Update and rebuild translations.

author: Andrei Karas <akaras@inbox.ru> 2012-02-18 17:19:50 +0300
committer: Andrei Karas <akaras@inbox.ru> 2012-02-18 17:19:50 +0300
commit: 33236f6f6de32b2d0b3aa4ca6181d6a266929f88 (patch)
tree: 23210ea8c43587172df0e39076f27cee2d0ee2f9 /po/hr.po
parent: c15376cf6d12abedb323da4f0c8ffa074ec7c05e (diff)
download: mv-33236f6f6de32b2d0b3aa4ca6181d6a266929f88.tar.gz
mv-33236f6f6de32b2d0b3aa4ca6181d6a266929f88.tar.bz2
mv-33236f6f6de32b2d0b3aa4ca6181d6a266929f88.tar.xz
mv-33236f6f6de32b2d0b3aa4ca6181d6a266929f88.zip
1 files changed, 1239 insertions, 1174 deletions
diff --git a/po/hr.po b/po/hr.po
index 102b0e2fa..d0f8ae86a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,255 +1,261 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-16 23:43+0300\n"
+"PO-Revision-Date: 2012-02-16 20:57+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: src/actorspritemanager.cpp:1171
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1540 src/gui/whoisonline.cpp:760
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1545 src/gui/whoisonline.cpp:765
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:972 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Slika"
 
-#: src/client.cpp:852
+#: src/client.cpp:977
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:934
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:965
+#: src/client.cpp:1091
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1098
+#: src/client.cpp:1226
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1129
+#: src/client.cpp:1261
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1139
+#: src/client.cpp:1271
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: 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:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1198
+#: src/client.cpp:1330
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1224
+#: src/client.cpp:1356
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1225
+#: src/client.cpp:1357
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1244
+#: src/client.cpp:1376
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1245
+#: src/client.cpp:1377
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1265
+#: src/client.cpp:1397
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1266
+#: src/client.cpp:1398
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651
+#: src/client.cpp:2082 src/client.cpp:2089
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1641
+#: src/client.cpp:1789
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1823 src/client.cpp:1829
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1702
+#: src/client.cpp:1850
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Nepoznata naredba."
 
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan šapate!"
 
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
-"vi."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to vi."
 
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -257,7 +263,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -265,7 +271,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -273,7 +279,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -281,7 +287,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -289,72 +295,72 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:572
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1322
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1732
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1733
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -379,42 +385,42 @@ msgstr ""
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:266
+#: src/gui/botcheckerwindow.cpp:267
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Ime"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Napad"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Govori"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:301
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Poništi"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Kupi"
 
@@ -425,36 +431,35 @@ msgid "Price: %s / Total: %s"
 msgstr "Cijena: %s / Ukupno: %s"
 
 #: src/gui/buydialog.cpp:103
-#, fuzzy
 msgid "Amount:"
-msgstr "Korisnički račun: %s"
+msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: 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:977
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 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: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:989
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
 #: 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/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Izlaz"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Max"
 
@@ -463,29 +468,29 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Trgovina"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Prodaj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
-#: 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/updaterwindow.cpp:161
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -517,11 +522,11 @@ msgid "The email address entries mismatch."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Promijeni Lozinku"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Lozinka"
@@ -548,68 +553,73 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Stvori Lika"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Ime:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Stvori"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Muško"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Žensko"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Molimo, rasporedi %d bodova"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ime mora imati barem 4 znaka."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Podaci lika su u redu"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
@@ -626,125 +636,126 @@ msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 msgid "Account and Character Management"
 msgstr "Upravljanje Računom i Likovima"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Odjavi"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225
+#: 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 "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -757,11 +768,13 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
@@ -841,121 +854,158 @@ msgstr ""
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "U redu"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Pomoć"
 
 #: src/gui/inventorywindow.cpp:71
-#, fuzzy
 msgid "by name"
-msgstr "Vidljiva imena"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:73
-#, fuzzy
 msgid "by weight"
-msgstr "Težina:"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
@@ -979,31 +1029,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Upotrijebi"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Razdvoji"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
@@ -1012,54 +1062,54 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Ispusti"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Sve"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Odaberite količinu predmeta za spremanje."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Odaberite iznos predmeta za preuzimanje."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Odaberi količinu predmeta za razdvajanje."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
@@ -1166,44 +1216,43 @@ msgstr ""
 msgid "You have left the guild."
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr ""
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr ""
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Poslužitelj:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
@@ -1247,31 +1296,27 @@ msgstr ""
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Čekanje servera"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Slijedeći"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Dostavi"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Za:"
@@ -1284,12 +1329,13 @@ msgstr "Pošalji"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1302,331 +1348,355 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trgovanje"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Igrači"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:538
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
@@ -1670,64 +1740,58 @@ msgstr "Lozinka mora biti kraća od %d znakova."
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Dodaj"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:544
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:546
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1939,29 +2003,33 @@ msgstr "Primjeni"
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
-#: 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 "Pritisnite tipku za početak kalibracije"
 
