Update fr and pl (Derpella) translations.

author: Andrei Karas <akaras@inbox.ru> 2011-11-29 18:34:59 +0300
committer: Andrei Karas <akaras@inbox.ru> 2011-11-29 18:42:06 +0300
commit: 8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0 (patch)
tree: df777b660d244edd3d45cd90010a1e31e57f3fc9
parent: a7f59172b83910f9e2dc17c116f70530f46cf6a1 (diff)
download: manaplus-8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0.tar.gz
manaplus-8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0.tar.bz2
manaplus-8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0.tar.xz
manaplus-8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0.zip
17 files changed, 2837 insertions, 2707 deletions
diff --git a/AUTHORS b/AUTHORS
index fd0ac2d5e..c96baedfa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Mihail Barer (Necromonger) <>
 Aline Ferraz de Souza (Freya) <freya.df gmail com>         (pt, pt_BR)
 Andrei Karas (4144) <akaras inbox ru>                      (ru)
 Bernard Hugonnet (Nard) <>                                 (fr)
+Derpella                                                   (pl)
 Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
 Mihail Barer (Necromonger) <>                              (ru)
 Petr Varkoček (pitriss) <>                                 (cs)
diff --git a/po/LINGUAS b/po/LINGUAS
index 9d3dffda2..c0a376b55 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -23,7 +23,7 @@ ja
 #nds # Not enough translations
 #nl # Not enough translations
 nl_BE
-#pl # Not enough translations
+pl
 pt
 pt_BR
 ru
diff --git a/po/cs.po b/po/cs.po
index 84f1af652..9c1700a73 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
@@ -736,7 +736,7 @@ msgstr "duhová 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2392,74 +2392,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Téma"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "Téma GUI"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Hlavní font"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Tučný font"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "Font částic"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "Pomocný font"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr "Bezpečný font"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr "Japonský font"
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Velikost písma"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Téma změněno"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Restartujte klient pro aplikováni změn."
@@ -3249,23 +3253,23 @@ msgstr "Hranice domácího místa"
 msgid "Road Point"
 msgstr "Bod cesty"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "Obnovit"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 9e299cd03..7ffe42a8a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -735,7 +735,7 @@ msgstr "Regenbogen 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2390,74 +2390,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Theme"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "GUI Theme"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Hauptschriftart"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Dicke Schrift"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "Schrift von Spieleraktionen"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Theme geändert"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
@@ -3254,23 +3258,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index a29cd35e8..62059f919 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-20 19:51+0000\n"
 "Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
@@ -734,7 +734,7 @@ msgstr "arco iris 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2389,74 +2389,79 @@ msgid "Indonesian"
 msgstr "Indonesio"
 
 #: src/gui/setup_theme.cpp:153
+#, fuzzy
+msgid "Polish"
+msgstr "Inglés"
+
+#: src/gui/setup_theme.cpp:154
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:155
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holanda (Bélgica/Flandes)"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:156
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:157
 msgid "Portuguese (Brazilian)"
 msgstr "Portugués (Brasileño)"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:158
 msgid "Russian"
 msgstr "Ruso"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr "Español (Castellano)"
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "Tema de interfáz gráfica"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr "Idioma"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Fuente principal"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Fuente negrita"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "Fuente de partícula"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "Fuente de la ayuda"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr "Fuente segura"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr "Fuente japonesa"
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie el juego para que los cambios tengan efecto."
@@ -3248,23 +3253,23 @@ msgstr "Limites de Lugar de Inicio"
 msgid "Road Point"
 msgstr "Mostrar camino"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr "Quienes están conectados - "
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
diff --git a/po/fi.po b/po/fi.po
index d5c0b53c9..01406e0ac 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -731,7 +731,7 @@ msgstr "sateenkaari 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2386,74 +2386,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Teema"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "Käyttöliittymän teema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Pääkirjasin"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Lihavoitu kirjasin"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "Ohjekirjasin"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
@@ -3241,23 +3245,23 @@ msgstr "Kotipaikan raja"
 msgid "Road Point"
 msgstr "Väyläpiste"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "Päivitä"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
diff --git a/po/fr.po b/po/fr.po
index 8aab19ce2..1c295ffda 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
+"PO-Revision-Date: 2011-11-28 21:35+0000\n"
+"Last-Translator: reid <reidyaro@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
 "fr/)\n"
 "Language: fr\n"
@@ -241,7 +241,7 @@ msgstr "sous liste noir"
 
 #: src/commandhandler.cpp:594
 msgid "enemy"
-msgstr ""
+msgstr "ennemi"
 
 #: src/commandhandler.cpp:609
 msgid "Player already erased!"
@@ -737,7 +737,7 @@ msgstr "arc en ciel 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -1351,7 +1351,7 @@ msgstr "Liste noir"
 #: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
 #: src/gui/popupmenu.cpp:666
 msgid "Set as enemy"
-msgstr ""
+msgstr "Définir comme ennemi"
 
 #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
@@ -1976,7 +1976,7 @@ msgstr "Activer la manette de jeu"
 
 #: src/gui/setup_joystick.cpp:75
 msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "Continuer d'utiliser le joystick si la fenêtre est minimisée."
 
 #: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
@@ -1988,7 +1988,7 @@ msgstr "Stop"
 
 #: src/gui/setup_joystick.cpp:149
 msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "Tournez le manche et n'appuyer pas sur les boutons"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2172,7 +2172,7 @@ msgstr "Activer le testeur de robots"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Active la protection pour serveurs defaillant (ne pas désactiver)"
 
 #: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
@@ -2318,7 +2318,7 @@ msgstr "Sous liste noir"
 
 #: src/gui/setup_relations.cpp:76
 msgid "Enemy"
-msgstr ""
+msgstr "Ennemi"
 
 #: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
@@ -2366,101 +2366,106 @@ msgstr "Immense (15)"
 
 #: src/gui/setup_theme.cpp:146
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Chinois (Chine)"
 
 #: src/gui/setup_theme.cpp:147
 msgid "Czech"
-msgstr ""
+msgstr "Tchèque"
 
 #: src/gui/setup_theme.cpp:148
 msgid "English"
-msgstr ""
+msgstr "Anglais"
 
 #: src/gui/setup_theme.cpp:149
 msgid "Finnish"
-msgstr ""
+msgstr "Finnois"
 
 #: src/gui/setup_theme.cpp:150
 msgid "French"
-msgstr ""
+msgstr "Français"
 
 #: src/gui/setup_theme.cpp:151
 msgid "German"
-msgstr ""
+msgstr "Allemand"
 
 #: src/gui/setup_theme.cpp:152
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonésien"
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
-msgstr ""
+#, fuzzy
+msgid "Polish"
+msgstr "Anglais"
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgid "Japanese"
+msgstr "Japonais"
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
-msgstr ""
+msgid "Dutch (Belgium/Flemish)"
+msgstr "Néerlandais (Belgique / Flandre)"
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
-msgstr ""
+msgid "Portuguese"
+msgstr "Portugais"
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
-msgstr ""
+msgid "Portuguese (Brazilian)"
+msgstr "Portugais (Brésilien)"
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr "Russe"
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Espagnol (Castillan)"
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Thème"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "Thème de l'interface"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
-msgstr ""
+msgstr "Langue"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Police principale"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Police grasse"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "Taille des effets de particules"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "Police de l'aide"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr "Police sécurisée"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr "police japonaise"
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Taille de police"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
@@ -3261,23 +3266,23 @@ msgstr "Limites de votre position"
 msgid "Road Point"
 msgstr "Étape"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3900,11 +3905,11 @@ msgstr "Vers la droite"
 
 #: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
-msgstr "Mouvements de dingue"
+msgstr "Mouvements de fous"
 
 #: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
-msgstr "Changer le mode de mouvement de dingue"
+msgstr "Changer le mode de mouvement de fou"
 
 #: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
@@ -3936,7 +3941,7 @@ msgstr "Changer d'attaque magique"
 
 #: src/keyboardconfig.cpp:329
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "Commutateur d'attaque en PVP"
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
@@ -4042,33 +4047,32 @@ msgstr "(I) Mouvements inversés"
 
 #: src/localplayer.cpp:1889
 msgid "(c) moves with some crazy moves"
-msgstr "(c) Mouvements un peu fous"
+msgstr "(c) mouvements un peu fous"
 
 #: src/localplayer.cpp:1890
 msgid "(C) moves with crazy moves"
-msgstr "(C) Mouvement complètement fous"
+msgstr "(C) mouvements complètements fous"
 
 #: src/localplayer.cpp:1891
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
 #: src/localplayer.cpp:1892
-#, fuzzy
 msgid "(?) unknown move"
-msgstr "(?) Suivre : mode inconnu"
+msgstr "(?) déplacement inconnue"
 
 #: src/localplayer.cpp:1914
-#, fuzzy, c-format
+#, c-format
 msgid "(%d) crazy move number %d"
-msgstr "(?) Mouvements fous"
+msgstr "(%d) mouvement de fou numerique %d"
 
 #: src/localplayer.cpp:1919
 msgid "(a) custom crazy move"
-msgstr "(a) Mouvements fous personnalisés"
+msgstr "(a) mouvements fous personnalisés"
 
 #: src/localplayer.cpp:1923
 msgid "(?) crazy move"
-msgstr "(?) Mouvements fous"
+msgstr "(?) mouvements fous"
 
 #: src/localplayer.cpp:1937
 msgid "(0) default moves to target"
@@ -4236,23 +4240,23 @@ msgstr "(?) Sorts d'attaque"
 
 #: src/localplayer.cpp:2115
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) attaque tous les joueurs"
 
 #: src/localplayer.cpp:2116
 msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) n'attaque pas des amis"
 
 #: src/localplayer.cpp:2117
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) attaque les mauvaises relations"
 
 #: src/localplayer.cpp:2118
 msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) Ne pas attaquer les joueurs"
 
 #: src/localplayer.cpp:2119
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) attaque en PVP"
 
 #: src/localplayer.cpp:2138
 msgid "(D) default imitation"
@@ -4299,9 +4303,8 @@ msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
 #: src/localplayer.cpp:2230
-#, fuzzy
 msgid "Game modifiers are unknown"
-msgstr "Modificateurs de mode de jeu activés"
+msgstr "Les modificateurs de jeux sont inconnus"
 
 #: src/localplayer.cpp:3746
 msgid "Follow: "
@@ -5679,99 +5682,3 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Objet inconnu"
-
-#~ msgid "(?) move"
-#~ msgstr "(?) Mouvements"
-
-#~ msgid "(?) map view"
-#~ msgstr "(?) Carte"
-
-#~ msgid "(D) design camera mode"
-#~ msgstr "(D) Définir le mode camera"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(I)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
diff --git a/po/id.po b/po/id.po
index f24788aaa..c8cadfc39 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -727,7 +727,7 @@ msgstr "pelangi 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2378,74 +2378,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "Tema Gui"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Jenis huruf utama"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Jenis huruf tebal"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr "Jenis huruf/Karakter yang diperbolehkan"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Ukuran huruf"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
@@ -3232,23 +3236,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index d417f15f5..f902dbc77 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
@@ -729,7 +729,7 @@ msgstr "虹 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2382,74 +2382,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "テーマ"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "GUIテーマ"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "メインフォント"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "太字フォント"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "粒子のフォント"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "ヘルプフォント"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "フォントサイズ"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "テーマは変えました"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更のため、アプリケーションを再起動してください。"
@@ -3238,23 +3242,23 @@ msgstr ""
 msgid "Road Point"
 msgstr "ロードのポイント"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "アップデート"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index ade60fbc7..cd6782d0e 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: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+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"
@@ -726,7 +726,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2379,74 +2379,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -3233,23 +3237,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index e33843673..69b255427 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
@@ -731,7 +731,7 @@ msgstr "regenboog 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2386,74 +2386,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Thema"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Standaard Lettertype"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Vet lettertype"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "Help lettertype"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
@@ -3248,23 +3252,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "Bijwerken"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
diff --git a/po/pl.po b/po/pl.po
index 8402fc357..cf2ce25c3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,474 +1,502 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
+#   <matwa@poczta.pl>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
+"PO-Revision-Date: 2011-11-29 15:18+0000\n"
+"Last-Translator: derpella <matwa@poczta.pl>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/"
+"pl/)\n"
+"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=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
-msgstr ""
+msgstr "Widoczne na mapie"
 
-#: src/being.cpp:542
+#: src/being.cpp:553
 msgid "dodge"
-msgstr ""
+msgstr "Unik!"
 
-#: src/being.cpp:542
+#: src/being.cpp:553
 msgid "miss"
-msgstr ""
+msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1534
 msgid "A"
-msgstr ""
+msgstr "AFK"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1539
 msgid "I"
-msgstr ""
+msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:908
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Wydajność programu"
+
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Obraz"
+
+#: src/client.cpp:895
+msgid "Themes"
+msgstr "Skórki"
+
+#: src/client.cpp:977
 msgid "Connecting to server"
-msgstr ""
+msgstr "Łączenie z serwerem"
 
-#: src/client.cpp:939
+#: src/client.cpp:1008
 msgid "Logging in"
-msgstr ""
+msgstr "Logowanie"
 
-#: src/client.cpp:972
+#: src/client.cpp:1041
 msgid "Entering game world"
-msgstr ""
+msgstr "Wchodzenie do świata gry"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1142
 msgid "Requesting characters"
-msgstr ""
+msgstr "Sprawdzanie postaci"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
-msgstr ""
+msgstr "Łączenie się z serwerem gry"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1183
 msgid "Changing game servers"
-msgstr ""
+msgstr "Zmiana serwera"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1242
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Sprawdzanie szczegółów rejestracji"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1268
 msgid "Password Change"
