summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/translations/help/cs.po2
-rw-r--r--data/translations/help/de.po2
-rw-r--r--data/translations/help/es.po2
-rw-r--r--data/translations/help/fr.po2
-rw-r--r--data/translations/help/id.po2
-rw-r--r--data/translations/help/it.po2
-rw-r--r--data/translations/help/ja.po2
-rw-r--r--data/translations/help/nl.po2
-rw-r--r--data/translations/help/nl_BE.po2
-rw-r--r--data/translations/help/pl.po4
-rw-r--r--data/translations/help/pt_BR.po4
-rw-r--r--data/translations/help/ru.po2
-rw-r--r--data/translations/help/sr.po2
-rw-r--r--data/translations/help/sv_SE.po2
-rw-r--r--data/translations/help/tr.po2
-rw-r--r--data/translations/help/uk.po2
-rw-r--r--data/translations/help/zh_CN.po2
-rw-r--r--data/translations/help/zh_HK.po2
-rw-r--r--data/translations/help/zh_TW.po2
-rw-r--r--po/ca.po293
-rw-r--r--po/cs.po299
-rw-r--r--po/de.po299
-rw-r--r--po/eo.po299
-rw-r--r--po/es.po299
-rw-r--r--po/fi.po297
-rw-r--r--po/fr.po325
-rw-r--r--po/id.po297
-rw-r--r--po/it.po297
-rw-r--r--po/ja.po297
-rw-r--r--po/manaplus.pot291
-rw-r--r--po/nl.po293
-rw-r--r--po/nl_BE.po293
-rw-r--r--po/pl.po299
-rw-r--r--po/pt.po299
-rw-r--r--po/pt_BR.po299
-rw-r--r--po/ru.po385
-rw-r--r--po/sr.po293
-rw-r--r--po/sv.po299
-rw-r--r--po/sv_SE.po299
-rw-r--r--po/tr.po295
-rw-r--r--po/uk.po299
-rw-r--r--po/zh_CN.po293
-rw-r--r--po/zh_HK.po293
43 files changed, 3708 insertions, 3566 deletions
diff --git a/data/translations/help/cs.po b/data/translations/help/cs.po
index 5cf69b592..fc909fe97 100644
--- a/data/translations/help/cs.po
+++ b/data/translations/help/cs.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/cs/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/de.po b/data/translations/help/de.po
index 3672d9208..854f3aa54 100644
--- a/data/translations/help/de.po
+++ b/data/translations/help/de.po
@@ -18,7 +18,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-09-12 17:39+0000\n"
+"PO-Revision-Date: 2017-09-23 18:10+0000\n"
"Last-Translator: Kristin Joris <kristin.joris@gmail.com>\n"
"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/de/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/es.po b/data/translations/help/es.po
index 76b1f0eda..637b7f484 100644
--- a/data/translations/help/es.po
+++ b/data/translations/help/es.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-11-30 18:20+0000\n"
+"PO-Revision-Date: 2017-09-23 18:10+0000\n"
"Last-Translator: Albert\n"
"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/fr.po b/data/translations/help/fr.po
index ca2dfdf7b..272edabbd 100644
--- a/data/translations/help/fr.po
+++ b/data/translations/help/fr.po
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2017-08-26 10:13+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Alige\n"
"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/id.po b/data/translations/help/id.po
index 596bc417f..4ad544d32 100644
--- a/data/translations/help/id.po
+++ b/data/translations/help/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/it.po b/data/translations/help/it.po
index 38f789861..228a59bed 100644
--- a/data/translations/help/it.po
+++ b/data/translations/help/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/ja.po b/data/translations/help/ja.po
index c07ae1ed0..cbba08570 100644
--- a/data/translations/help/ja.po
+++ b/data/translations/help/ja.po
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/ja/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/nl.po b/data/translations/help/nl.po
index da9b410bc..9706a7bfb 100644
--- a/data/translations/help/nl.po
+++ b/data/translations/help/nl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/nl_BE.po b/data/translations/help/nl_BE.po
index da9b410bc..9706a7bfb 100644
--- a/data/translations/help/nl_BE.po
+++ b/data/translations/help/nl_BE.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/pl.po b/data/translations/help/pl.po
index 0a46aa474..80851ddef 100644
--- a/data/translations/help/pl.po
+++ b/data/translations/help/pl.po
@@ -9,14 +9,14 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
msgid "/uploadserverconfig - upload server config into pastebin service."
msgstr "/uploadserverconfig - wklej konfigurację serwera na stronę pastebin."
diff --git a/data/translations/help/pt_BR.po b/data/translations/help/pt_BR.po
index 4f746c478..f6fec26fa 100644
--- a/data/translations/help/pt_BR.po
+++ b/data/translations/help/pt_BR.po
@@ -7,13 +7,13 @@
# freya <freya.df@gmail.com>, 2012
# freya <freya.df@gmail.com>, 2012
# Xtreem <guilhermegg11@hotmail.com>, 2014
-# sem nome <cpntb1@ymail.com>, 2014
+# Jesusaves <cpntb1@ymail.com>, 2014
# Luciano Zago <lcnzg7@gmail.com>, 2013
# Xtreem <guilhermegg11@hotmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-10 21:59+0000\n"
+"PO-Revision-Date: 2017-09-23 18:10+0000\n"
"Last-Translator: Diogo RBG <diogorbg@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po
index 6c6358e97..502f4b6d6 100644
--- a/data/translations/help/ru.po
+++ b/data/translations/help/ru.po
@@ -19,7 +19,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/sr.po b/data/translations/help/sr.po
index 7a1a60fe4..3618ed4ad 100644
--- a/data/translations/help/sr.po
+++ b/data/translations/help/sr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 14:48+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/sv_SE.po b/data/translations/help/sv_SE.po
index e113d1c3e..4f612d5af 100644
--- a/data/translations/help/sv_SE.po
+++ b/data/translations/help/sv_SE.po
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/language/sv_SE/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/tr.po b/data/translations/help/tr.po
index a4516edba..db661a4c0 100644
--- a/data/translations/help/tr.po
+++ b/data/translations/help/tr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-23 18:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/uk.po b/data/translations/help/uk.po
index 24eb6afda..6a2d637c2 100644
--- a/data/translations/help/uk.po
+++ b/data/translations/help/uk.po
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 18:19+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/zh_CN.po b/data/translations/help/zh_CN.po
index fd5495ca7..1054dc748 100644
--- a/data/translations/help/zh_CN.po
+++ b/data/translations/help/zh_CN.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/zh_HK.po b/data/translations/help/zh_HK.po
index 0be970d32..8c9beca01 100644
--- a/data/translations/help/zh_HK.po
+++ b/data/translations/help/zh_HK.po
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 18:19+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/data/translations/help/zh_TW.po b/data/translations/help/zh_TW.po
index 3d617f276..e0b54d548 100644
--- a/data/translations/help/zh_TW.po
+++ b/data/translations/help/zh_TW.po
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-07-03 21:08+0000\n"
+"PO-Revision-Date: 2017-09-19 18:19+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/akaras/manaplus/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/po/ca.po b/po/ca.po
index 72e1fd4e8..31334070b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
"ca/)\n"
@@ -51,59 +51,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Has intentat agafar un objecte inexistent."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "L'objecte es massa pesant."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "L'objecte esta massa lluny."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "L'inventari està complet."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "La pila d'objectes es massa gran."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "L'objecte pertany a una altra persona."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Problema desconegut al agafar l'objecte."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -112,58 +112,58 @@ msgstr[1] "Has recollit %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "treball"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr ""
@@ -364,7 +364,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "General"
@@ -796,18 +796,18 @@ msgstr "Lluny del teclat"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -844,8 +844,8 @@ msgstr "(F) mode de càmera lliure"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Tancar"
@@ -1382,8 +1382,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Nivell: %d"
@@ -2120,7 +2120,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr ""
@@ -2669,8 +2669,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Informació"
@@ -2814,7 +2814,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Bàsic"
@@ -2864,7 +2864,7 @@ msgstr "Xat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3176,7 +3176,7 @@ msgstr ""
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Max"
@@ -3203,8 +3203,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Diners: %s"
@@ -4757,104 +4757,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Permet registre de depurador"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Habilitar atac del cantó del servidor"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Permet comprovador de bots"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Mode de baix tràfic"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Mostra fons"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4877,8 +4882,8 @@ msgstr "no"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5294,8 +5299,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Tema"
@@ -5453,8 +5458,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Vídeo"
@@ -5859,7 +5864,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Ajuda"
@@ -6054,7 +6059,7 @@ msgstr "CON"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Configuració"
@@ -6096,7 +6101,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Crear"
@@ -6157,14 +6162,14 @@ msgstr "Les direccions de correu no coincideixen."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Error"
@@ -6352,7 +6357,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Juga"
@@ -6374,38 +6379,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr ""
@@ -6416,23 +6421,23 @@ msgid "Present: %s; %d players are present."
msgstr "Present: %s; %d jugadors estan presents."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Xiuxiuejant a %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6695,39 +6700,39 @@ msgid "Reset timer"
msgstr "Reajustar temporitzador"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6743,33 +6748,33 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
#, c-format
-msgid "Exp: %d/%d Left: %d"
+msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr ""
@@ -6979,13 +6984,13 @@ msgid "Level: %d (GM %d)"
msgstr "Nivell: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Necessites"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Nivell de treball: %d"
@@ -7441,33 +7446,33 @@ msgid "Accept Party Invite"
msgstr "Acceptar invitació a grup"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Experiència:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Treball: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Treball:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9046,33 +9051,33 @@ msgstr "Connexió interrompuda amb el servidor. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr ""
@@ -9581,22 +9586,22 @@ msgid "Poison had no effect..."
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9919,57 +9924,57 @@ msgid "Accepting incoming trade requests"
msgstr "Acceptant sol·licituds d'intercanvi"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Connectant al servidor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Iniciant sessió"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Entrant al mon de joc"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Sol·licitant personatges"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Connectant al servidor de joc"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Canviant servidors de joc"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Sol·licitant detalls de registre"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Canvi de contrasenya"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Contrasenya canviada amb èxit!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Canvi de correu"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Correu canviat amb èxit!"
diff --git a/po/cs.po b/po/cs.po
index 2364f4986..dd97e4833 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
"cs/)\n"
@@ -56,59 +56,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Byl jsi zabit %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Snažili jste se sebrat neexistující předmět."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Předmět je příliš těžký."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Předmět je příliš daleko."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Inventář je plný."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Hromada je příliš velká."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Předmět patří někomu jinému."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Nemůžeš zvednout toto možství předmětů."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Tvůj počet předmětů dasáhl maxima."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Neznámý problém při pokusu sebrat předmět."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -118,58 +118,58 @@ msgstr[2] "Sebral jsi %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "zk"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "práce"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Nasledovat: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Následování zrušeno."
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imitace: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitace zrušena."
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Vidíš %s"
@@ -371,7 +371,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Obecný"
@@ -803,18 +803,18 @@ msgstr "Pryč"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -851,8 +851,8 @@ msgstr "(F) mód volné kamery"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Zavřít"
@@ -1390,8 +1390,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Úroveň: %d"
@@ -2128,7 +2128,7 @@ msgstr "Resetovat žlutý pruh"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Zkopírovat do chatu"
@@ -2677,8 +2677,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Informace"
@@ -2822,7 +2822,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Zkladní"
@@ -2872,7 +2872,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3184,7 +3184,7 @@ msgstr "Bod na cestě"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Vše"
@@ -3211,8 +3211,8 @@ msgstr "Úroveň: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Peníze: %s"
@@ -4765,104 +4765,109 @@ msgstr "Typ proxy"
msgid "Proxy address:port"
msgstr "Proxy adresa:port"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Zapnout debug záznam"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr "Ignorovat pakety záznamu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Zapni OpenGL log"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Povolit záznam vstupu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr "Uploadovat soubor se záznamem"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Povolit útok na straně serveru"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr "Skrýt stránku podpory při chybě"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Povolit dvojklik"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Zapnout ověřovač botů"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Zapnout ochranu proti vadným serverům (nevypínej)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Mód nízkého síťového provozu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Použít FBO pro zachycení obrazovky (pouze pro openGl)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr "Složka pro snímky obrazovky"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Zpoždění sítě mezi sub servery"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Zobrazit pozadí"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Vlastní nastavení hustoty obrazovky"
@@ -4885,8 +4890,8 @@ msgstr "Ne"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Výkon"
@@ -5309,8 +5314,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Téma"
@@ -5468,8 +5473,8 @@ msgstr "Žádný rámeček"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -5872,7 +5877,7 @@ msgstr "POM"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Nápověda"
@@ -6067,7 +6072,7 @@ msgstr "NAS"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Nastavení"
@@ -6109,7 +6114,7 @@ msgstr "Počet:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Vytvořit"
@@ -6170,14 +6175,14 @@ msgstr "Emailové adresy nesouhlasí."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Chyba"
@@ -6365,7 +6370,7 @@ msgstr "Heslo"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Hrát"
@@ -6387,13 +6392,13 @@ msgid "Please enter new name"
msgstr "Prosím zadejte nové jméno"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"Život: %u/%u\n"
@@ -6403,27 +6408,27 @@ msgstr ""
"Peníze: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Špatné heslo"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Zadej heslo pro smazání postavy"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Zadej heslo:"
@@ -6434,23 +6439,23 @@ msgid "Present: %s; %d players are present."
msgstr "Přítomni: %s; %d hráčů je přítomno."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Šeptání pro %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6713,39 +6718,39 @@ msgid "Reset timer"
msgstr "Reset časů"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Zabití: %s, celkem zk %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Prům Zk: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Počet prům. oblud do úrovně: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Zabití/Min: %s, Zk/Min: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6763,33 +6768,33 @@ msgstr[1] "Čas do další úrovně při %d min: %s"
msgstr[2] "Čas do další úrovně při %d min: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Zk za poslední zabití:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Úroveň: %d na %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Zk: %d/%d Zbývá: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d Zk, prům. oblud na 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Čas do další úrovně: %s"
@@ -6999,13 +7004,13 @@ msgid "Level: %d (GM %d)"
msgstr "Úroveň: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Potřebuješ"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Prácovní úroveň: %d"
@@ -7461,33 +7466,33 @@ msgid "Accept Party Invite"
msgstr "Přijmout pozvání do party"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "BŽ:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Zk:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MB:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Práce: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Práce:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9070,33 +9075,33 @@ msgstr "Spojení se serverem ukončeno. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr "Chyba přejmenování postavy."
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr "Postava přejmenována."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr "Přejmenování není povoleno."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr "Nové jméno nebylo nastaveno."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr "Postava nenalezena."
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Nepodařilo se odstranit postavu."
@@ -9605,22 +9610,22 @@ msgid "Poison had no effect..."
msgstr "Jed nemá žádný účinek..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "O ManaPlus"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd srcfile dyestring dstfile"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "nebo"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
@@ -9942,57 +9947,57 @@ msgid "Accepting incoming trade requests"
msgstr "Akceptovat příchozí žádosti o obchodování"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Přihlašuji se"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Vyžaduji postavy"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Vyměňuji herní servery"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Požaduji registrační detaily"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Změna hesla"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Změna emailu"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
diff --git a/po/de.po b/po/de.po
index 806e71ab8..52b673d67 100644
--- a/po/de.po
+++ b/po/de.po
@@ -42,8 +42,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-23 18:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
"de/)\n"
@@ -84,59 +84,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Du wurdest von %s getötet."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Du versuchst, einen nicht existierenden Gegenstand aufzuheben."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Gegenstand ist zu schwer."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Gegenstand ist zu weit weg."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Inventar ist voll."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Stapel ist zu groß."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Gegenstand gehört jemand anderem."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Du kannst nicht diese Menge an Gegenständen aufnehmen."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Dein Gegenstandsstapel hat das Maximum erreicht."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Fehler bei dem Aufheben des Items."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -145,58 +145,58 @@ msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "EP"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "Job"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr "Homun"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr "hp"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr "mana"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Folgen: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Folgen abgebrochen"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imitation: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitation abgebrochen"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Du siehst %s"
@@ -402,7 +402,7 @@ msgstr "%s existiert nicht und kann nicht erstellt werden!"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Allgemein"
@@ -834,18 +834,18 @@ msgstr "Abwesend"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -882,8 +882,8 @@ msgstr "(F) Kameramodus: Frei"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Schließen"
@@ -1424,8 +1424,8 @@ msgstr "Chatroom: %s"
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Stufe: %d"
@@ -2162,7 +2162,7 @@ msgstr "Gelben Balken zurücksetzen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Zu Chat kopieren"
@@ -2711,8 +2711,8 @@ msgstr "Sklave erzeugen"
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Info"
@@ -2856,7 +2856,7 @@ msgstr "Zaubertyp: %s"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Normal"
@@ -2906,7 +2906,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3218,7 +3218,7 @@ msgstr "Wegpunkt"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Max"
@@ -3245,8 +3245,8 @@ msgstr "Level: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Geld: %s"
@@ -4934,104 +4934,109 @@ msgstr "Proxy Typ"
msgid "Proxy address:port"
msgstr "Proxy addresse:port"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr "OpenGL Versionsprüfung aktivieren (nicht deaktivieren)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Debuglog aktivieren"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr "Aufzeichnung der Pakete ignorieren"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr "Unimplementierte Pakete loggen"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "OpenGL-Log aktivieren"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Eingabelog aktivieren"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr "Log-Datei hochladen"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Serverseitigen Angriff aktivieren"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr "Bei Fehlermeldungen Link zur Unterstützungsseite verstecken"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Doppelklick aktivieren"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Botprüfer einschalten"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Schutz bei fehlerhaften-Servern aktiveren (Nicht deaktivieren)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Niedriger Datenverkehrsmodus"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "FBO für Screenshots benutzen (Nur für openGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr "Screenshotverzeichnis"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Netzwerkverzug zwischen Unterservern"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Hintergrund anzeigen"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Bildschirmraster überschreiben"
@@ -5054,8 +5059,8 @@ msgstr "Nein"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Leistung"
@@ -5478,8 +5483,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Theme"
@@ -5637,8 +5642,8 @@ msgstr "Kein Fensterrahmen"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -6046,7 +6051,7 @@ msgstr "HIF"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Hilfe"
@@ -6241,7 +6246,7 @@ msgstr "EINST"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Einstellungen"
@@ -6283,7 +6288,7 @@ msgstr "Menge:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Erstellen"
@@ -6344,14 +6349,14 @@ msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Fehler"
@@ -6539,7 +6544,7 @@ msgstr "Passwort"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Spielen"
@@ -6561,13 +6566,13 @@ msgid "Please enter new name"
msgstr "Bitte einen neuen Namen eingeben"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"HP: %u/%u\n"
@@ -6577,27 +6582,27 @@ msgstr ""
"Geld: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Falsches Passwort"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr "Gebe deine E-Mail ein, um den Charakter zu löschen"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr "E-Mail eingeben:"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Gib dein Passwort ein:"
@@ -6608,23 +6613,23 @@ msgid "Present: %s; %d players are present."
msgstr "Anwesend: %s ; %d Spieler sind anwesend."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Flüstern zu %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr "Bewegt: "
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr "Deine Nachricht wurde in den Handels-Tab verschoben"
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr "Defekter Spielername entdeckt: "
@@ -6887,39 +6892,39 @@ msgid "Reset timer"
msgstr "Zähler zurücksetzen"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Getötet: %s, Gesamte EP: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Durchschn. EP: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Durchschn. Monsteranz. zum nächsten Level: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Tötungen/Min: %s, EP/Min: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6935,33 +6940,33 @@ msgstr[0] "Zeit bis zum nächsten Level pro %d Min: %s"
msgstr[1] "Zeit bis zum nächsten Level pro %d Min: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "EP vom letzter Tötung:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Level: %d bei %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "EP: %d/%d Übrig: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d EP, Durchschn. Monsteranz. für 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Zeit bis zum nächsten Level: %s"
@@ -7171,13 +7176,13 @@ msgid "Level: %d (GM %d)"
msgstr "Level: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Verbleibend"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Job Level: %d"
@@ -7633,33 +7638,33 @@ msgid "Accept Party Invite"
msgstr "Gruppeneinladung annehmen"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "EP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Job:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9249,33 +9254,33 @@ msgstr "Verbindung mit Server abgebrochen. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr "Fehler beim Umbennen des Charakters."
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr "Charakter umbenannt."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr "Umbennen ist nicht erlaubt."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr "Neuer Name ist nicht gesetzt."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr "Charakter nicht gefunden."
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Konnte Charakter nicht löschen."
@@ -9784,22 +9789,22 @@ msgid "Poison had no effect..."
msgstr "Gift hatte kein Effekt..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Über"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd srcfile dyestring dstfile"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "oder"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
@@ -10125,57 +10130,57 @@ msgid "Accepting incoming trade requests"
msgstr "Eingehende Handelsanfragen akzeptieren"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Verbinde zum Server"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Anmelden"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Spielfiguren werden abgefragt"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Verbinde zum Spielserver"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Spielserver wechseln"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Passwort ändern"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "E-Mail ändern"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
diff --git a/po/eo.po b/po/eo.po
index ad0b953a4..0420db610 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Esperanto (http://www.transifex.com/akaras/manaplus/language/"
"eo/)\n"
@@ -52,59 +52,59 @@ msgstr "N"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Vin mortigis %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Provis preni neekzistantan objekton."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Objekto estas tro peza."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Objekto estas tro malproksima."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Objektujo estas plena."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Stako estas tro granda."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Objekto apartenas al iu alia."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Vi ne povas preni tiom da objektoj."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Via objekta stako havas la maksimuman nombron."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Nekonata eraro prenante objekton."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -113,58 +113,58 @@ msgstr[1] "Vi prenis %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "sperto"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "lerto"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr "Artohomo"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr "sano"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr "manao"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Sekvi: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Sekvado ĉesis"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imiti: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitado ĉesis"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Vi vidas %s"
@@ -367,7 +367,7 @@ msgstr "%s ne ekzistas kaj ne povas estiĝi!"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Ĝenerala"
@@ -799,18 +799,18 @@ msgstr "For"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "Bone"
@@ -847,8 +847,8 @@ msgstr "(F) libera reĝimo de vidpunkto"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Fermi"
@@ -1385,8 +1385,8 @@ msgstr "Retbabilejo: %s"
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Nivelo: %d"
@@ -2123,7 +2123,7 @@ msgstr "Rekomencigi flavan indikilon"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Kopii al retbabilo"
@@ -2672,8 +2672,8 @@ msgstr "Generi sklavon"
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Informoj"
@@ -2817,7 +2817,7 @@ msgstr "Tipo de uzo: %s"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Bazaj"
@@ -2867,7 +2867,7 @@ msgstr "Retbabilado"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3179,7 +3179,7 @@ msgstr "Vojpunkto"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Maksimume"
@@ -3206,8 +3206,8 @@ msgstr "Nivelo: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Mono: %s"
@@ -4877,104 +4877,109 @@ msgstr "Tipo de prokuro"
msgid "Proxy address:port"
msgstr "Prokura adreso:pordo"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr "Ŝalti kontrolon de OpenGL versio (ne malŝaltu)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Ŝalti sencimigan protokolon"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr "Malatenti protokoladon de paketoj"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr "Protokoli nerealigitajn paketojn"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Ŝalti protokolon de OpenGL"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Ŝalti protokolon de enigo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr "Alŝuti protokolan dosieron"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Ŝalti servilflankan atakon"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr "Kaŝi ligilon al subtena retpaĝo je eraro"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Ŝalti duoblajn klakojn"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Ŝalti kontrolanton de robotoj"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Ŝalti protekton kontraŭ cimigplenaj serviloj (ne malŝaltu)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Trafikŝpariga reĝimo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Uzi FBO por ekrankopioj (nur por opengl)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr "Ekrankopia dosierujo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Reta prokrasto inter sub-serviloj"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Montri fonon"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Transpasi denson de ekrano"
@@ -4997,8 +5002,8 @@ msgstr "Ne"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Rendimento"
@@ -5415,8 +5420,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Etoso"
@@ -5574,8 +5579,8 @@ msgstr "Sen kadro"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -5980,7 +5985,7 @@ msgstr "HEL"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Helpo"
@@ -6175,7 +6180,7 @@ msgstr "AG"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Agordoj"
@@ -6217,7 +6222,7 @@ msgstr "Kvanto:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Krei"
@@ -6278,14 +6283,14 @@ msgstr "La retpoŝtadresoj ne kongruas."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Eraro"
@@ -6473,7 +6478,7 @@ msgstr "Pasvorto"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Ludi"
@@ -6495,13 +6500,13 @@ msgid "Please enter new name"
msgstr "Bonvolu entajpi novan nomon"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"Sano: %u/%u\n"
@@ -6511,27 +6516,27 @@ msgstr ""
"Mono: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Malĝusta pasvorto"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr "Enigu vian retpoŝtadreson por forigi avataron"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr "Enigu retpoŝtadreson:"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Enigu pasvorton por forigi avataron"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Enigu pasvorton:"
@@ -6542,23 +6547,23 @@ msgid "Present: %s; %d players are present."
msgstr "Ĉeestantaj: %s, %d ludantoj ĉeestas."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Flustranta al %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr "Movita: "
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr "Via mesaĝo moviĝis al la negoca langeto"
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr "Difekta kaŝnomo detektita: "
@@ -6821,39 +6826,39 @@ msgid "Reset timer"
msgstr "Rekomencigi horloĝon"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Mortigoj: %s, tuta sperto: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Meza Sperto: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "N-ro da mezaj monstroj ĝis la sekva nivelo: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mortigoj/Min: %s, Sperto/Min: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6869,33 +6874,33 @@ msgstr[0] "Tempo por sekva nivelo po %d min: %s"
msgstr[1] "Tempo por sekva nivelo po %d min: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Sperto el lasta mortigo:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nivelo: %d je %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Sperto: %d/%d Mankas: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d da sperto, meza monstro por 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Tempo por sekva nivelo: %s"
@@ -7105,13 +7110,13 @@ msgid "Level: %d (GM %d)"
msgstr "Nivelo: %d (LG %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Bezono"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Lerta nivelo: %d"
@@ -7567,33 +7572,33 @@ msgid "Accept Party Invite"
msgstr "Akcepti Partian Inviton"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "Sano:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Sperto:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "Manao:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Lerto: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Lerto:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9178,33 +9183,33 @@ msgstr "Konekto al servilo finita. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr "Eraro renomi avataron."
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr "Avataro renomita."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr "Renomo ne permesita."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr "Nova nomo ne agordita."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr "Avataro ne trovita."
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Malsukcesis forigi avataron."
@@ -9713,22 +9718,22 @@ msgid "Poison had no effect..."
msgstr "Veneno malefikis..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Pri"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd srcfile dyestring dstfile"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "aŭ"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
@@ -10052,57 +10057,57 @@ msgid "Accepting incoming trade requests"
msgstr "Atentanta envenantajn negocajn petojn"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Konektanta al servilo"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Ensalutanta"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Eniranta ludan mondon"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Petanta avatarojn"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Konektanta al la luda servilo"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Ŝanĝanta ludajn servilojn"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Petanta detalojn de registrado"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Ŝanĝo de Pasvorto"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Sukcese ŝanĝis pasvorton!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Ŝanĝo de Retpoŝtadreso"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Sukcese ŝanĝis retpoŝtadreson!"
diff --git a/po/es.po b/po/es.po
index 30e3146ad..e32111c74 100644
--- a/po/es.po
+++ b/po/es.po
@@ -29,8 +29,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-23 18:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
"es/)\n"
@@ -71,59 +71,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Fuiste asesinado por %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Intentaste recoger un objeto inexistente."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "El artículo es muy pesado."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "El artículo está muy lejos."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "El inventario está lleno."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "El agrupamiento es demasiado grande."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "El artículo pertenece a alguien más."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "No puedes recoger esta cantidad de objetos."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Tu montón de objetos esta al máximo."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Problema desconocido al intentar recoger el artículo."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -132,58 +132,58 @@ msgstr[1] "Recogiste %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "exp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "trabajo"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr "Homúnculo"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr "hp"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr "maná"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Seguir: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Seguimiento cancelado"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imitación: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitación cancelada"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Tú ves %s"
@@ -387,7 +387,7 @@ msgstr "¡%s no existe y no puede ser creado!"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "General"
@@ -819,18 +819,18 @@ msgstr "Lejos del Teclado"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -867,8 +867,8 @@ msgstr "(F) modo de cámara libre"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Cerrar"
@@ -1408,8 +1408,8 @@ msgstr "Sala de chat: %s"
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Nivel: %d"
@@ -2146,7 +2146,7 @@ msgstr "Restablecer barra amarilla"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Copiar al chat"
@@ -2695,8 +2695,8 @@ msgstr "Engendrar esclavo"
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Información"
@@ -2840,7 +2840,7 @@ msgstr "Tipo de invocación: %s"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Básico"
@@ -2890,7 +2890,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3202,7 +3202,7 @@ msgstr "Punto de recorrido"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Máx"
@@ -3229,8 +3229,8 @@ msgstr "Nivel: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Dinero: %s"
@@ -4922,104 +4922,109 @@ msgstr "Tipo de proxy"
msgid "Proxy address:port"
msgstr "Dirección de proxy:puerto"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr "Habilitar comprobación de versión de OpenGL (no deshabilitar)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Habilitar registro de depuración"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr "Ignorar registro de paquetes"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr "Registrar paquetes sin implementar"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Habilitar registro OpenGl"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Habilitar registro de entrada"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr "Subir archivo de registro"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Habilitar el ataque del lado del servidor"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr "Ocultar enlace a página de soporte al ocurrir un error"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Habilitar doble clics"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Habilitar inspector de bot"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Activar la protección de servidores con errores (no deshabilitar)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Modo de bajo tráfico"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr "Directorio de capturas de pantalla"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Retraso de red entre sub servidores"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Mostrar fondo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Sobrescribir densidad de pantalla"
@@ -5042,8 +5047,8 @@ msgstr "No"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Rendimiento"
@@ -5463,8 +5468,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Tema"
@@ -5622,8 +5627,8 @@ msgstr "Sin marco"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -6028,7 +6033,7 @@ msgstr "HLP"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Ayuda"
@@ -6223,7 +6228,7 @@ msgstr "SET"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Configuración"
@@ -6265,7 +6270,7 @@ msgstr "Cantidad:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Crear"
@@ -6330,14 +6335,14 @@ msgstr "Las direcciones de correo suministradas no concuerdan."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Error"
@@ -6525,7 +6530,7 @@ msgstr "Contraseña"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Jugar"
@@ -6547,13 +6552,13 @@ msgid "Please enter new name"
msgstr "Por favor, ingresa un nuevo nombre"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"HP: %u/%u\n"
@@ -6563,27 +6568,27 @@ msgstr ""
"Dinero: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Contraseña incorrecta"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr "Ingresa tu correo para borrar el personaje"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr "Ingresa tu correo:"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Ingrese la contraseña para borrar el personaje"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Ingrese contraseña:"
@@ -6594,23 +6599,23 @@ msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jugadores están presentes."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Susurrando a %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr "Movido: "
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr "Tu mensaje fue movido a la pestaña de intercambio."
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr "Nombre roto detectado: "
@@ -6874,39 +6879,39 @@ msgid "Reset timer"
msgstr "Restablecer cronometrador"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Muertes: %s, exp. total: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Exp. Prom.: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Nro. de criaturas promedio para el siguiente nivel: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Matanza/Mín: %s, Exp/Mín: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6922,33 +6927,33 @@ msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Exp de último eliminado:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nivel: %d de %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp: %d/%d Falta: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, prom. criatura para 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Tiempo para el siguiente nivel: %s"
@@ -7158,13 +7163,13 @@ msgid "Level: %d (GM %d)"
msgstr "Nivel: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Necesitas"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Nivel de trabajo: %d"
@@ -7622,33 +7627,33 @@ msgid "Accept Party Invite"
msgstr "Aceptar invitación al grupo"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Exp:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Trabajo: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Trabajo:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr "Nivel: %d (%s %d)"
@@ -9237,33 +9242,33 @@ msgstr "Conexión al servidor terminada. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr "Error de renombrado del personaje."
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr "Personaje renombrado."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr "No se permite renombrar."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr "El nuevo nombre no está establecido."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr "Personaje no encontrado."
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Fallo al borrar el personaje."
@@ -9772,22 +9777,22 @@ msgid "Poison had no effect..."
msgstr "Veneno no tuvo ningún efecto..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Acerca de..."
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd archivoOrigen colorTinte archivoDestino"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "o"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd archivoOrigen archivoDestino"
@@ -10112,57 +10117,57 @@ msgid "Accepting incoming trade requests"
msgstr "Aceptando las peticiones de intercambio"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Conectando al servidor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Accediendo a la cuenta"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Cargando personajes"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Cambio de contraseña"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Cambio de Email"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
diff --git a/po/fi.po b/po/fi.po
index 3a122b1ef..c187982eb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
"fi/)\n"
@@ -51,59 +51,59 @@ msgstr "-"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Yritit poimia olemattoman tavaran."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Tavara on liian painava."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Tavara on liian kaukana."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Sinulla on liikaa tavaraa ennestään."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Kasa on liian suuri."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Tavara kuuluu jollekulle muulle."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Tuntematon ongelma esti tavaran poimimisen."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -112,58 +112,58 @@ msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr ""
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Seuraaminen keskeytetty"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Matkiminen keskeytetty"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr ""
@@ -365,7 +365,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Yleiset"
@@ -797,18 +797,18 @@ msgstr "Poissa"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "Ok"
@@ -845,8 +845,8 @@ msgstr "(F) vapaa kamera"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Sulje"
@@ -1383,8 +1383,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Taso: %d"
@@ -2121,7 +2121,7 @@ msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Kopioi keskusteluun"
@@ -2670,8 +2670,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Tietoja"
@@ -2815,7 +2815,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr ""
@@ -2865,7 +2865,7 @@ msgstr "Keskustelu"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3177,7 +3177,7 @@ msgstr ""
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Max"
@@ -3204,8 +3204,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Rahat: %s"
@@ -4758,104 +4758,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Ota käyttöön debug-loki"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Ota käyttöön palvelinpuolen hyökkäys"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Ota bottitutka käyttöön"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Matalan liikenteen tila"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Näytä tausta"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4878,8 +4883,8 @@ msgstr "Ei"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5295,8 +5300,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Teema"
@@ -5454,8 +5459,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Kuva"
@@ -5856,7 +5861,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Apua"
@@ -6051,7 +6056,7 @@ msgstr "Ase"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Asetukset"
@@ -6093,7 +6098,7 @@ msgstr "Määrä:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Luo"
@@ -6154,14 +6159,14 @@ msgstr "Annetut sähköpostiosoitteet eivät täsmää."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Virhe"
@@ -6349,7 +6354,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Pelaa"
@@ -6371,38 +6376,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Väärä salasana"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Anna salasana hahmon poistamiseksi"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Salasana:"
@@ -6413,23 +6418,23 @@ msgid "Present: %s; %d players are present."
msgstr "Läsnä: %s; %d pelaajaa paikalla."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Kuiskaat pelaajalle %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6692,39 +6697,39 @@ msgid "Reset timer"
msgstr "Nollaa ajastin"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Tappoja: %s, kp kaikkiaan: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Tappoa/min: %s, kp/min: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6740,33 +6745,33 @@ msgstr[0] "Aika ensi tasolle %d min perusteella: %s"
msgstr[1] "Aika ensi tasolle %d min perusteella: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Viime tapon kp:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Taso: %d @ %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Kokemus: %d/%d, jäljellä: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d kp, keskim. vastustajaa 1%%:iin: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Aika seur. tasolle: %s"
@@ -6976,13 +6981,13 @@ msgid "Level: %d (GM %d)"
msgstr "Taso: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Tarvitaan"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7438,33 +7443,33 @@ msgid "Accept Party Invite"
msgstr "Ota ryhmäkutsu vastaan"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "VP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Kok:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Työ: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Työ:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9044,33 +9049,33 @@ msgstr "Yhteys palvelimeen katkaistu. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Hahmon poisto epäonnistui."
@@ -9579,22 +9584,22 @@ msgid "Poison had no effect..."
msgstr "Myrkyllä ei ollut vaikutusta..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9916,57 +9921,57 @@ msgid "Accepting incoming trade requests"
msgstr "Hyväksyt kaupankäyntipyynnöt"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Kirjaudun sisään"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Salasanan vaihto"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Sähköpostin vaihto"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
diff --git a/po/fr.po b/po/fr.po
index 7c15c08eb..778d80a89 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -30,9 +30,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-18 09:00+0000\n"
+"Last-Translator: Alige\n"
"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
"fr/)\n"
"Language: fr\n"
@@ -72,59 +72,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Tu as été tué par %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Tu as essayé de prendre un objet qui n'existe pas."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "L'objet est trop lourd."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "L'objet est trop éloigné."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "L'inventaire est plein."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "La pile est trop grande."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "L'objet appartient a quelqu'un d'autre."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Tu ne peux pas ramasser cette quantité d'objets."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Ta pile de cet objet est pleine."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Problème inconnu pour ramasser l'objet."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -133,58 +133,58 @@ msgstr[1] "Tu as ramassé %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "job"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr "Homon"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr "PV"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr "Mana"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Suivre : %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Suivi annulé"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imiter : %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitation annulée"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Tu vois %s"
@@ -393,7 +393,7 @@ msgstr "%s n'existe pas et ne peut pas être créé !"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Général"
@@ -826,18 +826,18 @@ msgstr "Inactif"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "Ok"
@@ -874,8 +874,8 @@ msgstr "(F) Mode camera libre"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Fermer"
@@ -1416,8 +1416,8 @@ msgstr "Salon de discussion : %s"
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Niveau : %d"
@@ -2154,7 +2154,7 @@ msgstr "Remise à zéro des valeurs de la barre jaune"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Copier dans la conversation"
@@ -2703,8 +2703,8 @@ msgstr "Faire apparaître un esclave"
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Informations"
@@ -2848,7 +2848,7 @@ msgstr "Type de jet : %s"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Basique"
@@ -2898,7 +2898,7 @@ msgstr "Conversation"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3210,7 +3210,7 @@ msgstr "Point de route"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Max."
@@ -3237,8 +3237,8 @@ msgstr "Niveau : %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Argent : %s"
@@ -3719,7 +3719,7 @@ msgstr "Canaux audio"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:111
msgid "Parallel number of sounds"
-msgstr ""
+msgstr "Nombre parallèle des sons"
#. TRANSLATORS: settings group
#: src/gui/widgets/tabs/setup_audio.cpp:116
@@ -4603,32 +4603,32 @@ msgstr "xxhigh"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:102
msgid "verbose"
-msgstr ""
+msgstr "verbeux"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:104
msgid "debug"
-msgstr ""
+msgstr "déboggage"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:106
msgid "info"
-msgstr ""
+msgstr "info"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:108
msgid "warn"
-msgstr ""
+msgstr "averti"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:110
msgid "error"
-msgstr ""
+msgstr "erreur"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:112
msgid "critical"
-msgstr ""
+msgstr "critique"
#. TRANSLATORS: misc tab in settings
#: src/gui/widgets/tabs/setup_misc.cpp:126
@@ -4915,7 +4915,7 @@ msgstr "Intervalle de répétition personnalisé"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_misc.cpp:362
msgid "Enable alt-tab workaround"
-msgstr ""
+msgstr "Activer le palliatif alt-tab"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_misc.cpp:372
@@ -4937,104 +4937,109 @@ msgstr "Type de proxy"
msgid "Proxy address:port"
msgstr "Adresse du proxy:port"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
-msgstr ""
+msgstr "Diagraphie"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr "Activer la vérification de version d'OpenGL (ne pas désactiver)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Activer l'historique des informations de débogage"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr "Ignorer les paquets d'identification"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr "HIstorique des paquets non implémentés"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Activer historique OpenGL"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Activer l'historique des saisies"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
-msgstr ""
+msgstr "Niveau de diagraphie SDL"
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr "Mettre en ligne le fichier d'historique"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Activer l'attaque de la part du serveur"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr "Cacher le lien de la page d'aide quand erreur"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Activer double-cliques"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Activer le testeur de robots"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Activer la protection pour serveurs defaillant (ne pas désactiver)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Mode traffic faible"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Utiliser FBO pour les captures d'écran (seulement pour OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr "Répertoire des captures d'écran"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Retard du réseau entre les sous-serveurs"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Montrer le fond"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Écrasement de la densité de l'écran"
@@ -5057,8 +5062,8 @@ msgstr "Non"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Performance"
@@ -5158,7 +5163,7 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:161
msgid "Try first sdl driver (only for SDL2 default mode)"
-msgstr ""
+msgstr "Essaye le premier pilote sdl (seulement pour le mode SDL2 par défaut)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:167
@@ -5484,8 +5489,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Thème"
@@ -5619,7 +5624,7 @@ msgstr "Détecter le meilleur mode"
#. TRANSLATORS: video settings checkbox
#: src/gui/widgets/tabs/setup_video.cpp:96
msgid "High DPI"
-msgstr ""
+msgstr "PPI élevé"
#. TRANSLATORS: video settings checkbox
#: src/gui/widgets/tabs/setup_video.cpp:101
@@ -5643,8 +5648,8 @@ msgstr "Pas d'image"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Vidéo"
@@ -6051,7 +6056,7 @@ msgstr "AID"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Aide"
@@ -6246,7 +6251,7 @@ msgstr "Cfg"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Configuration"
@@ -6288,7 +6293,7 @@ msgstr "Montant :"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Créer"
@@ -6349,14 +6354,14 @@ msgstr "Les deux adresses mail ne sont pas identiques."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Erreur"
@@ -6544,7 +6549,7 @@ msgstr "Mot de passe"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Jouer"
@@ -6566,13 +6571,13 @@ msgid "Please enter new name"
msgstr "Merci d'entrer un nouveau nom"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"PV : %u/%u\n"
@@ -6582,27 +6587,27 @@ msgstr ""
"Argent : %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Mot de passe incorrect"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr "Saisis ton adresse mail pour supprimer ce personnage."
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr "Écris ton mail :"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Entre le mot de passe pour effacer le personnage"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Entre le mot de passe :"
@@ -6613,23 +6618,23 @@ msgid "Present: %s; %d players are present."
msgstr "Présents : %s ; %d joueurs sont présents."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Message privé envoyé à %s : %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr "Déplacé : "
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr "Votre message a été déplacé sur l'onglet marchand"
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr "Nom invalide détecté : "
@@ -6892,39 +6897,39 @@ msgid "Reset timer"
msgstr "Remettre le temps"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Nbre Tués : %s, total exp : %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Exp. Moy. : %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Nb. de monstres moy. pour niv. suiv. : %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Tués/Min : %s, Exp/Min : %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6940,33 +6945,33 @@ msgstr[0] "Temps pour le prochain niveau %d min: %s"
msgstr[1] "Temps pour le prochain niveau %d min : %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Exp du dernier tué :"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Niveau : %d à %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp : %d/%d Reste : %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d Moyenne des monstres tués 1%% : %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Temps pour le prochain niveau : %s"
@@ -7176,13 +7181,13 @@ msgid "Level: %d (GM %d)"
msgstr "Niveau : %d (MJ %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Restant"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Niveau de métier : %d"
@@ -7642,33 +7647,33 @@ msgid "Accept Party Invite"
msgstr "Accepter l'invitation pour ce groupe"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "Vie :"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Exp :"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "PM :"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Métier : %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Compétence :"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr "Niveau: %d (%s %d)"
@@ -9259,33 +9264,33 @@ msgstr "Connexion au serveur terminée. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr "Erreur de renommage du personnage."
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr "Personnage renommé."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr "Renommage non permis."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr "Le nouveau nom n'est pas appliqué."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr "Personnage non trouvé."
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "La suppression du personnage n'a pu s'effectuer."
@@ -9794,22 +9799,22 @@ msgid "Poison had no effect..."
msgstr "Le poison n'a pas eu d'effet..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "À propos"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd srcfile dyestring dstfile"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "ou"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
@@ -10136,57 +10141,57 @@ msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Connexion au serveur"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Connexion"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Entrée dans le monde de jeu"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Changement de mot de passe"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Modification de l'adresse mail"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "L'adresse mail a été changée avec succès !"
diff --git a/po/id.po b/po/id.po
index a98af1a82..68d9f9d37 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
"id/)\n"
@@ -55,59 +55,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Kamu dibunuh oleh %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Mencoba mengambil item yang tidak ada."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Barang terlalu berat."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Barang terlalu jauh."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Penyimpanan sudah penuh."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Tumpukan terlalu besar."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Barang masih milik orang lain."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Kamu tidak bisa mengambil barang dalam jumlah ini."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Jumlah tumpukan barangmu sudah maksimal."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Masalah mengambil barang yang tidak diketahui."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -115,58 +115,58 @@ msgstr[0] "Kamu mengambil %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "pekerjaan"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Ikuti: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Batal mengikuti"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Tiruan: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Batal menirukan"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Kamu lihat %s"
@@ -367,7 +367,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Umum"
@@ -799,18 +799,18 @@ msgstr "Pergi"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -847,8 +847,8 @@ msgstr "(F) mode kamera bebas"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Tutup"
@@ -1386,8 +1386,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Tingkatan: %d"
@@ -2124,7 +2124,7 @@ msgstr "Atur ulang bar kuning"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Salin ke obrolan"
@@ -2673,8 +2673,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr ""
@@ -2818,7 +2818,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Dasar"
@@ -2868,7 +2868,7 @@ msgstr "Obrolan"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3180,7 +3180,7 @@ msgstr "Titik jalan"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Maks"
@@ -3207,8 +3207,8 @@ msgstr "Level: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Uang: %s"
@@ -4759,104 +4759,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Perbolehkan pengecekan bot"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Perlihatkan latar belakang"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4879,8 +4884,8 @@ msgstr "Tidak"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Performa"
@@ -5296,8 +5301,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Tema"
@@ -5455,8 +5460,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Vidio"
@@ -5856,7 +5861,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Bantuan"
@@ -6051,7 +6056,7 @@ msgstr ""
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Pengaturan"
@@ -6093,7 +6098,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Buat"
@@ -6154,14 +6159,14 @@ msgstr "Pengisian alamat email tidak cocok."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Kesalahan"
@@ -6349,7 +6354,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Main"
@@ -6371,38 +6376,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Sandi tidak benar"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Masukan Sandi untuk menghapus karakter"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Masukkan sandi:"
@@ -6413,23 +6418,23 @@ msgid "Present: %s; %d players are present."
msgstr "Kehadiran: %s; %d pemain yang hadir."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Berbisik ke %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6692,39 +6697,39 @@ msgid "Reset timer"
msgstr "Atur ulang penghitung waktu"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Membunuh: %s, exp total: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Membunuh/menit: %s, Exp/menit: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6738,33 +6743,33 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Exp terakhir:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Level: %d pada %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp: %d/%d Tersisa: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, rata-rata mob untuk 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Waktu untuk ke level selanjutnya: %s"
@@ -6974,13 +6979,13 @@ msgid "Level: %d (GM %d)"
msgstr ""
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Butuh"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7436,33 +7441,33 @@ msgid "Accept Party Invite"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9039,33 +9044,33 @@ msgstr ""
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr ""
@@ -9574,22 +9579,22 @@ msgid "Poison had no effect..."
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Tentang"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "pewarnacmd sumberdata pewarnastring datadst"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "atau"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "pewarnacmd sumberpewarnastring datadst"
@@ -9912,57 +9917,57 @@ msgid "Accepting incoming trade requests"
msgstr "Terima permohonan transaksi"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Terhubung ke server"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Masuk"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Memasuki arena permainan"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Mengambil karakter"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Terhubung ke server permainan"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Mengganti server"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Perubahan Sandi"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Perubahan email"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil!"
diff --git a/po/it.po b/po/it.po
index 061579efe..3f55ec3fd 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
"it/)\n"
@@ -61,59 +61,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Sei stato ucciso da %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Forza raccolta oggetti non-esistenti."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "L'oggetto è troppo pesante."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "L'oggetto è troppo lontano."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "L'inventario è pieno."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Troppi oggetti impilati."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "L'oggetto è riservato ad un altro giocatore."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Raccolta oggetto fallita. Errore sconosciuto."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -122,58 +122,58 @@ msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "EXP"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "Job"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Segui: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Modalità Segui cancellata"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imita: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Modalità Imitazione cancellata"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Generale"
@@ -809,18 +809,18 @@ msgstr "Assente"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -857,8 +857,8 @@ msgstr "(F) Modalita' camera libera"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Chiudi"
@@ -1398,8 +1398,8 @@ msgstr "Stanza di chat: %s"
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Livello: %d"
@@ -2136,7 +2136,7 @@ msgstr "Reset barra gialla"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Copia in Chat"
@@ -2685,8 +2685,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Informazioni"
@@ -2830,7 +2830,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Base"
@@ -2880,7 +2880,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3192,7 +3192,7 @@ msgstr ""
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Massimo"
@@ -3219,8 +3219,8 @@ msgstr "Livello: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Soldi: %s"
@@ -4773,104 +4773,109 @@ msgstr "Tipologia Proxy"
msgid "Proxy address:port"
msgstr "Proxy indirizzo:porta"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Abilita i log di debug"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Attiva registro attivita' OpenGL"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Attiva attacchi server-side"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Abilita il bot checker"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Modalità basso traffico"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Usa FBO, Frame Buffer Object (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Mostra sfondo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4893,8 +4898,8 @@ msgstr "No"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5310,8 +5315,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Tema"
@@ -5469,8 +5474,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -5876,7 +5881,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Aiuto"
@@ -6071,7 +6076,7 @@ msgstr "SET"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Impostazioni"
@@ -6113,7 +6118,7 @@ msgstr "Quantita':"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Crea"
@@ -6174,14 +6179,14 @@ msgstr "Gli indirizzi email immessi non coincidono."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Errore"
@@ -6369,7 +6374,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Gioca"
@@ -6391,13 +6396,13 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"Hp: %u%u\n"
@@ -6407,27 +6412,27 @@ msgstr ""
"Soldi: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Password non valida"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Digitare password per eliminare un personaggio"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Digitare password:"
@@ -6438,23 +6443,23 @@ msgid "Present: %s; %d players are present."
msgstr "Presente: %s; %d giocatori sono presenti."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Sussurra a %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6717,39 +6722,39 @@ msgid "Reset timer"
msgstr "Reset timer"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6765,33 +6770,33 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Punti Exp ultimo Kill:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Livello: %d al %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp: %d/%d Mancante: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr ""
@@ -7001,13 +7006,13 @@ msgid "Level: %d (GM %d)"
msgstr "Livello: %d (GM:%d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Bisogno"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7463,33 +7468,33 @@ msgid "Accept Party Invite"
msgstr "Accetta invito nel party"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Esperienza:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Lavoro: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Lavoro:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9072,33 +9077,33 @@ msgstr "Connessione al server terminata. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Eliminazione personaggio fallita."
@@ -9607,22 +9612,22 @@ msgid "Poison had no effect..."
msgstr "Il veleno non ha effetto..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Info"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9945,57 +9950,57 @@ msgid "Accepting incoming trade requests"
msgstr "Le richieste di scambio in arrivo saranno accettate"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Connessione al server"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Accesso all'account"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Accesso al gioco"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Caricamento personaggi"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Cambia password"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Cambia Email"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
diff --git a/po/ja.po b/po/ja.po
index f0d4b83bd..78de69dcf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
"ja/)\n"
@@ -56,59 +56,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "存在しないアイテムは拾えません."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "アイテムが重過ぎます."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "アイテムが遠すぎます."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "インベントリーが満杯です."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "量が多すぎます."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "これは他のプレイヤーのアイテムです."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "不明なエラーの為拾えません."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -116,58 +116,58 @@ msgstr[0] "%d [@@%d|%s@@]を手に入れました."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "ジョブ"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "フォローを止める"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "真似をやめる"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr ""
@@ -371,7 +371,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "一般"
@@ -803,18 +803,18 @@ msgstr "アウェイ"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -851,8 +851,8 @@ msgstr "(F) フリーカメラモード"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "閉じる"
@@ -1389,8 +1389,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "レベル: %d"
@@ -2127,7 +2127,7 @@ msgstr "黄色バーをリセットする"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "チャットへコピーする"
@@ -2676,8 +2676,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "情報"
@@ -2821,7 +2821,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "基本"
@@ -2871,7 +2871,7 @@ msgstr "チャット"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3183,7 +3183,7 @@ msgstr ""
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "最大"
@@ -3210,8 +3210,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "GP: %s"
@@ -4764,104 +4764,109 @@ msgstr "プロキシタイプ"
msgid "Proxy address:port"
msgstr "プロキシアドレス:ポート"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "デバッグログを有効にする"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "OpenGLログを有効にする"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "入力ログを有効にする"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "サーバーサイドアタックを有効にする"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "ボットチェッカーを有効にする"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "不安定なサーバー保護を有効にする(無効にしない)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "低トラフィックモード"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "スクリーンショットにFBOを使う (OpenGLのみ)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "背景を表示する"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4884,8 +4889,8 @@ msgstr "いいえ"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5301,8 +5306,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "テーマ"
@@ -5460,8 +5465,8 @@ msgstr "フレームなし"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "ビデオ"
@@ -5861,7 +5866,7 @@ msgstr "ヘルプ"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "ヘルプ"
@@ -6056,7 +6061,7 @@ msgstr "SET"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "設定"
@@ -6098,7 +6103,7 @@ msgstr "量:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "作成"
@@ -6159,14 +6164,14 @@ msgstr "メールアドレスが一致しません."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "エラー"
@@ -6354,7 +6359,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "プレイ"
@@ -6376,38 +6381,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "パスワードが違います"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "キャラクターを削除するにはパスワードを入力して下さい"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "パスワードを入力して下さい:"
@@ -6418,23 +6423,23 @@ msgid "Present: %s; %d players are present."
msgstr "現在: %s; %d プレイヤーがいます."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "%sにささやき中:%s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6697,39 +6702,39 @@ msgid "Reset timer"
msgstr "タイマーをリセット"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "キル: %s, 合計exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "平均 Exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "次のレベルまでに必要なモブ数 約: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "キル/分: %s, Exp/分: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6743,33 +6748,33 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] "次のレベルアップ %d 分ごと: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "最後のExp:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "レベル: %d と %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp: %d/%d 残り: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, 平均の敵 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " 次のレベル達成までの時間: %s"
@@ -6979,13 +6984,13 @@ msgid "Level: %d (GM %d)"
msgstr "レベル: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "必要"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7441,33 +7446,33 @@ msgid "Accept Party Invite"
msgstr "パーティ招待を受け入れます"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Exp:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "ジョブ: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "ジョブポイント:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9050,33 +9055,33 @@ msgstr "サーバーへの接続が切断されました. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "キャラクター削除に失敗しました."
@@ -9585,22 +9590,22 @@ msgid "Poison had no effect..."
msgstr "毒の影響はなかった..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9922,57 +9927,57 @@ msgid "Accepting incoming trade requests"
msgstr "トレードリクエストを有効にしました"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "サーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "ログインしています"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "ゲームの世界に移動しています"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "キャラクターを呼び出しています"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "ゲームサーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "ゲームサーバーを変更しています"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "登録内容を呼び出しています"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "パスワード変更"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "パスワードを変更しました!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "メールアドレス変更"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "メールアドレスを変更しました!"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 17e564f30..8226935d3 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: 2017-09-16 17:07+0300\n"
+"POT-Creation-Date: 2017-09-30 15:41+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"
@@ -49,59 +49,59 @@ msgstr ""
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -110,58 +110,58 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr ""
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr ""
@@ -794,18 +794,18 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr ""
@@ -842,8 +842,8 @@ msgstr ""
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr ""
@@ -1380,8 +1380,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr ""
@@ -2118,7 +2118,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr ""
@@ -2667,8 +2667,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr ""
@@ -2812,7 +2812,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr ""
@@ -2862,7 +2862,7 @@ msgstr ""
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3174,7 +3174,7 @@ msgstr ""
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr ""
@@ -3201,8 +3201,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr ""
@@ -4753,104 +4753,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4873,8 +4878,8 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5290,8 +5295,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr ""
@@ -5449,8 +5454,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr ""
@@ -5850,7 +5855,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr ""
@@ -6045,7 +6050,7 @@ msgstr ""
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr ""
@@ -6087,7 +6092,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr ""
@@ -6148,14 +6153,14 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr ""
@@ -6343,7 +6348,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
@@ -6365,38 +6370,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr ""
@@ -6407,23 +6412,23 @@ msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6686,39 +6691,39 @@ msgid "Reset timer"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6734,33 +6739,33 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
#, c-format
-msgid "Exp: %d/%d Left: %d"
+msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr ""
@@ -6970,13 +6975,13 @@ msgid "Level: %d (GM %d)"
msgstr ""
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr ""
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7432,33 +7437,33 @@ msgid "Accept Party Invite"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9035,33 +9040,33 @@ msgstr ""
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr ""
@@ -9570,22 +9575,22 @@ msgid "Poison had no effect..."
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9907,57 +9912,57 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 0b111cf11..d67b0a8ca 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:45+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
"language/nl_BE/)\n"
@@ -53,59 +53,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "U bent gedood door %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Voorwerp is te zwaar."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Voorwerp is te ver weg."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Inventaris is vol."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Uw opstapeling is de groot."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Voorwerp behoort bij iemand anders."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "U kan deze hoeveelheid aan items niet oprapen."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "U zit aan het maximum van uw opslagruimte."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Onbekend probleem bij het oprapen van voorwerp."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -114,58 +114,58 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "ep"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "job"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Volg %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Volgen onderbroken"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imiteer %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitatie onderbroken"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "You see %s"
@@ -366,7 +366,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Algemeen"
@@ -798,18 +798,18 @@ msgstr "Weg"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "Oké"
@@ -846,8 +846,8 @@ msgstr "(F) vrije camera modus"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Sluiten"
@@ -1386,8 +1386,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
@@ -2124,7 +2124,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Kopieer naar chat"
@@ -2673,8 +2673,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Info"
@@ -2818,7 +2818,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Basis"
@@ -2868,7 +2868,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3180,7 +3180,7 @@ msgstr "Wegpunt"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Maximum"
@@ -3207,8 +3207,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Geld: %s"
@@ -4759,104 +4759,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Zet debug log aan"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Aanval gecontroleerd door server aanzetten"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Bot controle aanzetten"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Laag verkeer modus"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Toon achtergrond"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4879,8 +4884,8 @@ msgstr "Nee"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Performantie"
@@ -5296,8 +5301,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Thema"
@@ -5455,8 +5460,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -5862,7 +5867,7 @@ msgstr "HLP"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Help"
@@ -6057,7 +6062,7 @@ msgstr "CONF"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Configureren"
@@ -6099,7 +6104,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Aanmaken"
@@ -6160,14 +6165,14 @@ msgstr "De email adres ingaven zijn niet gelijk."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Fout"
@@ -6355,7 +6360,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Spelen"
@@ -6377,38 +6382,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Ongeldig paswoord"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Geef uw wachtwoord om uw personage te verwijderen"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Geef wachtwoord:"
@@ -6419,23 +6424,23 @@ msgid "Present: %s; %d players are present."
msgstr "Aanwezig: %s; %d speler zijn aanwezig."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6698,39 +6703,39 @@ msgid "Reset timer"
msgstr "Herzet timer"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6746,33 +6751,33 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
#, c-format
-msgid "Exp: %d/%d Left: %d"
+msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Tijd tot volgend niveau: %s"
@@ -6982,13 +6987,13 @@ msgid "Level: %d (GM %d)"
msgstr "Niveau: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Nood"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7444,33 +7449,33 @@ msgid "Accept Party Invite"
msgstr "Groepsuitnodiging aanvaarden"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "Leven:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Ervaring:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "Magie:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Job:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9053,33 +9058,33 @@ msgstr "Verbinding met server beëindigd. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Kon personage niet verwijderen."
@@ -9588,22 +9593,22 @@ msgid "Poison had no effect..."
msgstr "Gif had geen effect..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Over"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "of"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9925,57 +9930,57 @@ msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 0b111cf11..d67b0a8ca 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:45+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
"language/nl_BE/)\n"
@@ -53,59 +53,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "U bent gedood door %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Voorwerp is te zwaar."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Voorwerp is te ver weg."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Inventaris is vol."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Uw opstapeling is de groot."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Voorwerp behoort bij iemand anders."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "U kan deze hoeveelheid aan items niet oprapen."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "U zit aan het maximum van uw opslagruimte."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Onbekend probleem bij het oprapen van voorwerp."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -114,58 +114,58 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "ep"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "job"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Volg %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Volgen onderbroken"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imiteer %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitatie onderbroken"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "You see %s"
@@ -366,7 +366,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Algemeen"
@@ -798,18 +798,18 @@ msgstr "Weg"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "Oké"
@@ -846,8 +846,8 @@ msgstr "(F) vrije camera modus"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Sluiten"
@@ -1386,8 +1386,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
@@ -2124,7 +2124,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Kopieer naar chat"
@@ -2673,8 +2673,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Info"
@@ -2818,7 +2818,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Basis"
@@ -2868,7 +2868,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3180,7 +3180,7 @@ msgstr "Wegpunt"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Maximum"
@@ -3207,8 +3207,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Geld: %s"
@@ -4759,104 +4759,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Zet debug log aan"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Aanval gecontroleerd door server aanzetten"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Bot controle aanzetten"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Laag verkeer modus"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Toon achtergrond"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4879,8 +4884,8 @@ msgstr "Nee"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Performantie"
@@ -5296,8 +5301,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Thema"
@@ -5455,8 +5460,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -5862,7 +5867,7 @@ msgstr "HLP"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Help"
@@ -6057,7 +6062,7 @@ msgstr "CONF"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Configureren"
@@ -6099,7 +6104,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Aanmaken"
@@ -6160,14 +6165,14 @@ msgstr "De email adres ingaven zijn niet gelijk."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Fout"
@@ -6355,7 +6360,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Spelen"
@@ -6377,38 +6382,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Ongeldig paswoord"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Geef uw wachtwoord om uw personage te verwijderen"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Geef wachtwoord:"
@@ -6419,23 +6424,23 @@ msgid "Present: %s; %d players are present."
msgstr "Aanwezig: %s; %d speler zijn aanwezig."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6698,39 +6703,39 @@ msgid "Reset timer"
msgstr "Herzet timer"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6746,33 +6751,33 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
#, c-format
-msgid "Exp: %d/%d Left: %d"
+msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Tijd tot volgend niveau: %s"
@@ -6982,13 +6987,13 @@ msgid "Level: %d (GM %d)"
msgstr "Niveau: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Nood"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7444,33 +7449,33 @@ msgid "Accept Party Invite"
msgstr "Groepsuitnodiging aanvaarden"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "Leven:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Ervaring:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "Magie:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Job:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9053,33 +9058,33 @@ msgstr "Verbinding met server beëindigd. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Kon personage niet verwijderen."
@@ -9588,22 +9593,22 @@ msgid "Poison had no effect..."
msgstr "Gif had geen effect..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Over"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "of"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9925,57 +9930,57 @@ msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
diff --git a/po/pl.po b/po/pl.po
index 715b485ba..594389c67 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
"pl/)\n"
@@ -58,59 +58,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Zostałeś zabity przez %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Próbowano podnieść nieistniejący przedmiot."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Przedmiot zbyt ciężki."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Przedmiot za daleko."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Inwentarz jest pełny."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Za duży stos."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Przedmiot należy do kogoś innego."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Nie możesz podnieść tej ilości przedmiotów."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Twoja sterta przedmiotu osiągnęła maksymalną ilość."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -121,58 +121,58 @@ msgstr[3] "Podniosłeś/aś %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "skill"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr "Homun"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr "pż"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr "mana"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Podążanie: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Podążanie anulowane."
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imitowanie: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitacja anulowana"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Widzisz %s"
@@ -373,7 +373,7 @@ msgstr "%s nie istnieje i nie może być utworzony!"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Ogólny"
@@ -805,18 +805,18 @@ msgstr "AFK"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "Ok"
@@ -853,8 +853,8 @@ msgstr "(F) wolny tryb kamery"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Zamknij"
@@ -1394,8 +1394,8 @@ msgstr "Pokój czat: %s"
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Poziom: %d"
@@ -2132,7 +2132,7 @@ msgstr "Zresetuj żółty pasek"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Skopiuj do czatu"
@@ -2681,8 +2681,8 @@ msgstr "Stwórz niewolnika"
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Info"
@@ -2826,7 +2826,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Podstawowe"
@@ -2876,7 +2876,7 @@ msgstr "Czat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3188,7 +3188,7 @@ msgstr "Drogowskaz"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Maks."
@@ -3215,8 +3215,8 @@ msgstr "Poziom: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Pieniądze: %s"
@@ -4769,104 +4769,109 @@ msgstr "Rodzaj proxy"
msgid "Proxy address:port"
msgstr "Adres serwera:port"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Włącz logowanie Debug"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Włącz logowanie OpenGL"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Aktywuj logowanie wejścia"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr "Wyślij plik dziennika"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Włącz atak ze strony serwera"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr "Ukryj stronę wsparcia po wystąpieniu błędu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Aktywuj podwójne kliknięcia"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Włącz wykrywacza botów"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Włącz ochronę przeciw zbugowanym serwerom"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Tryb niskiego transferu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Używaj FBO do screenshotów (tylko w OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr "Folder zrzutów ekranu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Opóźnienie sieci między podserwerami"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Pokazuj tło"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Nadpisanie gęstości ekranu"
@@ -4889,8 +4894,8 @@ msgstr "Nie"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Wydajność"
@@ -5308,8 +5313,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Skórka"
@@ -5467,8 +5472,8 @@ msgstr "Bez ramki"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Ekran"
@@ -5873,7 +5878,7 @@ msgstr "PMC"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Pomoc"
@@ -6068,7 +6073,7 @@ msgstr "SET"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Konfiguracja"
@@ -6110,7 +6115,7 @@ msgstr "Ilość:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Utwórz"
@@ -6171,14 +6176,14 @@ msgstr "Pola adresu e-mail się nie zgadzają."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Błąd"
@@ -6366,7 +6371,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Graj"
@@ -6388,13 +6393,13 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"PŻ: %u/%u\n"
@@ -6404,27 +6409,27 @@ msgstr ""
"Pieniądze: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Nieprawidłowe hasło"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Wprowadź hasło aby usunąć postać"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Wprowadź hasło:"
@@ -6435,23 +6440,23 @@ msgid "Present: %s; %d players are present."
msgstr "%s obecny/a. %d graczy online."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Szepczesz do %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6714,39 +6719,39 @@ msgid "Reset timer"
msgstr "Zresetuj zegar"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Moby: %s, całk. exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Śr. Exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Przeciętna il mobów do nast.: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mob/Min: %s, Exp/Min: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6766,33 +6771,33 @@ msgstr[2] "Czas do nast. poziomu z %d min: %s"
msgstr[3] "Czas do nast. poziomu z %d min: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Ostatni exp:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Poziom: %d w %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp: %d%d Zostało: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, avg mob na 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Czas do nast. poziomu: %s"
@@ -7002,13 +7007,13 @@ msgid "Level: %d (GM %d)"
msgstr "Poziom: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Potrzeba"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Poziom Pracy: %d"
@@ -7464,33 +7469,33 @@ msgid "Accept Party Invite"
msgstr "Zaakceptuj zaproszenie do grupy"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Exp:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Praca: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Praca:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9071,33 +9076,33 @@ msgstr "Połączenie z serwerem przerwane. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Nie udało się skasować postaci."
@@ -9606,22 +9611,22 @@ msgid "Poison had no effect..."
msgstr "Trucizna nie zadziałała..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "O..."
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd srcfile dyestring dstfile"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "lub"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
@@ -9946,57 +9951,57 @@ msgid "Accepting incoming trade requests"
msgstr "Akceptowanie przychodzących próśb o handel"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Łączenie z serwerem"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Logowanie"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Łączenie się z serwerem gry"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Zmiana serwera"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Zmiana hasła"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
diff --git a/po/pt.po b/po/pt.po
index 4abe98f9b..23999b0d9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
"pt/)\n"
@@ -55,59 +55,59 @@ msgstr "l"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Foste morto(a) por %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Item está muito longe."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "O inventário está cheio."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -116,58 +116,58 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "exp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "Profissão"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Seguir: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Seguir cancelado"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imitando: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitação cancelada"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Você vê %s"
@@ -373,7 +373,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Geral"
@@ -805,18 +805,18 @@ msgstr "Indisponivel"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -853,8 +853,8 @@ msgstr "(F) Modo de jogo câmera livre"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Fechar"
@@ -1395,8 +1395,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Nível: %d"
@@ -2133,7 +2133,7 @@ msgstr "Resetar barra amarela"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Copiar para o chat"
@@ -2682,8 +2682,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Informações"
@@ -2827,7 +2827,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Básico"
@@ -2877,7 +2877,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3189,7 +3189,7 @@ msgstr "Ponto de estrada"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Máximo"
@@ -3216,8 +3216,8 @@ msgstr "Level: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Dinheiro: %s"
@@ -4770,104 +4770,109 @@ msgstr "Tipo de Proxy"
msgid "Proxy address:port"
msgstr "Proxy endereço:porta"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Habilitar Depurador"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Ativar LOG OpenGL"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Habilitar log de entrada"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Habilitar ataque do lado do servidor"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Atraso de rede entre os sub servidores"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Mostrar imagem de fundo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Substituição de densidade de tela"
@@ -4890,8 +4895,8 @@ msgstr "Não"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5307,8 +5312,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Tema"
@@ -5466,8 +5471,8 @@ msgstr "Sem moldura de janela"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Vídeo"
@@ -5871,7 +5876,7 @@ msgstr "AJD"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Ajuda"
@@ -6066,7 +6071,7 @@ msgstr "CON"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Configurar"
@@ -6108,7 +6113,7 @@ msgstr "Quantidade:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Criar"
@@ -6169,14 +6174,14 @@ msgstr "Os emails informados não são iguais."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Erro"
@@ -6364,7 +6369,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Jogar"
@@ -6386,13 +6391,13 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"Hp: %u/%u\n"
@@ -6402,27 +6407,27 @@ msgstr ""
"Dinheiro: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Senha Incorreta"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Entre com a Senha para Deletar o usuario"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Entre com a senha:"
@@ -6433,23 +6438,23 @@ msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6712,39 +6717,39 @@ msgid "Reset timer"
msgstr "Resetar tempo"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Mortes: %s, total exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Média Exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Nu. de mob para próximo level: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mortes/Min: %s Exp/Min: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6760,33 +6765,33 @@ msgstr[0] "Tempo para próximo nível por %d min: %s"
msgstr[1] "Tempo para próximo nível por %d mins: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Exp de última morte:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nível: %d em %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp: %d%d faltando: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, avg mob para 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Tempo para próximo nível: %s"
@@ -6996,13 +7001,13 @@ msgid "Level: %d (GM %d)"
msgstr "Nível: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Precisa"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7458,33 +7463,33 @@ msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Exp:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Job:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9066,33 +9071,33 @@ msgstr "Conexão com o servidor interrompida. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Falha ao deletar personagem."
@@ -9601,22 +9606,22 @@ msgid "Poison had no effect..."
msgstr "Veneno não surtiu efeito..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9938,57 +9943,57 @@ msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Conectando ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Efetuando login"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Requisitando personagens"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 087f7c529..bc9839c03 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -27,8 +27,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-23 18:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
"language/pt_BR/)\n"
@@ -69,59 +69,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Você foi morto(a) por %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Item está muito longe."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "O inventário está cheio."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Você não pode pegar essa quantia de itens."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Sua pilha de itens possui a quantidade máxima."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -130,58 +130,58 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "exp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "profissão"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr "Homúnculo"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr "hp"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr "mana"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Seguindo: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Seguindo cancelado"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imitando: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitação cancelada"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Você vê %s"
@@ -386,7 +386,7 @@ msgstr "%s não existe e não pode ser criado!"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Geral"
@@ -818,18 +818,18 @@ msgstr "Indisponivel"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -866,8 +866,8 @@ msgstr "(F) Modo de jogo câmera livre"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Fechar"
@@ -1408,8 +1408,8 @@ msgstr "Sala de chat: %s"
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Nível: %d"
@@ -2146,7 +2146,7 @@ msgstr "Zerar barra amarela"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Copiar para chat"
@@ -2695,8 +2695,8 @@ msgstr "Gerar escravo"
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Informações"
@@ -2840,7 +2840,7 @@ msgstr "Tipo de invocação: %s"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Básico"
@@ -2890,7 +2890,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3202,7 +3202,7 @@ msgstr "Ponto de estrada"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Máximo"
@@ -3229,8 +3229,8 @@ msgstr "Nível: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Dinheiro: %s"
@@ -4915,104 +4915,109 @@ msgstr "Tipo de Proxy"
msgid "Proxy address:port"
msgstr "Proxy endereço:porta"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr "Habilitar verificação de versão OpenGL (não desabilitar)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Habilitar Depurador"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr "Ignorar pacotes de registro"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Ativar LOG OpenGL"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Habilitar log de entrada"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr "Arquivo de registro enviado"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Habilitar ataque do lado do servidor"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr "Esconder link da página de suporte em erros"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Habilitar duplo clique"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr "Diretório de captura de tela"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Atraso de rede entre sub servidores"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Mostrar imagem de fundo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Ultrapassar Densidade da tela"
@@ -5035,8 +5040,8 @@ msgstr "Não"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Desempenho"
@@ -5456,8 +5461,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Tema"
@@ -5615,8 +5620,8 @@ msgstr "Sem moldura de janela"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Vídeo"
@@ -6020,7 +6025,7 @@ msgstr "AJU"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Ajuda"
@@ -6215,7 +6220,7 @@ msgstr "CON"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Configurar"
@@ -6257,7 +6262,7 @@ msgstr "Quantidade:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Criar"
@@ -6318,14 +6323,14 @@ msgstr "Os emails informados não são iguais."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Erro"
@@ -6513,7 +6518,7 @@ msgstr "Senha"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Jogar"
@@ -6535,13 +6540,13 @@ msgid "Please enter new name"
msgstr "Por favor insira o novo nome"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"Hp: %u/%u\n"
@@ -6551,27 +6556,27 @@ msgstr ""
"Dinheiro: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Senha incorreta"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr "Insira seu e-mail para deletar personagem"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr "Insira e-mail:"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Entre com a senha para apagar o personagem"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Entre com a senha:"
@@ -6582,23 +6587,23 @@ msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr "Movido: "
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr "Sua mensagem foi movida para a aba de negociação"
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr "Apelido suspeito detectado: "
@@ -6861,39 +6866,39 @@ msgid "Reset timer"
msgstr "Resetar tempo"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Mortes: %s Total exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Média Exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Média de mob para próximo level: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mortes/Min: %s Exp/Min: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6909,33 +6914,33 @@ msgstr[0] "Tempo para o próximo nível %d min: %s"
msgstr[1] "Tempo para o próximo nível %d mins: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Ultima exp por morte:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nível: %d em %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp: %d%d Falta: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d ex, avg mob por 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Tempo para próximo nível: %s"
@@ -7145,13 +7150,13 @@ msgid "Level: %d (GM %d)"
msgstr "Nível: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Precisa"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Nível de profissão: %d"
@@ -7607,33 +7612,33 @@ msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Exp:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Job:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9218,33 +9223,33 @@ msgstr "Conexão com o servidor interrompida. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr "Erro ao renomear personagem."
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr "Personagem renomeado."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr "Não é permitido renomear."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr "Novo nome não definido."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr "Personagem não encontrado."
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Falha ao deletar personagem."
@@ -9753,22 +9758,22 @@ msgid "Poison had no effect..."
msgstr "Veneno não surtiu efeito..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Sobre"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd srcfile dyestring dstfile"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "ou"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
@@ -10094,57 +10099,57 @@ msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Conectando-se ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Fazendo login"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Entrando no mundo do jogo"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Requerindo personagens"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Mudando de servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
diff --git a/po/ru.po b/po/ru.po
index 038cbf473..df025383f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@
# Necromonger <Necromong@inbox.ru>, 2011
# Necromonger <Necromong@inbox.ru>, 2011
# Yummie <reslayer@mail.ru>, 2011
-# Victor <ratrex@mail.ru>, 2016
+# Victor <ratrex@mail.ru>, 2016-2017
# Yummie <reslayer@mail.ru>, 2011
# Ильшат Сайдуллин <bio_editor@mail.ru>, 2013
# Роман Верменко <dargodet@gmail.com>, 2015
@@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-17 18:52+0000\n"
+"Last-Translator: Victor <ratrex@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
"ru/)\n"
"Language: ru\n"
@@ -65,59 +65,59 @@ msgstr "Б"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Вы были убиты %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Предмет слишком далеко."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Слишком много предметов."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Вы не можете поднять такое количество."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Слишком много предметов в стэке."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -128,58 +128,58 @@ msgstr[3] "Вы подняли %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "опыт"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "работа"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr "Гомун"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr "здоровье"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr "мана"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Следовать за: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Следование отменено"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Имитация: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Имитация отменена"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Вы видите %s"
@@ -382,7 +382,7 @@ msgstr "%s не существует и не может быть создана!
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Общие"
@@ -814,18 +814,18 @@ msgstr "Отошел"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "ОК"
@@ -862,8 +862,8 @@ msgstr "(F) свободная камера"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Закрыть"
@@ -1404,8 +1404,8 @@ msgstr "Комната чата: %s"
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Уровень: %d"
@@ -2142,7 +2142,7 @@ msgstr "сбросить настройки"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Скопировать в чат"
@@ -2198,7 +2198,7 @@ msgstr "Навык"
#. TRANSLATORS: add skill to shortcurs tab
#: src/gui/popups/popupmenu.cpp:2264
msgid "Add skill shortcut"
-msgstr ""
+msgstr "Добавить ярлык навыка"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set skill level
@@ -2691,8 +2691,8 @@ msgstr "Создать подчиненного"
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Сведения"
@@ -2836,7 +2836,7 @@ msgstr "Тип каста: %s"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Основное"
@@ -2886,7 +2886,7 @@ msgstr "Чат"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3198,7 +3198,7 @@ msgstr "Точка дороги"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Макс"
@@ -3225,8 +3225,8 @@ msgstr "Уровень: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Деньги: %s"
@@ -3707,7 +3707,7 @@ msgstr "Аудио каналы"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:111
msgid "Parallel number of sounds"
-msgstr ""
+msgstr "Параллельное количество звуков"
#. TRANSLATORS: settings group
#: src/gui/widgets/tabs/setup_audio.cpp:116
@@ -3849,6 +3849,11 @@ msgid ""
"It allows one to select default color of outgoing chat messages easily, but "
"also occupies some space in chat window."
msgstr ""
+"Включите эту опцию, чтобы видеть выдвигаемую панель выбора цвета в окне "
+"чата. Окно чата будет отображать выдвигаемую панель выбора цвета.\n"
+"\n"
+"Это позволяет легко выбирать цвет по умолчанию для исходящих сообщения в "
+"чате, однако занимает место в окне чата."
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_chat.cpp:90
@@ -3881,6 +3886,11 @@ msgid ""
"Note: long lines can make client slower. Lines longer than this limit will "
"be truncated."
msgstr ""
+"Лимит на количество символов самой длинной строки текста отображаемой в "
+"чате.\n"
+"\n"
+"Памятка: длинные строки могут замедлять работу клиента. Строки превышающие "
+"лимит будут обрезаны."
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_chat.cpp:110
@@ -3896,6 +3906,12 @@ msgid ""
"\n"
"Note: keeping too many lines in scroll buffer can slow client down."
msgstr ""
+"Ограничивает количество строк чата, хранящихся в скролл буфере. Чат хранит "
+"определенное количество последних строк текста. Самые старые строки "
+"превышающие этот лимит будут удалены из скролл буфера.\n"
+"\n"
+"Примечание: хранение слишком многих строк в скролл буфере может замедлить "
+"работу клиента."
#. TRANSLATORS: settings group
#: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -3936,6 +3952,8 @@ msgid ""
"If this setting enabled, client will load old chat tabs content from logs on "
"startup instead of starting with empty chat tabs."
msgstr ""
+"Если эта опция включена, во время старта клиента будет загружаться "
+"содержимое старых вкладок чата из логов вместо старта с пустыми вкладками."
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_chat.cpp:143
@@ -4179,6 +4197,8 @@ msgid ""
"If this feature enabled, timestamps in chat will use local times. If "
"disabled, server time will be used (often it is GMT+0)."
msgstr ""
+"Если опция активна, метки времени в чате будут использовать локальное время. "
+"Если отключена, будет использоваться серверное время (зачастую это GTM+0)."
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_chat.cpp:296
@@ -4458,32 +4478,32 @@ msgstr "большой_3"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:102
msgid "verbose"
-msgstr ""
+msgstr "подробно"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:104
msgid "debug"
-msgstr ""
+msgstr "отладка"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:106
msgid "info"
-msgstr ""
+msgstr "информация"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:108
msgid "warn"
-msgstr ""
+msgstr "предупреждение"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:110
msgid "error"
-msgstr ""
+msgstr "ошибка"
#. TRANSLATORS: sdl2 log level
#: src/gui/widgets/tabs/setup_misc.cpp:112
msgid "critical"
-msgstr ""
+msgstr "критический"
#. TRANSLATORS: misc tab in settings
#: src/gui/widgets/tabs/setup_misc.cpp:126
@@ -4769,7 +4789,7 @@ msgstr "Специальное время повтора клавиш"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_misc.cpp:362
msgid "Enable alt-tab workaround"
-msgstr ""
+msgstr "Включить alt-tab прокрутку"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_misc.cpp:372
@@ -4791,104 +4811,109 @@ msgstr "Тип прокси"
msgid "Proxy address:port"
msgstr "Прокси адрес:порт"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
-msgstr ""
+msgstr "Логирование"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr "Включить проверку версии OpenGL (не выключать)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Включить отлад. лог"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr "Исключить из логгирования пакеты"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr "Сохранять нереализованные пакеты"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Включить лог OpenGL"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Включить лог ввода"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
-msgstr ""
+msgstr "уровень логирования SDL"
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr "Выгрузить лог файл"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Включить серверную атаку"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr "При выводе ошибки, прятать ссылку на страницу поддержки"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Включить поддержку двойного клика"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Включить детектор ботов"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Включить защиту от бажных серверов (не выключать!)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Режим кеширования игроков"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Использовать FBO для скриншотов (только в режиме opengl)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr "Путь для снимков экрана"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Задержка между сетевыми соединениями"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Показать фон"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Переопределение плотности экрана"
@@ -4911,8 +4936,8 @@ msgstr "Нет"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Производительность"
@@ -5015,7 +5040,7 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:161
msgid "Try first sdl driver (only for SDL2 default mode)"
-msgstr ""
+msgstr "Использовать сначала sdl драйвер (только для SDL2 режима)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:167
@@ -5098,7 +5123,7 @@ msgstr "сверху"
#. TRANSLATORS: show on top or down
#: src/gui/widgets/tabs/setup_players.cpp:73
msgid "bottom"
-msgstr ""
+msgstr "внизу"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_players.cpp:90
@@ -5335,8 +5360,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Тема"
@@ -5470,7 +5495,7 @@ msgstr "Найти лучший режим"
#. TRANSLATORS: video settings checkbox
#: src/gui/widgets/tabs/setup_video.cpp:96
msgid "High DPI"
-msgstr ""
+msgstr "Высокий DPI"
#. TRANSLATORS: video settings checkbox
#: src/gui/widgets/tabs/setup_video.cpp:101
@@ -5494,8 +5519,8 @@ msgstr "Без рамки"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Видео"
@@ -5901,7 +5926,7 @@ msgstr "СПР"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Помощь"
@@ -6096,7 +6121,7 @@ msgstr "ОПЦ"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Настройка"
@@ -6138,7 +6163,7 @@ msgstr "Количество:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Создать"
@@ -6199,14 +6224,14 @@ msgstr "Адрес E-mail не совпадает."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Ошибка"
@@ -6394,7 +6419,7 @@ msgstr "Пароль"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Играть"
@@ -6416,13 +6441,13 @@ msgid "Please enter new name"
msgstr "Пожалуйста, введите новое имя"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"Hp: %u/%u\n"
@@ -6432,27 +6457,27 @@ msgstr ""
"Деньги: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Неправильный пароль"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr "Введите ваш email для удаления персонажа"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr "Введите email:"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Введите пароль для удаления персонажа"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Введите пароль:"
@@ -6463,23 +6488,23 @@ msgid "Present: %s; %d players are present."
msgstr "Присутствуют: %s; Всего %d игроков."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr "Перемещено: "
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr "Ваше сообщение перемещено на страницу торговли"
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr "Обнаружен некорректный ник: "
@@ -6742,39 +6767,39 @@ msgid "Reset timer"
msgstr "Сбросить таймер"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Убийств: %s, всего опыта: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Средний опыт: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Средн. кол-во монстров до след. уров.: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6794,33 +6819,33 @@ msgstr[2] "Время до следующего уровня в мин. %d: %s"
msgstr[3] "Время до следующего уровня в мин. %d: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Опыт за последнее убийство:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Уровень: %d на %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Опыт: %d/%d Осталось: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d опыта, среднее кол-во мобов для 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Время до следующего уровня: %s"
@@ -6928,7 +6953,7 @@ msgstr "Просмотр почтового сообщения"
#. TRANSLATORS: mail view attach / items button
#: src/gui/windows/mailviewwindow.cpp:57
msgid "Get items"
-msgstr ""
+msgstr "Получить предметы"
#: src/gui/windows/mailviewwindow.cpp:57
msgid "Get attach"
@@ -6952,7 +6977,7 @@ msgstr "От:"
#. TRANSLATORS: mail view attached money button
#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr ""
+msgstr "Получить деньги"
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -6967,7 +6992,7 @@ msgstr "Новое"
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
-msgstr ""
+msgstr "Получить золото"
#: src/gui/windows/mailwindow.cpp:76
msgid "Return"
@@ -7030,13 +7055,13 @@ msgid "Level: %d (GM %d)"
msgstr "Уровень: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Нужно"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Уровень профессии: %d"
@@ -7492,33 +7517,33 @@ msgid "Accept Party Invite"
msgstr "Принять приглашение в группу"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "Жизнь:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Опыт:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "Мана:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Профессия: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Профессия:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr "Уровень: %d (%s %d)"
@@ -9102,33 +9127,33 @@ msgstr "Подключение к серверу прервано. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr "Ошибка изменения имени персонажа."
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr "Персонаж переименован."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr "Изменение имени запрещено."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr "Новое имя не указано."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr "Персонаж не найден."
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Невозможно удалить персонажа."
@@ -9637,22 +9662,22 @@ msgid "Poison had no effect..."
msgstr "Яд не подействовал..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "О Программе"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd исходный_файл строка_цвета файл_назначения"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "или"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd файл_строка_цвета файл_назначения"
@@ -9976,57 +10001,57 @@ msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Авторизация"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Входим в игровой мир"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Получение списка персонажей"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Смена игрового сервера"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Изменить Пароль"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Сменить Email"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Email изменен!"
@@ -11123,78 +11148,80 @@ msgstr "Невозможно купить. Выбраны недопустимы
#: src/resources/notifications.h:854
#, c-format
msgid "Mail destination name %s is wrong."
-msgstr ""
+msgstr "Имя адресата %s неверное."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:858
msgid "Item attach failed. Weight too big."
-msgstr ""
+msgstr "Не удалось прикрепить предмет. Вес слишком большой."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:862
msgid "Item attach failed. Fatal error."
-msgstr ""
+msgstr "Не удалось прикрепить предмет. Критическая ошибка."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:866
msgid "Item attach failed. No more space."
-msgstr ""
+msgstr "Не удалось прикрепить предмет. Нет свободного места."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:870
msgid "Item attach failed. Item on tradeable."
-msgstr ""
+msgstr "Не удалось прикрепить предмет. Предмет на продаже."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:874
msgid "Item attach failed. Unknown error."
-msgstr ""
+msgstr "Не удалось прикрепить предмет. Неизвестная ошибка."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
#, c-format
msgid "Item %s remove failed."
-msgstr ""
+msgstr "Не удалось удалить предмет %s."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
msgid "Mail send failed. Fatal error."
-msgstr ""
+msgstr "Не удалось отправить сообщение. Критическая ошибка."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:886
msgid "Mail send failed. Too many mails sent."
-msgstr ""
+msgstr "Не удалось отправить сообщение. Слишком много сообщений отправлено."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:890
msgid "Mail send failed. Wrong attach found."
-msgstr ""
+msgstr "Не удалось отправить сообщение. Некорректное вложение."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:894
msgid "Mail send failed. Receiver name wrong or not checked."
msgstr ""
+"Не удалось отправить сообщение. Имя получателя неверное или не проверено."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:898
msgid "Error on getting attach. No space or weight too high."
msgstr ""
+"Ошибка при получении вложения. Нет свободного места или вес слишком велик."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:902
msgid "You got money from mail."
-msgstr ""
+msgstr "Вы получили деньги из почты."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:906
msgid "Error on getting money attach."
-msgstr ""
+msgstr "Ошибка при получении денежного вложения."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:910
msgid "Error on getting money attach. Too many money."
-msgstr ""
+msgstr "Ошибка при получении денежного вложения. Слишком много денег."
#. TRANSLATORS: skill level
#: src/resources/skill/skillinfo.cpp:113
diff --git a/po/sr.po b/po/sr.po
index 11cb5a1ae..49aa05980 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 14:48+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
"sr/)\n"
@@ -52,59 +52,59 @@ msgstr ""
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -114,58 +114,58 @@ msgstr[2] "Pokupio %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr ""
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr ""
@@ -366,7 +366,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Opšte"
@@ -798,18 +798,18 @@ msgstr "Nedostupan"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "U redu"
@@ -846,8 +846,8 @@ msgstr ""
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Zatvori"
@@ -1384,8 +1384,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Nivo: %d"
@@ -2122,7 +2122,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr ""
@@ -2671,8 +2671,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr ""
@@ -2816,7 +2816,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr ""
@@ -2866,7 +2866,7 @@ msgstr "Ćaskanje"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3178,7 +3178,7 @@ msgstr ""
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr ""
@@ -3205,8 +3205,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Novac: %s"
@@ -4759,104 +4759,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Režim niskog protoka"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Prikaži pozadinu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4879,8 +4884,8 @@ msgstr "Ne"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5296,8 +5301,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Stil"
@@ -5455,8 +5460,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -5856,7 +5861,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Pomoć"
@@ -6051,7 +6056,7 @@ msgstr ""
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Podešavanje"
@@ -6093,7 +6098,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr ""
@@ -6154,14 +6159,14 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Greška"
@@ -6349,7 +6354,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
@@ -6371,38 +6376,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr ""
@@ -6413,23 +6418,23 @@ msgid "Present: %s; %d players are present."
msgstr "Prisutnost: %s; %d igrača je prisutno."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Šapućem prema %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6692,39 +6697,39 @@ msgid "Reset timer"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6742,33 +6747,33 @@ msgstr[1] ""
msgstr[2] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
#, c-format
-msgid "Exp: %d/%d Left: %d"
+msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr ""
@@ -6978,13 +6983,13 @@ msgid "Level: %d (GM %d)"
msgstr "Nivo: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr ""
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7440,33 +7445,33 @@ msgid "Accept Party Invite"
msgstr "Prihvati zahtev za partiju"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "Zdravlje:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Iskustvo:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "Magija:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Posao: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Posao:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9043,33 +9048,33 @@ msgstr ""
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr ""
@@ -9578,22 +9583,22 @@ msgid "Poison had no effect..."
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "O programu"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9915,57 +9920,57 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Povezivanje sa serverom"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Prijavljivanje"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Ulaz u svet"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Tražim karaktere"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Poverzujem se sa serverom za igru"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Menjam server igre"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Zahtevam detalje registracije"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Promena lozinke"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Lozinka je uspešno promenjena!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Izmena e-mail adrese"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "E-mail adresa je uspešno promenjena!"
diff --git a/po/sv.po b/po/sv.po
index 5719328f5..e6bfdd517 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:46+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
"language/sv_SE/)\n"
@@ -50,59 +50,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Försökte plocka upp icke existerande item."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Item är för tung."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Item:en är för långt bort."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Inventory är fullt."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Stack är för stor."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Item:et tillhör någon annan."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Okänt fel vid upplockning av item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -111,58 +111,58 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "jobb"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Follow: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Follow avbruten"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imitation: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitation avbruten"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Du ser %s"
@@ -366,7 +366,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "General"
@@ -798,18 +798,18 @@ msgstr "Iväg"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -846,8 +846,8 @@ msgstr "(F) fritt kamera-läge"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Stäng"
@@ -1384,8 +1384,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
@@ -2122,7 +2122,7 @@ msgstr "Återställ yellow bar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Kopiera till chat"
@@ -2671,8 +2671,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Info"
@@ -2816,7 +2816,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Enkel"
@@ -2866,7 +2866,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3178,7 +3178,7 @@ msgstr "Väg-märke"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Max"
@@ -3205,8 +3205,8 @@ msgstr "Level: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Money: %s"
@@ -4760,104 +4760,109 @@ msgstr "Proxy-typ"
msgid "Proxy address:port"
msgstr "Proxy-adress:port"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Aktivera debug-logg"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Aktivera OpenGL-logg"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Aktivera inputs-logg"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Aktivera serversideattack"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Aktivera dubbleklick"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Aktivera bot checker"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Aktivera buggig-server-skydd (ändra inte denna är du snäll)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Lågtrafik-mode"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Använd FBO för skärmdumpar (bara för openGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Nätverksfördröjning mellan underservrar"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Visa bakgrund"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Skärmdensitet överskrids"
@@ -4880,8 +4885,8 @@ msgstr "Nej"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5297,8 +5302,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Tema"
@@ -5456,8 +5461,8 @@ msgstr "Ingen ram"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -5861,7 +5866,7 @@ msgstr "HLP"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Hjälp"
@@ -6056,7 +6061,7 @@ msgstr "SET"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Inställningar"
@@ -6098,7 +6103,7 @@ msgstr "Antal:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Skapa"
@@ -6159,14 +6164,14 @@ msgstr "E-postadressen matchar inte."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Error"
@@ -6354,7 +6359,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Spela"
@@ -6376,13 +6381,13 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"Hp: %u/%u⏎\n"
@@ -6392,27 +6397,27 @@ msgstr ""
"Money: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Felaktigt lösenord"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Skriv in lösenordet för att radera karaktär"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Skriv lösenord:"
@@ -6423,23 +6428,23 @@ msgid "Present: %s; %d players are present."
msgstr "Presentera: %s; %d spelare är presenterad."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6704,39 +6709,39 @@ msgid "Reset timer"
msgstr "Återställ timer"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Kills: %s, total exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Medel-Exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Medelantal mobs till nästa level: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Kills/Min: %s, Exp/Min: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6752,33 +6757,33 @@ msgstr[0] "Tid för nästa level per %d min: %s"
msgstr[1] "Tid för nästa level per %d min: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Last kill exp:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Level: %d vid %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp: %d/%d Kvar: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, avg mob för 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Tid tills nästa level: %s"
@@ -6988,13 +6993,13 @@ msgid "Level: %d (GM %d)"
msgstr "Level: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Behöver"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Jobb level: %d"
@@ -7450,33 +7455,33 @@ msgid "Accept Party Invite"
msgstr "Acceptera Party-invite"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Exp:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Jobb: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Jobb:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9060,33 +9065,33 @@ msgstr "Anslutningen till servern avslutad. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Misslyckades att radera karaktär."
@@ -9595,22 +9600,22 @@ msgid "Poison had no effect..."
msgstr "Poison hade ingen effekt..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9932,57 +9937,57 @@ msgid "Accepting incoming trade requests"
msgstr "Acceptera inkommande bytes-förfrågningar"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Ändrar spelserver"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 5719328f5..e6bfdd517 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:46+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
"language/sv_SE/)\n"
@@ -50,59 +50,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Försökte plocka upp icke existerande item."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Item är för tung."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Item:en är för långt bort."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Inventory är fullt."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Stack är för stor."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Item:et tillhör någon annan."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Okänt fel vid upplockning av item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -111,58 +111,58 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "jobb"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Follow: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Follow avbruten"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Imitation: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Imitation avbruten"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Du ser %s"
@@ -366,7 +366,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "General"
@@ -798,18 +798,18 @@ msgstr "Iväg"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "OK"
@@ -846,8 +846,8 @@ msgstr "(F) fritt kamera-läge"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Stäng"
@@ -1384,8 +1384,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
@@ -2122,7 +2122,7 @@ msgstr "Återställ yellow bar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Kopiera till chat"
@@ -2671,8 +2671,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Info"
@@ -2816,7 +2816,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Enkel"
@@ -2866,7 +2866,7 @@ msgstr "Chat"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3178,7 +3178,7 @@ msgstr "Väg-märke"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Max"
@@ -3205,8 +3205,8 @@ msgstr "Level: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Money: %s"
@@ -4760,104 +4760,109 @@ msgstr "Proxy-typ"
msgid "Proxy address:port"
msgstr "Proxy-adress:port"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Aktivera debug-logg"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Aktivera OpenGL-logg"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Aktivera inputs-logg"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Aktivera serversideattack"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Aktivera dubbleklick"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Aktivera bot checker"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Aktivera buggig-server-skydd (ändra inte denna är du snäll)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Lågtrafik-mode"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Använd FBO för skärmdumpar (bara för openGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Nätverksfördröjning mellan underservrar"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Visa bakgrund"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Skärmdensitet överskrids"
@@ -4880,8 +4885,8 @@ msgstr "Nej"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5297,8 +5302,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Tema"
@@ -5456,8 +5461,8 @@ msgstr "Ingen ram"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -5861,7 +5866,7 @@ msgstr "HLP"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Hjälp"
@@ -6056,7 +6061,7 @@ msgstr "SET"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Inställningar"
@@ -6098,7 +6103,7 @@ msgstr "Antal:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Skapa"
@@ -6159,14 +6164,14 @@ msgstr "E-postadressen matchar inte."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Error"
@@ -6354,7 +6359,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Spela"
@@ -6376,13 +6381,13 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"Hp: %u/%u⏎\n"
@@ -6392,27 +6397,27 @@ msgstr ""
"Money: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Felaktigt lösenord"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Skriv in lösenordet för att radera karaktär"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Skriv lösenord:"
@@ -6423,23 +6428,23 @@ msgid "Present: %s; %d players are present."
msgstr "Presentera: %s; %d spelare är presenterad."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6704,39 +6709,39 @@ msgid "Reset timer"
msgstr "Återställ timer"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Kills: %s, total exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Medel-Exp: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Medelantal mobs till nästa level: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Kills/Min: %s, Exp/Min: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6752,33 +6757,33 @@ msgstr[0] "Tid för nästa level per %d min: %s"
msgstr[1] "Tid för nästa level per %d min: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Last kill exp:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Level: %d vid %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Exp: %d/%d Kvar: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, avg mob för 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Tid tills nästa level: %s"
@@ -6988,13 +6993,13 @@ msgid "Level: %d (GM %d)"
msgstr "Level: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Behöver"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Jobb level: %d"
@@ -7450,33 +7455,33 @@ msgid "Accept Party Invite"
msgstr "Acceptera Party-invite"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Exp:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Jobb: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Jobb:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9060,33 +9065,33 @@ msgstr "Anslutningen till servern avslutad. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Misslyckades att radera karaktär."
@@ -9595,22 +9600,22 @@ msgid "Poison had no effect..."
msgstr "Poison hade ingen effekt..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9932,57 +9937,57 @@ msgid "Accepting incoming trade requests"
msgstr "Acceptera inkommande bytes-förfrågningar"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Ändrar spelserver"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
diff --git a/po/tr.po b/po/tr.po
index 560e5f79d..fcd871587 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
"tr/)\n"
@@ -52,59 +52,59 @@ msgstr "İ"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "%s tarafından öldürüldün."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Var olmayan item toplanmaya çalışıldı."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "İtem çok ağır."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "İtem çok uzakta."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "Envanter dolu."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Küme çok büyük."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "İtem başkasına ait."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Bu miktardaki itemi alamazsınız."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "İtem kümesi maksimum miktarda."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "İtem toplamada bilinmeyen hata."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -113,58 +113,58 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "iş"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Takip et: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Takip iptal edildi."
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Taklit: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Taklit iptal edildi"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "%s görüyorsun"
@@ -365,7 +365,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Genel"
@@ -797,18 +797,18 @@ msgstr "Uzakta"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "TAMAM"
@@ -845,8 +845,8 @@ msgstr "(F) serbest kamera modu"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Kapat"
@@ -1387,8 +1387,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Seviye: %d"
@@ -2125,7 +2125,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr ""
@@ -2674,8 +2674,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Bilgi"
@@ -2819,7 +2819,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr ""
@@ -2869,7 +2869,7 @@ msgstr "Sohbet"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3181,7 +3181,7 @@ msgstr ""
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "En Fazla"
@@ -3208,8 +3208,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Para: %s"
@@ -4763,104 +4763,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Hata ayıklama modunu etkinleştir"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Sunucu yan saldırılarını etkinleştir"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Bot Kontrolörünü etkinleştir"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Düşük trafik modu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Arkaplanı göster"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4883,8 +4888,8 @@ msgstr "Hayır"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Performans"
@@ -5300,8 +5305,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Tema"
@@ -5459,8 +5464,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Video"
@@ -5860,7 +5865,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Yardım"
@@ -6055,7 +6060,7 @@ msgstr "AYR"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Ayarlar"
@@ -6097,7 +6102,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Oluştur"
@@ -6158,14 +6163,14 @@ msgstr "E-posta adresleri uyuşmuyor."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Hata"
@@ -6353,7 +6358,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Oyna"
@@ -6375,38 +6380,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr ""
@@ -6417,23 +6422,23 @@ msgid "Present: %s; %d players are present."
msgstr "Mevcut: %s; %d oyuncu mevcut."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "%s 'e fısıldanıyor: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6696,39 +6701,39 @@ msgid "Reset timer"
msgstr "Sayacı sıfırla"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Bir üst levele kadar ortalama canavar sayısı: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6744,33 +6749,33 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
#, c-format
-msgid "Exp: %d/%d Left: %d"
+msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d tecrübe, 1%% için ortalama canavar sayısı: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr ""
@@ -6980,13 +6985,13 @@ msgid "Level: %d (GM %d)"
msgstr "Level: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Gereklilik"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7442,33 +7447,33 @@ msgid "Accept Party Invite"
msgstr "Grup Davetini Kabul et"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Exp:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "İş: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "İş:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9047,33 +9052,33 @@ msgstr ""
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr ""
@@ -9582,22 +9587,22 @@ msgid "Poison had no effect..."
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Hakkında"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd srcfile dyestring dstfile"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "ya da"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
@@ -9919,57 +9924,57 @@ msgid "Accepting incoming trade requests"
msgstr "Gelen takas istekleri kabul ediliyor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Sunucuya bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Giriş yapılıyor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Oyun dünyasına giriliyor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Karakterler isteniliyor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Oyun sunucusuna bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Oyun sunucusu değiştiriliyor"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Kayıt detayları isteniyor"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Şifre Değiştir"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Şifreniz başarı ile değiştirildi!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "E-posta Değiştir"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "E-posta başarı ile değiştirildi!"
diff --git a/po/uk.po b/po/uk.po
index cea71292d..296574742 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 17:10+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
"uk/)\n"
@@ -53,59 +53,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "Вас вбив %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "Спроби підняти неіснуючий предмет."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "Предмет занадто важкий."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "Предмет задалеко щоб підняти."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "В сумці немає місця."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "Забагато предметів у купі."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "Предмет належить комусь іншому."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "Не можливо підняти стільки предметів."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "Кількість цих предметів досягла межі."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "Невстановлена помилка під час спроби підняти предмет."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -115,58 +115,58 @@ msgstr[2] "Ви підняли %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "досвід"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "робота"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "Йти слідом за: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "Слідкування відмінено"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "Імітація: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "Імітацію відмінено"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "Ти бачиш %s"
@@ -369,7 +369,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "Загальне"
@@ -801,18 +801,18 @@ msgstr "Відсутній"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "ОК"
@@ -849,8 +849,8 @@ msgstr "(F) вільний режим камери"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "Закрити"
@@ -1389,8 +1389,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "Рівень: %d"
@@ -2127,7 +2127,7 @@ msgstr "Скинути Жовтий рядок"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "Додати до чату"
@@ -2676,8 +2676,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "Відомості"
@@ -2821,7 +2821,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "Загальне"
@@ -2871,7 +2871,7 @@ msgstr "Чат"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3183,7 +3183,7 @@ msgstr "Точка шляху"
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "Все"
@@ -3210,8 +3210,8 @@ msgstr "Рівень: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "Кошти: %s"
@@ -4764,104 +4764,109 @@ msgstr "Тип проксі"
msgid "Proxy address:port"
msgstr "Проксі хост:порт"
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "Ввімкнути лог зневадження"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr "Не вносити в лог мережеві пакети"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr "Ввімкнути OpenGL лог"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr "Ввімкнути лог введення"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr "Завантажили лог файл"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "Ввімкнути серверну атаку"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr "Не видавати адресу підтримки при помилці"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr "Ввімкнути підтримку подвійних кліків"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "Ввімкнути перевірку ботів"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr "Ввімкнути захист від глючних серверів (не вимикати!)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "Режим кешування гравців"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Вживати FBO для скріншотів (тільки OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr "Тека скріншотів"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr "Встановити затримку з'єднання між підсерверами"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "Показати фон"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr "Корекція роздільності екрану"
@@ -4884,8 +4889,8 @@ msgstr "Ні"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "Продуктивність"
@@ -5306,8 +5311,8 @@ msgstr "Інфо"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "Теми"
@@ -5465,8 +5470,8 @@ msgstr "Без рамки"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "Відео"
@@ -5866,7 +5871,7 @@ msgstr "ДОВ"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "Довідка"
@@ -6061,7 +6066,7 @@ msgstr "НАЛ"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "Налаштування"
@@ -6103,7 +6108,7 @@ msgstr "Кількість:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "Створити"
@@ -6164,14 +6169,14 @@ msgstr "Адреси скриньок не спідпадають."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "Помилка"
@@ -6359,7 +6364,7 @@ msgstr "Пароль"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Увійти"
@@ -6381,13 +6386,13 @@ msgid "Please enter new name"
msgstr "Будь ласка, вкажіть нове ім'я"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
-#, c-format
+#: src/gui/windows/charselectdialog.cpp:248
+#, fuzzy, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
"Hp: %u/%u\n"
@@ -6397,27 +6402,27 @@ msgstr ""
"Кошти: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "Неправильний пароль!"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "Вкажіть пароль для видалення персонажу"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "Пароль:"
@@ -6428,23 +6433,23 @@ msgid "Present: %s; %d players are present."
msgstr "Присутні: %s; %d гравців онлайн."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Шепчу до %s: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6707,39 +6712,39 @@ msgid "Reset timer"
msgstr "Скинути таймер"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Вбито: %s, загальний досвід: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr "Середній досвід: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Скільки сер. мобів до наступного рівня: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Вбивств/хв.: %s, досвід/хв.: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6757,33 +6762,33 @@ msgstr[1] "Час до наступного рівня (оцінка за %d х
msgstr[2] "Час до наступного рівня (оцінка за %d хв.): %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "Досвід з останнього мобу:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "Рівень: %d на %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
msgstr "Досвід: %d/%d, залишилось: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr "1%% = %d досвіду, середніх мобів для 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr " Час до наступного рівня: %s"
@@ -6993,13 +6998,13 @@ msgid "Level: %d (GM %d)"
msgstr "Рівень: %d (ГМ %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "Потрібно"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr "Рівень роботи: %d"
@@ -7455,33 +7460,33 @@ msgid "Accept Party Invite"
msgstr "Запрошення до групи прийнято"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "Здоров'я:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "Досвід:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "Мана:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "Робота: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "Робота:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9060,33 +9065,33 @@ msgstr "З'єднання з сервером припинене. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr "Помилка переіменування персонажу."
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr "Персонаж переіменовано."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr "Переіменування не дозволене."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr "Нове ім'я не вжито."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr "Персонаж не знайдено."
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Неможливо видалити персонаж."
@@ -9595,22 +9600,22 @@ msgid "Poison had no effect..."
msgstr "Отрута не подіяла..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "Про програму"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd файл_джерела рядок_кольору файл_призначення"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "або"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd файл_рядків_кольору файл_призначення"
@@ -9934,57 +9939,57 @@ msgid "Accepting incoming trade requests"
msgstr "Приймання вхідних пропозицій торгівлі"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "Очікування відповіді сервера"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "Авторизація..."
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "Поринаємо в ігровий всесвіт..."
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "Завантаження списку персонажів..."
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "Приєднання до серверу..."
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "Зміна ігрового серверу..."
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "Запитуємо деталі реєстрації"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "Змінити пароль"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "Пароль змінено!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "Змінити імейл"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "Імейл змінено!"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ad156492f..c978d40b2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
"language/zh_CN/)\n"
@@ -57,59 +57,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "项目是太重了."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "物品太远了."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -117,58 +117,58 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr ""
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr ""
@@ -369,7 +369,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "常规"
@@ -801,18 +801,18 @@ msgstr "距离"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "确定"
@@ -849,8 +849,8 @@ msgstr ""
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "关闭"
@@ -1387,8 +1387,8 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "等级: %d"
@@ -2125,7 +2125,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr ""
@@ -2674,8 +2674,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr "信息"
@@ -2819,7 +2819,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "基础"
@@ -2869,7 +2869,7 @@ msgstr "聊天"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3181,7 +3181,7 @@ msgstr ""
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr "最大"
@@ -3208,8 +3208,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr "金币: %s"
@@ -4760,104 +4760,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr "启用调试日志"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr "启用服务器端的攻击"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr "启用挂机检查"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr "低流量模式"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr "显示背景"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4880,8 +4885,8 @@ msgstr "否"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr ""
@@ -5297,8 +5302,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "主题"
@@ -5456,8 +5461,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "视频"
@@ -5857,7 +5862,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "帮助"
@@ -6052,7 +6057,7 @@ msgstr "SET"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "设置"
@@ -6094,7 +6099,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "建立"
@@ -6155,14 +6160,14 @@ msgstr "电子邮件地址不匹配."
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "错误"
@@ -6350,7 +6355,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "开始"
@@ -6372,38 +6377,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr "不正确的密码"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr "删除字符输入的密码"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr "输入密码:"
@@ -6414,23 +6419,23 @@ msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "对%s密语到: %s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6693,39 +6698,39 @@ msgid "Reset timer"
msgstr "复位定时器"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6739,33 +6744,33 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr "最后EXP:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr "等级:%d 在 %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
#, c-format
-msgid "Exp: %d/%d Left: %d"
+msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr ""
@@ -6975,13 +6980,13 @@ msgid "Level: %d (GM %d)"
msgstr "级别:%d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr "需要"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7437,33 +7442,33 @@ msgid "Accept Party Invite"
msgstr "接受帮会邀请"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr "HP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr "经验:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr "MP:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "职业: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr "职业:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9042,33 +9047,33 @@ msgstr "连接到服务器终止. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "删除角色失败."
@@ -9577,22 +9582,22 @@ msgid "Poison had no effect..."
msgstr "毒药无效..."
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "关于"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
@@ -9914,57 +9919,57 @@ msgid "Accepting incoming trade requests"
msgstr "接受传入的交易请求"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "正在连接服务器"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "登录中"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "进入游戏世界"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "请求角色"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "正在连接游戏服务器"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "正在更改游戏服务器"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "正在请求详细注册信息"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "更改密码"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "密码更改成功!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "更改电子邮箱地址"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "电子邮箱地址更改成功!"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 94362bae3..eca1c8840 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
"language/zh_HK/)\n"
@@ -51,59 +51,59 @@ msgstr "I"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
#, c-format
msgid "You were killed by %s."
msgstr "你已被 %s 殺死."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
msgid "Tried to pick up nonexistent item."
msgstr "曾試圖拿起不存在的物品."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
msgid "Item is too heavy."
msgstr "該物品太重."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
msgid "Item is too far away."
msgstr "該物品太遠."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
msgid "Inventory is full."
msgstr "背包已滿."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
msgid "Stack is too big."
msgstr "數目太大."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
msgid "Item belongs to someone else."
msgstr "該物品屬於其他人."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
msgid "You can't pickup this amount of items."
msgstr "你不能拿起這個數量的物品."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
msgid "Your item stack has max amount."
msgstr "你的物品數量已達最大限額."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
msgid "Unknown problem picking up item."
msgstr "拿起物品時遇到不明錯誤."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -111,58 +111,58 @@ msgstr[0] "你拾取了 %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
msgid "xp"
msgstr "經驗值"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
msgid "job"
msgstr "勞動值"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
msgid "hp"
msgstr "生命值"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
msgid "mana"
msgstr "法力值"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
#, c-format
msgid "Follow: %s"
msgstr "跟隨: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
msgid "Follow canceled"
msgstr "已取消跟隨."
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
#, c-format
msgid "Imitation: %s"
msgstr "模仿:%s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
msgid "Imitation canceled"
msgstr "已取消模仿."
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
#, c-format
msgid "You see %s"
msgstr "你看到 %s"
@@ -363,7 +363,7 @@ msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
msgid "General"
msgstr "一般"
@@ -795,18 +795,18 @@ msgstr "暫離鍵盤"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
#: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
msgid "OK"
msgstr "確定"
@@ -843,8 +843,8 @@ msgstr "(F) 自由鏡頭模式"
#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
msgid "Close"
msgstr "關閉"
@@ -1381,8 +1381,8 @@ msgstr "聊天室:%s"
#. TRANSLATORS: status window label
#: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
#: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
#, c-format
msgid "Level: %d"
msgstr "等級:%d"
@@ -2119,7 +2119,7 @@ msgstr "重設黃色欄"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
msgid "Copy to chat"
msgstr "複製至對話"
@@ -2668,8 +2668,8 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
#: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
#: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
msgid "Info"
msgstr ""
@@ -2813,7 +2813,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
msgid "Basic"
msgstr "基本"
@@ -2863,7 +2863,7 @@ msgstr "聊天"
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
#: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
#: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
msgid "Other"
@@ -3175,7 +3175,7 @@ msgstr ""
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
msgid "Max"
msgstr ""
@@ -3202,8 +3202,8 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
#, c-format
msgid "Money: %s"
msgstr ""
@@ -4754,104 +4754,109 @@ msgstr ""
msgid "Proxy address:port"
msgstr ""
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
msgid "Logging"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
msgid "Enable OpenGL version check (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
msgid "Log unimplemented packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
msgid "SDL logging level"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
msgid "Screen density override"
msgstr ""
@@ -4874,8 +4879,8 @@ msgstr "否"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
msgid "Performance"
msgstr "性能"
@@ -5291,8 +5296,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
msgid "Theme"
msgstr "主題"
@@ -5450,8 +5455,8 @@ msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
msgid "Video"
msgstr "顯示"
@@ -5851,7 +5856,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
msgid "Help"
msgstr "說明"
@@ -6046,7 +6051,7 @@ msgstr ""
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
msgid "Setup"
msgstr "設定"
@@ -6088,7 +6093,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
msgid "Create"
msgstr "建立隊伍"
@@ -6149,14 +6154,14 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:204
#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
msgid "Error"
msgstr "錯誤"
@@ -6344,7 +6349,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "開始"
@@ -6366,38 +6371,38 @@ msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
#, c-format
msgid ""
"Hp: %u/%u\n"
"Mp: %u/%u\n"
"Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
"Money: %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
msgid "Enter password for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
msgid "Enter password:"
msgstr ""
@@ -6408,23 +6413,23 @@ msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "對 %s 悄悄話:%s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
msgid "Broken nick detected: "
msgstr ""
@@ -6687,39 +6692,39 @@ msgid "Reset timer"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6733,33 +6738,33 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
msgid "Last kill exp:"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
#, c-format
-msgid "Exp: %d/%d Left: %d"
+msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
#, c-format
msgid " Time for next level: %s"
msgstr ""
@@ -6969,13 +6974,13 @@ msgid "Level: %d (GM %d)"
msgstr ""
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
msgid "Need"
msgstr ""
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
#, c-format
msgid "Job level: %d"
msgstr ""
@@ -7431,33 +7436,33 @@ msgid "Accept Party Invite"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
msgid "HP:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
msgid "Exp:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
msgid "MP:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
#, c-format
msgid "Job: %d"
msgstr "職業:%d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
msgid "Job:"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
#, c-format
msgid "Level: %d (%s %d)"
msgstr ""
@@ -9034,33 +9039,33 @@ msgstr ""
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr ""
@@ -9569,22 +9574,22 @@ msgid "Poison had no effect..."
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
msgid "About"
msgstr "關於"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr "dyecmd srcfile dyestring dstfile"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
msgid "or"
msgstr "or"
#. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
@@ -9906,57 +9911,57 @@ msgid "Accepting incoming trade requests"
msgstr "正在接受傳入的交易請求"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
msgid "Connecting to server"
msgstr "正在連接到伺服器"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
msgid "Logging in"
msgstr "正在登入"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
msgid "Entering game world"
msgstr "正在進入遊戲"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
msgid "Requesting characters"
msgstr "正在查詢角色"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
msgid "Connecting to the game server"
msgstr "正在連接到遊戲伺服器"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
msgid "Changing game servers"
msgstr "正在轉換遊戲伺服器"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
msgid "Requesting registration details"
msgstr "正在查詢註冊的詳細信息"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
msgid "Password Change"
msgstr "更改密碼"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
msgid "Password changed successfully!"
msgstr "成功更改密碼!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
msgid "Email Change"
msgstr "更改電郵地址"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
msgid "Email changed successfully!"
msgstr "成功更改電郵地址!"