Update translations.

41 files changed, 4370 insertions, 4063 deletions

diff --git a/data/translations/help/de.po b/data/translations/help/de.po
index d5d9849ba..37b12509c 100644
--- a/data/translations/help/de.po
+++ b/data/translations/help/de.po
@@ -18,9 +18,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-07-31 14:01+0000\n"
-"Last-Translator: Suni <kristin.joris@gmail.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/de/)\n"
+"PO-Revision-Date: 2015-08-04 13:09+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -289,7 +289,7 @@ msgid ""
 " Left click to execute default action: walk, pick up an item, attack a monster\n"
 " and talk to NPCs (be sure to click on their feet). Right click to show up a\n"
 " context menu. Holding [Left Shift] prevents from walking when attacking."
-msgstr "Linker Mausklick um Standard-Aktion ausführen: laufen, einen \nGegenstand aufheben, ein Monster angreifen und mit NPCs sprechen\n(achte darauf, auf ihre Füße zu klicken). Rechter Mausklick zeigt ein\nKontextmenü. Wenn du [Links Umschalt] gedrückt hältst,verhinderst du\nbeim Angriff das Laufen."
+msgstr " Linker Mausklick um Standard-Aktion ausführen: laufen, einen \n Gegenstand aufheben, ein Monster angreifen und mit NPCs sprechen\n (achte darauf, auf ihre Füße zu klicken). Rechter Mausklick zeigt ein\n Kontextmenü. Wenn du [Links Umschalt] gedrückt hältst,verhinderst du\n beim Angriff das Laufen."
 
 msgid "Search string not found."
 msgstr "Suchstring nicht gefunden."
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 466ebbb1c..06a51d33f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,8 +10,10 @@ src/being/localplayer.cpp
 src/being/playerrelations.cpp
 src/catch.hpp
 src/client.cpp
+src/commandline.cpp
 src/configmanager.cpp
 src/dirs.cpp
+src/dyetool/client.cpp
 src/dyetool/dyemain.cpp
 src/game.cpp
 src/gamemodifiers.cpp
@@ -137,7 +139,6 @@ src/input/pages/windows.cpp
 src/inventory.cpp
 src/localconsts.h
 src/logger.h
-src/main.cpp
 src/net/ea/charserverhandler.cpp
 src/net/ea/chathandler.cpp
 src/net/ea/gamehandler.cpp
diff --git a/po/ar.po b/po/ar.po
index bd77665ad..18571e6fc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/akaras/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -673,7 +675,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1870,7 +1872,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
@@ -2539,6 +2541,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2550,15 +2553,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2568,6 +2574,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2592,10 +2599,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2605,6 +2614,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2624,6 +2634,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2633,6 +2644,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4467,107 +4479,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5735,13 +5747,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 322adaf7c..ee0c33ebd 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
+"Language-Team: Bulgarian (http://www.transifex.com/akaras/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -669,7 +671,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1866,7 +1868,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
@@ -2535,6 +2537,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2546,15 +2549,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2564,6 +2570,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2588,10 +2595,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2601,6 +2610,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2620,6 +2630,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2629,6 +2640,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4463,107 +4475,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5731,13 +5743,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index e3ef79755..f6dc6dc94 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/"
-"language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
+"ca/)\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,8 +35,8 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -488,43 +488,48 @@ msgstr "Bombolla flotant"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configuració"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -537,8 +542,9 @@ msgstr "Ajuda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -638,6 +644,136 @@ msgstr "Registre anul·lat amb èxit"
 msgid "Farewell, come back any time..."
 msgstr "Adéu, torna quan vulguis..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opcions:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Arxiu de registre a utilitzar"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Mosta la versió"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Mostra aquesta ajuda"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Directori de configuració a utilitzar"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Inicia sessió amb aquest nom d'usuari"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Inicia sessió amb aquesta contrasenya"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Inicia sessió amb aquest personatge"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Servidor d'inici de sessió o IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Port d'inici de sessió"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Selecciona servidor i personatge per defecte"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Omet la descàrrega d'actualitzacions"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Directori de càrrega del joc"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Directori per a ser usat per desar informació"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Directori per a guardar captures de pantalla"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode : Comença el joc en mode segur"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -661,15 +797,15 @@ msgstr "Error creant el directori d'actualitzacions!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s no existeix i no pot ser creat! Sortint."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1098,31 +1234,31 @@ msgid "(F) free camera mode"
 msgstr "(F) mode de càmera lliure"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5790,9 +5926,8 @@ msgstr "Xiuxiuejant a %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Hack de desplaçament ràpid detectat."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6929,25 +7064,25 @@ msgstr "Tria Món"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6955,7 +7090,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8090,136 +8225,6 @@ msgstr "Emmagatzematge"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opcions:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Arxiu de registre a utilitzar"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Mosta la versió"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Mostra aquesta ajuda"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Directori de configuració a utilitzar"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Inicia sessió amb aquest nom d'usuari"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Inicia sessió amb aquesta contrasenya"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Inicia sessió amb aquest personatge"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Servidor d'inici de sessió o IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Port d'inici de sessió"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Selecciona servidor i personatge per defecte"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Omet la descàrrega d'actualitzacions"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Directori de càrrega del joc"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Directori per a ser usat per desar informació"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Directori per a guardar captures de pantalla"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode : Comença el joc en mode segur"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/cs.po b/po/cs.po