-msgstr ""
+msgstr "Zmiana hasła"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "Hasło zmienione z powodzeniem!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1288
 msgid "Email Change"
-msgstr ""
+msgstr "Zmiana adresu e-mail"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
-msgstr ""
+msgstr "Adres e-mail zmieniony z powodzeniem!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1309
 msgid "Unregister Successful"
-msgstr ""
+msgstr "Wyrejestrowano z powodzeniem"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
-msgstr ""
+msgstr "Nieprawidłowy serwer aktualizacji: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:209
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:329
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Nie można utworzyć zakładki szeptu dla ksywki \"%s\"! Już istnieje, albo to "
-"ty."
+"Nie można utworzyć zakładki szeptu dla \"%s\"! Już istnieje, albo to Ty."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:363
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Prośba o dołączenie do kanału %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:390
 msgid "Guild name is missing."
-msgstr ""
+msgstr "Brak nazwy gildii."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
 msgid "Please specify a name."
-msgstr ""
+msgstr "Proszę wpisać prawidłową nazwę."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:455
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:455
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:466
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:472
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:500
 msgid "friend"
-msgstr ""
+msgstr "znajomy"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:505
 msgid "disregarded"
-msgstr ""
+msgstr "lekceważony"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:510
 msgid "neutral"
-msgstr ""
+msgstr "neutralny"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:529
 #, c-format
 msgid "Player already %s!"
-msgstr ""
+msgstr "Gracz jest już %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:543
 #, c-format
 msgid "Player successfully %s!"
-msgstr ""
+msgstr "Gracz jest teraz %s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:551
 #, c-format
 msgid "Player could not be %s!"
-msgstr ""
+msgstr "Gracz nie może być %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:574
 msgid "Player wasn't ignored!"
-msgstr ""
+msgstr "Gracz nie był ignorowany!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:581
 msgid "Player no longer ignored!"
-msgstr ""
+msgstr "Gracz już nie jest ignorowany!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:583
 msgid "Player could not be unignored!"
-msgstr ""
+msgstr "Gracz nie może być odignorowany!"
+
+#: src/commandhandler.cpp:589
+msgid "blacklisted"
+msgstr "dodany/a do czarnej listy"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr "wróg"
+
+#: src/commandhandler.cpp:609
 msgid "Player already erased!"
-msgstr ""
+msgstr "Gracz został usunięty!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:620
 msgid "Player successfully erased!"
-msgstr ""
+msgstr "Gracz usunięty z powodzeniem!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:622
 msgid "Player could not be erased!"
-msgstr ""
+msgstr "Gracz nie mógł zostać usunięty!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
 #, c-format
 msgid "Client uptime: %s"
-msgstr ""
+msgstr "Czas pracy programu: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:939
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d tydzień"
+msgstr[1] "%d tygodni/e"
+msgstr[2] "%d tygodni/e"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d dzień"
+msgstr[1] "%d dni"
+msgstr[2] "%d dni"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:956
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d godzina"
+msgstr[1] "%d godzin/y"
+msgstr[2] "%d godzin/y"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:964
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d minuta"
+msgstr[1] "%d minut/y"
+msgstr[2] "%d minut/y"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:972
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekund/y"
+msgstr[2] "%d sekund/y"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1051
 msgid "font cache size"
-msgstr ""
+msgstr "rozmiar cache czcionki"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1063
 msgid "Cache size:"
-msgstr ""
+msgstr "Rozmiar cache:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1067
 msgid "Created:"
-msgstr ""
+msgstr "Stworzono:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1069
 msgid "Deleted:"
-msgstr ""
+msgstr "Usunięto:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
 msgid "Resource images:"
-msgstr ""
+msgstr "Obrazy źródłowe:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
 msgid "Resource orphaned images:"
-msgstr ""
+msgstr "Osierocone obrazy źródłowe:"
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405
 msgid "Debug"
-msgstr ""
+msgstr "Debug"
 
-#: src/game.cpp:475
+#: src/game.cpp:506
 msgid "Screenshot saved as "
-msgstr ""
+msgstr "Zrzut ekranu zapisany jako"
 
-#: src/game.cpp:483
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:523
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
-msgstr ""
+msgstr "Połączenie z serwerem zostało zerwane."
 
-#: src/game.cpp:537
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
-msgstr ""
+msgstr "Nie można załądować mapy"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
-msgstr ""
+msgstr "Grupa: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
-msgstr ""
+msgstr "Gildia: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
-msgstr ""
+msgstr "Miejsce w PvP: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
-msgstr ""
+msgstr "Komentarz: %s"
 
 #: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr ""
+msgstr "Wykrywacz botów"
 
 #: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
 msgid "Attack"
 msgstr "Atak"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Rozmowa"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
 msgid "Move"
-msgstr ""
+msgstr "Przesuń się"
 
 #: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
-msgstr ""
+msgstr "Rezultat"
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
 msgid "Reset"
 msgstr "Resetuj"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s/ Razem: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr "Ilość:"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
-msgstr ""
+msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
-msgstr ""
+msgstr "-"
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Maks."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
 msgid "Shop"
 msgstr "Sklep"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Sprzedaj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
 msgstr "Anuluj"
 
 #: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
-msgstr "Zmień adres Email"
+msgstr "Zmień adres e-mail"
 
 #: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
@@ -477,24 +505,24 @@ msgstr "Konto: %s"
 
 #: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr ""
+msgstr "Proszę wpisać i potwierdzić adres e-mail:"
 
 #: src/gui/changeemaildialog.cpp:132
 #, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr ""
+msgstr "Nowy adres e-mail musi mieć co najmniej %d znaków."
 
 #: src/gui/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr ""
+msgstr "Nowy adres e-mail może mieć najwyżej %d znaków."
 
 #: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr ""
+msgstr "Pola adresu e-mail się nie zgadzają."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
 msgid "Change Password"
 msgstr "Zmień hasło"
 
@@ -505,209 +533,211 @@ msgstr "Hasło:"
 
 #: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr ""
+msgstr "Proszę wpisać i potwierdzić hasło:"
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
-msgstr ""
+msgstr "Proszę wpisać stare hasło."
 
 #: src/gui/changepassworddialog.cpp:120
 #, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr ""
+msgstr "Nowe hasło musi mieć co najmniej %d znaków."
 
 #: src/gui/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr ""
+msgstr "Nowe hasło może mieć najwyżej %d znaków."
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "Potwierdzenie hasła nie zgadza się."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Imię:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
-msgstr ""
+msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
-msgstr ""
+msgstr "Kolor włosów:"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
-msgstr ""
+msgstr "Fryzura:"
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
-msgstr ""
+msgstr "Rasa:"
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
+#: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Utwórz"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Kobieta"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
-msgstr "Twoje imię musi mieć conajmniej 4 znaki."
+msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "Potwierdź usunięcie postaci"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
-msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
+msgstr "Czy jesteś pewny/a, że chcesz usunąć tę postać?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "Zarządzanie kontem i postaciami"
 
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
 msgid "Switch Login"
-msgstr ""
+msgstr "Przeloguj się"
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Wyrejestruj"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
 msgid "Change Email"
-msgstr ""
+msgstr "Zmiana adresu e-mail"
 
 #: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
-msgstr ""
+msgstr "Nieprawidłowe hasło"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
-msgstr ""
+msgstr "Wprowadź hasło aby usunąć postać"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
-msgstr ""
+msgstr "Wprowadź hasło:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
-msgstr ""
+msgstr "Wybierz"
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
-msgstr ""
+msgstr "Poziom %d"
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
-msgstr ""
+msgstr "(puste)"
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
 msgid "default"
-msgstr ""
+msgstr "domyślny"
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
-msgstr ""
+msgstr "czarny"
 
 #: src/gui/chatwindow.cpp:114
 msgid "red"
-msgstr ""
+msgstr "czerwony"
 
 #: src/gui/chatwindow.cpp:115
 msgid "green"
-msgstr ""
+msgstr "zielony"
 
 #: src/gui/chatwindow.cpp:116
 msgid "blue"
-msgstr ""
+msgstr "niebieski"
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
-msgstr ""
+msgstr "złoty"
 
 #: src/gui/chatwindow.cpp:118
 msgid "yellow"
-msgstr ""
+msgstr "żółty"
 
 #: src/gui/chatwindow.cpp:119
 msgid "pink"
-msgstr ""
+msgstr "różowy"
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
-msgstr ""
+msgstr "fioletowy"
 
 #: src/gui/chatwindow.cpp:121
 msgid "grey"
-msgstr ""
+msgstr "szary"
 
 #: src/gui/chatwindow.cpp:122
 msgid "brown"
-msgstr ""
+msgstr "brązowy"
 
 #: src/gui/chatwindow.cpp:123
 msgid "rainbow 1"
-msgstr ""
+msgstr "tęczowy 1"
 
 #: src/gui/chatwindow.cpp:124
 msgid "rainbow 2"
-msgstr ""
+msgstr "tęczowy 2"
 
 #: src/gui/chatwindow.cpp:125
 msgid "rainbow 3"
-msgstr ""
-
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgstr "tęczowy 3"
+
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -715,12 +745,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:615
 #, c-format
 msgid "Present: %s; %d players are present."
-msgstr ""
+msgstr "%s obecny/a. %d graczy online."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1002
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -734,183 +764,186 @@ msgid "No"
 msgstr "Nie"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
 msgid "Ignore"
-msgstr ""
+msgstr "Ignoruj"
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
-msgstr ""
+msgstr "Cel"
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
-msgstr ""
+msgstr "Siatka"
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
-msgstr ""
+msgstr "Muzyka:"
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
-msgstr ""
+msgstr "Mapa:"
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
-msgstr ""
+msgstr "Mini-mapa:"
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
-msgstr ""
+msgstr "Kursor:"
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
-msgstr ""
+msgstr "Pozycja gracza:"
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
-msgstr ""
+msgstr "Licznik cząsteczek:"
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
-msgstr ""
+msgstr "Licznik aktorów na mapie:"
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
-msgstr ""
+msgstr "%d FPS (Software)"
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
-msgstr ""
+msgstr "%d FPS (szybki OpenGL)"
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
-msgstr ""
+msgstr "%d FPS (stary OpenGL)"
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
-msgstr ""
+msgstr "%d FPS"
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
-msgstr ""
+msgstr "Licznik tekstur:"
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
-msgstr ""
+msgstr "Licznik cząsteczek: %d"
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
 msgid "Target:"
-msgstr ""
+msgstr "Cel:"
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
 msgid "Target Id:"
-msgstr ""
+msgstr "ID celu:"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
 msgid "Target Level:"
-msgstr ""
+msgstr "Poziom celu:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
 msgid "Target Party:"
-msgstr ""
+msgstr "Grupa celu:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
 msgid "Target Guild:"
-msgstr ""
+msgstr "Gildia celu:"
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
 msgid "Attack delay:"
-msgstr ""
+msgstr "Opóźnienie ataku:"
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
 msgid "Minimal hit:"
-msgstr ""
+msgstr "Najsłabsze uderzenie:"
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
 msgid "Maximum hit:"
-msgstr ""
+msgstr "Najmocniejsze uderzenie:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
 msgid "Critical hit:"
-msgstr ""
+msgstr "Uderzenie krytyczne:"
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
 #, c-format
 msgid "Ping: %s ms"
-msgstr ""
+msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
 #, c-format
 msgid "In: %d bytes/s"
-msgstr ""
+msgstr "Wejście: %d bajtów"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Out: %d bytes/s"
-msgstr ""
+msgstr "Wyjście: %d bajtów"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "Cz wiesz że..."
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
 msgid "< Previous"
-msgstr ""
+msgstr "< Cofnij"
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
 msgid "Next >"
-msgstr ""
+msgstr "Dalej>"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Auto open this window"
-msgstr ""
+msgstr "Otwieraj to okno automatycznie"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -918,80 +951,84 @@ msgstr "Zdejmij"
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr "wg. nazwy"
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr "wg. ID"
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr "wg. wagi"
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr "wg. ilości"
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr "wg. typu"
+
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Miejsc:"
 
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
-msgstr ""
+msgstr "Filtr:"
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
 msgid "Use"
 msgstr "Użyj"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
 msgid "Drop..."
-msgstr ""
+msgstr "Upuść..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
 msgid "Split"
 msgstr "Podziel"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:559
 msgid "Outfits"
-msgstr ""
+msgstr "Stroje"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "Waga:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Upuść"
@@ -1014,7 +1051,7 @@ msgstr "Podaj ilość rzeczy do przechowania."
 
 #: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
-msgstr "Wybierz ilość przedmiotów do pobrania."
+msgstr "Wybierz ilość przedmiotów do odbioru."
 
 #: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
@@ -1022,147 +1059,151 @@ msgstr "Wybierz ilość przedmiotów do podziału."
 
 #: src/gui/itemamountwindow.cpp:276
 msgid "Add to buy shop."
-msgstr ""
+msgstr "Dodaj to sklepu (sprzedaj)"
 
 #: src/gui/itemamountwindow.cpp:279
 msgid "Add to sell shop."
-msgstr ""
+msgstr "Dodaj do sklepu (kupuj)"
 
 #: src/gui/itemamountwindow.cpp:282
 msgid "Unknown."
-msgstr ""
+msgstr "Nieznany obiekt"
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
-msgstr ""
+msgstr ", "
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
-msgstr ""
+msgstr "Waga: %s"
 
 #: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr ""
