1 files changed, 48 insertions, 37 deletions

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 ""