index cc52ce586..662a0e661 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,10 +14,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
+"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
 "cs/)\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -40,8 +40,8 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -493,43 +493,48 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Výkon"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápověda"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -542,8 +547,9 @@ msgstr "Nápověda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -643,6 +649,137 @@ msgstr "Zrušení registrace úspěšné"
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [možnosti] [soubor-manaplus]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[soubor-manaplus] : Manaplus soubor je XML soubor (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  používá se k nastavení vlastních parametrů"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  pro manaplus klienta."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Nastavení:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Použij logový soubor"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Složka uchování záznamu chatu"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Zobraz verzi"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Zobraz tuto nápovědu"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Použij adresář s konfigurací"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Přihlaš se tímto jménem"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Přihlaš se tímto heslem"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Přihlaš se k této postavě"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Přihlaš se k tomuto serveru nebo IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr "  -y --server-type    : Typ přihlašovacího serveru"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Přihlaš se k tomuto portu"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host    : Použít tohoto host pro update"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Vyber výchozí server postav a postavu"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Přeskoč stahování aktualizací"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Adresář odkud načíst herní data"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Adresář který použít jako lokální uložiště dat"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Adresář pro snímky obrazovky"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Pro spuštění hry v bezpečném módu"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr "     --renderer       : Nastaví typ vykreslování"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : Spustit testování ovladačů a automatickou konfiguraci"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : Zakázat OpenGL pro toto sezení"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -666,15 +803,15 @@ msgstr "Chyba při vytváření adresáře s updaty!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "nebo"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
@@ -1103,31 +1240,31 @@ msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Preješ si otevřít stránku podpory?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Zpráva"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Oživ"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 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:184
+#: src/gui/dialogsmanager.cpp:198
 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á."
@@ -5806,9 +5943,8 @@ msgstr "Šeptání pro %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Detekován podvod s rychlostí."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6945,25 +7081,25 @@ msgstr "Vyber svět"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "kl_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "Jknoflík%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "neznámá klávesa"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -6971,7 +7107,7 @@ msgstr "JK%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "n kl"
 
@@ -8108,137 +8244,6 @@ msgstr "Sklad"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [možnosti] [soubor-manaplus]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[soubor-manaplus] : Manaplus soubor je XML soubor (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  používá se k nastavení vlastních parametrů"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  pro manaplus klienta."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Nastavení:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Použij logový soubor"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Složka uchování záznamu chatu"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Zobraz verzi"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Zobraz tuto nápovědu"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Použij adresář s konfigurací"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Přihlaš se tímto jménem"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Přihlaš se tímto heslem"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Přihlaš se k této postavě"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Přihlaš se k tomuto serveru nebo IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr "  -y --server-type    : Typ přihlašovacího serveru"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Přihlaš se k tomuto portu"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : Použít tohoto host pro update"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Vyber výchozí server postav a postavu"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Přeskoč stahování aktualizací"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Adresář odkud načíst herní data"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Adresář který použít jako lokální uložiště dat"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Adresář pro snímky obrazovky"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Pro spuštění hry v bezpečném módu"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr "     --renderer       : Nastaví typ vykreslování"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Spustit testování ovladačů a automatickou konfiguraci"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : Zakázat OpenGL pro toto sezení"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/de.po b/po/de.po
index de65d8ddc..efec0716d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -33,10 +33,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-31 13:20+0000\n"
-"Last-Translator: Suni <kristin.joris@gmail.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-04 13:10+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -59,8 +59,8 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -513,43 +513,48 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Leistung"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "Über"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -562,8 +567,9 @@ msgstr "Hilfe"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -663,6 +669,141 @@ msgstr "Erfolgreich abgemeldet."
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [options] [manaplus-file]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-file] : Die manaplus-Datei ist eine XML-Datei (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  genutzt um eigene Parameter zu setzen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  zum manaplus Client."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Optionen:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Log-Datei benutzen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Verzeichnis für Chat-Logs"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Die Version des Spieles anzeigen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Diesen Hilfstext anzeigen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Zu benutzendes Konfigurationsverzeichnis"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Mit angegebenem Benutzernamen anmelden"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Angegebenes Passwort benutzen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --charakter      : Mit angegebenem Spieler anmelden"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Name oder IP-Adresse des Loginservers"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr "  -y --server-type    : Loginserver-Typ"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Port des Loginservers"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host    : Update host benutzen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+"  -D --default        : Voreingestellten Charakterserver und Charakter wählen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    :  Herunterladen von Updates überspringen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+"  -d --data           : Verzeichnis von dem Spieldaten geladen werden sollen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+" -L --localdata-dir : Verzeichnis das als Lokales Verzeichnis benutzt werden "
+"soll"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Verzeichnis zum Speichern von Screenshots"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Spiel im sicheren Modus starten"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr "     --renderer       : Renderer-Typ setzen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --Tests          : Treibertest und automatische Konfiguration starten"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : OpenGL für diese Sitzung deaktivieren"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -686,15 +827,15 @@ msgstr "Fehler beim erstellen des Verzeichnisses für Updates!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fehler: %s existiert nicht und kann nicht erstellt werden! Beende..."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "oder"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
@@ -1123,25 +1264,25 @@ msgid "(F) free camera mode"
 msgstr "(F) Kameramodus: Frei"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Willst du die Unterstützungsseite öffnen?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Nachricht"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Wiederbeleben"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1149,7 +1290,7 @@ msgstr ""
 "Gesundheit nicht mehr regenerieren."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 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 "
@@ -5970,9 +6111,8 @@ msgstr "Flüstern zu %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Defekter Spielername entdeckt: %s"
+msgstr "Defekter Spielername entdeckt: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -7109,25 +7249,25 @@ msgstr "Welt auswählen"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JKnopf%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "Unbekannte Taste"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -7135,7 +7275,7 @@ msgstr "JK%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "UTaste"
 
@@ -8270,141 +8410,6 @@ msgstr "Lager"
 msgid "Npc"
 msgstr "NPC"
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [options] [manaplus-file]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[manaplus-file] : Die manaplus-Datei ist eine XML-Datei (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  genutzt um eigene Parameter zu setzen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  zum manaplus Client."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Optionen:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Log-Datei benutzen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Verzeichnis für Chat-Logs"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Die Version des Spieles anzeigen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Diesen Hilfstext anzeigen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Zu benutzendes Konfigurationsverzeichnis"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Mit angegebenem Benutzernamen anmelden"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Angegebenes Passwort benutzen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --charakter      : Mit angegebenem Spieler anmelden"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Name oder IP-Adresse des Loginservers"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr "  -y --server-type    : Loginserver-Typ"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Port des Loginservers"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : Update host benutzen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : Voreingestellten Charakterserver und Charakter wählen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    :  Herunterladen von Updates überspringen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Verzeichnis von dem Spieldaten geladen werden sollen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-" -L --localdata-dir : Verzeichnis das als Lokales Verzeichnis benutzt werden "
-"soll"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Verzeichnis zum Speichern von Screenshots"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Spiel im sicheren Modus starten"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr "     --renderer       : Renderer-Typ setzen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --Tests          : Treibertest und automatische Konfiguration starten"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : OpenGL für diese Sitzung deaktivieren"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8933,7 +8938,7 @@ msgstr "Angriffsbereich"
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
 msgid "Damage per sec."
-msgstr "Schaden/Sek"
+msgstr "Schaden/Sek."
 
 #: src/net/eathena/generalhandler.cpp:410
 msgid "Karma"
diff --git a/po/en_GB.po b/po/en_GB.po
index 3f0123995..eee0c71b2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/akaras/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -281,12 +281,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -316,25 +318,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr "dodge"
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -670,7 +672,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr "General"
 
@@ -1867,7 +1869,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Players"
 
@@ -2536,6 +2538,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2547,15 +2550,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr "Particle effects"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2565,6 +2571,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2589,10 +2596,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2602,6 +2611,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr "Critical Hit"
@@ -2621,6 +2631,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr "Misses"
@@ -2630,6 +2641,7 @@ msgstr "Misses"
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4464,107 +4476,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr "Visible names"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5732,13 +5744,12 @@ msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index d848ef984..a438a1c1c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
+"Language-Team: Esperanto (http://www.transifex.com/akaras/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -281,12 +281,14 @@ msgstr ""
 msgid "enemy"
 msgstr "malamiko"
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -316,25 +318,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr "I"
 
@@ -670,7 +672,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1867,7 +1869,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Ludantoj"
 
@@ -2536,6 +2538,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2547,15 +2550,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2565,6 +2571,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2589,10 +2596,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2602,6 +2611,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2621,6 +2631,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2630,6 +2641,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4464,107 +4476,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5732,13 +5744,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 57e9b6451..856d45a3e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,11 +21,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 18:19+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
-"language/es/)\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-04 13:11+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,8 +47,8 @@ msgstr "Archivo subido"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -500,43 +500,48 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Rendimiento"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ayuda"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -549,8 +554,9 @@ msgstr "Ayuda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -650,6 +656,139 @@ msgstr "Registro cancelado"
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [opciones] [manaplus-file]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-file] : El archivo manaplus es un archivo XML (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "              usado para establecer parámetros personalizados."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "              al cliente manaplus."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opciones:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Archivo de registro a usar"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Directorio de registro a usar"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Muestra la versión"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Muestra esta ayuda"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Configuración del directorio a usar"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Acceder con este nombre de usuario"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Acceder con esta contraseña"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Acceder con este personaje"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Servidor de inicio de sesión o IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr "  -y --server-type    : Tipo de servidor de inicio de sesión"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Puerto del servidor de inicio de sesión"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host    : Usar este host de actualización"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Saltarse las descargas de actualización"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+"  -d --data           : Carpeta desde la que se cargan los datos del juego"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+"     --screenshot-dir : Carpeta donde se guardan las capturas de pantalla"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode : Iniciar el juego en modo seguro"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr "     --renderer: Establecer tipo de renderizador"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : Comenzar a probar controladores y auto configurar"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl: Deshabilitar OpenGL para esta sesión"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -673,15 +812,15 @@ msgstr "¡Error al crear la carpeta de actualizaciones!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd archivoOrigen colorTinte archivoDestino"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "o"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
@@ -1110,25 +1249,25 @@ msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "¿Quieres abrir la página de soporte?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Mensaje"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Revivir"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1136,7 +1275,7 @@ msgstr ""
 "salud."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 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."
@@ -1650,7 +1789,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:285
 msgid "Cards: "
-msgstr "Tarjetas:"
+msgstr "Tarjetas: "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
@@ -5825,9 +5964,8 @@ msgstr "Susurrando a %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Nick roto detectado: %s"
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6967,25 +7105,25 @@ msgstr "Escoger Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "tecla desconocida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6993,7 +7131,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "desc."
 
@@ -8128,139 +8266,6 @@ msgstr "Almacenamiento"
 msgid "Npc"
 msgstr "Npc"
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [opciones] [manaplus-file]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[manaplus-file] : El archivo manaplus es un archivo XML (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "              usado para establecer parámetros personalizados."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "              al cliente manaplus."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opciones:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Archivo de registro a usar"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Directorio de registro a usar"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Muestra la versión"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Muestra esta ayuda"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Configuración del directorio a usar"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Acceder con este nombre de usuario"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Acceder con esta contraseña"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Acceder con este personaje"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Servidor de inicio de sesión o IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr "  -y --server-type    : Tipo de servidor de inicio de sesión"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Puerto del servidor de inicio de sesión"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : Usar este host de actualización"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Saltarse las descargas de actualización"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Carpeta desde la que se cargan los datos del juego"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"     --screenshot-dir : Carpeta donde se guardan las capturas de pantalla"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode : Iniciar el juego en modo seguro"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr "     --renderer: Establecer tipo de renderizador"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Comenzar a probar controladores y auto configurar"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl: Deshabilitar OpenGL para esta sesión"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/et.po b/po/et.po
index 88ec51b0a..75866a5a4 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
+"Language-Team: Estonian (http://www.transifex.com/akaras/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -669,7 +671,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1866,7 +1868,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
@@ -2535,6 +2537,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2546,15 +2549,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2564,6 +2570,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2588,10 +2595,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2601,6 +2610,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2620,6 +2630,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2629,6 +2640,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4463,107 +4475,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5731,13 +5743,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index e0f881f3f..0bcb49f1e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
+"Language-Team: Persian (http://www.transifex.com/akaras/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -668,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr "کلی"
 
@@ -1865,7 +1867,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
@@ -2534,6 +2536,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2545,15 +2548,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2563,6 +2569,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2587,10 +2594,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2600,6 +2609,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2619,6 +2629,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2628,6 +2639,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4462,107 +4474,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5730,13 +5742,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index e88e80c38..5ff649285 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
-"language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
+"fi/)\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,8 +35,8 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -487,43 +487,48 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Apua"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -536,8 +541,9 @@ msgstr "Apua"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -637,6 +643,137 @@ msgstr "Tietojen poisto onnistui"
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [asetukset] [manaplus-tiedosto]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  jolla asetetaan erikoisvalitsimia"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  manaplus-ohjelmalle."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Asetusvivut:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Käytettävä lokitiedosto"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Näytä versionumero"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Näytä tämä ohje"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+"  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Ohita päivityslataukset"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Käynnistä peli vikasietotilassa"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr "  -T --tests          : Käynnistä ajuritestaus ja automaattiasetukset"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -660,15 +797,15 @@ msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1097,31 +1234,31 @@ msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Viesti"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 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:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 
@@ -5785,9 +5922,8 @@ msgstr "Kuiskaat pelaajalle %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Nopeusviritelmä havaittu."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6922,25 +7058,25 @@ msgstr "Valitse pelimaailma"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6948,7 +7084,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8083,137 +8219,6 @@ msgstr "Varasto"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [asetukset] [manaplus-tiedosto]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  jolla asetetaan erikoisvalitsimia"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  manaplus-ohjelmalle."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Asetusvivut:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Käytettävä lokitiedosto"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Näytä versionumero"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Näytä tämä ohje"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-"  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Ohita päivityslataukset"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Käynnistä peli vikasietotilassa"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Käynnistä ajuritestaus ja automaattiasetukset"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/fr.po b/po/fr.po
index 676d04205..1945a0b11 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,10 +21,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
+"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -47,8 +47,8 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -502,43 +502,48 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aide"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -551,8 +556,9 @@ msgstr "Aide"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -652,6 +658,143 @@ msgstr "Désinscription réussie"
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [options] [manaplus-file]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[Manaplus-file] : Le fichier manaplus est un fichier XML (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  utilisé pour définir des paramètres personnalisés"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  pour le client manaplus."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Options :"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : fichier journal à utiliser"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+" -a --chat-log-dir : Répertoire de l'historique de conversation à utiliser"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Affiche la version"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help : Montre cette rubrique d'aide"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password : Se connecter avec ce mot de passe"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character : Se connecter avec ce personnage"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr "  -y --server-type : Type de connexion au serveur"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : Port de connexion au serveur"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr " -H --update-host : Utilise cet hôte de mise à jour"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+"  -D --default : Choisir le serveur de personnages et le personnage par "
+"défaut"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+"  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Répertoire des données du jeu à charger"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+"  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Démarrer le jeu en mode sûr"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr "     --renderer       : Définir le type de rendu"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : Commencer le test des drivers et la configuration "
+"automatique"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr " -O --no-opengl : Désactiver OpenGL pour cette session"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -676,15 +819,15 @@ msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 "Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "ou"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
@@ -1114,25 +1257,25 @@ msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Veux-tu ouvrir la page d'aide ?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Message"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Ressusciter"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1140,7 +1283,7 @@ msgstr ""
 "n'êtes plus en mesure de récupérer votre santé."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Vous portez moins de la moitié du poids maximal de votre inventaire. Vous "
@@ -5831,9 +5974,8 @@ msgstr "Message privé envoyé à %s : %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Speed hack détecté."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6974,25 +7116,25 @@ msgstr "Choix du monde"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JBoutton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "touche inconnue"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7000,7 +7142,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "touche u"
 
@@ -8135,143 +8277,6 @@ msgstr "Entrepôt"
 msgid "Npc"
 msgstr "Npc"
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [options] [manaplus-file]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[Manaplus-file] : Le fichier manaplus est un fichier XML (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  utilisé pour définir des paramètres personnalisés"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  pour le client manaplus."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Options :"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : fichier journal à utiliser"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-" -a --chat-log-dir : Répertoire de l'historique de conversation à utiliser"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Affiche la version"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Montre cette rubrique d'aide"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Se connecter avec ce mot de passe"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Se connecter avec ce personnage"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr "  -y --server-type : Type de connexion au serveur"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Port de connexion au serveur"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr " -H --update-host : Utilise cet hôte de mise à jour"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default : Choisir le serveur de personnages et le personnage par "
-"défaut"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-"  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Répertoire des données du jeu à charger"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Démarrer le jeu en mode sûr"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr "     --renderer       : Définir le type de rendu"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Commencer le test des drivers et la configuration "
-"automatique"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr " -O --no-opengl : Désactiver OpenGL pour cette session"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/he.po b/po/he.po
index f179ba2e6..752e2bd4f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/akaras/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -669,7 +671,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr "כללי"
 
@@ -1866,7 +1868,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "שחקנים"
 
@@ -2535,6 +2537,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2546,15 +2549,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr "אפקטים חלקיים"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2564,6 +2570,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2588,10 +2595,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2601,6 +2610,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr "מכה קריטית"
@@ -2620,6 +2630,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr "פספוס"
@@ -2629,6 +2640,7 @@ msgstr "פספוס"
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4463,107 +4475,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr "שמות גלויים"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5731,13 +5743,12 @@ msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 02aff3c13..168e586f5 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/akaras/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -670,7 +672,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr "Općenito"
 
@@ -1867,7 +1869,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Igrači"
 
@@ -2536,6 +2538,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2547,15 +2550,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2565,6 +2571,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2589,10 +2596,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2602,6 +2611,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr "Kritični Udarac"
@@ -2621,6 +2631,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr "Promašaji"
@@ -2630,6 +2641,7 @@ msgstr "Promašaji"
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4464,107 +4476,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr "Vidljiva imena"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5732,13 +5744,12 @@ msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 484e7c79f..78333d6b7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/akaras/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -669,7 +671,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr "Általános"
 
@@ -1866,7 +1868,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Játékosok"
 
@@ -2535,6 +2537,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2546,15 +2549,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr "Játékbéli effektek"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2564,6 +2570,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2588,10 +2595,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2601,6 +2610,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr "Kritikális ütéskor"
@@ -2620,6 +2630,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr "Ha nincs találat."
@@ -2629,6 +2640,7 @@ msgstr "Ha nincs találat."
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4463,107 +4475,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr "Látható nevek"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5731,13 +5743,12 @@ msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index f27564059..adbdb39c2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,11 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
-"language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
+"id/)\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,8 +39,8 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -491,43 +491,48 @@ msgstr "Gelembung mengambang"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performa"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vidio"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "Tentang"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Bantuan"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -540,8 +545,9 @@ msgstr "Bantuan"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -641,6 +647,136 @@ msgstr "Telah tidak terdaftar"
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -664,15 +800,15 @@ msgstr "Gagal membuat direktori update!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Kesalahan %s tidak ada dan tidak dapat dibuat! Keluar."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "pewarnacmd sumberdata pewarnastring datadst"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "atau"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "pewarnacmd sumberpewarnastring datadst"
 
@@ -1101,32 +1237,32 @@ msgid "(F) free camera mode"
 msgstr "(F) mode kamera bebas"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Kamu ingin membuka halaman bantuan?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Pesan"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Hidupkan"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 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:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kamu membawa kurang dari separuh beratmu. Kamu bisa regenerasi darah."
 
@@ -6921,25 +7057,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6947,7 +7083,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8082,136 +8218,6 @@ msgstr "Tempat penyimpanan"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/it.po b/po/it.po
index f608cfee0..b0fa4eaae 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,11 +18,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
-"language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
+"it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,8 +44,8 @@ msgstr "File caricato"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -497,43 +497,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aiuto"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -546,8 +551,9 @@ msgstr "Aiuto"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -647,6 +653,139 @@ msgstr "Annullamento registrazione effettuato con successo"
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opzioni:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Log file da usare"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Visualizza la versione"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Visualizza l'aiuto"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Configura la directory da usare"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Effettua il Login con questo username"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Effettua il Login con questa password"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Effettua il Login con questo personaggio"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+"  -s --server         : Effettua il Login con questo nome Server o a questo "
+"indirizzo IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Effettua il Login a questa Server port"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Sceglie il personaggio e il server di default"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Non effettuare il download degli aggiornamenti"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Scegli la Directory per lanciare il gioco"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Directory da usare per i dati locali"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+"     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Lancia il gioco in modalità Sicura"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -670,15 +809,15 @@ msgstr "Errore durante la creazione della directory degli aggiornamenti!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1107,25 +1246,25 @@ msgid "(F) free camera mode"
 msgstr "(F) Modalita' camera libera"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Messaggio"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1133,7 +1272,7 @@ msgstr ""
 "vita."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 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."
@@ -5803,9 +5942,8 @@ msgstr "Sussurra a %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Rilevato speed hack."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6942,25 +7080,25 @@ msgstr "Scegli parola"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "pulsante sconosciuto"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6968,7 +7106,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8103,139 +8241,6 @@ msgstr "Magazzino"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opzioni:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Log file da usare"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Visualizza la versione"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Visualizza l'aiuto"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Configura la directory da usare"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Effettua il Login con questo username"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Effettua il Login con questa password"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Effettua il Login con questo personaggio"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-"  -s --server         : Effettua il Login con questo nome Server o a questo "
-"indirizzo IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Effettua il Login a questa Server port"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Sceglie il personaggio e il server di default"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Non effettuare il download degli aggiornamenti"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Scegli la Directory per lanciare il gioco"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Directory da usare per i dati locali"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Lancia il gioco in modalità Sicura"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/ja.po b/po/ja.po
index 207b1b164..71ce5f6e4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,11 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
-"language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
+"ja/)\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,8 +40,8 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -491,43 +491,48 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -540,8 +545,9 @@ msgstr "ヘルプ"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -641,6 +647,139 @@ msgstr "登録を解除しました"
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [オプション] [manaplus-ファイル]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-ファイル] : manaplusのファイルはXMLファイルです (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  でカスタムパラメーターを設定しました"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  をmanaplusクライアントへ設定しました."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "オプション:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : 使用するログファイル"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : バージョンを表示"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : ヘルプメニュー表示"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : 使用する設定ファイル"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : この名前でログインする"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : このパスワードでログインする"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : このキャラクターでログインする"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : ログインサーバー又はIP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : ログインサーバーポート"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+"  -D --default        : デフォルトで使用するキャラクターサーバーとキャラク"
+"ターを選択する"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : アップデートをスキップする"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : ゲームデータを読み込む場所"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : ローカルデータディレクトリの場所"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : スクリーンショットの保存場所"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : セーフモードでゲームを始める"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -664,15 +803,15 @@ msgstr "更新フォルダの作成エラ!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1101,31 +1240,31 @@ msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "メッセージ"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "インベントリーが体重の半分以上の為、体力は回復できません."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "インベントリーが体重の半分以下になった為、体力は回復します."
 
@@ -5788,9 +5927,8 @@ msgstr "%sにささやき中:%s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "スピードハックが探知されました."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6925,25 +7063,25 @@ msgstr "世界の選択"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "ジョイスティックボタン%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "不明なキー"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6951,7 +7089,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u キー"
 
@@ -8086,139 +8224,6 @@ msgstr "倉庫"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [オプション] [manaplus-ファイル]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[manaplus-ファイル] : manaplusのファイルはXMLファイルです (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  でカスタムパラメーターを設定しました"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  をmanaplusクライアントへ設定しました."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "オプション:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : 使用するログファイル"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : バージョンを表示"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : ヘルプメニュー表示"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : 使用する設定ファイル"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : この名前でログインする"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : このパスワードでログインする"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : このキャラクターでログインする"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : ログインサーバー又はIP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : ログインサーバーポート"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : デフォルトで使用するキャラクターサーバーとキャラク"
-"ターを選択する"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : アップデートをスキップする"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : ゲームデータを読み込む場所"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : ローカルデータディレクトリの場所"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : スクリーンショットの保存場所"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : セーフモードでゲームを始める"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/ka.po b/po/ka.po
index 465394740..50126cad0 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
+"Language-Team: Georgian (http://www.transifex.com/akaras/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -668,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1865,7 +1867,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
@@ -2534,6 +2536,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2545,15 +2548,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2563,6 +2569,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2587,10 +2594,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2600,6 +2609,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2619,6 +2629,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2628,6 +2639,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4462,107 +4474,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5730,13 +5742,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index bd8afa935..a4d707cdd 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"POT-Creation-Date: 2015-08-04 15:55+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"
@@ -33,8 +33,8 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -485,43 +485,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -534,8 +539,9 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -635,6 +641,136 @@ msgstr ""
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -658,15 +794,15 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1095,31 +1231,31 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -6916,25 +7052,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6942,7 +7078,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8077,136 +8213,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/nb.po b/po/nb.po
index 78fa75d27..dd9ca863d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/akaras/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -669,7 +671,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr "Generelt"
 
@@ -1866,7 +1868,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spillere"
 
@@ -2535,6 +2537,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2546,15 +2549,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr "Partikkeleffekter"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2564,6 +2570,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2588,10 +2595,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2601,6 +2610,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2620,6 +2630,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2629,6 +2640,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4463,107 +4475,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr "Synlige navn"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5731,13 +5743,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 4c83fd3c8..85de1b613 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
 "Language: nl_BE\n"
 "MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -489,43 +489,48 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -538,8 +543,9 @@ msgstr "Help"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -639,6 +645,136 @@ msgstr "Registratie ongedaan gemaakt!"
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [opties] [mana-bestand]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "              om manuele parameters te gebruiken"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "              aan de manaplus client."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opties:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Log bestand te gebruiken"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Toon de versie"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Toon deze help"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Configuratie map te gebruiken"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Login met deze gebruikersnaam"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Loging met dit wachtwoord"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Login met dit karakter"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Login servernaam of IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Login serverpoort"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Kies standaard karakterserver en karakter"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : update downloads overslaan"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Map om spelgegevens te laden"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Start spel in veilige modus"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -662,15 +798,15 @@ msgstr "Fout bij het creëren van de update map!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "of"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1099,25 +1235,25 @@ msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Bericht"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1125,7 +1261,7 @@ msgstr ""
 "herstellen."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5792,9 +5928,8 @@ msgstr "Fluisteren naar %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Snelheidshack gedetecteerd."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6931,25 +7066,25 @@ msgstr "Kies Wereld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6957,7 +7092,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u key"
 
@@ -8092,136 +8227,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [opties] [mana-bestand]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "              om manuele parameters te gebruiken"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "              aan de manaplus client."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opties:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Log bestand te gebruiken"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Toon de versie"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Toon deze help"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Configuratie map te gebruiken"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Login met deze gebruikersnaam"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Loging met dit wachtwoord"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Login met dit karakter"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Login servernaam of IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Login serverpoort"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Kies standaard karakterserver en karakter"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : update downloads overslaan"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Map om spelgegevens te laden"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Start spel in veilige modus"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 4c83fd3c8..85de1b613 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
 "Language: nl_BE\n"
 "MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -489,43 +489,48 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -538,8 +543,9 @@ msgstr "Help"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -639,6 +645,136 @@ msgstr "Registratie ongedaan gemaakt!"
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [opties] [mana-bestand]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "              om manuele parameters te gebruiken"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "              aan de manaplus client."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opties:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Log bestand te gebruiken"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Toon de versie"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Toon deze help"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Configuratie map te gebruiken"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Login met deze gebruikersnaam"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Loging met dit wachtwoord"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Login met dit karakter"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Login servernaam of IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Login serverpoort"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Kies standaard karakterserver en karakter"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : update downloads overslaan"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Map om spelgegevens te laden"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Start spel in veilige modus"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -662,15 +798,15 @@ msgstr "Fout bij het creëren van de update map!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "of"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1099,25 +1235,25 @@ msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Bericht"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1125,7 +1261,7 @@ msgstr ""
 "herstellen."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5792,9 +5928,8 @@ msgstr "Fluisteren naar %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Snelheidshack gedetecteerd."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6931,25 +7066,25 @@ msgstr "Kies Wereld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6957,7 +7092,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u key"
 
@@ -8092,136 +8227,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [opties] [mana-bestand]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "              om manuele parameters te gebruiken"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "              aan de manaplus client."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opties:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Log bestand te gebruiken"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Toon de versie"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Toon deze help"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Configuratie map te gebruiken"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Login met deze gebruikersnaam"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Loging met dit wachtwoord"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Login met dit karakter"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Login servernaam of IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Login serverpoort"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Kies standaard karakterserver en karakter"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : update downloads overslaan"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Map om spelgegevens te laden"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Start spel in veilige modus"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/pl.po b/po/pl.po
index 9182d15ec..60d377658 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,10 +14,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
+"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
 "pl/)\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -41,8 +41,8 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -494,43 +494,48 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Wydajność"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -543,8 +548,9 @@ msgstr "Pomoc"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -644,6 +650,136 @@ msgstr "Wyrejestrowano z powodzeniem"
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [opcje] [manaplus-file]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  używane do wprowadzania własnych parametrów"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  do klienta manaplus."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opcje:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Używany plik logów"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Folder do zapisywania logów"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Pokaż wersję"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Pokaż tą pomoc"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Katalog konfiguracyjny"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Zaloguj się tym loginem"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Zaloguj się tym hasłem"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Zaloguj się tą postacią"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Nazwa serwera lub IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Port serwera"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host    : użyj tego hostu aktualizacyjnego"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Wybierz domyślny serwer i postać"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Omiń aktualizację"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Katalog z danymi gry"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Katalog z lokalnymi danymi"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Katalog ze zrzutami ekranu"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Rozpocznij grę w trybie bezpieczeństwa"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr "     --renderer       : Ustawia rodzaj renderowania"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr "  -T --test           : Rozpocznij test sterowników i autokonfigurację"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : deaktywuj OpenGL na tę sesję"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -667,15 +803,15 @@ msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "lub"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
@@ -1104,32 +1240,32 @@ msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Czy chcesz otworzyć stronę ze wsparciem/pomocą?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Wiadomość"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Wskrześ"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 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:184
+#: src/gui/dialogsmanager.cpp:198
 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ć "
@@ -5808,9 +5944,8 @@ msgstr "Szepczesz do %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Wykryto speed hack."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6949,25 +7084,25 @@ msgstr "Wybierz świat"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "nieznany klawisz"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6975,7 +7110,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "(nieznany)"
 
@@ -8110,136 +8245,6 @@ msgstr "Magazyn"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [opcje] [manaplus-file]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  używane do wprowadzania własnych parametrów"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  do klienta manaplus."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opcje:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Używany plik logów"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Folder do zapisywania logów"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Pokaż wersję"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Pokaż tą pomoc"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Katalog konfiguracyjny"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Zaloguj się tym loginem"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Zaloguj się tym hasłem"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Zaloguj się tą postacią"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Nazwa serwera lub IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Port serwera"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : użyj tego hostu aktualizacyjnego"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Wybierz domyślny serwer i postać"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Omiń aktualizację"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Katalog z danymi gry"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Katalog z lokalnymi danymi"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Katalog ze zrzutami ekranu"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Rozpocznij grę w trybie bezpieczeństwa"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr "     --renderer       : Ustawia rodzaj renderowania"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --test           : Rozpocznij test sterowników i autokonfigurację"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : deaktywuj OpenGL na tę sesję"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/pt.po b/po/pt.po
index 4df9886f9..a26da85a4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,11 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
-"language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
+"pt/)\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,8 +37,8 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -489,43 +489,48 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -538,8 +543,9 @@ msgstr "Ajuda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -639,6 +645,141 @@ msgstr "Registro cancelado com sucesso"
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [opções] [manaplus-arquivo]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  usado para definir parâmetros customizados"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  para o cliente manaplus."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opções:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Usar arquivo de log"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir : Diretório para log de chat"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        :  Exibe a versão"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Exibe esta ajuda"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Efetua login com este usuário"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       :Efetua login com esta senha"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      :Efetua login com este personagem"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         :  Nome ou IP do servidor de login"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Porta do servidor de login"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host : Usar este host de update"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+"  -D --default        : Escolhe um personagem e um servidor de personagem "
+"padrão"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Não faz downloads de atualização"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Inicia o jogo em modo seguro"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --testes          : Começar a testar drivers para auto configuração"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -662,15 +803,15 @@ msgstr "Erro ao criar pasta de atualizações!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1099,25 +1240,25 @@ msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1125,7 +1266,7 @@ msgstr ""
 "recuperar HP."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 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 "
@@ -5799,9 +5940,8 @@ msgstr "Enviando MP para %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Hack de velocidade detectado."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6937,25 +7077,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JBotão%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6963,7 +7103,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "Tecla u"
 
@@ -8098,141 +8238,6 @@ msgstr "Armazém"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [opções] [manaplus-arquivo]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  usado para definir parâmetros customizados"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  para o cliente manaplus."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opções:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Usar arquivo de log"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir : Diretório para log de chat"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        :  Exibe a versão"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Exibe esta ajuda"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Efetua login com este usuário"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       :Efetua login com esta senha"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      :Efetua login com este personagem"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         :  Nome ou IP do servidor de login"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Porta do servidor de login"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host : Usar este host de update"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : Escolhe um personagem e um servidor de personagem "
-"padrão"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Não faz downloads de atualização"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Inicia o jogo em modo seguro"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --testes          : Começar a testar drivers para auto configuração"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c770cbaee..37d2867b9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,11 +22,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
-"manaplus/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
+"language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,8 +48,8 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -502,43 +502,48 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Desempenho"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -551,8 +556,9 @@ msgstr "Ajuda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -652,6 +658,140 @@ msgstr "Registro cancelado com sucesso"
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "Manaplus [opções] [manaplus-arquivo]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  Usado para parâmetros customizados"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  Para o cliente Manaplus."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opções:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Usar arquivo de log"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Diretório para registro de chat"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        :  Exibe a versão"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Exibe esta ajuda"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Efetua login com este usuário"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       :Efetua login com esta senha"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      :Efetua login com este personagem"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         :  Nome ou IP do servidor de login"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr "  -y --server-type: tipo de login do servidor"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Porta do servidor de login"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host    : Usar este host de update"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+"  -D --default        : Escolhe um personagem e um servidor de personagem "
+"padrão"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Não faz downloads de atualização"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Inicia o jogo em modo seguro"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr "     --renderer       : Define o tipo de renderização"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr "  -T --testes         : Começa a testar drivers e a auto-configurar"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : Desabilita OpenGL nesta sessão"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -675,15 +815,15 @@ msgstr "Erro ao criar pasta de atualizações!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "ou"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
@@ -1112,25 +1252,25 @@ msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Você quer abrir a página de suporte?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Reviver"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1138,7 +1278,7 @@ msgstr ""
 "recuperar HP."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 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 "
@@ -5816,9 +5956,8 @@ msgstr "Enviando MP para %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Hack de velocidade detectado."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6954,25 +7093,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "BotãoJ%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6980,7 +7119,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "tecla u"
 
@@ -8115,140 +8254,6 @@ msgstr "Armazém"
 msgid "Npc"
 msgstr "Npc"
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "Manaplus [opções] [manaplus-arquivo]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  Usado para parâmetros customizados"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  Para o cliente Manaplus."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opções:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Usar arquivo de log"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Diretório para registro de chat"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        :  Exibe a versão"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Exibe esta ajuda"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Efetua login com este usuário"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       :Efetua login com esta senha"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      :Efetua login com este personagem"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         :  Nome ou IP do servidor de login"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr "  -y --server-type: tipo de login do servidor"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Porta do servidor de login"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : Usar este host de update"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : Escolhe um personagem e um servidor de personagem "
-"padrão"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Não faz downloads de atualização"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Inicia o jogo em modo seguro"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr "     --renderer       : Define o tipo de renderização"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --testes         : Começa a testar drivers e a auto-configurar"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : Desabilita OpenGL nesta sessão"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/ru.po b/po/ru.po
index 73635dd9e..b4b817969 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,11 +18,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-31 10:20+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-04 13:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
-"language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
+"ru/)\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,8 +46,8 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -500,43 +500,48 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Помощь"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -549,8 +554,9 @@ msgstr "Помощь"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -650,6 +656,138 @@ msgstr "Регистрация удалена"
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [параметры] [файл-manaplus]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[файл-manaplus] : Файл manaplus это xml файл (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  используется для указания дополнительных параметров"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  в клиенте."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Опции:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Использовать указанный файл как лог"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Использовать указанный каталог для лога"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Показать версию"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Показать эту справку"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Использовать указанный каталог конфигурации"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Войти с указанным логином"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Войти с указанным паролем"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Использовать указанный персонаж"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Имя или IP сервера авторизации"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr "  -y --server-type    : Тип сервера"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Порт сервера авторизации"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host    : Использовать этот узел обновлений"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+"  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Пропустить обновление"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Загрузить игровые данные из этого каталога"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Каталог для локальных данных"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Сохранять скриншоты в указанном каталоге"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Запуск игры в безопасном режиме"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr "     --renderer       : Устанавливает тип рендера"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : Не использовать OpenGL для этой сессии"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -673,15 +811,15 @@ msgstr "Ошибка создания директории для обновле
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd исходный_файл строка_цвета файл_назначения"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "или"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
@@ -1110,25 +1248,25 @@ msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Открыть страницу поддержки?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Сообщение"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Оживить"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1136,7 +1274,7 @@ msgstr ""
 "восстанавливаться не будет."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Вес предметов составляет менее половины допустимого. Теперь Вы можете "
@@ -1651,7 +1789,7 @@ msgstr "Вес: %s"
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:285
 msgid "Cards: "
-msgstr "Карты:"
+msgstr "Карты: "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
@@ -5819,9 +5957,8 @@ msgstr "Вы прошептали %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Обнаружен неправильный ник: %s"
+msgstr "Обнаружен некорректный ник: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6962,25 +7099,25 @@ msgstr "Выберите сервер"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "КнопДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "неизвестная кнопка"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -6988,7 +7125,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "неиз."
 
@@ -8123,138 +8260,6 @@ msgstr "Хранилище"
 msgid "Npc"
 msgstr "НИП"
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [параметры] [файл-manaplus]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[файл-manaplus] : Файл manaplus это xml файл (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  используется для указания дополнительных параметров"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  в клиенте."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Опции:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Использовать указанный файл как лог"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Использовать указанный каталог для лога"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Показать версию"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Показать эту справку"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Использовать указанный каталог конфигурации"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Войти с указанным логином"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Войти с указанным паролем"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Использовать указанный персонаж"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Имя или IP сервера авторизации"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr "  -y --server-type    : Тип сервера"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Порт сервера авторизации"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : Использовать этот узел обновлений"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Пропустить обновление"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Загрузить игровые данные из этого каталога"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Каталог для локальных данных"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Сохранять скриншоты в указанном каталоге"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Запуск игры в безопасном режиме"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr "     --renderer       : Устанавливает тип рендера"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : Не использовать OpenGL для этой сессии"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9748,7 +9753,7 @@ msgstr "Ошибка входа в комнату. Неправильная ра
 #: src/resources/notifications.h:568
 #, c-format
 msgid "Left %d seconds until you can use item."
-msgstr "Осталось %d секунд, пока вы можете использовать предмет"
+msgstr "Осталось %d секунд, пока вы можете использовать предмет."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:572
diff --git a/po/sk.po b/po/sk.po
index 39a1652e8..dc8a3af1a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/akaras/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -670,7 +672,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1867,7 +1869,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
@@ -2536,6 +2538,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2547,15 +2550,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2565,6 +2571,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2589,10 +2596,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2602,6 +2611,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2621,6 +2631,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2630,6 +2641,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4464,107 +4476,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5732,13 +5744,12 @@ msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/sq.po b/po/sq.po
index b40b933b7..d2154e861 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
+"Language-Team: Albanian (http://www.transifex.com/akaras/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -669,7 +671,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1866,7 +1868,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
@@ -2535,6 +2537,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2546,15 +2549,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2564,6 +2570,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2588,10 +2595,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2601,6 +2610,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2620,6 +2630,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2629,6 +2640,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4463,107 +4475,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5731,13 +5743,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 2093c47b4..151725fe3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
-"manaplus/language/sv_SE/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
+"language/sv_SE/)\n"
 "Language: sv_SE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,8 +34,8 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -486,43 +486,48 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -535,8 +540,9 @@ msgstr "Hjälp"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -636,6 +642,139 @@ msgstr "Avregistrering lyckad"
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [options] [manaplus-file]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-file] : manaplus-filen är en XML-fil (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  används för att sätta anpassade parameters"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  till manaplus-klienten."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Inställningar:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Log-fil att använda"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Katalog att använda för Chat-logg"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Visa version"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Visa hjälp"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Logga in med detta användarnamn"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Logga in med detta lösenord"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Logga in med denna karaktär"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Inloggningsserver-namn eller IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Loginserver-port"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host    : Använd detta för att uppdatera hosten"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Välj standard-karaktär server och karaktär"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Undvik uppdateringshemladdning"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Katalog att ladda speldata från"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Katalog att använda som lokal datakatalog"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Katalog att lagra skärmdumpar i"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Starta spelet i felsäkert läge"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : Börja testning av drivrutiner och automat-"
+"configurering"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -659,15 +798,15 @@ msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1096,31 +1235,31 @@ msgid "(F) free camera mode"
 msgstr "(F) fritt kamera-läge"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Meddelande"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 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:184
+#: src/gui/dialogsmanager.cpp:198
 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."
 
@@ -5793,9 +5932,8 @@ msgstr "Viskar till %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Speed hack upptäckt."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6934,25 +7072,25 @@ msgstr "Välj värld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6960,7 +7098,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -8095,139 +8233,6 @@ msgstr "Storage"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [options] [manaplus-file]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[manaplus-file] : manaplus-filen är en XML-fil (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  används för att sätta anpassade parameters"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  till manaplus-klienten."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Inställningar:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Log-fil att använda"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Katalog att använda för Chat-logg"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Visa version"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Visa hjälp"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Logga in med detta användarnamn"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Logga in med detta lösenord"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Logga in med denna karaktär"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Inloggningsserver-namn eller IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Loginserver-port"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : Använd detta för att uppdatera hosten"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Välj standard-karaktär server och karaktär"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Undvik uppdateringshemladdning"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Katalog att ladda speldata från"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Katalog att använda som lokal datakatalog"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Katalog att lagra skärmdumpar i"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Starta spelet i felsäkert läge"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Börja testning av drivrutiner och automat-"
-"configurering"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 2093c47b4..151725fe3 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
-"manaplus/language/sv_SE/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
+"language/sv_SE/)\n"
 "Language: sv_SE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,8 +34,8 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -486,43 +486,48 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -535,8 +540,9 @@ msgstr "Hjälp"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -636,6 +642,139 @@ msgstr "Avregistrering lyckad"
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [options] [manaplus-file]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-file] : manaplus-filen är en XML-fil (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  används för att sätta anpassade parameters"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  till manaplus-klienten."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Inställningar:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Log-fil att använda"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Katalog att använda för Chat-logg"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Visa version"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Visa hjälp"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Logga in med detta användarnamn"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Logga in med detta lösenord"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Logga in med denna karaktär"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Inloggningsserver-namn eller IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Loginserver-port"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host    : Använd detta för att uppdatera hosten"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Välj standard-karaktär server och karaktär"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Undvik uppdateringshemladdning"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Katalog att ladda speldata från"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Katalog att använda som lokal datakatalog"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Katalog att lagra skärmdumpar i"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Starta spelet i felsäkert läge"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : Börja testning av drivrutiner och automat-"
+"configurering"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -659,15 +798,15 @@ msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1096,31 +1235,31 @@ msgid "(F) free camera mode"
 msgstr "(F) fritt kamera-läge"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Meddelande"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 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:184
+#: src/gui/dialogsmanager.cpp:198
 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."
 
@@ -5793,9 +5932,8 @@ msgstr "Viskar till %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Speed hack upptäckt."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6934,25 +7072,25 @@ msgstr "Välj värld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6960,7 +7098,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -8095,139 +8233,6 @@ msgstr "Storage"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [options] [manaplus-file]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[manaplus-file] : manaplus-filen är en XML-fil (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  används för att sätta anpassade parameters"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  till manaplus-klienten."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Inställningar:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Log-fil att använda"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Katalog att använda för Chat-logg"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Visa version"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Visa hjälp"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Logga in med detta användarnamn"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Logga in med detta lösenord"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Logga in med denna karaktär"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Inloggningsserver-namn eller IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Loginserver-port"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : Använd detta för att uppdatera hosten"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Välj standard-karaktär server och karaktär"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Undvik uppdateringshemladdning"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Katalog att ladda speldata från"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Katalog att använda som lokal datakatalog"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Katalog att lagra skärmdumpar i"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Starta spelet i felsäkert läge"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Börja testning av drivrutiner och automat-"
-"configurering"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/te.po b/po/te.po
index 3ab62f817..023257870 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
+"Language-Team: Telugu (http://www.transifex.com/akaras/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -669,7 +671,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr "సాధారణ"
 
@@ -1866,7 +1868,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "ఆటగాళ్ళు"
 
@@ -2535,6 +2537,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2546,15 +2549,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2564,6 +2570,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2588,10 +2595,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2601,6 +2610,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2620,6 +2630,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2629,6 +2640,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4463,107 +4475,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5731,13 +5743,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index ed5c86184..4161c2e76 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
+"Language-Team: Thai (http://www.transifex.com/akaras/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -668,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1865,7 +1867,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
@@ -2534,6 +2536,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2545,15 +2548,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2563,6 +2569,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2587,10 +2594,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2600,6 +2609,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2619,6 +2629,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2628,6 +2639,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4462,107 +4474,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5730,13 +5742,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 2372a8a21..79e8a3f41 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,11 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
-"language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
+"tr/)\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,8 +36,8 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -488,43 +488,48 @@ msgstr "Yüzen balon"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performans"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Yardım"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -537,8 +542,9 @@ msgstr "Yardım"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -638,6 +644,136 @@ msgstr "Kayıt silme başarılı"
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Seçenekler:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l --log-file       : Kullanımı kütükle"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Versiyonu görüntüle"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Yardımı görüntüle"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Kullanılacak ayar klasörü"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Bu kullanıcı adı ile giriş yap"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Bu şifre ile giriş yap"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Bu karakter ile giriş yap"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Sunucu adına veya IP'ye giriş yap"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Sunucu Portuna Giriş yap"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Varsayılan karakter sunucusu ve karakteri seç"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Güncelleme indirmelerini atla"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Oyun bilgilerinin yükleneceği klasör"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Yerel bilgi klasörü olarak kullanılacak klasör"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Ekran görüntülerinin kaydedileceği klasör"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Oyunu güvenli modda başlat"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -661,15 +797,15 @@ msgstr "Güncelleme klasörleri yaratılırken hata oluştu!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Hata: %s bulunamadı ve yaratılamıyor! Çıkış yapılıyor."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "ya da"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
@@ -1098,25 +1234,25 @@ msgid "(F) free camera mode"
 msgstr "(F) serbest kamera modu"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Destek sayfasını açmak ister misin?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Mesaj"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Dirilt"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1124,7 +1260,7 @@ msgstr ""
 "iyileşemiyorsun."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 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 "
@@ -6928,25 +7064,25 @@ msgstr "Dünya Seç"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6954,7 +7090,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8089,136 +8225,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Seçenekler:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Kullanımı kütükle"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Versiyonu görüntüle"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Yardımı görüntüle"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Kullanılacak ayar klasörü"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Bu kullanıcı adı ile giriş yap"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Bu şifre ile giriş yap"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Bu karakter ile giriş yap"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Sunucu adına veya IP'ye giriş yap"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Sunucu Portuna Giriş yap"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Varsayılan karakter sunucusu ve karakteri seç"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Güncelleme indirmelerini atla"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Oyun bilgilerinin yükleneceği klasör"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Yerel bilgi klasörü olarak kullanılacak klasör"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Ekran görüntülerinin kaydedileceği klasör"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Oyunu güvenli modda başlat"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/uk.po b/po/uk.po
index 9af9e0193..43f9e1598 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,11 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/manaplus/"
-"language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
+"uk/)\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,8 +37,8 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -492,43 +492,48 @@ msgstr "Плаваюча бульбашка"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Налаштування"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Продуктивність"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Відео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Теми"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr "Про програму"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Довідка"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -541,8 +546,9 @@ msgstr "Довідка"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -642,6 +648,138 @@ msgstr "Акаунт видалено"
 msgid "Farewell, come back any time..."
 msgstr "До побачення та вертайтесь."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [опції] [manaplus-файл]"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-файл] : Файл manaplus це XML файл (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr "                  використовується для додаткових параметрів"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr "                  до manaplus клієнту."
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Параметри:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  - --log-file        : Лог-файл"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Тека логу чату"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Показати версію"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Показати ще раз цю довідку"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+"  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Зареєструватися на сервері зі вказаним логіном"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Зареєструватися на сервері зі вказаним паролем"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Обрати в акаунті зазначеного персонажа"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Ім'я серверу або IP"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr "  -y --server-type    : Тип логін-серверу"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Порт логіну"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+"  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Обрати сервер та персонаж за замовчуванням"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Пропустити завантаження оновлення"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Тека з користувацькими ігровими ресурсами"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Тека з локальними даними"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Тека скріншотів"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Ввімкнути гру в безпечному режимі"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr "     --renderer       : Ввімкнути тип рендерингу"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr "  -T --tests          : Стартувати тести та автоконфігурацію"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : Вимкнути OpenGL під час цієї сесії"
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -665,15 +803,15 @@ msgstr "Неможливо створити теку для оновлень!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Помилка: тека %s не існує і не може бути створена! Виходимо."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd файл_джерела рядок_кольору файл_призначення"
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr "або"
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_рядків_кольору файл_призначення"
 
@@ -1102,25 +1240,25 @@ msgid "(F) free camera mode"
 msgstr "(F) вільний режим камери"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr "Чи бажаєте відвідати сторінку підтримки?"
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "Повідомлення"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr "Опритомнити"
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -1128,7 +1266,7 @@ msgstr ""
 "зможете відновлюватися."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Ви навантажені менш, ніж на половину. Тепер ви можете відновлюватися."
 
@@ -5801,9 +5939,8 @@ msgstr "Шепчу до %s: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "Виявлено перевищення швидкісних лімітів."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6940,25 +7077,25 @@ msgstr "Оберіть світ"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr "клавіша_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr "КлавішаДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr "невідома клавіша"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -6966,7 +7103,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr "невід."
 
@@ -8101,138 +8238,6 @@ msgstr "Сховище"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [опції] [manaplus-файл]"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr "[manaplus-файл] : Файл manaplus це XML файл (.manaplus)"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr "                  використовується для додаткових параметрів"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr "                  до manaplus клієнту."
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Параметри:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  - --log-file        : Лог-файл"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Тека логу чату"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Показати версію"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Показати ще раз цю довідку"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-"  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Зареєструватися на сервері зі вказаним логіном"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Зареєструватися на сервері зі вказаним паролем"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Обрати в акаунті зазначеного персонажа"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Ім'я серверу або IP"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr "  -y --server-type    : Тип логін-серверу"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Порт логіну"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-"  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Обрати сервер та персонаж за замовчуванням"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Пропустити завантаження оновлення"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Тека з користувацькими ігровими ресурсами"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Тека з локальними даними"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Тека скріншотів"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr "     --safemode       : Ввімкнути гру в безпечному режимі"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr "     --renderer       : Ввімкнути тип рендерингу"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Стартувати тести та автоконфігурацію"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : Вимкнути OpenGL під час цієї сесії"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/vls.po b/po/vls.po
index a3b5d5c46..e9fb09cef 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
+"Language-Team: Vlaams (http://www.transifex.com/akaras/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -279,12 +279,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -314,25 +316,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -668,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1865,7 +1867,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
@@ -2534,6 +2536,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2545,15 +2548,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2563,6 +2569,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2587,10 +2594,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2600,6 +2609,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2619,6 +2629,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2628,6 +2639,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4462,107 +4474,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5730,13 +5742,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2ed1af3da..e489185c4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,10 +15,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
+"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -41,8 +41,8 @@ msgstr ""
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -492,43 +492,48 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:805 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:808 src/dyetool/client.cpp:489
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:811 src/dyetool/client.cpp:492
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:814 src/dyetool/client.cpp:495
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:817 src/dyetool/client.cpp:498
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:820 src/dyetool/client.cpp:501 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -541,8 +546,9 @@ msgstr "帮助"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -642,6 +648,136 @@ msgstr "取消注册成功"
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "选项:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr "  -l--log-file        : 日志文件"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version       : 显示版本"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -665,15 +801,15 @@ msgstr "创建更新目录错误!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出."
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -1102,31 +1238,31 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr "讯息"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5787,9 +5923,8 @@ msgstr "对%s密语到：%s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/chatwindow.cpp:1565
-#, fuzzy
 msgid "Broken nick detected: "
-msgstr "检测速度劈."
+msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
@@ -6922,25 +7057,25 @@ msgstr "选择世界"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6948,7 +7083,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8083,136 +8218,6 @@ msgstr "仓库"
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "选项:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr "  -l--log-file        : 日志文件"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version       : 显示版本"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0a362c71d..d690f112d 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -668,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr ""
 
@@ -1865,7 +1867,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "玩家"
 
@@ -2534,6 +2536,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2545,15 +2548,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2563,6 +2569,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2587,10 +2594,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2600,6 +2609,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr ""
@@ -2619,6 +2629,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr ""
@@ -2628,6 +2639,7 @@ msgstr ""
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4462,107 +4474,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5730,13 +5742,12 @@ msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c0ba487b4..dcda84ba6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-29 22:39+0300\n"
-"PO-Revision-Date: 2015-07-30 09:13+0000\n"
+"POT-Creation-Date: 2015-08-01 14:09+0300\n"
+"PO-Revision-Date: 2015-08-02 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/akaras/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,12 +280,14 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
-#: src/actions/commands.cpp:947
+#. TRANSLATORS: result from command /confget
+#: src/actions/commands.cpp:948
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
-#: src/actions/commands.cpp:959
+#. TRANSLATORS: result from command /serverconfget
+#: src/actions/commands.cpp:961
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -315,25 +317,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:438
+#: src/being/being.cpp:440
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:612
+#: src/being/being.cpp:614
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2084 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2089 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -668,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2188
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
 msgid "General"
 msgstr "一般"
 
@@ -1865,7 +1867,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:55
+#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "玩家"
 
@@ -2534,6 +2536,7 @@ msgstr ""
 msgid "Guild members"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
 #: src/gui/userpalette.cpp:224
 #, c-format
@@ -2545,15 +2548,18 @@ msgstr ""
 msgid "Particles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
 #: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr "粒子效果"
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:237
 msgid "Pickup notification"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:242
 msgid "Exp notification"
 msgstr ""
@@ -2563,6 +2569,7 @@ msgstr ""
 msgid "Hp bars"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:250
 msgid "Player HP bar"
 msgstr ""
@@ -2587,10 +2594,12 @@ msgstr ""
 msgid "Hits"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:276
 msgid "Player hits monster"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:281
 msgid "Monster hits player"
 msgstr ""
@@ -2600,6 +2609,7 @@ msgstr ""
 msgid "Other player hits local player"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:291
 msgid "Critical Hit"
 msgstr "致命一擊"
@@ -2619,6 +2629,7 @@ msgstr ""
 msgid "Local player miss"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:310
 msgid "Misses"
 msgstr "失誤"
@@ -2628,6 +2639,7 @@ msgstr "失誤"
 msgid "Tiles"
 msgstr ""
 
+#. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Portal highlight"
 msgstr ""
@@ -4462,107 +4474,107 @@ msgid "Disable logging in game (do not enable)"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:41
+#: src/gui/widgets/tabs/setup_players.cpp:42
 msgid "hide"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:43
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "show at top"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:45
+#: src/gui/widgets/tabs/setup_players.cpp:46
 msgid "show at right"
 msgstr ""
 
 #. TRANSLATORS: screen badges type
-#: src/gui/widgets/tabs/setup_players.cpp:47
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "show at bottom"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:62
+#: src/gui/widgets/tabs/setup_players.cpp:63
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:66
+#: src/gui/widgets/tabs/setup_players.cpp:67
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:70
+#: src/gui/widgets/tabs/setup_players.cpp:71
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:74
+#: src/gui/widgets/tabs/setup_players.cpp:75
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:78
+#: src/gui/widgets/tabs/setup_players.cpp:79
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:82
+#: src/gui/widgets/tabs/setup_players.cpp:83
 msgid "Visible names"
 msgstr "可見的名稱"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:86
+#: src/gui/widgets/tabs/setup_players.cpp:87
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:91
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Badges"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:95
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:99
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:103
+#: src/gui/widgets/tabs/setup_players.cpp:104
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:107
+#: src/gui/widgets/tabs/setup_players.cpp:108
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:111
+#: src/gui/widgets/tabs/setup_players.cpp:112
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:115
+#: src/gui/widgets/tabs/setup_players.cpp:116
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:119
+#: src/gui/widgets/tabs/setup_players.cpp:120
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:123
+#: src/gui/widgets/tabs/setup_players.cpp:124
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:127
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5730,13 +5742,12 @@ msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1566
-#, c-format
-msgid "Broken nick detected: %s"
+#: src/gui/windows/chatwindow.cpp:1565
+msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1754 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""