+msgstr "Statystyki ataku:"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
-msgstr ""
+msgstr "Zresetuj statystyki"
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
-msgstr ""
+msgstr "Zresetuj zegar"
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "Poziom: %d w %f%%"
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
-msgstr ""
+msgstr "Exp: %d%d Zostało: %d"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %d exp, avg mob na 1%%: %s"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr ""
+msgstr "Moby: %s, całk. exp: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Avg Exp: %s, ilość mobów na nast. poziom: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
+msgstr "Mob/Min: %s, Exp/Min: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Szybkość exp na %d min: %s"
+msgstr[1] "Szybkość exp na %d min: %s"
+msgstr[2] "Szybkość exp na %d min: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Czas do nast. poziomu z %d min: %s"
+msgstr[1] "Czas do nast. poziomu z %d min: %s"
+msgstr[2] "Czas do nast. poziomu z %d min: %s"
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
-msgstr ""
+msgstr "Ostatni exp:"
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
-msgstr ""
+msgstr "Następny spawn Jack-O:"
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "  Czas do nast. poziomu: %s"
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
-msgstr ""
+msgstr "Jack-O spawnuje się"
+
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
+msgstr "Opuściłeś/aś gildię."
 
 #: src/gui/logindialog.cpp:59
 msgid "Normal"
-msgstr ""
+msgstr "Normalna"
 
 #: src/gui/logindialog.cpp:60
 msgid "Auto Close"
-msgstr ""
+msgstr "Automatyczne zamykanie"
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
-msgstr ""
+msgstr "Omiń"
 
 #: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Serwer:"
 
 #: src/gui/logindialog.cpp:96
 msgid "Custom update host"
-msgstr ""
+msgstr "Zaawansowane ustawienia aktualizacji"
 
 #: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr ""
+msgstr "Zapamiętaj login"
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
-msgstr ""
+msgstr "Aktualizacja:"
 
 #: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
@@ -1170,47 +1211,47 @@ msgstr "Rejestruj"
 
 #: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr ""
+msgstr "Zmień serwer"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
-msgstr ""
+msgstr "pasek życia"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
-msgstr ""
+msgstr "pasek many"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
-msgstr ""
+msgstr "pasek punktów doświadczenia"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
-msgstr ""
+msgstr "pasek punktów umiejętności"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
-msgstr ""
+msgstr "pasek obciążenia"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
-msgstr ""
+msgstr "pasek miejsc w inwentarzu"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
-msgstr ""
+msgstr "pasek pieniędzy"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
-msgstr ""
+msgstr "pasek strzał"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
-msgstr ""
+msgstr "pasek statusu"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
-msgstr ""
+msgstr "Potrzeba"
 
 #: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
@@ -1225,17 +1266,17 @@ msgid "Submit"
 msgstr "Zatwierdź"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
 msgid "Clear"
-msgstr ""
+msgstr "Wyczyść"
 
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
 msgid "> Next"
-msgstr ""
+msgstr ">Następny"
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1249,345 +1290,373 @@ msgstr "Wyślij"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
 #, c-format
 msgid "Outfit: %d"
-msgstr ""
+msgstr "Strój: %d"
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
 #, c-format
 msgid "Key: %s"
-msgstr ""
+msgstr "Klawisz: %s"
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
-msgstr ""
+msgstr "Najpierw zdejmij"
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
-msgstr ""
+msgstr "Strój na afk"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
 msgid "Whisper"
-msgstr ""
+msgstr "Szept"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
 msgid "Heal"
-msgstr ""
+msgstr "Lecz"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
 msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+msgstr "Dodaj do znajomych"
+
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
 msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgstr "Lekceważ"
+
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
+msgid "Black list"
+msgstr "Czarna lista"
+
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr "Ustaw jako wroga"
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
 msgid "Erase"
-msgstr ""
+msgstr "Usuń"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
 msgid "Unignore"
-msgstr ""
+msgstr "Odignoruj"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
-msgstr ""
+msgstr "Całkowicie ignoruj"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
 msgid "Follow"
-msgstr ""
+msgstr "Podążaj"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
 msgid "Imitation"
-msgstr ""
+msgstr "Imituj"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
 msgid "Invite to party"
-msgstr ""
+msgstr "Zaproś do grupy"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
 msgid "Kick from party"
-msgstr ""
+msgstr "Wyrzuć z grupy"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
 msgid "Kick from guild"
-msgstr ""
+msgstr "Wyrzuć z gildii"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
 msgid "Change pos in guild"
-msgstr ""
+msgstr "Zmień pozycję w gildii"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
 msgid "Invite to guild"
-msgstr ""
+msgstr "Zaproś do gildii"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:261
 msgid "Kick player"
-msgstr ""
+msgstr "Wyrzuć gracza"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:263
 msgid "Nuke"
-msgstr ""
+msgstr "Wysadź w powietrze"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
 msgid "Show Items"
-msgstr ""
+msgstr "Pokaż przedmioty"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
 msgid "Undress"
-msgstr ""
+msgstr "Rozbierz"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
 msgid "Add comment"
-msgstr ""
+msgstr "Dodaj komentarz"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
 msgid "Buy (?)"
-msgstr ""
+msgstr "Kup (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
 msgid "Sell (?)"
-msgstr ""
+msgstr "Sprzedaj (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:308
 msgid "Kick"
-msgstr ""
+msgstr "Wyrzuć"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:319
 msgid "Remove from attack list"
-msgstr ""
+msgstr "Usuń z listy ataku"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:324
 msgid "Add to priority attack list"
-msgstr ""
+msgstr "Dodaj do listy priorytetów"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:326
 msgid "Add to attack list"
-msgstr ""
+msgstr "Dodaj do listy atakowanych"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:328
 msgid "Add to ignore list"
-msgstr ""
+msgstr "Dodaj do listy ignorowanych"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
 msgid "Add name to chat"
-msgstr ""
+msgstr "Wpisz do czatu"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:522
 msgid "Pick up"
-msgstr ""
+msgstr "Podnieś"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
 msgid "Add to chat"
-msgstr ""
+msgstr "Dodaj to czatu"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:540
 msgid "Map Item"
-msgstr ""
+msgstr "Przedmiot mapy"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:541
 msgid "Rename"
-msgstr ""
+msgstr "Zmień nazwę"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
 msgid "Remove"
-msgstr ""
+msgstr "Usuń"
+
+#: src/gui/popupmenu.cpp:547
+msgid "Warp"
+msgstr "Teleport"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:560
 msgid "Load old outfits"
-msgstr ""
+msgstr "Przywróć stare stroje"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
 msgid "Spells"
-msgstr ""
+msgstr "Zaklęcia"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:577
 msgid "Load old spells"
-msgstr ""
+msgstr "Przywróć stare zaklęcia"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:578
 msgid "Edit spell"
-msgstr ""
+msgstr "Edytuj zaklęcie"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:602
 msgid "Disable highlight"
-msgstr ""
+msgstr "Wyłącz podświetlenie"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:604
 msgid "Enable highlight"
-msgstr ""
+msgstr "Włącz podświetlenie"
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
-msgstr ""
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
+msgstr "Nie usuwaj imion"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:608
 msgid "Remove name"
-msgstr ""
+msgstr "Usuń imię"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:610
 msgid "Enable away"
-msgstr ""
+msgstr "Włącz tryb AFK"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:612
 msgid "Disable away"
-msgstr ""
+msgstr "Wyłącz tryb AFK"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
 msgid "Leave"
-msgstr ""
+msgstr "Opuść"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:813
 msgid "Change guild position"
-msgstr ""
+msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1286
 msgid "Rename map sign          "
-msgstr ""
+msgstr "Zmień nazwę drogowskazu"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1288
 msgid "Name:                    "
-msgstr ""
+msgstr "Imię:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1338
 msgid "Player comment            "
-msgstr ""
+msgstr "Komentarz gracza            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1340
 msgid "Comment:                      "
-msgstr ""
+msgstr "Komentarz:                      "
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1711
 msgid "Add to trade"
-msgstr ""
+msgstr "Dodaj do handlu"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1715
 msgid "Add to trade 10"
-msgstr ""
+msgstr "Dodaj 10 do handlu"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1716
 msgid "Add to trade half"
-msgstr ""
+msgstr "Dodaj połowę do handlu"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1717
 msgid "Add to trade all"
-msgstr ""
+msgstr "Dodaj wszystko do handlu"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1727
 msgid "Store 10"
-msgstr ""
+msgstr "Przechowaj 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1728
 msgid "Store half"
-msgstr ""
+msgstr "Przechowaj połowę"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1729
 msgid "Store all"
-msgstr ""
+msgstr "Przechowaj wszystko"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
 msgid "Drop all"
-msgstr ""
+msgstr "Upuść wszystko"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1768
 msgid "Retrieve 10"
-msgstr ""
+msgstr "Odbierz 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1769
 msgid "Retrieve half"
-msgstr ""
+msgstr "Odbierz połowę"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1770
 msgid "Retrieve all"
-msgstr ""
+msgstr "Odbierz wszystko"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
 msgid "Load old item shortcuts"
-msgstr ""
+msgstr "Przywróć stare skróty przedmiotów"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1902
 msgid "Load old drop shortcuts"
-msgstr ""
+msgstr "Przywróć stare skróty upuszczania"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
 msgid "Hide"
-msgstr ""
+msgstr "Ukryj"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
 msgid "Show"
-msgstr ""
+msgstr "Pokaż"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1975
 msgid "Reset yellow bar"
-msgstr ""
+msgstr "Zresetuj żółty pasek"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
-msgstr ""
+msgstr "Skopiuj do czatu"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
-msgstr ""
+msgstr "(domyślne)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
 msgid "Move up"
-msgstr ""
+msgstr "W górę"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
 msgid "Move down"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
+msgstr "W dół"
 
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Zmień serwer"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Zmień postać"
 
@@ -1597,12 +1666,12 @@ msgstr "Potwierdź:"
 
 #: src/gui/register.cpp:108
 msgid "Email:"
-msgstr "Email:"
+msgstr "E-mail:"
 
 #: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
-msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
+msgstr "Nazwa użytkownika musi być długa na co najmniej %d znaków."
 
 #: src/gui/register.cpp:184
 #, c-format
@@ -1612,102 +1681,102 @@ msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
 #: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
-msgstr "Hasło musi mieć conajmniej %d znaków."
+msgstr "Hasło musi mieć co najmniej %d znaków."
 
 #: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
-msgstr "Hasło nie może mieć więcej jak %d znaków."
+msgstr "Hasło nie może mieć więcej niż %d znaków."
 
 #: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:237
 msgid "Choose Your Server"
-msgstr ""
+msgstr "Wybierz serwer"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:248
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr ""
+msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:253
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "Użyj tego samego IP dla podserwerów"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:271
 msgid "Server type:"
-msgstr ""
+msgstr "Typ serwera:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:295
 msgid "Load"
-msgstr ""
+msgstr "Załaduj"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:296
 msgid "Connect"
-msgstr ""
+msgstr "Połącz"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Custom Server"
-msgstr ""
+msgstr "Dodaj serwer"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:402
 msgid "Please type both the address and the port of a server."
 msgstr "Proszę wpisać adres i port serwera"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:560
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "Ściąganie listy serwerów... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:565
 msgid "Waiting for server..."
-msgstr ""
+msgstr "Czekanie na serwer..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:569
 msgid "Preparing download"
-msgstr ""
+msgstr "Przygotowanie ściągania"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:573
 msgid "Error retreiving server list!"
-msgstr ""
+msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:678
 msgid "requires a newer version"
-msgstr ""
+msgstr "wymaga nowszej wersji"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:680
 #, c-format
 msgid "requires v%s"
-msgstr ""
+msgstr "wymaga v%s"
 
 #: src/gui/setup_audio.cpp:50
 msgid "Enable Audio"
-msgstr ""
+msgstr "Włącz dźwięk"
 
 #: src/gui/setup_audio.cpp:51
 msgid "Enable game sfx"
-msgstr ""
+msgstr "Włącz efekty gry"
 
 #: src/gui/setup_audio.cpp:52
 msgid "Enable gui sfx"
-msgstr ""
+msgstr "Włącz efekty GUI"
 
 #: src/gui/setup_audio.cpp:53
 msgid "Enable music"
-msgstr ""
+msgstr "Włącz muzykę"
 
 #: src/gui/setup_audio.cpp:54
 msgid "Enable mumble voice chat"
-msgstr ""
+msgstr "Włącz integrację z Mumble"
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
-msgstr ""
+msgstr "Ściągnij muzykę"
 
 #: src/gui/setup_audio.cpp:61
 msgid "Audio"
@@ -1723,15 +1792,15 @@ msgstr "Głośność muzyki"
 
 #: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr ""
+msgstr "Powiadomienie"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+msgstr "Musisz zrestartować program aby ściągnąć nową muzykę."
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
-msgstr ""
+msgstr "Silnik dźwięku"
 
 #: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
 msgid "Colors"
@@ -1739,55 +1808,55 @@ msgstr "Kolory"
 
 #: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
-msgstr ""
+msgstr "Usuń kolory z odbieranych wiadomości"
 
 #: src/gui/setup_chat.cpp:60
 msgid "Show chat colors list"
-msgstr ""
+msgstr "Pokazuj listę kolorów do czatu"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Commands"
-msgstr ""
+msgstr "Polecenia"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+msgstr "Pozwól poleceniom magicznym i GM pojawiać się we wszystkich zakładkach"
 
 #: src/gui/setup_chat.cpp:70
 msgid "Limits"
-msgstr ""
+msgstr "Limity"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
-msgstr ""
+msgstr "Limit znaków w wierszu czatu"
 
 #: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
-msgstr ""
+msgstr "Limit wierszy w czacie"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Logs"
-msgstr ""
+msgstr "Logi"
 
 #: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
-msgstr ""
+msgstr "Włącz logowanie czatu"
 
 #: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
-msgstr ""
+msgstr "Pokazuj historię czatu"
 
 #: src/gui/setup_chat.cpp:88
 msgid "Messages"