-#: 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 "Kalibriraj"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Igraća palica"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Kružite palicom"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2144,22 +2212,22 @@ msgid "Enable bot checker"
 msgstr ""
 
 #: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
 msgid "Show background"
 msgstr ""
 
@@ -2211,10 +2279,6 @@ msgstr ""
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Igrači"
-
 #: src/gui/setup_players.cpp:54
 msgid "Show gender"
 msgstr ""
@@ -2259,120 +2323,188 @@ msgstr ""
 msgid "Allow self heal with mouse click"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:87
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Odnos"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutralno"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Prijatelj"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Zanemareno"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorirano"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Dozvoli trgovanje"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Dozvoli šapate"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+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:191
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:194
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Veličina fonta"
 
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
+#: src/gui/setup_video.cpp:641
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
@@ -2424,148 +2556,151 @@ msgstr "srednje"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:291
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:293
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:295
 msgid "Show pickup notification"
 msgstr "Prikaži obavijesti o prikupljanju."
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:297
 msgid "in chat"
 msgstr "u chat-u"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:299
 msgid "as particle"
 msgstr "kao čestica"
 
+#: src/gui/setup_video.cpp:301
+msgid "Enable resize"
+msgstr ""
+
 #: src/gui/setup_video.cpp:302
+msgid "No frame"
+msgstr ""
+
+#: src/gui/setup_video.cpp:306
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
+#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:325
 msgid "Overhead text"
 msgstr "Tekst iznad glave"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:326
 msgid "Gui opacity"
 msgstr "Prozirnost sučelja"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:327
 msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:328
 msgid "Particle detail"
 msgstr ""
 
-#: 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:708
+#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
+#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
+#: src/gui/setup_video.cpp:728
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:494
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:500
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:511
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:512
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:524
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:525
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:618
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:619
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:638
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:674
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:675
 msgid "Changes will take effect on map change."
 msgstr "Promjene će stupiti na snagu na promjeni karte."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -2583,6 +2718,14 @@ msgstr "Gore"
 msgid "Skill points available: %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2593,6 +2736,11 @@ msgstr ""
 msgid "Skill %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2603,194 +2751,204 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Ceh"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Partija"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2798,425 +2956,54 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: 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 "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:294
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:302
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:306
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:310
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:314
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:318
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:337
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:354
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:358
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:362
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:380
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:384
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:388
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:392
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:396
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:400
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:404
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:408
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:417
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:421
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:425
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:429
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:433
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:437
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:441
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:469
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:473
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:482
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:486
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:490
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:499
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:502
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:513
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:517
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:521
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:537
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Zadatak: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Zadatak:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:657
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:691
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:697
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:700
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:719
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:722
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:725
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:739
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:771
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:807
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:824
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:830
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:836
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
-msgid "(O)"
-msgstr ""
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr ""
@@ -3343,7 +3130,8 @@ msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3351,33 +3139,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Ažuriranje"
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Igraj"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Vrlo je preporučljivo da"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Dovršeno"
 
@@ -3529,23 +3317,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:104
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:198
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:632
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:671
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3613,8 +3401,7 @@ msgstr "Ova naredba čini <nadimak> operatorom kanala."
 #: 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 ""
-"Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
+msgstr "Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
@@ -3685,10 +3472,6 @@ msgstr ""
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3722,7 +3505,8 @@ msgid "Command: /unignore <player>"
 msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -3922,9 +3706,8 @@ msgid "Select OK"
 msgstr "Odaberite OK"
 
 #: src/keyboardconfig.cpp:85
-#, fuzzy
 msgid "Shortcuts Keys"
-msgstr "Prečac do Predmeta %d"
+msgstr ""
 
 #: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
@@ -3940,7 +3723,7 @@ msgstr ""
 #: 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:369
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Prečac do Predmeta %d"
@@ -4067,181 +3850,186 @@ msgstr "Smajlić"
 #: 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:364
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Prečica za Ispoljavanje emocija %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
-#, fuzzy
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
-msgstr "Chat"
+msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Pomakni Chat Gore"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Pomakni Chat Dolje"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Prethodna Chat Kartica"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:337
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4249,40 +4037,41 @@ msgid ""
 msgstr ""
 
 #: src/localplayer.cpp:381