-msgstr ""
+msgstr "Wiadomości"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
-msgstr ""
+msgstr "Ukryj wiadomości od sklepów"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Tabs"
-msgstr ""
+msgstr "Zakładki"
 
 #: src/gui/setup_chat.cpp:96
 msgid "Put all whispers in tabs"
@@ -1795,35 +1864,47 @@ msgstr "Umieść wszystkie szepty w zakładkach"
 
 #: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
-msgstr ""
+msgstr "Loguj powiadomienia o magii w zakładce Debug"
 
 #: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
-msgstr ""
+msgstr "Pokazuj wiadomości serwera w zakładce Debug"
 
 #: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
-msgstr ""
+msgstr "Włącz tab handlowy"
 
 #: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
-msgstr ""
+msgstr "Włącz zakładkę bitewną"
 
 #: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr ""
+msgstr "Pokazuj wydarzenia bitewne"
 
 #: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr ""
+msgstr "Jeśli potrzeba, zmień rozmiaw zakładek czatu"
 
 #: src/gui/setup_chat.cpp:118
 msgid "Time"
-msgstr ""
+msgstr "Czas"
 
 #: src/gui/setup_chat.cpp:120
 msgid "Use local time"
-msgstr ""
+msgstr "Użyj lokalnego czasu"
+
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
+msgid "Other"
+msgstr "Inne"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr "Podświetlaj słowa (oddzielaj przecinkiem)"
+
+#: src/gui/setup_chat.cpp:128
+msgid "Show MVP messages"
+msgstr "Pokazuj wiadomości MVP"
 
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
@@ -1831,7 +1912,7 @@ msgstr "Kolor będzie wyglądał w ten sposób"
 
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr ""
+msgstr "Typ:"
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1840,7 +1921,7 @@ msgstr "Statyczny"
 #: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
 #: src/gui/setup_colors.cpp:408
 msgid "Pulse"
-msgstr "Puls"
+msgstr "Pulsujący"
 
 #: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
 #: src/gui/setup_colors.cpp:409
@@ -1854,59 +1935,59 @@ msgstr "Widmo"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr ""
+msgstr "Opóźnienie:"
 
 #: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr ""
+msgstr "Czerwony:"
 
 #: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr ""
+msgstr "Zielony:"
 
 #: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr ""
+msgstr "Niebieski:"
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
-msgstr ""
+msgstr "Alfa:"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:71
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:74
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Naciśnij przycisk aby rozpocząć kalibrację"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibruj"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Włącz joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr "Używaj joysticka jeśli okno klienta nieaktywne"
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Obróć drążek"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr "Obracaj uchwytem i nie naciskaj guzików."
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1918,7 +1999,7 @@ msgstr "Przypisz"
 
 #: src/gui/setup_keyboard.cpp:93
 msgid "Unassign"
-msgstr ""
+msgstr "Odznacz"
 
 #: src/gui/setup_keyboard.cpp:97
 msgid "Default"
@@ -1928,217 +2009,233 @@ msgstr "Domyślny"
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
-msgstr ""
+msgstr "Różne"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Potwory"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
-msgstr ""
+msgstr "Pokaż zadane potworom obrażenia"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "Automatycznie namierzaj tylko dosięgalne potwory"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
-msgstr ""
+msgstr "Podświetl zasięg ataku potworów"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
-msgstr ""
+msgstr "Pokazuj pasek życia potworów"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
-msgstr ""
+msgstr "Przewijaj namierzanie potworów"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
-msgstr ""
+msgstr "Włącz efekty portali"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
-msgstr ""
+msgstr "Podświetl portale na mapie"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
-msgstr ""
+msgstr "Podświetl przedmioty na podłodze"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
-msgstr ""
+msgstr "Podświetl zasięg ataku graczy"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
-msgstr ""
+msgstr "Pokaż rozszerzone minimapy"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
-msgstr ""
+msgstr "Rysuj ścieżkę"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
-msgstr ""
+msgstr "Rysuj klawisze skrótu na mapie"
+
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr "Włącz leniwe przewijanie"
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr "Leniwość przewijania"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr "Promień przewijania"
+
+#: src/gui/setup_other.cpp:97
 msgid "Moving"
-msgstr ""
+msgstr "Poruszanie się"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:99
 msgid "Auto fix position"
-msgstr ""
+msgstr "Koryguj pozycję automatycznie"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:102
 msgid "Attack while moving"
-msgstr ""
+msgstr "Atakuj podczas poruszania się"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:105
 msgid "Sync player move"
-msgstr ""
+msgstr "Synchronizuj ruchy graczy"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:108
 msgid "Crazy move A program"
-msgstr ""
+msgstr "Szalone ruchy: program A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:112
 msgid "Player"
-msgstr ""
+msgstr "Gracze"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:114
 msgid "Show own hp bar"
-msgstr ""
+msgstr "Pokazuj własny pasek życia"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:117
 msgid "Enable quick stats"
-msgstr ""
+msgstr "Włącz szybkie statystyki"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
-msgstr ""
+msgstr "Przewijaj namierzanie graczy"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:123
 msgid "Show job exp messages"
-msgstr ""
+msgstr "Pokazuj wiadomości o punktach doświadczenia umiejętności"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:126
 msgid "Show players popups"
-msgstr ""
+msgstr "Pokazuj wyskakujące powiadomienia graczy"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:129
 msgid "Afk message"
-msgstr ""
+msgstr "Wiadomość AFK"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:132
 msgid "Show job"
-msgstr ""
+msgstr "Pokazuj poziom umiejętności"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:135
 msgid "Enable attack filter"
-msgstr ""
+msgstr "Filtruj ataki"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:138
 msgid "Enable advert protocol"
-msgstr ""
+msgstr "Włącz protokół reklamowy"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:144
 msgid "Accept sell/buy requests"
-msgstr ""
+msgstr "Akceptuj prośby o handel"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:147
 msgid "Enable shop mode"
-msgstr ""
+msgstr "Włącz tryb sklepu"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:153
 msgid "Log NPC dialogue"
-msgstr ""
+msgstr "Loguj dialogi NPC"
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
-msgstr ""
+#: src/gui/setup_other.cpp:157
+msgid "Bots support"
+msgstr "Integracja z botami"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:159
+msgid "Enable auction bot support"
+msgstr "Włącz integrację z AuctionBotem"
+
+#: src/gui/setup_other.cpp:162
+msgid "Enable guild bot support and disable native guild support"
+msgstr "Włącz integrację z guild-botem i wyłącz natywną obsługę gildii"
+
+#: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
-msgstr ""
+msgstr "Włącz atak ze strony serwera"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:171
 msgid "Enable bot checker"
-msgstr ""
+msgstr "Włącz wykrywacza botów"
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
-msgstr ""
+#: src/gui/setup_other.cpp:174
+msgid "Enable buggy servers protection (do not disable)"
+msgstr "Włącz ochronę przeciw zbugowanym serwerom"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
-msgstr ""
+msgstr "Włącz logowanie Debug"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:181
 msgid "Low traffic mode"
-msgstr ""
+msgstr "Tryb niskiego transferu"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:184
 msgid "Hide shield sprite"
-msgstr ""
+msgstr "Chowaj obrazek tarczy"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:187
 msgid "Show background"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
+msgstr "Pokazuj tło"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+msgstr "Lepsza wydajność programu (włącz by poprawić wydajność)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "Automatycznie dopasuj ustawienia jakości"
 
 #: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
 msgid "Hw acceleration"
-msgstr ""
+msgstr "Przyspieszenie Hw"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
-msgstr ""
+msgstr "Włącz cache przezroczystości (Software, może zużyć dużo pamięci)"
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
-msgstr ""
+msgstr "Włącz redukowanie map (Software)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
 msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "Lepsza jakość (wyłącz dla lepszej wydajności)"
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
+msgstr "Napraw kanał alfa (Software, może bardzo spowolniać)"
+
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr "Pokaż przezroczystość istot"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
-msgstr ""
+msgstr "Włącz reorganizację obrazków"
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+msgstr "Mała pamięć (włącz by zmniejszyć obciążenie pamięci)"
 
 #: src/gui/setup_perfomance.cpp:86
 msgid "Disable advanced beings caching (Software)"
-msgstr ""
+msgstr "Wyłącz zaawansowany cache istot (Software)"
 
 #: src/gui/setup_perfomance.cpp:89
 msgid "Disable beings caching (Software)"
-msgstr ""
+msgstr "Wyłącz cache istot (Software)"
 
 #: src/gui/setup_players.cpp:48
 msgid "Players"
@@ -2146,35 +2243,47 @@ msgstr "Gracze"
 
 #: src/gui/setup_players.cpp:54
 msgid "Show gender"
-msgstr ""
+msgstr "Pokazuj płeć"
 
 #: src/gui/setup_players.cpp:57
 msgid "Show level"
-msgstr ""
+msgstr "Pokazuj poziom"
 
 #: src/gui/setup_players.cpp:60
 msgid "Show own name"
-msgstr ""
+msgstr "Pokazuj własne imię"
 
 #: src/gui/setup_players.cpp:63
-msgid "Target dead players"
-msgstr ""
+msgid "Enable extended mouse targeting"
+msgstr "Włącz zaawansowane namierzanie myszką"
 
 #: src/gui/setup_players.cpp:66
+msgid "Target dead players"
+msgstr "Namierzaj martwych graczy"
+
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Widoczne imiona"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
-msgstr ""
+msgstr "Bezpieczny handel"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
-msgstr ""
+msgstr "Niebezpieczne znaki w imionach"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
-msgstr ""
+msgstr "Pokaż statusy"
+
+#: src/gui/setup_players.cpp:81
+msgid "Show ip addresses on screenshots"
+msgstr "Pokaż adres IP na zrzutach ekranu"
+
+#: src/gui/setup_players.cpp:84
+msgid "Allow self heal with mouse click"
+msgstr "Pozwól na leczenie siebie kliknięciem"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
@@ -2190,7 +2299,7 @@ msgstr "Przyjaciel"
 
 #: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
-msgstr "Nielubiany"
+msgstr "Lekceważony"
 
 #: src/gui/setup_relations.cpp:73
 msgid "Ignored"
@@ -2198,104 +2307,177 @@ msgstr "Ignorowany"
 
 #: src/gui/setup_relations.cpp:74
 msgid "Erased"
-msgstr ""
+msgstr "Skasowany"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:75
+msgid "Blacklisted"
+msgstr "Dodany/a do czarnej listy"
+
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr "Wróg"
+
+#: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
 msgstr "Zezwól na handel"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
 msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Old"
-msgstr ""
+msgstr "Stary"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
 msgid "Relations"
-msgstr ""
+msgstr "Relacje"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:108
 msgid "Tiny (10)"
-msgstr ""
+msgstr "Bardzo mała (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:109
 msgid "Small (11)"
-msgstr ""
+msgstr "Mała (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:110
 msgid "Medium (12)"
-msgstr ""
+msgstr "Średnia (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:111
 msgid "Large (13)"
-msgstr ""
+msgstr "Duża (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:112
 msgid "Big (14)"
-msgstr ""
+msgstr "Bardzo duża (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:113
 msgid "Huge (15)"
-msgstr ""
+msgstr "Ogromna (15)"
+
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr "Chinese (China)"
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr "Czech"
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr "English"
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr "Finnish"
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr "French"
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr "German"
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr "Indonesian"
+
+#: src/gui/setup_theme.cpp:153
+#, fuzzy
+msgid "Polish"
+msgstr "English"
+
+#: src/gui/setup_theme.cpp:154
+msgid "Japanese"
+msgstr "Japanese"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:155
+msgid "Dutch (Belgium/Flemish)"
+msgstr "Dutch (Belgium/Flemish)"
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: src/gui/setup_theme.cpp:157
+msgid "Portuguese (Brazilian)"
+msgstr "Portuguese (Brazilian)"
+
+#: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr "Russian"
+
+#: src/gui/setup_theme.cpp:159
+msgid "Spanish (Castilian)"
+msgstr "Spanish (Castilian)"
+
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
-msgstr ""
+msgstr "Skórka"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
-msgstr ""
+msgstr "Skórka GUI"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:194
+msgid "Language"
+msgstr "Język"
+
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
-msgstr ""
+msgstr "Główna czcionka"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
-msgstr ""
+msgstr "Pogrubiona czcionka"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
-msgstr ""
+msgstr "Czcionka efektów"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
-msgstr ""
+msgstr "Czcionka pomocy"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
-msgstr ""
+msgstr "Bezpieczna czcionka"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:200
+msgid "Japanese font"
+msgstr "Japońska czcionka"
+
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
-msgstr ""
+msgstr "Skórka zmieniona"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
-msgstr "Uruchom ponownie twojego klienta, aby mogły zajść zmiany."
+msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
 
 #: src/gui/setup_video.cpp:194
 msgid "Software"
-msgstr ""
+msgstr "Software"
 
 #: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
-msgstr ""
+msgstr "Szybki OpenGL"
 
 #: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
-msgstr ""
+msgstr "Bezpieczny OpenGL"
 
 #: src/gui/setup_video.cpp:223
 msgid "No text"
@@ -2331,11 +2513,11 @@ msgstr "średnie"
 
 #: src/gui/setup_video.cpp:267
 msgid "max"
-msgstr "max"
+msgstr "najlepsze"
 
 #: src/gui/setup_video.cpp:288
 msgid "Full screen"
-msgstr "Pełen ekran"
+msgstr "Pełny ekran"
 
 #: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
@@ -2361,16 +2543,12 @@ msgstr "jako cząsteczkę"
 
 #: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr ""
+msgstr "Limit FPS:"
 
 #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
 msgid "Alt FPS limit: "
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Obraz"
+msgstr "Alternatywny limit FPS:"
 
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
@@ -2386,27 +2564,30 @@ msgstr "Efekty otoczenia"
 
 #: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr ""
+msgstr "Detale cząsteczkowe"
 
 #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
 msgid "None"
-msgstr ""
+msgstr "Brak"
 
 #: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
+"Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
+"Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego "
+"stanu!"
 
 #: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr ""
+msgstr "Zmiana na tryb pełnoekranowy"
 
 #: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
@@ -2414,7 +2595,7 @@ msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
 #: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr ""
+msgstr "Zmiana na OpenGL"
 
 #: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
@@ -2422,788 +2603,432 @@ msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
 #: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
-msgstr ""
+msgstr "Własna rozdzielczość (np. 1024x768)"
 
 #: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
-msgstr ""
+msgstr "Wpisz nową rozdzielczość:"
 
 #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr ""
+msgstr "Rozdzielczość zmieniona"
 
 #: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
+"Niektóre okna mogą być przesunięte aby dopasować się do niższej "
+"rozdzielczości."
 
 #: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr ""
+msgstr "Ustawienia efektów cząsteczkowych zmienione."
 
 #: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Efekty nastąpią po zmianie mapy."
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
 msgid "Personal Shop"
-msgstr ""
+msgstr "Własny sklep"
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
 msgid "Buy items"
-msgstr ""
+msgstr "Kupuj"
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
 msgid "Sell items"
-msgstr ""
+msgstr "Sprzedaj"
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
 msgid "Announce"
-msgstr ""
+msgstr "Ogłoś"
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
 msgid "Show links in announce"
-msgstr ""
+msgstr "Pokazuj linki w ogłoszeniach"
+
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr "Aukcja"
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
-msgstr "Prośba o Handel"
+msgstr "Prośba o handel"
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
 #, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%s chce %s%s, akceptujesz?"
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Zdolności"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "Góra"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
-msgstr ""
+msgstr "Dostępne punkty umiejętności: %d"
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
-msgstr ""
+msgstr "Zestaw umiejętności %d"
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
-msgstr ""
+msgstr "Umiejętność %d"
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
-msgstr ""
+msgstr "Poziom: %d"
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
-msgstr ""
+msgstr "Poziom: %d(%+d)"
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gildia"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "Zaproszono gracza %s do gildii %s."
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
 #, c-format
 msgid "Guild %s quit requested."
-msgstr ""
+msgstr "Poproszono o wyjście z gildii %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "Zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "Kogo chcesz zaprosić do gildii %s?"
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
 msgid "Leave Guild?"
-msgstr ""
+msgstr "Opuścić gildię?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "Na pewno opuścić gildię %s?"
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupa"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
 #, c-format
 msgid "Invited user %s to party."
-msgstr ""
+msgstr "Gracz %s zaproszony do grupy."
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
 #, c-format
 msgid "Party %s quit requested."
-msgstr ""
+msgstr "Poproszono o wyjście z grupy %s."
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
 msgid "Member Invite to Party"
-msgstr ""
+msgstr "Zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
 #, c-format
 msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "Kogo chcesz zaprosić do grupy %s?"
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
 msgid "Leave Party?"
-msgstr ""
+msgstr "Opuścić grupę?"
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
 #, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr ""
+msgstr "Na pewno opuścić grupę %s?"
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
 msgid "Nav"
-msgstr ""
+msgstr "Nawigacja"
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
 msgid "Atk"
-msgstr ""
+msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
 msgid "Priority mobs"
-msgstr ""
+msgstr "Priorytetowe moby"
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
 msgid "Attack mobs"
-msgstr ""
+msgstr "Atakuj moby"
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
 msgid "Ignore mobs"
-msgstr ""
+msgstr "Ignoruj moby"
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
 msgid "Create Guild"
-msgstr "Utwórz Gildię"
+msgstr "Utwórz gildię"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
 msgid "Create Party"
-msgstr ""
+msgstr "Utwórz grupę"
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
 msgid "Social"
-msgstr ""
+msgstr "Społeczność"
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
 msgid "Invite"
-msgstr ""
+msgstr "Zaproś"
 
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
 #, c-format
 msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
 #, c-format
 msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "Odrzucono zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "Akceptowano zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "Odrzucono zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "Tworzenie gildii o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "Tworzenie grupy o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
 msgid "Guild Name"
-msgstr ""
+msgstr "Nazwa gildii"
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
 msgid "Choose your guild's name."
-msgstr ""
+msgstr "Wybierz nazwę gildii."
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
 msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "Gildia o tej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
 #, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr ""
+msgstr "%s zaprosił/a Cię do gildii %s."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
 msgid "Accept Guild Invite"
-msgstr ""
+msgstr "Akceptuj zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
 msgid "Received party request, but one already exists."
-msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
+msgstr "Grupa o takiej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
 msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "Zostałeś/aś zaproszony/a do grupy."
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
 #, c-format
 msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "Zostałeś/aś zaproszony/a do grupy %s."
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
 #, c-format
 msgid "%s has invited you to join their party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy."
+msgstr "%s zaprosił/a Cię do grupy."
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "%s has invited you to join the %s party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
+msgstr "%s zaprosił/a Cię do grupy %s ."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
 msgid "Party Name"
-msgstr ""
+msgstr "Nazwa grupy"
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
 msgid "Choose your party's name."
-msgstr ""
+msgstr "Wybierz nazwę grupy."
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
+msgstr "Specjalne"
 
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Pieniądze: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Praca: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Praca:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
-msgstr ""
+msgstr "Punkty postaci: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
-msgstr ""
+msgstr "Poziom: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
+msgstr "Punkty korekcyjne: %d"
 
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr ""
+msgstr "Bez celu"
 
 #: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr ""
+msgstr "Dozwól cel"
 
 #: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr ""
+msgstr "Wymaga celu"
 
 #: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr ""
+msgstr "Ogólna Magia"
 
 #: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr ""
+msgstr "Magia Życia"
 
 #: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr ""
+msgstr "Magia Wojny"
 
 #: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
-msgstr ""
+msgstr "Magia Transmutacji"
 
 #: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
-msgstr ""
+msgstr "Magia Natury"
 
 #: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
-msgstr ""
+msgstr "Magia Astralna"
 
 #: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr ""
+msgstr "Edytor poleceń"
 
 #: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr ""
+msgstr "magia"
 
 #: src/gui/textcommandeditor.cpp:189
 msgid "other"
-msgstr ""
+msgstr "inne"
 
 #: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
-msgstr ""
+msgstr "Symbol:"
 
 #: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr ""
+msgstr "Polecenie:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr "Komentarz:"
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
-msgstr ""
+msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
-msgstr ""
+msgstr "Rodzaj celu:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
-msgstr ""
+msgstr "Ikona:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
-msgstr ""
+msgstr "Poziom magii:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
-msgstr ""
+msgstr "Szkoła magii:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
-msgstr ""
+msgstr "Poziom szkoły:"
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
-msgstr ""
+msgstr "Zachowaj"
 
 #: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
@@ -3225,62 +3050,61 @@ msgstr "Zaakceptowano. Oczekiwanie..."
 msgid "Trade: You"
 msgstr "Handel: Ty"
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
-msgstr ""
+msgstr "Otrzymujesz %s"
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "Zmień"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr "Nie masz wystarczającej ilości pieniędzy."
+
+#: src/gui/tradewindow.cpp:454
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
 "rodzaj przedmiotu w okienku."
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "Nie masz wystarczającej ilości pieniędzy."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
 msgid "Updating..."
 msgstr "Aktualizacja..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
 msgid "Play"
 msgstr "Graj"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
-msgstr ""
+msgstr "##1  Spróbuj ponownie później."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -3290,19 +3114,19 @@ msgstr "Byty"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
-msgstr ""
+msgstr "Imiona przyjaciół"
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr ""
+msgstr "Imiona lekceważonych"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr ""
+msgstr "Imiona ignorowanych"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
-msgstr ""
+msgstr "Imiona usuniętych"
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3322,23 +3146,23 @@ msgstr "NPC"
 
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
-msgstr ""
+msgstr "Pasek życia potwora"
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
-msgstr ""
+msgstr "Pasek życia potwora (drugi kolor)"
 
 #: src/gui/userpalette.cpp:129
 msgid "Party Members"
-msgstr ""
+msgstr "Członkowie grupy"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
-msgstr ""
+msgstr "Członkowie drużyny"
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
-msgstr "Efekty Cząsteczkowe"
+msgstr "Efekty cząsteczkowe"
 
 #: src/gui/userpalette.cpp:132
 msgid "Pickup Notification"
@@ -3350,23 +3174,23 @@ msgstr "Powiadomienie o Exp"
 
 #: src/gui/userpalette.cpp:134
 msgid "Player HP bar"
-msgstr ""
+msgstr "Pasek życia gracza"
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
-msgstr ""
+msgstr "Pasek życia gracza (drugi kolor)"
 
 #: src/gui/userpalette.cpp:137
 msgid "Player Hits Monster"
-msgstr ""
+msgstr "Inny gracz uderza potwora"
 
 #: src/gui/userpalette.cpp:138
 msgid "Monster Hits Player"
-msgstr ""
+msgstr "Potwór uderza gracza"
 
 #: src/gui/userpalette.cpp:140
 msgid "Other Player Hits Local Player"
-msgstr ""
+msgstr "Inny gracz uderza Ciebie"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
@@ -3374,15 +3198,15 @@ msgstr "Uderzenie Krytyczne"
 
 #: src/gui/userpalette.cpp:143
 msgid "Local Player Hits Monster"
-msgstr ""
+msgstr "Uderzasz potwora"
 
 #: src/gui/userpalette.cpp:145
 msgid "Local Player Critical Hit"
-msgstr ""
+msgstr "Zadajesz cios krytyczny"
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
-msgstr ""
+msgstr "Pudłujesz"
 
 #: src/gui/userpalette.cpp:148
 msgid "Misses"
@@ -3390,71 +3214,71 @@ msgstr "Pudła"
 
 #: src/gui/userpalette.cpp:149
 msgid "Portal Highlight"
-msgstr ""
+msgstr "Podświetlenie portalu"
 
 #: src/gui/userpalette.cpp:151
 msgid "Default collision Highlight"
-msgstr ""
+msgstr "Podświetlenie nieprzechadzalnych terenów"
 
 #: src/gui/userpalette.cpp:153
 msgid "Air collision Highlight"
-msgstr ""
+msgstr "Podświetlenie przeszkód powietrznych"
 
 #: src/gui/userpalette.cpp:155
 msgid "Water collision Highlight"
-msgstr ""
+msgstr "Podświetlenie przeszkód wodnych"
 
 #: src/gui/userpalette.cpp:157
 msgid "Walkable Highlight"
-msgstr ""
+msgstr "Podświetlenie miejsc, po których da się chodzić"
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
-msgstr ""
+msgstr "Zasięg Twojego ataku"
 
 #: src/gui/userpalette.cpp:161
 msgid "Local Player Attack Range Border"
-msgstr ""
+msgstr "Obwódka zasięgu Twojego ataku"
 
 #: src/gui/userpalette.cpp:163
 msgid "Monster Attack Range"
-msgstr ""
+msgstr "Zakres ataku potwora"
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
-msgstr ""
+msgstr "Lokalizacja domowa"
 
 #: src/gui/userpalette.cpp:167
 msgid "Home Place Border"
-msgstr ""
+msgstr "Obwódka lokalizacji domowej"
 
 #: src/gui/userpalette.cpp:169
 msgid "Road Point"
-msgstr ""
+msgstr "Drogowskaz"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "Kto jest online- aktualizacja"
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
-msgstr ""
+msgstr "Aktualizacja"
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
-msgstr ""
+msgstr "Gracze online- "
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
-msgstr ""
+msgstr "Gracze online- błąd"
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "Gracze online- aktualizacja"
 
 #: src/gui/widgets/battletab.cpp:45
 msgid "Battle"
-msgstr ""
+msgstr "Bitwa"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
@@ -3502,7 +3326,7 @@ msgstr "Komenda powoduje opuszczenie obecnego kanału."
 
 #: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Jeżeli jesteś ostatnią osobą na kanale, zostanie on usunięty."
+msgstr "Jeżeli jesteś ostatnią osobą w pokoju, zostanie on usunięty."
 
 #: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
@@ -3513,7 +3337,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Ta komenda uczyni <ksywka> operatorem kanału."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
 
@@ -3549,15 +3374,54 @@ msgstr "Ogłoszenie ogólne od %s:"
 #: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
-msgstr ""
+msgstr "%s szepcze: %s"
+
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Polecenie: /invite <nick>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "To polecenie zaprasza <nick> do gildii, do której należysz."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Polecenie: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "To polecenie sprawia że gracz opuszcza gildię."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Pokaż tą pomoc."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Zaproś gracza do swojej gildii"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Opuść swoją gildię"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Wyrzuć kogoś ze swojej gildii"
+
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Edycja"
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > Ignoruj gracza"
 
 #: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore- Przestań ignorować gracza"
 
 #: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
@@ -3573,48 +3437,47 @@ msgstr "Komenda zamyka obecną zakładkę szeptania"
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr ""
+msgstr "Polecenie: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr ""
+msgstr "To polecenie ignoruje gracza niezależnie od obecnych relacji."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
-msgstr ""
+msgstr "Komenda: /unignore <gracz>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr ""
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "To polecenie przerywa ignorowanie gracza, jeśli był ignorowany."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
-msgstr ""
+msgstr "WB"
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
-msgstr ""
+msgstr "Wykrywacz botów"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
-msgstr ""
+msgstr "ONL"
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
-msgstr ""
+msgstr "Gracze online"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
-msgstr ""
+msgstr "SB"
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
-msgstr ""
+msgstr "Emotki"
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
-msgstr ""
+msgstr "STA"
 
 #: src/gui/windowmenu.cpp:73
 msgid "Status"