-msgid "You were killed by "
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4290,119 +4079,396 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:1714
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1906
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1933
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1938
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1942
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1956
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1983
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2030
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2084
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2104
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2128
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2152
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2175
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:2224
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2225
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2226 src/localplayer.cpp:2241
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2239
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2240
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2265
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2266
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:4152
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opcije:"
 
-#: src/main.cpp:54
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4418,71 +4484,75 @@ msgstr "Hvala za kupnju."
 msgid "Unable to buy."
 msgstr "Ne može se kupiti"
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: 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 ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: 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 ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4512,35 +4582,31 @@ msgid "MVP player: "
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:370
-#, fuzzy
 msgid "All whispers ignored."
-msgstr "Dozvoli šapate"
+msgstr ""
 
 #: src/net/ea/chathandler.cpp:374
-#, fuzzy
 msgid "All whispers ignore failed."
-msgstr "Stavi sve šapate u kartice"
+msgstr ""
 
 #: src/net/ea/chathandler.cpp:385
-#, fuzzy
 msgid "All whispers unignored."
-msgstr "Dozvoli šapate"
+msgstr ""
 
 #: src/net/ea/chathandler.cpp:389
-#, fuzzy
 msgid "All whispers unignore failed."
-msgstr "Stavi sve šapate u kartice"
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -4630,11 +4696,11 @@ msgstr ""
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
@@ -4711,15 +4777,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4727,15 +4793,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4751,66 +4817,66 @@ msgstr ""
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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 ""
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
@@ -4852,166 +4918,165 @@ msgstr ""
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Vi ste mrtvi."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Žao nam je obavijestiti vas da je vaš lik je bio ubijen u borbi."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Niste više tako živi."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Kraj Igre!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
-msgstr ""
-"Ne, djeco. Vaš lik zapravo nije umro. On... err... je otišao na bolje mjesto."
+msgstr "Ne, djeco. Vaš lik zapravo nije umro. On... err... je otišao na bolje mjesto."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Predpostavljam da ovo nije išlo previše dobro."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Želite li svoju imovinu identificirati?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Nažalost, ni traga od vas nije nikada pronađeno ..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Uništen."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Izgleda da su vam predali vašu glavu."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Uprskali ste opet, odbacite svoje tijelo u kanalizaciju i nabavite novo."
+msgstr "Uprskali ste opet, odbacite svoje tijelo u kanalizaciju i nabavite novo."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 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 ""
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:453
+#: src/net/ea/playerhandler.cpp:454
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:460
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:505
+#: src/net/ea/playerhandler.cpp:506
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:623
+#: src/net/ea/playerhandler.cpp:624
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5100,57 +5165,57 @@ msgstr ""
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s želi trgovati s vama, prihvaćate li?"
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "Otkazano trgovanje."
 
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "Trgovanje je završeno."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Snaga"
 
@@ -5159,7 +5224,7 @@ msgstr "Snaga"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Okretnost"
 
@@ -5168,7 +5233,7 @@ msgstr "Okretnost"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Spretnost"
 
@@ -5177,7 +5242,7 @@ msgstr "Spretnost"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitalnost"
 
@@ -5186,7 +5251,7 @@ msgstr "Vitalnost"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Inteligencija"
 
@@ -5518,62 +5583,62 @@ msgstr ""
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Sreća"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
@@ -5582,47 +5647,47 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%s nije u vašoj partiji!"
 
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "neimenovano"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Napad %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrana %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "Zdravlje %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "Mana %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Nepoznati predmet"
author	Andrei Karas <akaras@inbox.ru>	2012-02-18 17:19:50 +0300
committer	Andrei Karas <akaras@inbox.ru>	2012-02-18 17:19:50 +0300
commit	33236f6f6de32b2d0b3aa4ca6181d6a266929f88 (patch)
tree	23210ea8c43587172df0e39076f27cee2d0ee2f9 /po/hr.po
parent	c15376cf6d12abedb323da4f0c8ffa074ec7c05e (diff)
download	mv-33236f6f6de32b2d0b3aa4ca6181d6a266929f88.tar.gz mv-33236f6f6de32b2d0b3aa4ca6181d6a266929f88.tar.bz2 mv-33236f6f6de32b2d0b3aa4ca6181d6a266929f88.tar.xz mv-33236f6f6de32b2d0b3aa4ca6181d6a266929f88.zip