@@ -3622,618 +3485,921 @@ msgstr "Stan"
 
 #: src/gui/windowmenu.cpp:74
 msgid "EQU"
-msgstr ""
+msgstr "EKW"
 
 #: src/gui/windowmenu.cpp:76
 msgid "INV"
-msgstr ""
+msgstr "INW"
 
 #: src/gui/windowmenu.cpp:81
 msgid "SKI"
-msgstr ""
+msgstr "SKI"
 
 #: src/gui/windowmenu.cpp:88
 msgid "SPE"
-msgstr ""
+msgstr "SPE"
 
 #: src/gui/windowmenu.cpp:93
 msgid "SOC"
-msgstr ""
+msgstr "SOC"
 
 #: src/gui/windowmenu.cpp:94
 msgid "SH"
-msgstr ""
+msgstr "SK"
 
 #: src/gui/windowmenu.cpp:94
 msgid "Shortcuts"
-msgstr ""
+msgstr "Skróty"
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
-msgstr ""
+msgstr "MG"
 
 #: src/gui/windowmenu.cpp:97
 msgid "DR"
-msgstr ""
+msgstr "UP"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "WŻ"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Czy wiesz, że..."
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
-msgstr ""
+msgstr "UST"
 
 #: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr ""
+msgstr "Wybierz świat"
 
 #: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr ""
+msgstr "Przeloguj się"
 
 #: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr ""
+msgstr "Wybierz świat"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
-msgstr ""
+msgstr "Magazyn"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
-msgstr ""
+msgstr "Wózek"
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr "Podstawowe klawisze"
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Przesuń w górę"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Przesuń w dół"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Przesuń w lewo"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Przesuń w prawo"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Namierz i Atakuj"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
-msgstr ""
+msgstr "Podejdź do celu"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
-msgstr ""
+msgstr "Zmień sposób podchodzenia do celu"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
-msgstr ""
+msgstr "Podejdź do lokacji domowej"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
-msgstr ""
+msgstr "Ustaw lokację domową"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
-msgstr ""
-
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Emotikonka"
+msgstr "Podejdź do punktu nawigacyjnego"
 
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Zatrzymaj Atak"
 
-#: src/keyboardconfig.cpp:64
-msgid "Target Closest"
-msgstr ""
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr "Przestań namierzać"
 
 #: src/keyboardconfig.cpp:66
+msgid "Target Closest"
+msgstr "Celuj w najbliższe"
+
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "Namierz NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Namierz Gracza"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Podnieś"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
-msgstr ""
+msgstr "Zmień sposób podnoszenia"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Ukryj Okna"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Usiądź"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
-msgstr ""
+msgstr "Zmień widok mapy"
 
-#: src/keyboardconfig.cpp:80
-msgid "Item Shortcuts Key"
-msgstr ""
+#: src/keyboardconfig.cpp:82
+msgid "Select OK"
+msgstr "Wybrano OK"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:85
+msgid "Shortcuts Keys"
+msgstr "Klawisze skrótu"
+
+#: src/keyboardconfig.cpp:86
+msgid "Item Shortcuts Key"
+msgstr "Klawisz skrótu przedmiotu"
+
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:371
 #, c-format
 msgid "Item Shortcut %d"
-msgstr "Skrót Przedmiotu %d"
+msgstr "Skrót przedmiotu %d"
+
+#: src/keyboardconfig.cpp:128
+msgid "Windows Keys"
+msgstr "Klawisze okien"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Okno Pomocy"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Okno statusu"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Okno Inwentarza"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Okno Ekwipunku"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Okno Umiejętności"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Okno Minimapy"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Okno Czatu"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
-msgstr "Okno Skrótów Przedmiotów"
+msgstr "Okno Skrótów przedmiotów"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Okno Ustawień"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Okno diagnostyczne"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
-msgstr ""
+msgstr "Okno społeczne"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Okno Skrótów Emotek"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
-msgstr ""
+msgstr "Okno strojów"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
-msgstr ""
+msgstr "Okno sklepu"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
-msgstr ""
+msgstr "Okno szybkiego upuszczania"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
-msgstr ""
+msgstr "Okno statystyk bitewnych"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
-msgstr ""
+msgstr "Okno poleceń"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
-msgstr ""
+msgstr "Okno wykrywacza botów"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
-msgstr ""
+msgstr "Okno graczy online"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
-msgstr ""
+msgstr "Okno \"Czy wiesz że...\""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
-msgstr ""
+msgstr "Poprzednia zakładka społeczna"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
-msgstr ""
+msgstr "Następna zakładka społeczna"
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:175
+msgid "Emotes Keys"
+msgstr "Klawisze emotek"
+
+#: src/keyboardconfig.cpp:176
+msgid "Smilie"
+msgstr "Emotikonka"
+
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
 #: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
 #: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:366
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Skrót Emotki %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:270
+msgid "Outfits Keys"
+msgstr "Klawisze stroju"
+
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
-msgstr ""
+msgstr "Nałóż strój"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
-msgstr ""
+msgstr "Kopiuj strój"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
-msgstr ""
+msgstr "Skopiuj ekwipunek do stroju"
+
+#: src/keyboardconfig.cpp:277
+msgid "Chat Keys"
+msgstr "Klawisze czatu"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Przewiń czat do góry"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Przewiń czat w doł"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Poprzednia zakładka czatu"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
-msgstr ""
+msgstr "Zamknij bieżącą zakładkę czatu"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
-msgstr ""
+msgstr "Poprzedni wiersz czatu"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
-msgstr ""
+msgstr "Następny wiersz czatu"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
-msgstr ""
+msgstr "Dopełnianie w czacie"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
-msgstr ""
+msgstr "Wyłącz wpisywanie do czatu"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Wybrano OK"
+#: src/keyboardconfig.cpp:299
+msgid "Other Keys"
+msgstr "Inne"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
-msgstr ""
+msgstr "Skieruj się w górę"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
-msgstr ""
+msgstr "Skieruj się w dół"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
-msgstr ""
+msgstr "Skieruj się w lewo"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
-msgstr ""
+msgstr "Skieruj się w prawo"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
-msgstr ""
+msgstr "Szalone ruchy"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
-msgstr ""
+msgstr "Zmień tryb szalonych ruchów"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
-msgstr ""
+msgstr "Szybkie upuszczenie N przedmiotów z pozycji 0"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
-msgstr ""
+msgstr "Szybkie upuszczenie N przedmiotów"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
-msgstr ""
+msgstr "Zmień licznik szybkiego upuszczania"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
-msgstr ""
+msgstr "Szybkie leczenie celu lub siebie"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
-msgstr ""
+msgstr "Użyj zaklęcia #itenplz"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
-msgstr ""
+msgstr "Użyj magicznego ataku"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
-msgstr ""
+msgstr "Przełącz magiczny atak"
+
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
+msgstr "Przełącz atak PvP"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:330
 msgid "Change move type"
-msgstr ""
+msgstr "Zmień tryb poruszania się"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Weapon Type"
-msgstr ""
+msgstr "Zmień rodzaj broni"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:334
 msgid "Change Attack Type"
-msgstr ""
+msgstr "Zmień rodzaj ataku"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:336
 msgid "Change Follow mode"
-msgstr ""
+msgstr "Zmień rodzaj podążania"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:338
 msgid "Change Imitation mode"
-msgstr ""
+msgstr "Zmień rodzaj imitacji"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:341
 msgid "Disable / Enable Game modifier keys"
-msgstr ""
+msgstr "Włącz/ wyłącz klawisze modyfikatorów gry"
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:342
 msgid "On / Off audio"
-msgstr ""
+msgstr "Włącz/ wyłącz dźwięk"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:344
 msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "Włącz/ wyłącz tryb AFK"
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:346
 msgid "Emulate right click from keyboard"
-msgstr ""
+msgstr "Emuluj prawe kliknięcie klawiaturą"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:348
 msgid "Toggle camera mode"
-msgstr ""
+msgstr "Przełącz tryb kamery"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:350
 msgid "Modifier key"
-msgstr ""
+msgstr "Klawisz modyfikatora"
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:429
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
+"Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
+"się problemy."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:384
 msgid "You were killed by "
-msgstr ""
+msgstr "Zostałeś/aś zabity/a przez "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
-msgstr ""
+msgstr "Próbowano podnieść nieistniejący przedmiot."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
-msgstr ""
+msgstr "Przedmiot zbyt ciężki."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
-msgstr ""
+msgstr "Przedmiot za daleko"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
-msgstr ""
+msgstr "Inwentarz jest pełny."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
-msgstr ""
+msgstr "Za duży stos."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
-msgstr ""
+msgstr "Przedmiot należy do kogoś innego."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
-msgstr ""
+msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Podniosłeś/aś %d [@@%d|%s@@]."
+msgstr[1] "Podniosłeś/aś %d [@@%d|%s@@]."
+msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
+
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) domyślne poruszanie się"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr "(I) odwrócone ruchy"
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr "(c) trochę szalonych ruchów"
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr "(C) dużo szalonych ruchów"
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) podwójne normalne + szalone"
+
+#: src/localplayer.cpp:1892
+msgid "(?) unknown move"
+msgstr "(?) nieznany sposób poruszania się"
+
+#: src/localplayer.cpp:1914
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr "(%d) szalone ruchy numer %d"
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr "(a) własne szalone ruchy"
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr "(?) szalone ruchy"
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr "(0) domyślne przybliżenie do celu"
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr "(1) podejdź do 1 pola od celu"
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) podejdź do 2 pól od celu"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr "(3) podejdź do 3 pól od celu"
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr "(5) podejdź do 5 pól od celu"
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr "(7) podejdź do 7 pól od celu"
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr "(A) podejdź do celu na zasięg ataku"
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr "(a) zasięg ataku łucznika"
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?) pól do celu"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr "(D) domyślne podążanie"
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr "(R) relatywne podążanie"
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr "(M) lustrzane podążanie"
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr "(P) niewolnicze podążanie"
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr "(?) nieznane podążanie"
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) atak"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) domyślny atak"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) zdejmij tarczę do ataku"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S) załóż tarczę do ataku"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) idź, atakuj"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) idź, atakuj, podnieś"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) bez autoataku"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) podnoś w promieniu 1x1"
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) podnoś w promieniu 2x1"
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) podnoś w promieniu 2x3"
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) podnoś w promieniu 3x3"
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) podejdź i podnoś do 4 pól"
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr "(G) podejdź i podnoś do 8 pól"
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr "(A) podejdź i podnoś w zasięgu wzroku"
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) podnoś"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) normalny widok mapy"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr "(D) widok debug"
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr "(u) płaska mapa"
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr "(U) płaska mapa 2"
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) mapa bez tekstur"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b) dwukolorowa mapa"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) użyj #flar jako M.A."
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) użyj #chiza jako M.A."
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) użyj #ingrav jako M.A."
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) użyj #ingrav jako M.A."
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) użyj #upmarmu jako M.A."
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) magiczny atak"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr "(a) atakuj wszystkich graczy"
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr "(f) nie atakuj przyjaciół"
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr "(b) atakuj nielubianych"
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr "(d) nie atakuj nikogo"
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr "(?) atak PvP"
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr "(D) domyślna imitacja"
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr "(O) Imituj strój"
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) imitacja"
+
+#: src/localplayer.cpp:2168
 msgid "Away"
-msgstr ""
+msgstr "AFK"
+
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) przy klawiaturze"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) AFK"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) stan"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr "(G) tryb kamery gry"
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr "(F) wolny tryb kamery"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr "Modyfikatory gry włączone."
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr "Modyfikatory gry wyłączone."
+
+#: src/localplayer.cpp:2230
+msgid "Game modifiers are unknown"
+msgstr "Modyfikatory gry nieznane"
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
-msgstr ""
+msgstr "Podążasz za: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
-msgstr ""
+msgstr "Podążanie anulowane."
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
-msgstr ""
+msgstr "Imitujesz: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
-msgstr ""
+msgstr "Imitacja anulowana"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4113
 msgid "You see "
-msgstr ""
+msgstr "Widzisz "
 
 #: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
-msgstr ""
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [opcje] [manaplus-file]"
 
 #: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr ""
-
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
-msgstr ""
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)"
 
 #: src/main.cpp:50
-msgid "              to the manaplus client."
-msgstr ""
+msgid "                  used to set custom parameters"
+msgstr "                  używane do wprowadzania własnych parametrów"
+
+#: src/main.cpp:51
+msgid "                  to the manaplus client."
+msgstr "                  do klienta manaplus."
 
-#: src/main.cpp:52
+#: src/main.cpp:53
 msgid "Options:"
 msgstr "Opcje:"
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "  -l --log-file       : Log file to use"
-msgstr ""
+msgstr "  -l --log-file       : Używany plik logów"
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr ""
+msgstr "  -L --chat-log-dir   : Używany katalog logów"
 
-#: src/main.cpp:55
+#: src/main.cpp:56
 msgid "  -v --version        : Display the version"
-msgstr ""
+msgstr "  -v --version        : Pokaż wersję"
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "  -h --help           : Display this help"
-msgstr ""
+msgstr "  -h --help           : Pokaż tą pomoc"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
+msgstr "  -C --config-dir     : Katalog konfiguracyjny"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -U --username       : Login with this username"
-msgstr ""
+msgstr "  -U --username       : Zaloguj się tym loginem"
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -P --password       : Login with this password"
-msgstr ""
+msgstr "  -P --password       : Zaloguj się tym hasłem"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -c --character      : Login with this character"
-msgstr ""
+msgstr "  -c --character      : Zaloguj się tą postacią"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -s --server         : Login server name or IP"
-msgstr ""
+msgstr "  -s --server         : Nazwa serwera lub IP"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -p --port           : Login server port"
-msgstr ""
+msgstr "  -p --port           : Port serwera"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "     --update-host    : Use this update host"
-msgstr ""
+msgstr "     --update-host    : Użyj tego serwera aktualizacji"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
+msgstr "  -D --default        : Wybierz domyślny serwer i postać"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
+msgstr "  -u --skip-update    : Omiń aktualizację"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
+msgstr "  -d --data           : Katalog z danymi gry"
 
-#: src/main.cpp:69
+#: src/main.cpp:70
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
+msgstr "  -L --localdata-dir  : Katalog z lokalnymi danymi"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
+msgstr "     --screenshot-dir : Katalog ze zrzutami ekranu"
 
-#: src/main.cpp:72
+#: src/main.cpp:73
 msgid "     --safemode       : Start game in safe mode"
-msgstr ""
+msgstr "     --safemode       : Rozpocznij grę w trybie bezpieczeństwa"
 
-#: src/main.cpp:74
+#: src/main.cpp:75
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr ""
+msgstr "     --no-opengl      : Wyłącz OpenGL w tej sesji"
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4247,143 +4413,127 @@ msgstr "Dziękuję za kupno."
 msgid "Unable to buy."
 msgstr "Nie można kupić."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
-msgstr ""
+msgstr "Siła:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
-msgstr ""
+msgstr "Szybkość:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
-msgstr ""
+msgstr "Witalność:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
-msgstr ""
+msgstr "Inteligencja:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
-msgstr ""
+msgstr "Zręczność:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
-msgstr ""
+msgstr "Szczęście:"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+msgstr "Odmowa wstępu. Prawdopodobnie serwer jest przeciążony."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
-msgstr ""
+msgstr "Nie można użyć tego ID."
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
-msgstr ""
+msgstr "Nieznany błąd serwera postaci."
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
+msgstr "Nie udało się stworzyć postaci. Prawdopodobnie imię jest już zajęte."
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
-msgstr ""
+msgstr "Nieprawidłowe imię."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
-msgstr ""
+msgstr "Nieprawidłowe staty."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
-msgstr ""
+msgstr "Nieprawidłowe włosy."
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
-msgstr ""
+msgstr "Nieprawidłowe miejsce inwentarza."
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
-msgstr ""
+msgstr "Postać skasowana."
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
-msgstr ""
+msgstr "Nie udało się skasować postaci."
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
-msgstr ""
+msgstr "Pokoje nie są obsługiwane!"
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr ""
+msgstr "Szept nie mógł zostać wysłany, %s jest offline."
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr ""
+msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany/a przez %s."
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
-msgstr ""
+msgstr "Gracz MVP."
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
-msgstr ""
+msgstr "Gracz MVP: "
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
+msgstr "Wszystkie szepty ignorowane."
 
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
+msgstr "Nie udało się ignorować wszystkich szeptów."
 
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
+msgstr "Wszystkie szepty odignorowane."
 
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
+msgstr "Nie udało się odignorować wszystkich szeptów."
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
+#: src/net/ea/gamehandler.cpp:87
+#, c-format
+msgid "Online users: %d"
+msgstr "Gracze online: %d"
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
+#: src/net/ea/gamehandler.cpp:99
+msgid "Game"
+msgstr "Gra"
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
+#: src/net/ea/gamehandler.cpp:99
+msgid "Request to quit denied!"
+msgstr "Żądanie wyjścia odrzucone!"
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
@@ -4391,351 +4541,363 @@ msgstr "Gildia została utworzona."
 
 #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr ""
+msgstr "Już jesteś w gildii."
 
 #: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
-msgstr ""
+msgstr "Na tym serwerze nie można utworzyć gildii."
 
 #: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr ""
+msgstr "Nieznana odpowiedź serwera."
 
 #: src/net/ea/guildhandler.cpp:180
 #, c-format
 msgid "Guild name: %s"
-msgstr ""
+msgstr "Nazwa gildii: %s"
 
 #: src/net/ea/guildhandler.cpp:182
 #, c-format
 msgid "Guild master: %s"
-msgstr ""
+msgstr "Przywódca gildii: %s"
 
 #: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
-msgstr ""
+msgstr "Poziom gildii: %d"
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
-msgstr ""
+msgstr "Członkowie online: %d"
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
-msgstr ""
+msgstr "Maksymalna ilość członków: %d"
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
-msgstr ""
+msgstr "Przeciętny poziom: %d"
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
-msgstr ""
+msgstr "Punkty doświadczenie gildii: %d"
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
-msgstr ""
+msgstr "Punkty doświadczenia do następnego poziomu gildii: %d"
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
-msgstr ""
+msgstr "Zamek gildii: %s"
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
-msgstr ""
+msgstr "Nie można zaprosić gracza do gildii."
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
-msgstr ""
+msgstr "Gracz odrzucił zaproszenie do gildii."
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
-msgstr ""
+msgstr "Gracz należy teraz do Twojej gildii."
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
-msgstr ""
+msgstr "Twoja gildia jest pełna."
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
-msgstr ""
+msgstr "Nieznana odpowiedź na zaproszenie do gildii."
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
-msgstr ""
+msgstr "%s opuścił/a Twoją gildię."
 
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:498
 msgid "You was kicked from guild."
-msgstr ""
+msgstr "Zostałeś/aś wyrzucony/a z gildii."
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:511
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr ""
+msgstr "%s wyrzucił/a Cię z gildii."
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr ""
+msgstr "/invite > Zaproś gracza do swojej grupy"
 
 #: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr ""
+msgstr "/leave > Opuść swoją grupę"
 
 #: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr ""
+msgstr "/kick > Wyrzuć kogoś z grupy"
 
 #: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr ""
+msgstr "/item > Pokaż/zmień stan dzielenia się przedmiotami w grupie"
 
 #: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
+"/exp > Pokaż/zmień ustawienia grupy dotyczące dzielenia się punktami "
+"doświadczenia"
 
 #: src/net/ea/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
-msgstr ""
+msgstr "To polecenie zaprasza <nick>  do Twojej drużyny."
 
 #: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr ""
+msgstr "To polecenie sprawia, że gracz opuszcza grupę."
 
 #: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr ""
+msgstr "Polecenie: /item <zasada>"
 
 #: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
-msgstr ""
+msgstr "To polecenie zmienia zasady dzielenia się przedmiotami w grupie."
 
 #: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
+"<zasada> to może być \"1\", \"yes\", \"true\" aby włączyć dzielenie się, lub "
+"\"0\", \"no\", \"false\" aby je wyłączyć."
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
-msgstr ""
+msgstr "Polecenie: /item"
 
 #: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
+"To polecenie pokazuje aktualny stan zasad dzielenia się przedmiotami w "
+"grupie."
 
 #: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr ""
+msgstr "Polecenie: /exp <zasada>"
 
 #: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
+"To polecenie zmienia aktualny stan zasad dzielenia się punktami "
+"doświadczenia w grupie."
 
 #: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
+"<zasada> to może być \"1\", \"yes\", \"true\" żeby włączyć dzielenie się "
+"punktami doświadczenia, \"0\", \"no\", \"false\" żeby je wyłączyć."
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
-msgstr ""
+msgstr "Polecenie: /exp"
 
 #: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
+"To polecenie pokazuje aktualny stan zasad dzielenia się punktami "
+"doświadczenia w grupie."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
-msgstr ""
+msgstr "Włączono dzielenie się przedmiotami."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
-msgstr ""
+msgstr "Wyłączono dzielenie się przedmiotami."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
-msgstr ""
+msgstr "Nie można włączyć dzielenia się przedmiotami."
 
 #: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr ""
+msgstr "Stan dzielenia się przedmiotami nieznany."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
-msgstr ""
+msgstr "Podział doświadczenia włączony."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
-msgstr ""
+msgstr "Podział doświadczenia wyłączony."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr ""
+"Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica "
+"poziomów jest większa niż 10."
 
 #: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr ""
+msgstr "Nieznany stan podziału doświadczenia."
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
-msgstr ""
+msgstr "Nie można użyć przedmiotu."
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
-msgstr ""
+msgstr "Nie można założyć."
 
 #: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr ""
+msgstr "Konto nie znalezione. Prosimy się przelogować."
 
 #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr ""
+msgstr "Stare hasło nieprawidłowe."
 
 #: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr ""
+msgstr "Nowe hasło jest zbyt krótkie."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr ""
+msgstr "Nieznany błąd."
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:203
 msgid "Unregistered ID."
-msgstr ""
+msgstr "Niezarejestrowany ID."
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:206
 msgid "Wrong password."
-msgstr ""
+msgstr "Nieprawidłowe hasło."
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:209
 msgid "Account expired."
-msgstr ""
+msgstr "Ważność konta wygasła."
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:212
 msgid "Rejected from server."
-msgstr ""
+msgstr "Nie przyjęty przez serwer."
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:215
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
+msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów."
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:219
 msgid "Client too old."
-msgstr ""
+msgstr "Klient jest zbyt nieaktualny."
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:222
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
+"Dostałeś/aś tymczasowego bana do %s.\n"
+"Prosimy o kontakt z drużyną GM-ów przez fora."
 
-#: src/net/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:229
 msgid "Server overpopulated."
-msgstr ""
+msgstr "Serwer jest przeciążony."
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:232
 msgid "This user name is already taken."
-msgstr ""
+msgstr "Login jest już w użyciu."
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:238
 msgid "Username permanently erased."
-msgstr ""
+msgstr "Login pernamentnie usunięty."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
-msgstr ""
+msgstr "Nie udało się utworzyć grupy."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
-msgstr ""
+msgstr "Grupa utworzona z powodzeniem."
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
-msgstr ""
+msgstr "%s przyłączył/a się do Twojej drużyny."
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
-msgstr ""
+msgstr "%s już należy do grupy."
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
-msgstr ""
+msgstr "%s odrzucił/a Twoje zaproszenie."
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
-msgstr ""
+msgstr "%s został/a przyłączony/a do grupy."
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
-msgstr ""
+msgstr "%s nie może się przyłączyć, ponieważ grupa jest już pełna."
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr ""
+msgstr "QQQ Nieznana odpowiedź na zaproszenie od %s."
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
-msgstr ""
+msgstr "Opuściłeś/aś grupę."
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
-msgstr ""
+msgstr "%s opuścił/a Twoją grupę."
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr ""
+msgstr "Nieznany członek grupy chciał powiedzieć: %s"
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
-msgstr "Jesteś martwy."
+msgstr "Jesteś martwy/a."
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
-msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
+msgstr "Z ubolewaniem powiadamiamy, iż Twoja postać poległa w bitwie."
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Już nie jesteś taki żywy."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
+msgstr "Skostniałe łapy ponurego żniwiarza sięgają po Twoją duszę."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Koniec gry!"
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:102
 msgid "Insert coin to continue."
-msgstr ""
+msgstr "Wrzuć żeton aby kontynuować."
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4743,380 +4905,385 @@ msgstr ""
 "Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
 "do lepszego miejsca."
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
-"zawiódł."
+"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią gardłem zawiódł."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
-msgstr "Czy chesz zidentyfikować twoje rzeczy?"
+msgstr "Czy chesz zidentyfikować swoje rzeczy?"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
-msgstr "Niestety, ślad po tobie zaginął..."
+msgstr "Niestety, ślad po Tobie zaginął..."
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Unicestwiony."
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Wygląda na to, że podano tobie twoją głowę."
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
+msgstr "Znowu nawaliłeś, wrzuć swoje ciało do ścieku i kup sobie nowe."
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:120
 msgid "You're not dead yet. You're just resting."
-msgstr ""
+msgstr "Jeszcze nie umarłeś. Tylko sobie odpoczywasz."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You are no more."
-msgstr ""
+msgstr "Już Cię nie ma."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You have ceased to be."
-msgstr ""
+msgstr "Twoja marna egzystencja może teraz odejść w zapomnienie."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You've expired and gone to meet your maker."
-msgstr ""
+msgstr "Odeszłeś by spotkać się ze swym stwórcą."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You're a stiff."
-msgstr ""
+msgstr "Jesteś sztywniak."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "Bereft of life, you rest in peace."
-msgstr ""
+msgstr "Pozbawiony życia, spoczywasz w pokoju."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
+msgstr "Gdybyś nie był wirtualny, wąchałbyś kwiatki od spodu."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "Your metabolic processes are now history."
-msgstr ""
+msgstr "Twoje procesy metaboliczne są teraz historią."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "You're off the twig."
-msgstr ""
+msgstr "Wypadłeś z rozgrywki."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You've kicked the bucket."
-msgstr ""
+msgstr "Kopnąłeś w kalendarz."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
+"Zrzuciłeś swą ziemską powłokę, wyniosłeś ducha poza doczesne wymiary i "
+"przyłączyłeś się do chórów anielskich."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:132
 msgid "You are an ex-player."
-msgstr ""
+msgstr "Jesteś eks-graczem."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
-msgstr ""
+msgstr "Kopyrtnąłeś."
 
-#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
+#: src/net/ea/playerhandler.cpp:427
 msgid "Message"
-msgstr ""
+msgstr "Wiadomość"
 
-#: src/net/ea/playerhandler.cpp:337
+#: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
+"Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
 
-#: src/net/ea/playerhandler.cpp:347
+#: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
+"Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać "
+"zdrowie."
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
-msgstr ""
+msgstr "Podniosłeś/aś %s."
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
-msgstr ""
+msgstr "Wydałeś/aś %s."
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "Nie można podnieść poziomu umiejętności!"
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
-msgstr ""
+msgstr "Dodaj strzały do ekwipunku."
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
-msgstr ""
+msgstr "Handel zakończony niepowodzeniem!"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
-msgstr ""
+msgstr "Emotka nieudana!"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
-msgstr ""
+msgstr "Nie można usiąść!"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "Nie można stworzyć czatu!"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
-msgstr ""
+msgstr "Nie udało się dołączyć do grupy!"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
-msgstr ""
+msgstr "Nie można krzyczeć!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Nie masz jeszcze wymaganego poziomu!"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "Zbyt niskie HP!"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "Zbyt niska mana!"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
-msgstr ""
+msgstr "Nie masz notek!"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "Nie możesz tego teraz zrobić!"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
-msgstr ""
+msgstr "Chyba brak Ci kasy... ;-)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "Nie możesz użyć tej umiejętności przy tym rodzaju broni!"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
-msgstr ""
+msgstr "Potrzebujesz innego czerwonego klejnotu!"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "Potrzebujesz innego niebieskiego klejnotu!"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Niesiesz za duży ciężar by to zrobić!"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "Eee? A to to co?"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
-msgstr ""
+msgstr "Nie udało się przeteleportować..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "Nie udało się niczego ukraść..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "Trucizna nie zadziałała..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
-msgstr "%s chce handlować z tobą, zgadzasz się?"
+msgstr "%s chce handlować z Tobą, zgadzasz się?"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr ""
+msgstr "Handel niemożliwy. Partner handlowy jest zbyt daleko."
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr ""
+msgstr "Handel niemożliwy. Postać nie istnieje."
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
-msgstr ""
+msgstr "Handel anulowany z nieznanych powodów."
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
-msgstr ""
+msgstr "Handel: Ty i %s"
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr ""
+msgstr "Handel z %s anulowany."
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
-msgstr ""
+msgstr "Nieobsługiwany pakiet anulowania handlu."
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
+msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz jest przeciążona."
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
+"Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w "
+"inwentarzu."
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
-msgstr ""
+msgstr "Nie można dodać przedmiotu. Tym przedmiotem nie można handlować."
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
-msgstr ""
+msgstr "Nie można dodać przedmiotu z niewiadomych przyczyn."
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "Handel anulowany."
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "Handel zakończony."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
 msgid "Strength"
 msgstr "Siła"
 
 #: src/net/manaserv/attributes.cpp:167
 #, c-format
 msgid "Strength %+.1f"
-msgstr ""
+msgstr "Siła %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
 msgid "Agility"
 msgstr "Zwinność"
 
 #: src/net/manaserv/attributes.cpp:180
 #, c-format
 msgid "Agility %+.1f"
-msgstr ""
+msgstr "Szybkość %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
 msgid "Dexterity"
 msgstr "Zręczność"
 
 #: src/net/manaserv/attributes.cpp:193
 #, c-format
 msgid "Dexterity %+.1f"
-msgstr ""
+msgstr "Zręczność %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
 msgid "Vitality"
 msgstr "Witalność"
 
 #: src/net/manaserv/attributes.cpp:206
 #, c-format
 msgid "Vitality %+.1f"
-msgstr ""
+msgstr "Witalność %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
 msgid "Intelligence"
 msgstr "Inteligencja"
 
 #: src/net/manaserv/attributes.cpp:219
 #, c-format
 msgid "Intelligence %+.1f"
-msgstr ""
+msgstr "Inteligencja %+.1f"
 
 #: src/net/manaserv/attributes.cpp:225
 msgid "Willpower"
-msgstr ""
+msgstr "Siła woli"
 
 #: src/net/manaserv/attributes.cpp:232
 #, c-format
 msgid "Willpower %+.1f"
-msgstr ""
+msgstr "Siła woli %+.1f"
 
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
-msgstr ""
+msgstr "Naciśnij OK aby się zrespawnować."
 
 #: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr ""
+msgstr "Padłeś."
 
 #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr ""
+msgstr "Nie jesteś zalogowany/a."
 
 #: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
-msgstr ""
+msgstr "Nie ma dostępnych miejsc."
 
 #: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
-msgstr ""
+msgstr "Błędna nazwa."
 
 #: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr ""
+msgstr "Imię postaci już wykorzystane."
 
 #: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "Błędna fryzura."
 
 #: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
-msgstr ""
+msgstr "Błędny kolor włosów."
 
 #: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
-msgstr ""
+msgstr "Błędna płeć."
 
 #: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr ""
+msgstr "Staty postaci są zbyt wysokie."
 
 #: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr ""
+msgstr "Staty postaci są zbyt niskie."
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
 msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
+msgstr "Przynajmniej jeden stat jest poza dozwolonym zakresem: (%u - %u)."
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
-msgstr ""
+msgstr "Błędny numer miejsca w inwentarzu."
 
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr ""
+msgstr "Gracz skasowany."
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr ""
+msgstr "Zaznaczenie poza limitami."
 
 #: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
-msgstr ""
+msgstr "Nieznany błąd (%d)."
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -5130,43 +5297,43 @@ msgstr "Temat: %s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr ""
+msgstr "Gracze w tym pokoju:"
 
 #: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr ""
+msgstr "Błąd w przyłączaniu się do pokoju."
 
 #: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr ""
+msgstr "Lista pokojów."
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
-msgstr ""
+msgstr "Koniec listy pokojów."
 
 #: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
-msgstr ""
+msgstr "%s wchodzi do pokoju."
 
 #: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
-msgstr ""
+msgstr "%s opuścił/a pokój."
 
 #: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%s nadał/a tryb %s użytkownikowi %s."
 
 #: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s wyrzucił/a %s."
 
 #: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr ""
+msgstr "Nieznane wydarzenie pokoju."
 
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
@@ -5182,23 +5349,23 @@ msgstr "Członek został pomyślnie wypromowany."
 
 #: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
-msgstr "Promocja Członka nie powiodła się."
+msgstr "Promocja członka nie powiodła się."
 
 #: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr ""
+msgstr "Nieprawidłowy magic_token."
 
 #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
-msgstr ""
+msgstr "Już zalogowano."
 
 #: src/net/manaserv/loginhandler.cpp:99
 msgid "Account banned."
-msgstr ""
+msgstr "Konto zbanowane."
 
 #: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr ""
+msgstr "Nowe hasło nieprawidłowe."
 
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
@@ -5206,52 +5373,54 @@ msgstr "Konto niepołączone. Proszę najpierw się zalogować."
 
 #: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr ""
+msgstr "Nowy adres e-mail nieprawidłowy."
 
 #: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr ""
+msgstr "Stary adres e-mail nieprawidłowy."
 
 #: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr ""
+msgstr "Nowy adres e-mail już zarejestrowany."
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
+"Rejestracja przez program zablokowana. Proszę skontaktować się z "
+"administracją serwera."
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr ""
+msgstr "Wersja klienta jest zbyt stara."
 
 #: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr ""
+msgstr "Nieprawidłowy login lub hasło."
 
 #: src/net/manaserv/loginhandler.cpp:284
 msgid "Account banned"
-msgstr ""
+msgstr "Konto zbanowane."
 
 #: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
+msgstr "Próba zalogowania zbyt wcześnie po poprzedniej próbie."
 
 #: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr ""
+msgstr "Niepoprawny login, hasło lub adres e-mail."
 
 #: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr ""
+msgstr "Login już istnieje."
 
 #: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr ""
+msgstr "Adres e-mail już zarejestrowany."
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+msgstr "Captcha zabrała Ci zbyt wiele czasu, albo została źle rozwiązana."
 
 #: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
@@ -5265,7 +5434,7 @@ msgstr "%s dołączył do grupy."
 #: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
-msgstr ""
+msgstr "%s odrzucił/a Twoje zaproszenie."
 
 #: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
@@ -5298,177 +5467,179 @@ msgstr "Nie można sprzedać."
 
 #: src/net/tmwa/buysellhandler.cpp:140
 msgid "Unable to sell while trading."
-msgstr ""
+msgstr "Nie można sprzedawać podczas handlowania."
 
 #: src/net/tmwa/buysellhandler.cpp:143
 msgid "Unable to sell unsellable item."
-msgstr ""
+msgstr "Nie można sprzedać- niesprzedawalny przedmiot"
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr "Siła %+d"
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr "Zwinność %+d"
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr "Witalność %+d"
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencja %+d"
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Zręczność %+d"
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr "Szczęście %+d"
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
-msgstr ""
+msgstr "Błąd uwierzytelniania."
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
-msgstr ""
+msgstr "Brak dostępnych serwerów."
 
 #: src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
-msgstr ""
+msgstr "Ktoś inny próbuje użyć konta."
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
-msgstr ""
+msgstr "To konto jest już zalogowane."
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
-msgstr ""
+msgstr "Wykryto speed hack."
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
-msgstr ""
+msgstr "Zduplikowany login."
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
-msgstr ""
+msgstr "Nieznany błąd połączenia."
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "Luck"
 msgstr "Szczęście"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Defense"
-msgstr ""
+msgstr "Obrona"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "M.Attack"
-msgstr ""
+msgstr "Atak mag."
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "M.Defense"
-msgstr ""
+msgstr "Obrona mag."
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 #, no-c-format
 msgid "% Accuracy"
-msgstr ""
+msgstr "% celności"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 #, no-c-format
 msgid "% Evade"
-msgstr ""
+msgstr "% uników"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 #, no-c-format
 msgid "% Critical"
-msgstr ""
+msgstr "% ciosów krytycznych"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 msgid "Attack Delay"
-msgstr ""
+msgstr "Opóźnienie ataku"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 msgid "Walk Delay"
-msgstr ""
+msgstr "Opóźnienie poruszania się"
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:283
 msgid "Attack Range"
-msgstr ""
+msgstr "Zasięg ataku"
+
+#: src/net/tmwa/generalhandler.cpp:285
+msgid "Damage per sec."
+msgstr "Obrażenia na sek."
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "Network::connect() otrzymał pusty adres!"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
-msgstr ""
+msgstr "Nie można było odnaleźć serwera."
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
-msgstr ""
+msgstr "Połączenie z serwerem przerwane."
 
 #: src/net/tmwa/partyhandler.cpp:171
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s nie jest w twojej grupie!"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
-msgstr ""
+msgstr "Pisz '...'"
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:481
 msgid "Blink name"
-msgstr ""
+msgstr "Mruganie nicka"
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
-msgstr ""
+msgstr "Bąbelek \"...\" nad głową"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
-msgstr ""
+msgstr "Bąbelek nad głową"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "nienazwany"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "Attack %+d"
 msgstr "Atak %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrona %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
-
-
diff --git a/po/pt.po b/po/pt.po
index 91a041ad2..53fe4bd7f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
@@ -732,7 +732,7 @@ msgstr "arco-íris 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2386,74 +2386,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr "Fonte Segura"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr "Font Jasponesa"
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -3245,23 +3249,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4c7d2cbd6..b7803f16a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
@@ -734,7 +734,7 @@ msgstr "arco-íris 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2388,74 +2388,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr "Fonte segura"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr "Font Japonesa"
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -3247,23 +3251,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
diff --git a/po/ru.po b/po/ru.po
index b2c77759f..dc3c6b857 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-20 17:44+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -740,7 +740,7 @@ msgstr "радуга 3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2401,74 +2401,79 @@ msgid "Indonesian"
 msgstr "Индонезийский"
 
 #: src/gui/setup_theme.cpp:153
+#, fuzzy
+msgid "Polish"
+msgstr "Английский"
+
+#: src/gui/setup_theme.cpp:154
 msgid "Japanese"
 msgstr "Японский"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:155
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Голландский (Бельгийский / Фламандский)"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:156
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:157
 msgid "Portuguese (Brazilian)"
 msgstr "Португальский (Бразильский)"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:158
 msgid "Russian"
 msgstr "Русский"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr "Испанский (Кастильский)"
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Тема"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "Тема интерфейса"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr "Язык"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Основной шрифт"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Жирный шрифт"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "Шрифт частиц"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "Шрифт помощи"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr "Безопасный шрифт"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr "Японский шрифт"
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
@@ -3263,23 +3268,23 @@ msgstr "Бордюр домашней позиции"
 msgid "Road Point"
 msgstr "Точка дороги"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "Обновить"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 519462407..f06a31d1f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"POT-Creation-Date: 2011-11-29 18:31+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
@@ -724,7 +724,7 @@ msgstr "彩虹3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -2375,74 +2375,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "主题"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "桂主题"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "主要字体"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "加粗字体"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "粒子字体"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "帮助字体"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr "安全字体"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr "日文字体"
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "字体大小"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
@@ -3229,23 +3233,23 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
+#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:110
 msgid "Update"
 msgstr "更新"
 
-#: src/gui/whoisonline.cpp:307
+#: src/gui/whoisonline.cpp:309
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:508
+#: src/gui/whoisonline.cpp:517
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:540
+#: src/gui/whoisonline.cpp:549
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index 3b1c1d932..67936f698 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -138,7 +138,7 @@ struct Language
     std::string value;
 };
 
-const int langs_count = 14;
+const int langs_count = 15;
 
 const Language LANG_NAME[langs_count] =
 {
@@ -150,6 +150,7 @@ const Language LANG_NAME[langs_count] =
     {N_("French"), "fr_FR"},
     {N_("German"), "de_DE"},
     {N_("Indonesian"), "id_ID"},
+    {N_("Polish"), "pl_PL"},
     {N_("Japanese"), "ja_JP.utf8"},
     {N_("Dutch (Belgium/Flemish)"), "nl_BE"},
     {N_("Portuguese"), "pt_PT"},
author	Andrei Karas <akaras@inbox.ru>	2011-11-29 18:34:59 +0300
committer	Andrei Karas <akaras@inbox.ru>	2011-11-29 18:42:06 +0300
commit	8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0 (patch)
tree	df777b660d244edd3d45cd90010a1e31e57f3fc9
parent	a7f59172b83910f9e2dc17c116f70530f46cf6a1 (diff)
download	manaplus-8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0.tar.gz manaplus-8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0.tar.bz2 manaplus-8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0.tar.xz manaplus-8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0.zip