update translations.

1 files changed, 3091 insertions, 2890 deletions

diff --git a/po/hr.po b/po/hr.po
index ec5300717..05358f780 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-09-19 12:56+0300\n"
-"PO-Revision-Date: 2013-09-20 08:56+0000\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
+"PO-Revision-Date: 2013-10-26 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,87 +19,87 @@ msgstr ""
 "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"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:855
+#: src/actionmanager.cpp:857
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:865
+#: src/actionmanager.cpp:867
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
 #. TRANSLATORS: visible beings on map
-#: src/actorspritemanager.cpp:1248
+#: src/actormanager.cpp:1249
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:290
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:498
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:498
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1740 src/gui/whoisonline.cpp:843
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1745 src/gui/whoisonline.cpp:848
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:387
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1365
+#: src/being/localplayer.cpp:1372
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1369
+#: src/being/localplayer.cpp:1376
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1373
+#: src/being/localplayer.cpp:1380
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:1384
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:1388
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:1392
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:1396
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1413
+#: src/being/localplayer.cpp:1420
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,395 +108,398 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1618 src/being/localplayer.cpp:1653
-#: src/being/localplayer.cpp:1654
+#: src/being/localplayer.cpp:1625 src/being/localplayer.cpp:1660
+#: src/being/localplayer.cpp:1661
 msgid "xp"
 msgstr ""
 
-#: src/being/localplayer.cpp:1659 src/being/localplayer.cpp:1666
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1666 src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1680
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1857
+#: src/being/localplayer.cpp:1865
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1859
+#: src/being/localplayer.cpp:1867
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1861
+#: src/being/localplayer.cpp:1869
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1863
+#: src/being/localplayer.cpp:1871
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1865
+#: src/being/localplayer.cpp:1873
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1867
+#: src/being/localplayer.cpp:1875
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1890
+#: src/being/localplayer.cpp:1898
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1896
+#: src/being/localplayer.cpp:1904
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1901
+#: src/being/localplayer.cpp:1909
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1916
+#: src/being/localplayer.cpp:1924
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1918
+#: src/being/localplayer.cpp:1926
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1920
+#: src/being/localplayer.cpp:1928
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1922
+#: src/being/localplayer.cpp:1930
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1924
+#: src/being/localplayer.cpp:1932
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1926
+#: src/being/localplayer.cpp:1934
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1928
+#: src/being/localplayer.cpp:1936
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1938
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1940
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1942
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1954
+#: src/being/localplayer.cpp:1962
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1956
+#: src/being/localplayer.cpp:1964
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1958
+#: src/being/localplayer.cpp:1966
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1960
+#: src/being/localplayer.cpp:1968
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1962
+#: src/being/localplayer.cpp:1970
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1982 src/being/localplayer.cpp:1990
-#: src/being/localplayer.cpp:2018
+#: src/being/localplayer.cpp:1990 src/being/localplayer.cpp:1998
+#: src/being/localplayer.cpp:2026
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1984 src/being/localplayer.cpp:2010
+#: src/being/localplayer.cpp:1992 src/being/localplayer.cpp:2018
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1986
+#: src/being/localplayer.cpp:1994
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1988
+#: src/being/localplayer.cpp:1996
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2012
+#: src/being/localplayer.cpp:2020
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2014
+#: src/being/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2016
+#: src/being/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2070
+#: src/being/localplayer.cpp:2078
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2072
+#: src/being/localplayer.cpp:2080
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2074
+#: src/being/localplayer.cpp:2082
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2076
+#: src/being/localplayer.cpp:2084
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2078
+#: src/being/localplayer.cpp:2086
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2080
+#: src/being/localplayer.cpp:2088
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2082
+#: src/being/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:2106
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2100
+#: src/being/localplayer.cpp:2108
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2102
+#: src/being/localplayer.cpp:2110
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2104
+#: src/being/localplayer.cpp:2112
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2106
+#: src/being/localplayer.cpp:2114
 msgid "(e) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2108
+#: src/being/localplayer.cpp:2116
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2128
+#: src/being/localplayer.cpp:2136
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2130
+#: src/being/localplayer.cpp:2138
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2132
+#: src/being/localplayer.cpp:2140
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2134
+#: src/being/localplayer.cpp:2142
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2136
+#: src/being/localplayer.cpp:2144
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2138
+#: src/being/localplayer.cpp:2146
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2158
+#: src/being/localplayer.cpp:2166
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2160
+#: src/being/localplayer.cpp:2168
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2162
+#: src/being/localplayer.cpp:2170
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2164
+#: src/being/localplayer.cpp:2172
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2166
+#: src/being/localplayer.cpp:2174
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2194
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2188
+#: src/being/localplayer.cpp:2196
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2190
+#: src/being/localplayer.cpp:2198
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2219
+#: src/being/localplayer.cpp:2227
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2242
+#: src/being/localplayer.cpp:2250
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2244
+#: src/being/localplayer.cpp:2252
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2246 src/being/localplayer.cpp:2264
+#: src/being/localplayer.cpp:2254 src/being/localplayer.cpp:2272
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260
+#: src/being/localplayer.cpp:2268
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2262
+#: src/being/localplayer.cpp:2270
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2289
+#: src/being/localplayer.cpp:2297
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2291
+#: src/being/localplayer.cpp:2299
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2293
+#: src/being/localplayer.cpp:2301
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3832
+#: src/being/localplayer.cpp:3860
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3838 src/being/localplayer.cpp:3863
+#: src/being/localplayer.cpp:3866 src/being/localplayer.cpp:3891
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3848
+#: src/being/localplayer.cpp:3876
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3854 src/being/localplayer.cpp:3868
+#: src/being/localplayer.cpp:3882 src/being/localplayer.cpp:3896
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4211
+#: src/being/localplayer.cpp:4239
 #, c-format
 msgid "You see %s"
 msgstr ""
 
 #. TRANSLATORS: ignore/unignore action
 #. TRANSLATORS: popup menu item
-#: src/being/playerrelations.cpp:466 src/gui/popupmenu.cpp:2397
-#: src/gui/popupmenu.cpp:2428
+#. TRANSLATORS: add player to completle ignore list
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add player to ignore list
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2567
 msgid "Completely ignore"
 msgstr ""
 
@@ -521,71 +524,80 @@ msgid "Floating bubble"
 msgstr ""
 
 #. TRANSLATORS: setup tab quick button
-#. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1170 src/gui/setup.cpp:57 src/gui/windowmenu.cpp:162
+#. TRANSLATORS: setup window name
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1174 src/gui/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1177 src/gui/setup_video.cpp:219
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Slika"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1180 src/gui/setup_theme.cpp:280
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr ""
 
+#. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: help window name
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
+#: src/gui/windows/helpwindow.cpp:50
+msgid "Help"
+msgstr "Pomoć"
+
 #. TRANSLATORS: close quick button
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close chat tab
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
 #. TRANSLATORS: npc dialog button
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1184 src/gui/didyouknowwindow.cpp:77
-#: src/gui/inventorywindow.cpp:238 src/gui/npcdialog.cpp:69
-#: src/gui/npcdialog.cpp:106 src/gui/popupmenu.cpp:563
-#: src/gui/questswindow.cpp:135 src/gui/shopwindow.cpp:77
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
+#: src/gui/windows/didyouknowwindow.cpp:78
+#: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
+#: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1345
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1384
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1505
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1544
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1557
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr ""
 
@@ -600,75 +612,78 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1614 src/client.cpp:1625 src/client.cpp:1801
-#: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:358 src/gui/charselectdialog.cpp:292
-#: src/gui/editserverdialog.cpp:214 src/gui/registerdialog.cpp:255
-#: src/gui/unregisterdialog.cpp:142 src/net/ea/charserverhandler.cpp:201
-#: src/net/ea/charserverhandler.cpp:225
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
+#: src/gui/windows/charcreatedialog.cpp:357
+#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:259
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:225
 msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1638
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1675
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1677
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1698
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1700
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1722
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1724
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1986 src/client.cpp:2001 src/client.cpp:2044
-#: src/client.cpp:2060 src/client.cpp:2501 src/client.cpp:2509
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2201
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2242 src/client.cpp:2249
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2271 src/client.cpp:2284
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:3069
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -681,8 +696,8 @@ msgstr "Nepoznata naredba."
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: unignore command
 #. TRANSLATORS: erase command
-#: src/commands.cpp:149 src/commands.cpp:444 src/commands.cpp:531
-#: src/commands.cpp:585
+#: src/commands.cpp:150 src/commands.cpp:443 src/commands.cpp:530
+#: src/commands.cpp:584
 msgid "Please specify a name."
 msgstr ""
 
@@ -705,12 +720,12 @@ msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/commands.cpp:348
+#: src/commands.cpp:347
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan šapate!"
 
 #. TRANSLATORS: new whisper query
-#: src/commands.cpp:366
+#: src/commands.cpp:365
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -719,167 +734,167 @@ msgstr "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili s
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:385 src/commands.cpp:396
+#: src/commands.cpp:384 src/commands.cpp:395
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/commands.cpp:408 src/net/ea/gui/partytab.cpp:152
+#: src/commands.cpp:407 src/net/ea/gui/partytab.cpp:152
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
 #. TRANSLATORS: create guild message
-#: src/commands.cpp:424
+#: src/commands.cpp:423
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commands.cpp:461
+#: src/commands.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commands.cpp:461
+#: src/commands.cpp:460
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:472
+#: src/commands.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:481
+#: src/commands.cpp:480
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
 #. TRANSLATORS: adding friend command
-#: src/commands.cpp:509
+#: src/commands.cpp:508
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/commands.cpp:515
+#: src/commands.cpp:514
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/commands.cpp:521
+#: src/commands.cpp:520
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/commands.cpp:546
+#: src/commands.cpp:545
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/commands.cpp:556
+#: src/commands.cpp:555
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/commands.cpp:561
+#: src/commands.cpp:560
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/commands.cpp:569
+#: src/commands.cpp:568
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/commands.cpp:575
+#: src/commands.cpp:574
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/commands.cpp:595
+#: src/commands.cpp:594
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/commands.cpp:609
+#: src/commands.cpp:608
 msgid "Player successfully erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/commands.cpp:614
+#: src/commands.cpp:613
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/commands.cpp:896 src/commands.cpp:952
+#: src/commands.cpp:895 src/commands.cpp:951
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/commands.cpp:907
+#: src/commands.cpp:906
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/commands.cpp:907
+#: src/commands.cpp:906
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/commands.cpp:918
+#: src/commands.cpp:917
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/commands.cpp:918
+#: src/commands.cpp:917
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:927
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/commands.cpp:928
+#: src/commands.cpp:927
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:937
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/commands.cpp:938
+#: src/commands.cpp:937
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:947
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/commands.cpp:948
+#: src/commands.cpp:947
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/commands.cpp:1106
+#: src/commands.cpp:1105
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1343 src/commands.cpp:1352
+#: src/commands.cpp:1360 src/commands.cpp:1369
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/commands.cpp:1346 src/commands.cpp:1355
+#: src/commands.cpp:1363 src/commands.cpp:1372
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -890,2099 +905,837 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:257 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:272 src/gui/widgets/tabs/chattab.cpp:469
 msgid "General"
 msgstr "Općenito"
 
 #. TRANSLATORS: chat tab header
-#. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:273 src/gui/debugwindow.cpp:50 src/gui/widgets/chattab.cpp:467
-#: src/gui/windowmenu.cpp:149
+#. TRANSLATORS: debug window name
+#: src/game.cpp:288 src/gui/widgets/tabs/chattab.cpp:471
+#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:51
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:539
+#: src/game.cpp:553
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:549
+#: src/game.cpp:563
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:621
+#: src/game.cpp:635
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:624
+#: src/game.cpp:638
 msgid "Network Error"
 msgstr "Mreža Greška"
 
 #. TRANSLATORS: being popup label
-#: src/gui/beingpopup.cpp:130
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/beingpopup.cpp:145
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/beingpopup.cpp:159
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/beingpopup.cpp:171
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:262
-msgid "Bot Checker"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:189
+#, c-format
+msgid "Weight: %s"
 msgstr ""
 
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:271 src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "Poništi"
-
-#. TRANSLATORS: bot checker window table header
-#. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:298 src/gui/setup_relations.cpp:58
-msgid "Name"
-msgstr "Ime"
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: trade with player
+#. TRANSLATORS: trade chat tab name
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/widgets/tabs/tradetab.cpp:33
+msgid "Trade"
+msgstr "Trgovanje"
 
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: trade attack player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: attack monster
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
+#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:628
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:250
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/windows/botcheckerwindow.cpp:300
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:285
 msgid "Attack"
 msgstr "Napad"
 
-#. TRANSLATORS: bot checker window table header
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:302 src/gui/popupmenu.cpp:220
-#: src/gui/setupactiondata.h:93
-msgid "Talk"
-msgstr "Govori"
-
-#. TRANSLATORS: bot checker window table header
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:304 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:637
-#: src/gui/popupmenu.cpp:712 src/gui/setupactiondata.h:1856
-msgid "Move"
-msgstr ""
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:306
-msgid "Result"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/buydialog.cpp:56
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/buydialog.cpp:58
-msgid "by price"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/buydialog.cpp:60 src/gui/inventorywindow.cpp:71
-msgid "by name"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/buydialog.cpp:62 src/gui/inventorywindow.cpp:73
-msgid "by id"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/buydialog.cpp:64 src/gui/inventorywindow.cpp:75
-msgid "by weight"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/buydialog.cpp:66 src/gui/inventorywindow.cpp:77
-msgid "by amount"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#. TRANSLATORS: inventory sort mode
-#: src/gui/buydialog.cpp:68 src/gui/inventorywindow.cpp:79
-msgid "by type"
-msgstr ""
-
-#. TRANSLATORS: buy dialog name
-#: src/gui/buydialog.cpp:194
-msgid "Create items"
-msgstr ""
-
-#. TRANSLATORS: buy dialog name
-#. TRANSLATORS: shop window button
 #. TRANSLATORS: popup menu item
-#: src/gui/buydialog.cpp:206 src/gui/buydialog.cpp:218
-#: src/gui/buydialog.cpp:271 src/gui/buyselldialog.cpp:67
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:2454
-msgid "Buy"
-msgstr "Kupi"
-
-#. TRANSLATORS: buy dialog label
-#. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:98 src/gui/selldialog.cpp:363
-#, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Cijena: %s / Ukupno: %s"
-
-#. TRANSLATORS: buy dialog label
-#: src/gui/buydialog.cpp:260
-msgid "Amount:"
-msgstr ""
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:203
-#: src/gui/itemamountwindow.cpp:238 src/gui/npcdialog.cpp:99
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:795
-msgid "+"
-msgstr ""
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:201
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:101
-#: src/gui/selldialog.cpp:104 src/gui/statuswindow.cpp:808
-msgid "-"
+#. TRANSLATORS: send whisper to player
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+msgid "Whisper"
 msgstr ""
 
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
-#: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:117
-#: src/gui/charselectdialog.cpp:585 src/gui/socialwindow.cpp:1285
-msgid "Create"
-msgstr "Stvori"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: quit dialog name
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:51
-#: src/gui/quitdialog.cpp:56 src/gui/quitdialog.cpp:58
-#: src/gui/selldialog.cpp:108 src/gui/serverdialog.cpp:254
-#: src/gui/setupactiondata.h:177
-msgid "Quit"
-msgstr "Izlaz"
-
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:110
-#: src/gui/statuswindow.cpp:536 src/gui/statuswindow.cpp:591
-#: src/gui/statuswindow.cpp:792 src/gui/statuswindow.cpp:826
-msgid "Max"
-msgstr "Max"
-
-#. TRANSLATORS: shop window name
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: settings group
-#. TRANSLATORS: full button name
-#: src/gui/buyselldialog.cpp:39 src/gui/buyselldialog.cpp:50
-#: src/gui/inventorywindow.cpp:209 src/gui/setup_other.cpp:246
-#: src/gui/windowmenu.cpp:141
-msgid "Shop"
-msgstr "Trgovina"
-
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: sell dialog name
-#. TRANSLATORS: sell dialog button
-#: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:224
-#: src/gui/popupmenu.cpp:2456 src/gui/selldialog.cpp:55
-#: src/gui/selldialog.cpp:65 src/gui/selldialog.cpp:106
-msgid "Sell"
-msgstr "Prodaj"
-
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: button in npc post dialog
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: input action name
-#. TRANSLATORS: setup button
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: unregister dialog. button.
-#. TRANSLATORS: updater window button
-#: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:119
-#: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:64
-#: src/gui/popupmenu.cpp:279 src/gui/popupmenu.cpp:313
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:445
-#: src/gui/popupmenu.cpp:476 src/gui/popupmenu.cpp:503
-#: src/gui/popupmenu.cpp:521 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:722 src/gui/popupmenu.cpp:749
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1911
-#: src/gui/popupmenu.cpp:1958 src/gui/popupmenu.cpp:1997
-#: src/gui/popupmenu.cpp:2037 src/gui/popupmenu.cpp:2103
-#: src/gui/popupmenu.cpp:2175 src/gui/popupmenu.cpp:2206
-#: src/gui/popupmenu.cpp:2230 src/gui/popupmenu.cpp:2249
-#: src/gui/popupmenu.cpp:2269 src/gui/popupmenu.cpp:2295
-#: src/gui/popupmenu.cpp:2310 src/gui/popupmenu.cpp:2544
-#: src/gui/popupmenu.cpp:2664 src/gui/quitdialog.cpp:69
-#: src/gui/registerdialog.cpp:76 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1219
-#: src/gui/textcommandeditor.cpp:201 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:54 src/gui/updaterwindow.cpp:179
-msgid "Cancel"
-msgstr "Poništi"
-
-#. TRANSLATORS: change email dialog header
-#. TRANSLATORS: button in change email dialog
-#: src/gui/changeemaildialog.cpp:47 src/gui/changeemaildialog.cpp:52
-msgid "Change Email Address"
-msgstr "Promijeni Email Adresu"
-
-#. TRANSLATORS: label in change email dialog
-#. TRANSLATORS: change password dialog label
-#: src/gui/changeemaildialog.cpp:60 src/gui/changepassworddialog.cpp:63
-#, c-format
-msgid "Account: %s"
-msgstr "Korisnički račun: %s"
-
-#. TRANSLATORS: label in change email dialog
-#: src/gui/changeemaildialog.cpp:64
-msgid "Type new email address twice:"
-msgstr ""
-
-#. TRANSLATORS: change email error
-#: src/gui/changeemaildialog.cpp:140
-#, c-format
-msgid "The new email address needs to be at least %u characters long."
-msgstr ""
-
-#. TRANSLATORS: change email error
-#: src/gui/changeemaildialog.cpp:148
-#, c-format
-msgid "The new email address needs to be less than %u characters long."
-msgstr ""
-
-#. TRANSLATORS: change email error
-#: src/gui/changeemaildialog.cpp:156
-msgid "The email address entries mismatch."
-msgstr ""
-
-#. TRANSLATORS: change password window name
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:54
-#: src/gui/charselectdialog.cpp:97
-msgid "Change Password"
-msgstr "Promijeni Lozinku"
-
-#. TRANSLATORS: change password dialog label
-#. TRANSLATORS: login dialog label
-#. TRANSLATORS: register dialog. label.
-#. TRANSLATORS: unregister dialog. label.
-#: src/gui/changepassworddialog.cpp:67 src/gui/logindialog.cpp:183
-#: src/gui/registerdialog.cpp:90 src/gui/unregisterdialog.cpp:61
-msgid "Password:"
-msgstr "Lozinka"
-
-#. TRANSLATORS: change password dialog label
-#: src/gui/changepassworddialog.cpp:70
-msgid "Type new password twice:"
-msgstr ""
-
-#. TRANSLATORS: change password error
-#: src/gui/changepassworddialog.cpp:121
-msgid "Enter the old password first."
-msgstr ""
-
-#. TRANSLATORS: change password error
-#: src/gui/changepassworddialog.cpp:128
-#, c-format
-msgid "The new password needs to be at least %u characters long."
-msgstr ""
-
-#. TRANSLATORS: change password error
-#: src/gui/changepassworddialog.cpp:136
-#, c-format
-msgid "The new password needs to be less than %u characters long."
-msgstr ""
-
-#. TRANSLATORS: change password error
-#: src/gui/changepassworddialog.cpp:144
-msgid "The new password entries mismatch."
-msgstr ""
-
-#. TRANSLATORS: char create dialog name
-#: src/gui/charcreatedialog.cpp:65
-msgid "New Character"
-msgstr ""
-
-#. TRANSLATORS: char create dialog label
-#. TRANSLATORS: edit server dialog label
-#. TRANSLATORS: login dialog label
-#. TRANSLATORS: register dialog. label.
-#: src/gui/charcreatedialog.cpp:71 src/gui/editserverdialog.cpp:88
-#: src/gui/logindialog.cpp:181 src/gui/registerdialog.cpp:88
-msgid "Name:"
-msgstr "Ime:"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: outfits window button
-#: src/gui/charcreatedialog.cpp:75 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:101 src/gui/charcreatedialog.cpp:171
-#: src/gui/charcreatedialog.cpp:181 src/gui/outfitwindow.cpp:63
-msgid ">"
-msgstr ""
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: outfits window button
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:86
-#: src/gui/charcreatedialog.cpp:173 src/gui/charcreatedialog.cpp:183
-#: src/gui/outfitwindow.cpp:61
-msgid "<"
-msgstr ""
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/charcreatedialog.cpp:81
-msgid "Hair color:"
-msgstr ""
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/charcreatedialog.cpp:88
-msgid "Hair style:"
-msgstr ""
-
-#. TRANSLATORS: char create dialog button
-#: src/gui/charcreatedialog.cpp:99
-msgid "^"
-msgstr ""
-
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: register dialog. button.
-#: src/gui/charcreatedialog.cpp:103 src/gui/registerdialog.cpp:109
-msgid "Male"
-msgstr "Muško"
-
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: register dialog. button.
-#: src/gui/charcreatedialog.cpp:105 src/gui/registerdialog.cpp:111
-msgid "Female"
-msgstr "Žensko"
-
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: input action name
-#. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: settings group
-#: src/gui/charcreatedialog.cpp:107 src/gui/registerdialog.cpp:115
-#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
-#: src/gui/setup_audio.cpp:159 src/gui/setup_chat.cpp:176
-#: src/gui/setup_other.cpp:320 src/gui/setup_visual.cpp:175
-msgid "Other"
-msgstr ""
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:467
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Molimo, rasporedi %d bodova"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/charcreatedialog.cpp:175
-msgid "Race:"
-msgstr ""
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/charcreatedialog.cpp:185
-msgid "Look:"
-msgstr ""
-
-#. TRANSLATORS: char creation error
-#: src/gui/charcreatedialog.cpp:360
-msgid "Your name needs to be at least 4 characters."
-msgstr "Ime mora imati barem 4 znaka."
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/charcreatedialog.cpp:457
-msgid "Character stats OK"
-msgstr "Podaci lika su u redu"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/charcreatedialog.cpp:473
-#, c-format
-msgid "Please remove %d points"
-msgstr "Molimo, oduzmi %d bodova"
-
-#. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
-msgid "Confirm Character Delete"
-msgstr "Potvrdi Brisanje Lika"
-
-#. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:64
-msgid "Are you sure you want to delete this character?"
-msgstr "Da li ste sigurni da želite obrisati ovog lika?"
-
-#. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:88
-#, c-format
-msgid "Account %s (last login time %s)"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:95
-msgid "Switch Login"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:102 src/gui/charselectdialog.cpp:580
-#: src/gui/updaterwindow.cpp:181
-msgid "Play"
-msgstr "Igraj"
-
-#. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: info message
-#: src/gui/charselectdialog.cpp:104 src/net/ea/charserverhandler.cpp:216
-msgid "Info"
-msgstr "Info"
-
-#. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: input action name
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:106 src/gui/serverdialog.cpp:262
-#: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:259
-#: src/gui/shopwindow.cpp:93 src/gui/shopwindow.cpp:100
-#: src/gui/textcommandeditor.cpp:205
-msgid "Delete"
-msgstr "Obriši"
-
-#. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: unregister dialog name
-#. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:131 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Odjavi"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:143
-msgid "Change Email"
-msgstr ""
-
-#. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:181
-#, c-format
-msgid "Account %s"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:250
-#, c-format
-msgid ""
-"Hp: %u/%u\n"
-"Mp: %u/%u\n"
-"Level: %u\n"
-"Experience: %u\n"
-"Money: %s"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:292
-msgid "Incorrect password"
-msgstr ""
-
-#. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:428
-msgid "Enter password for deleting character"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:428
-msgid "Enter password:"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:69
-#: src/gui/setup_other.cpp:70 src/gui/setup_visual.cpp:77
-msgid "default"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:144 src/gui/widgets/colormodel.cpp:74
-msgid "black"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:146 src/gui/widgets/colormodel.cpp:76
-msgid "red"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:148 src/gui/widgets/colormodel.cpp:78
-msgid "green"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:150 src/gui/widgets/colormodel.cpp:80
-msgid "blue"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:152 src/gui/widgets/colormodel.cpp:82
-msgid "gold"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:154 src/gui/widgets/colormodel.cpp:84
-msgid "yellow"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:156 src/gui/widgets/colormodel.cpp:86
-msgid "pink"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:158 src/gui/widgets/colormodel.cpp:88
-msgid "purple"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:160 src/gui/widgets/colormodel.cpp:90
-msgid "grey"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#. TRANSLATORS: color name
-#: src/gui/chatwindow.cpp:162 src/gui/widgets/colormodel.cpp:92
-msgid "brown"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
-msgid "rainbow 3"
-msgstr ""
-
-#. TRANSLATORS: chat window name
-#. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
-#: src/gui/setup_chat.cpp:41 src/gui/windowmenu.cpp:83
-msgid "Chat"
-msgstr "Chat"
-
-#. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:686
-#, c-format
-msgid "Present: %s; %d players are present."
+#. TRANSLATORS: heal player
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+msgid "Heal"
 msgstr ""
 
-#. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1094
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Šaptaj prema %s: %s"
-
-#. TRANSLATORS: confirm dialog button
-#: src/gui/confirmdialog.cpp:48
-msgid "Yes"
-msgstr "Da"
-
-#. TRANSLATORS: confirm dialog button
-#. TRANSLATORS: texture compression type
-#: src/gui/confirmdialog.cpp:50 src/gui/setup_perfomance.cpp:39
-msgid "No"
-msgstr "Ne"
-
-#. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:53 src/gui/popupmenu.cpp:2358
-#: src/gui/popupmenu.cpp:2371 src/gui/popupmenu.cpp:2386
-#: src/gui/popupmenu.cpp:2415
-msgid "Ignore"
-msgstr ""
-
-#. TRANSLATORS: debug window tab
-#. TRANSLATORS: mini map window name
-#. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:68 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
-#: src/gui/setup_other.cpp:124 src/gui/windowmenu.cpp:100
-msgid "Map"
-msgstr "Karta"
-
-#. TRANSLATORS: debug window tab
-#: src/gui/debugwindow.cpp:70
-msgid "Target"
-msgstr ""
-
-#. TRANSLATORS: debug window tab
-#: src/gui/debugwindow.cpp:72
-msgid "Net"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:292
-#: src/gui/debugwindow.cpp:343
-msgid "Music:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:347
-msgid "Map:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:345
-msgid "Minimap:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:289
-#: src/gui/debugwindow.cpp:341
-msgid "Cursor:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172
-msgid "Particle count:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:311
-#: src/gui/debugwindow.cpp:351
-msgid "Map actors count:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:270
-#: src/gui/debugwindow.cpp:276
-msgid "Player Position:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:183 src/gui/debugwindow.cpp:324
-msgid "Draw calls:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:332
-msgid "Texture binds:"
-msgstr ""
-
-#. TRANSLATORS: debug window label, frames per second
-#: src/gui/debugwindow.cpp:191
-#, c-format
-msgid "%d FPS"
-msgstr ""
-
-#. TRANSLATORS: debug window label, logic per second
-#: src/gui/debugwindow.cpp:193 src/gui/debugwindow.cpp:359
-#, c-format
-msgid "%d LPS"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:204 src/gui/debugwindow.cpp:228
-#, c-format
-msgid "%d FPS (Software)"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:211
-#, c-format
-msgid "%d FPS (normal OpenGL)"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:215
-#, c-format
-msgid "%d FPS (safe OpenGL)"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:219
-#, c-format
-msgid "%d FPS (mobile OpenGL)"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:223
-#, c-format
-msgid "%d FPS (SDL2 default)"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:317
-msgid "Textures count:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:306
-#, c-format
-msgid "Particle count: %d"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:365 src/gui/debugwindow.cpp:415
-#: src/gui/debugwindow.cpp:477
-msgid "Target:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:367 src/gui/debugwindow.cpp:421
-#: src/gui/debugwindow.cpp:479
-msgid "Target Id:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:370 src/gui/debugwindow.cpp:424
-#: src/gui/debugwindow.cpp:481
-msgid "Target type:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:372
-msgid "Target level:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:374 src/gui/debugwindow.cpp:440
-msgid "Target race:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:376
-msgid "Target party:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:378
-msgid "Target guild:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:380 src/gui/debugwindow.cpp:465
-#: src/gui/debugwindow.cpp:471 src/gui/debugwindow.cpp:489
-msgid "Attack delay:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:382 src/gui/debugwindow.cpp:452
-#: src/gui/debugwindow.cpp:491
-msgid "Minimal hit:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:384 src/gui/debugwindow.cpp:455
-#: src/gui/debugwindow.cpp:493
-msgid "Maximum hit:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:386 src/gui/debugwindow.cpp:458
-#: src/gui/debugwindow.cpp:495
-msgid "Critical hit:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:429 src/gui/debugwindow.cpp:435
-#: src/gui/debugwindow.cpp:483
-msgid "Target Level:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:443 src/gui/debugwindow.cpp:485
-msgid "Target Party:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:447 src/gui/debugwindow.cpp:487
-msgid "Target Guild:"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:528
-#, c-format
-msgid "Ping: %s ms"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:531
-#, c-format
-msgid "In: %d bytes/s"
-msgstr ""
-
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:534
-#, c-format
-msgid "Out: %d bytes/s"
-msgstr ""
-
-#. TRANSLATORS: did you know window name
-#: src/gui/didyouknowwindow.cpp:50
-msgid "Did You Know?"
-msgstr ""
-
-#. TRANSLATORS: did you know window button
-#: src/gui/didyouknowwindow.cpp:56
-msgid "< Previous"
-msgstr ""
-
-#. TRANSLATORS: did you know window button
-#: src/gui/didyouknowwindow.cpp:58
-msgid "Next >"
-msgstr ""
-
-#. TRANSLATORS: did you know window checkbox
-#: src/gui/didyouknowwindow.cpp:60
-msgid "Auto open this window"
-msgstr ""
-
-#. TRANSLATORS: edit dialog label
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: ok dialog button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: text dialog button
-#: src/gui/editdialog.cpp:43 src/gui/editserverdialog.cpp:76
-#: src/gui/itemamountwindow.cpp:205 src/gui/okdialog.cpp:50
-#: src/gui/quitdialog.cpp:67 src/gui/textdialog.cpp:46
-msgid "OK"
-msgstr "U redu"
-
-#. TRANSLATORS: edit server dialog name
-#: src/gui/editserverdialog.cpp:65
-msgid "Edit Server"
-msgstr ""
-
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:74 src/gui/serverdialog.cpp:256
-msgid "Connect"
-msgstr ""
-
-#. TRANSLATORS: edit server dialog label
-#: src/gui/editserverdialog.cpp:90
-msgid "Address:"
-msgstr ""
-
-#. TRANSLATORS: edit server dialog label
-#: src/gui/editserverdialog.cpp:92
-msgid "Port:"
-msgstr "Port:"
-
-#. TRANSLATORS: edit server dialog label
-#: src/gui/editserverdialog.cpp:94
-msgid "Server type:"
-msgstr ""
-
-#. TRANSLATORS: edit server dialog label
-#: src/gui/editserverdialog.cpp:96
-msgid "Description:"
-msgstr ""
-
-#. TRANSLATORS: edit server dialog label
-#: src/gui/editserverdialog.cpp:98
-msgid "Online list url:"
-msgstr ""
-
-#. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:216
-msgid "Please at least type both the address and the port of the server."
-msgstr ""
-
-#. TRANSLATORS: font size
-#: src/gui/emotewindow.cpp:42
-msgid "Normal font"
-msgstr ""
-
-#. TRANSLATORS: font size
-#. TRANSLATORS: theme settings label
-#: src/gui/emotewindow.cpp:44 src/gui/setup_theme.cpp:246
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: emotes window name
-#. TRANSLATORS: emotes tab name
-#. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:49 src/gui/emotewindow.cpp:100
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: emotes tab name
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/emotewindow.cpp:102 src/gui/setup_chat.cpp:61
-#: src/gui/setup_colors.cpp:81
-msgid "Colors"
-msgstr "Boje"
-
-#. TRANSLATORS: emotes tab name
-#: src/gui/emotewindow.cpp:104
-msgid "Fonts"
+#. TRANSLATORS: kick player from guild
+#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+msgid "Kick from guild"
 msgstr ""
 
-#. TRANSLATORS: equipment window name
-#. TRANSLATORS: inventory button
-#: src/gui/equipmentwindow.cpp:62 src/gui/inventorywindow.cpp:211
-#: src/gui/windowmenu.cpp:94
-msgid "Equipment"
-msgstr "Oprema"
-
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
-#: src/gui/equipmentwindow.cpp:69 src/gui/inventorywindow.cpp:190
-#: src/gui/inventorywindow.cpp:669 src/gui/popupmenu.cpp:2590
-msgid "Unequip"
-msgstr "Skini opremu"
-
-#. TRANSLATORS: help window name
-#: src/gui/helpwindow.cpp:50 src/gui/windowmenu.cpp:69
-msgid "Help"
-msgstr "Pomoć"
-
-#. TRANSLATORS: help window. button.
-#: src/gui/helpwindow.cpp:53
-msgid "Did you know..."
+#. TRANSLATORS: change player position in guild
+#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
+#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+msgid "Change pos in guild"
 msgstr ""
 
-#. TRANSLATORS: inventory window name
-#. TRANSLATORS: inventory type name
-#: src/gui/inventorywindow.cpp:143 src/gui/windowmenu.cpp:97
-#: src/inventory.cpp:256
-msgid "Inventory"
-msgstr "Zalihe"
-
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
 #. TRANSLATORS: popup menu item
-#: src/gui/inventorywindow.cpp:186 src/gui/inventorywindow.cpp:674
-#: src/gui/outfitwindow.cpp:65 src/gui/popupmenu.cpp:2595
-msgid "Equip"
-msgstr "Opremi"
-
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: skills dialog button
-#: src/gui/inventorywindow.cpp:188 src/gui/inventorywindow.cpp:680
-#: src/gui/popupmenu.cpp:1906 src/gui/popupmenu.cpp:2603
-#: src/gui/skilldialog.cpp:286
-msgid "Use"
-msgstr "Upotrijebi"
-
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: popup menu item
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:777
-#: src/gui/popupmenu.cpp:2613
-msgid "Drop..."
+#. TRANSLATORS: invite player to guild
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
+#: src/gui/popups/popupmenu.cpp:763
+msgid "Invite to guild"
 msgstr ""
 
-#. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:2627
-msgid "Split"
-msgstr "Razdvoji"
-
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window name
-#. TRANSLATORS: popup menu header
-#. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: full button name
-#: src/gui/inventorywindow.cpp:207 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:516 src/gui/setupactiondata.h:1864
-#: src/gui/windowmenu.cpp:145
-msgid "Outfits"
+#. TRANSLATORS: set player invisible for self by id
+#: src/gui/popups/popupmenu.cpp:223
+msgid "Nuke"
 msgstr ""
 
-#. TRANSLATORS: storage button
-#. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:234 src/gui/inventorywindow.cpp:769
-#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1942
-#: src/gui/popupmenu.cpp:1980 src/gui/setup.cpp:87
-msgid "Store"
-msgstr "Pohrani"
-
-#. TRANSLATORS: storage button
+#. TRANSLATORS: move to player location
 #. TRANSLATORS: popup menu item
-#: src/gui/inventorywindow.cpp:236 src/gui/popupmenu.cpp:1850
-msgid "Retrieve"
-msgstr "Preuzmi"
-
-#. TRANSLATORS: status window label
-#: src/gui/inventorywindow.cpp:587 src/gui/statuswindow.cpp:146
-#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:342
-#: src/gui/widgets/characterdisplay.cpp:128
-#, c-format
-msgid "Money: %s"
-msgstr "Novac: %s"
-
-#. TRANSLATORS: inventory button
+#. TRANSLATORS: move to npc location
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: full button name
-#: src/gui/inventorywindow.cpp:782 src/gui/popupmenu.cpp:2620
-#: src/gui/windowmenu.cpp:133
-msgid "Drop"
-msgstr "Ispusti"
-
-#. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:209
-msgid "All"
-msgstr "Sve"
-
-#. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:265
-msgid "Select amount of items to trade."
-msgstr "Odaberi količinu predmeta za razmjenu."
-
-#. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:269
-msgid "Select amount of items to drop."
-msgstr "Odaberi količinu predmeta za ispuštanje."
-
-#. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:273
-msgid "Select amount of items to store."
-msgstr "Odaberite količinu predmeta za spremanje."
-
-#. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:277
-msgid "Select amount of items to retrieve."
-msgstr "Odaberite iznos predmeta za preuzimanje."
-
-#. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:281
-msgid "Select amount of items to split."
-msgstr "Odaberi količinu predmeta za razdvajanje."
-
-#. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:285
-msgid "Add to buy shop."
-msgstr ""
-
-#. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:289
-msgid "Add to sell shop."
-msgstr ""
-
-#. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:293
-msgid "Unknown."
-msgstr ""
-
-#. TRANSLATORS: popup label
-#: src/gui/itempopup.cpp:187
-#, c-format
-msgid "Weight: %s"
-msgstr ""
-
-#. TRANSLATORS: kill stats window name
-#: src/gui/killstats.cpp:42 src/gui/windowmenu.cpp:78
-msgid "Kill stats"
-msgstr ""
-
-#. TRANSLATORS: kill stats window button
-#: src/gui/killstats.cpp:50
-msgid "Reset stats"
-msgstr ""
-
-#. TRANSLATORS: kill stats window button
-#: src/gui/killstats.cpp:52
-msgid "Reset timer"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:57 src/gui/killstats.cpp:169
-#: src/gui/killstats.cpp:274 src/gui/killstats.cpp:507
-#, c-format
-msgid "Kills: %s, total exp: %s"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:60 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:251 src/gui/killstats.cpp:266
-#: src/gui/killstats.cpp:509
-#, c-format
-msgid "Avg Exp: %s"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:62 src/gui/killstats.cpp:174
-#: src/gui/killstats.cpp:256 src/gui/killstats.cpp:270
-#: src/gui/killstats.cpp:512
-#, c-format
-msgid "No. of avg mob to next level: %s"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:65 src/gui/killstats.cpp:185
-#: src/gui/killstats.cpp:278 src/gui/killstats.cpp:515
-#, c-format
-msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:74 src/gui/killstats.cpp:79
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:375
-#, c-format
-msgid "Exp speed per %d min: %s"
-msgid_plural "Exp speed per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:76 src/gui/killstats.cpp:82
-#, c-format
-msgid "Time for next level per %d min: %s"
-msgid_plural "Time for next level per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:283
-msgid "Last kill exp:"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:406
-#: src/gui/killstats.cpp:413 src/gui/killstats.cpp:420
-#: src/gui/killstats.cpp:426
-msgid "Time before jacko spawn:"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:119 src/gui/killstats.cpp:236
-#, c-format
-msgid "Level: %d at %f%%"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:124 src/gui/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:128 src/gui/killstats.cpp:247
-#: src/gui/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:341 src/gui/killstats.cpp:350
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:383 src/gui/killstats.cpp:392
-#, c-format
-msgid "  Time for next level: %s"
-msgstr ""
-
-#. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:413
-#, c-format
-msgid "%s %d?"
-msgstr ""
-
-#: src/gui/killstats.cpp:420
-msgid "jacko spawning"
-msgstr ""
-
-#. TRANSLATORS: update type
-#. TRANSLATORS: onscreen button size
-#: src/gui/logindialog.cpp:76 src/gui/setup_touch.cpp:38
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/logindialog.cpp:78
-msgid "Auto Close"
-msgstr ""
-
-#. TRANSLATORS: update type
-#: src/gui/logindialog.cpp:80
-msgid "Skip"
-msgstr ""
-
-#. TRANSLATORS: login dialog name
-#. TRANSLATORS: login dialog button
-#: src/gui/logindialog.cpp:142 src/gui/logindialog.cpp:159
-msgid "Login"
-msgstr "Korisničko ime"
-
-#. TRANSLATORS: login dialog label
-#: src/gui/logindialog.cpp:149
-msgid "Remember username"
-msgstr ""
-
-#. TRANSLATORS: login dialog label
-#: src/gui/logindialog.cpp:152
-msgid "Update:"
-msgstr ""
-
-#. TRANSLATORS: login dialog button
-#: src/gui/logindialog.cpp:157
-msgid "Change Server"
-msgstr ""
-
-#. TRANSLATORS: login dialog button
-#. TRANSLATORS: register dialog name
-#. TRANSLATORS: register dialog. button.
-#: src/gui/logindialog.cpp:161 src/gui/registerdialog.cpp:65
-#: src/gui/registerdialog.cpp:74
-msgid "Register"
-msgstr "Registriraj se"
-
-#. TRANSLATORS: login dialog checkbox
-#: src/gui/logindialog.cpp:163
-msgid "Custom update host"
-msgstr ""
-
-#. TRANSLATORS: login dialog label
-#: src/gui/logindialog.cpp:177
-msgid "Server:"
-msgstr "Poslužitelj:"
-
-#. TRANSLATORS: login dialog label
-#: src/gui/logindialog.cpp:187
-#, c-format
-msgid "Update host: %s"
-msgstr ""
-
-#: src/gui/logindialog.cpp:298
-msgid "Open register url"
-msgstr ""
-
-#. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:62
-msgid "health bar"
-msgstr ""
-
-#. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:66
-msgid "mana bar"
-msgstr ""
-
-#. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:70
-msgid "experience bar"
-msgstr ""
-
-#. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:74
-msgid "weight bar"
-msgstr ""
-
-#. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:77
-msgid "inventory slots bar"
-msgstr ""
-
-#. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:80
-msgid "money bar"
-msgstr ""
-
-#. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:83
-msgid "arrows bar"
-msgstr ""
-
-#. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:87
-msgid "status bar"
-msgstr ""
-
-#. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:107
-msgid "job bar"
-msgstr ""
-
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:308 src/gui/statuswindow.cpp:300
-#, c-format
-msgid "Level: %d (GM %d)"
-msgstr ""
-
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:315 src/gui/statuswindow.cpp:144
-#: src/gui/statuswindow.cpp:307 src/gui/statuswindow.cpp:378
-#, c-format
-msgid "Level: %d"
-msgstr "Nivo: %d"
-
-#. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:369
-msgid "Need"
-msgstr ""
-
-#. TRANSLATORS: job bar label
-#: src/gui/ministatuswindow.cpp:355
-#, c-format
-msgid "Job level: %d"
-msgstr ""
-
-#. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:65
-msgid "Stop waiting"
-msgstr ""
-
-#. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:67
-msgid "Next"
-msgstr "Slijedeći"
-
-#. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:71
-msgid "Submit"
-msgstr "Dostavi"
-
-#. TRANSLATORS: npc dialog name
-#. TRANSLATORS: npc post dialog caption
-#. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:80 src/gui/npcpostdialog.cpp:43
-#: src/gui/setup_other.cpp:258
-msgid "NPC"
-msgstr "NPC"
-
-#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: move to player position
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:567
-msgid "Clear"
-msgstr ""
-
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/npcdialog.cpp:108 src/gui/serverdialog.cpp:258
-#: src/gui/shopwindow.cpp:91 src/gui/shopwindow.cpp:98
-#: src/gui/tradewindow.cpp:78
-msgid "Add"
-msgstr "Dodaj"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/npcpostdialog.cpp:53
-msgid "To:"
-msgstr "Za:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/npcpostdialog.cpp:60
-msgid "Send"
-msgstr "Pošalji"
-
-#. TRANSLATORS: npc post message error
-#: src/gui/npcpostdialog.cpp:107
-msgid "Failed to send as sender or letter invalid."
-msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
-
-#. TRANSLATORS: outfits window label
-#: src/gui/outfitwindow.cpp:67 src/gui/outfitwindow.cpp:559
-#, c-format
-msgid "Outfit: %d"
-msgstr ""
-
-#. TRANSLATORS: outfits window checkbox
-#: src/gui/outfitwindow.cpp:69
-msgid "Unequip first"
-msgstr ""
-
-#. TRANSLATORS: outfits window checkbox
-#: src/gui/outfitwindow.cpp:72
-msgid "Away outfit"
-msgstr ""
-
-#. TRANSLATORS: outfits window label
-#. TRANSLATORS: short key name
-#: src/gui/outfitwindow.cpp:76 src/gui/outfitwindow.cpp:565
-#: src/gui/windowmenu.cpp:295
-#, c-format
-msgid "Key: %s"
-msgstr ""
-
+#. TRANSLATORS: move to map item
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: trade chat tab name
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:626
-#: src/gui/widgets/tradetab.cpp:33
-msgid "Trade"
-msgstr "Trgovanje"
-
+#. TRANSLATORS: move to player position
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:335
-msgid "Whisper"
+#. TRANSLATORS: move to player location
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: bot checker window table header
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
+#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
+#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/setupactiondata.h:1856 src/gui/windows/botcheckerwindow.cpp:304
+msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:631
-msgid "Heal"
-msgstr ""
+#. TRANSLATORS: talk with npc
+#. TRANSLATORS: input action name
+#. TRANSLATORS: bot checker window table header
+#: src/gui/popups/popupmenu.cpp:237 src/gui/setupactiondata.h:93
+#: src/gui/windows/botcheckerwindow.cpp:302
+msgid "Talk"
+msgstr "Govori"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:187
-#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:674
-msgid "Kick from guild"
-msgstr ""
-
+#. TRANSLATORS: buy from npc
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:193
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:680
-msgid "Change pos in guild"
-msgstr ""
+#. TRANSLATORS: buy item
+#. TRANSLATORS: buy dialog name
+#. TRANSLATORS: shop window button
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2595
+#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
+#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
+msgid "Buy"
+msgstr "Kupi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:690
-msgid "Invite to guild"
-msgstr ""
-
+#. TRANSLATORS: sell to npc
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:208
-msgid "Nuke"
-msgstr ""
+#. TRANSLATORS: sell item
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: sell dialog name
+#. TRANSLATORS: sell dialog button
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
+#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
+msgid "Sell"
+msgstr "Prodaj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:229 src/gui/popupmenu.cpp:344
-#: src/gui/popupmenu.cpp:2509
+#. TRANSLATORS: add comment to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add comment to player
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
+#: src/gui/popups/popupmenu.cpp:2659
 msgid "Add comment"
 msgstr ""
 
+#. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:247
+#: src/gui/popups/popupmenu.cpp:270
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:253
+#. TRANSLATORS: add monster to priotiry attack list
+#: src/gui/popups/popupmenu.cpp:277
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:256
+#. TRANSLATORS: add monster to attack list
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Add to attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:2527
+#. TRANSLATORS: add monster to ignore list
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add item to pickup list
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2679
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:275 src/gui/popupmenu.cpp:399
+#. TRANSLATORS: add being name to chat
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add player name to chat
+#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
 msgid "Add name to chat"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: input action name
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: button in npc post dialog
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: party popup item
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: unregister dialog. button.
+#. TRANSLATORS: updater window button
+#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
+#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2833 src/gui/setupactiondata.h:1797
+#: src/gui/windows/buyselldialog.cpp:71
+#: src/gui/windows/changeemaildialog.cpp:55
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/connectiondialog.cpp:48
+#: src/gui/windows/editserverdialog.cpp:78
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
+#: src/gui/windows/socialwindow.cpp:1231
+#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/unregisterdialog.cpp:54
+#: src/gui/windows/updaterwindow.cpp:179
+msgid "Cancel"
+msgstr "Poništi"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popupmenu.cpp:291 src/gui/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
 msgid "Players"
 msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:355 src/gui/popupmenu.cpp:656
-#: src/gui/popupmenu.cpp:2495
+#. TRANSLATORS: kick player from party
+#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:438
+#. TRANSLATORS: pickup item from ground
+#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:442 src/gui/popupmenu.cpp:1874
-#: src/gui/popupmenu.cpp:1945 src/gui/popupmenu.cpp:1984
+#. TRANSLATORS: add item name to chat
+#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
+#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:464
+#. TRANSLATORS: rename map item
+#: src/gui/popups/popupmenu.cpp:507
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:2172
-#: src/gui/popupmenu.cpp:2203
+#. TRANSLATORS: remove map item
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: remove attack target
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: remove item from pickup filter
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:495
+#. TRANSLATORS: warp to map item
+#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:500
+#. TRANSLATORS: move camera to map item
+#: src/gui/popups/popupmenu.cpp:549
 msgid "Move camera"
 msgstr ""
 
+#. TRANSLATORS: popup menu header
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: full button name
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window name
+#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1864
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/outfitwindow.cpp:53
+msgid "Outfits"
+msgstr ""
+
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:518
+#. TRANSLATORS: clear selected outfit
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popupmenu.cpp:539 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:541
+#. TRANSLATORS: edit selected spell
+#: src/gui/popups/popupmenu.cpp:594
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:573
+#. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: npc dialog button
+#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+msgid "Clear"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: disable chat tab highlight
+#: src/gui/popups/popupmenu.cpp:630
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:578
+#. TRANSLATORS: enable chat tab highlight
+#: src/gui/popups/popupmenu.cpp:636
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:583
+#. TRANSLATORS: do not remove player names from chat tab
+#: src/gui/popups/popupmenu.cpp:642
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:588
+#. TRANSLATORS: remove player names from chat tab
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:593
+#. TRANSLATORS: enable away messages in chat tab
+#: src/gui/popups/popupmenu.cpp:654
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:598
+#. TRANSLATORS: disable away messages in chat tab
+#: src/gui/popups/popupmenu.cpp:660
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:604 src/gui/socialwindow.cpp:1289
+#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
 msgid "Leave"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:608 src/gui/popupmenu.cpp:2266
-#: src/gui/popupmenu.cpp:2307
+#. TRANSLATORS: copy selected text to clipboard
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: copy link to clipboard
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: copy npc text to clipboard
+#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
+#: src/gui/popups/popupmenu.cpp:2416
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:2490
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2637
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popups/popupmenu.cpp:806
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1269
+#: src/gui/popups/popupmenu.cpp:1329
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popups/popupmenu.cpp:1331
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1294
+#: src/gui/popups/popupmenu.cpp:1355
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1296
+#: src/gui/popups/popupmenu.cpp:1357
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1806
+#. TRANSLATORS: add item to trade
+#: src/gui/popups/popupmenu.cpp:1869
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1812
+#. TRANSLATORS: add 10 item amount to trade
+#: src/gui/popups/popupmenu.cpp:1876
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1815
+#. TRANSLATORS: add half item amount to trade
+#: src/gui/popups/popupmenu.cpp:1880
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1817
+#. TRANSLATORS: add all amount except one item to trade
+#: src/gui/popups/popupmenu.cpp:1883
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1819
+#. TRANSLATORS: add all amount item to trade
+#: src/gui/popups/popupmenu.cpp:1886
 msgid "Add to trade all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1832
+#. TRANSLATORS: add item to storage
+#. TRANSLATORS: storage button
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: setup button
+#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
+#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:248
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/setup.cpp:92
+msgid "Store"
+msgstr "Pohrani"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add 10 item amount to storage
+#: src/gui/popups/popupmenu.cpp:1901
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1835
+#. TRANSLATORS: add half item amount to storage
+#: src/gui/popups/popupmenu.cpp:1905
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1837
+#. TRANSLATORS: add all except one item amount to storage
+#: src/gui/popups/popupmenu.cpp:1908
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1839
+#. TRANSLATORS: add all item amount to storage
+#: src/gui/popups/popupmenu.cpp:1911
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1856
+#. TRANSLATORS: get item from storage
+#. TRANSLATORS: storage button
+#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:250
+msgid "Retrieve"
+msgstr "Preuzmi"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: get 10 item amount from storage
+#: src/gui/popups/popupmenu.cpp:1930
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1859
+#. TRANSLATORS: get half item amount from storage
+#: src/gui/popups/popupmenu.cpp:1934
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1861
+#. TRANSLATORS: get all except one item amount from storage
+#: src/gui/popups/popupmenu.cpp:1937
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1863
+#. TRANSLATORS: get all item amount from storage
+#: src/gui/popups/popupmenu.cpp:1940
 msgid "Retrieve all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:1994
+#. TRANSLATORS: use item
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: skills dialog button
+#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2761
+#: src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/skilldialog.cpp:290
+msgid "Use"
+msgstr "Upotrijebi"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2080
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2084
+#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popupmenu.cpp:2101 src/gui/statuswindow.cpp:165
+#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:167
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
-#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2195
-#: src/gui/setup_theme.cpp:59 src/gui/setup_theme.cpp:146
-#: src/gui/socialwindow.cpp:988
+#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/widgets/tabs/setup_theme.cpp:58
+#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/windows/socialwindow.cpp:997
 msgid "(default)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2139 src/gui/popupmenu.cpp:2156
+#. TRANSLATORS: move attack target up
+#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2161
+#. TRANSLATORS: move attack target down
+#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
 msgid "Move down"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2227 src/gui/popupmenu.cpp:2507
+#. TRANSLATORS: undress item from player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: undress player
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2656
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2244
+#. TRANSLATORS: copy text to clipboard
+#: src/gui/popups/popupmenu.cpp:2346
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2246
+#. TRANSLATORS: paste text from clipboard
+#: src/gui/popups/popupmenu.cpp:2349
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2264
+#. TRANSLATORS: open link in browser
+#: src/gui/popups/popupmenu.cpp:2369
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2389
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2354
+#. TRANSLATORS: add player to friends list
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2356 src/gui/popupmenu.cpp:2369
-#: src/gui/popupmenu.cpp:2384 src/gui/popupmenu.cpp:2413
-#: src/gui/popupmenu.cpp:2426
+#. TRANSLATORS: add player to disregarded list
+#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:2564
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2360 src/gui/popupmenu.cpp:2373
-#: src/gui/popupmenu.cpp:2417
+#. TRANSLATORS: add player to ignore list
+#. TRANSLATORS: confirm dialog button
+#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/windows/confirmdialog.cpp:58
+msgid "Ignore"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add player to black list
+#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2362 src/gui/popupmenu.cpp:2375
-#: src/gui/popupmenu.cpp:2388
+#. TRANSLATORS: add player to enemy list
+#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2364 src/gui/popupmenu.cpp:2377
-#: src/gui/popupmenu.cpp:2390 src/gui/popupmenu.cpp:2399
-#: src/gui/popupmenu.cpp:2406 src/gui/popupmenu.cpp:2419
+#. TRANSLATORS: add player to erased list
+#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2382 src/gui/popupmenu.cpp:2395
-#: src/gui/popupmenu.cpp:2404 src/gui/popupmenu.cpp:2411
-#: src/gui/popupmenu.cpp:2424
+#. TRANSLATORS: remove player from ignore list
+#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2561
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2578
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2441
+#. TRANSLATORS: imitate player
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2462 src/gui/popupmenu.cpp:2475
+#. TRANSLATORS: buy item
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2620
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2464 src/gui/popupmenu.cpp:2477
+#. TRANSLATORS: sell item
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2653
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2519
+#. TRANSLATORS: remove item from pickup list
+#: src/gui/popups/popupmenu.cpp:2670
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2570
+#. TRANSLATORS: remove protection from item
+#: src/gui/popups/popupmenu.cpp:2724
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2578
+#. TRANSLATORS: add protection to item
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2615
+#. TRANSLATORS: unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2746 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:674
+msgid "Unequip"
+msgstr "Skini opremu"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: use item
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:679 src/gui/windows/outfitwindow.cpp:60
+msgid "Equip"
+msgstr "Opremi"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: drop item
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2772 src/gui/windows/inventorywindow.cpp:217
+#: src/gui/windows/inventorywindow.cpp:782
+msgid "Drop..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: drop all item amount
+#: src/gui/popups/popupmenu.cpp:2775
 msgid "Drop all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2636
+#. TRANSLATORS: drop item
+#. TRANSLATORS: full button name
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2781 src/gui/windowmenu.cpp:136
+#: src/gui/windows/inventorywindow.cpp:787
+msgid "Drop"
+msgstr "Ispusti"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: split items
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2789 src/gui/windows/inventorywindow.cpp:219
+msgid "Split"
+msgstr "Razdvoji"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: gm commands
+#: src/gui/popups/popupmenu.cpp:2799
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2807
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2648
+#. TRANSLATORS: check player ip
+#: src/gui/popups/popupmenu.cpp:2812
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2650
+#. TRANSLATORS: go to player position
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2652
+#. TRANSLATORS: recall player to current position
+#: src/gui/popups/popupmenu.cpp:2818
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2654
+#. TRANSLATORS: revive player
+#: src/gui/popups/popupmenu.cpp:2821
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popupmenu.cpp:2658
+#. TRANSLATORS: kick player
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Kick"
 msgstr ""
 
-#. TRANSLATORS: quests window name
-#: src/gui/questswindow.cpp:123 src/gui/windowmenu.cpp:72
-msgid "Quests"
-msgstr ""
-
-#. TRANSLATORS: quests window quest name
-#. TRANSLATORS: unknown key name
-#: src/gui/questswindow.cpp:249 src/gui/setup_input.cpp:360
-msgid "unknown"
-msgstr ""
-
-#. TRANSLATORS: quit dialog button
-#: src/gui/quitdialog.cpp:61
-msgid "Switch server"
-msgstr "Promijeni poslužitelj"
-
-#. TRANSLATORS: quit dialog button
-#: src/gui/quitdialog.cpp:64
-msgid "Switch character"
-msgstr "Promijeni lika"
-
-#. TRANSLATORS: register dialog. label.
-#: src/gui/registerdialog.cpp:92
-msgid "Confirm:"
-msgstr "Potvrdi:"
-
-#. TRANSLATORS: register dialog. label.
-#: src/gui/registerdialog.cpp:132
-msgid "Email:"
-msgstr "E-pošta:"
-
-#. TRANSLATORS: error message
-#: src/gui/registerdialog.cpp:200
-#, c-format
-msgid "The username needs to be at least %u characters long."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/gui/registerdialog.cpp:209
-#, c-format
-msgid "The username needs to be less than %u characters long."
-msgstr ""
-
-#. TRANSLATORS: error message
-#. TRANSLATORS: unregister dialog. error message.
-#: src/gui/registerdialog.cpp:218 src/gui/unregisterdialog.cpp:125
-#, c-format
-msgid "The password needs to be at least %u characters long."
-msgstr ""
-
-#. TRANSLATORS: error message
-#. TRANSLATORS: unregister dialog. error message.
-#: src/gui/registerdialog.cpp:227 src/gui/unregisterdialog.cpp:132
-#, c-format
-msgid "The password needs to be less than %u characters long."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/gui/registerdialog.cpp:235
-msgid "Passwords do not match."
-msgstr "Lozinke se ne podudaraju."
-
-#. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:244
-msgid "sell item"
-msgstr ""
-
-#. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:246
-#, c-format
-msgid "Do you really want to sell %s?"
-msgstr ""
-
-#. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:247
-msgid "Choose Your Server"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:260 src/gui/widgets/setupitem.cpp:301
-#: src/gui/widgets/setupitem.cpp:428
-msgid "Edit"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:264
-msgid "Load"
-msgstr ""
-
-#. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:278
-msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr ""
-
-#. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:287
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
-#, c-format
-msgid "Downloading server list...%2.2f%%"
-msgstr ""
-
-#. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
-msgid "Waiting for server..."
-msgstr ""
-
-#. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
-msgid "Preparing download"
-msgstr ""
-
-#. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
-msgid "Error retreiving server list!"
-msgstr ""
-
-#. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:624
-msgid "requires a newer version"
-msgstr ""
-
-#. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:629
-#, c-format
-msgid "requires v%s"
-msgstr ""
-
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:45
 msgid "Target and attack keys"
@@ -3084,6 +1837,19 @@ msgid "Select OK"
 msgstr "Odaberite OK"
 
 #. TRANSLATORS: input action name
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: servers dialog button
+#: src/gui/setupactiondata.h:177 src/gui/windows/buydialog.cpp:275
+#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
+#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/selldialog.cpp:109
+#: src/gui/windows/serverdialog.cpp:254
+msgid "Quit"
+msgstr "Izlaz"
+
+#. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:183
 msgid "Stop or sit"
 msgstr ""
@@ -3616,6 +2382,21 @@ msgid "Page down"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: register dialog. button.
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
+#: src/gui/widgets/tabs/setup_audio.cpp:159
+#: src/gui/widgets/tabs/setup_chat.cpp:180
+#: src/gui/widgets/tabs/setup_other.cpp:321
+#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:107
+#: src/gui/windows/registerdialog.cpp:115
+msgid "Other"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1785
 msgid "Select"
 msgstr ""
@@ -3626,6 +2407,20 @@ msgid "Select2"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: command editor button
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/textcommandeditor.cpp:205
+msgid "Delete"
+msgstr "Obriši"
+
+#. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:1809
 msgid "Backspace"
 msgstr ""
@@ -3652,2835 +2447,4241 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1858 src/gui/windowmenu.cpp:125
+#: src/gui/setupactiondata.h:1858 src/gui/windowmenu.cpp:128
 msgid "Shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1860 src/gui/setup_other.cpp:298
-#: src/gui/windowmenu.cpp:158
+#: src/gui/setupactiondata.h:1860 src/gui/widgets/tabs/setup_other.cpp:299
+#: src/gui/windowmenu.cpp:161
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#: src/gui/setupactiondata.h:1862 src/gui/windows/emotewindow.cpp:49
+#: src/gui/windows/emotewindow.cpp:107
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: settings tab name
+#. TRANSLATORS: chat window name
+#: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
+msgid "Chat"
+msgstr "Chat"
+
+#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:110
+msgid "Being"
+msgstr "Biće"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:112
+msgid "Friend names"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:114
+msgid "Disregarded names"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:116
+msgid "Ignored names"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:118
+msgid "Erased names"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:120
+msgid "Other players names"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:122
+msgid "Own name"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:124
+msgid "GM names"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:126
+msgid "NPCs"
+msgstr "NPCs"
+
+#. TRANSLATORS: palette color
+#. TRANSLATORS: settings option
+#: src/gui/userpalette.cpp:128 src/gui/widgets/tabs/setup_other.cpp:100
+msgid "Monsters"
+msgstr "Čudovišta"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:130
+msgid "Monster HP bar"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:133
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:135
+msgid "Party members"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:137
+msgid "Guild members"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#. TRANSLATORS: settings option
+#: src/gui/userpalette.cpp:139 src/gui/widgets/tabs/setup_visual.cpp:140
+msgid "Particle effects"
+msgstr "Efekt čestica"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:141
+msgid "Pickup notification"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:143
+msgid "Exp notification"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:145
+msgid "Player HP bar"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:149
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:151
+msgid "Player hits monster"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:153
+msgid "Monster hits player"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:157
+msgid "Other player hits local player"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:159
+msgid "Critical Hit"
+msgstr "Kritični Udarac"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:163
+msgid "Local player hits monster"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:166
+msgid "Local player critical hit"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:169
+msgid "Local player miss"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:171
+msgid "Misses"
+msgstr "Promašaji"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:173
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:176
+msgid "Default collision highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:179
+msgid "Air collision highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:182
+msgid "Water collision highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:185
+msgid "Special ground collision highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:188
+msgid "Walkable highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:191
+msgid "Local player attack range"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:194
+msgid "Local player attack range border"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:197
+msgid "Monster attack range"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:201
+msgid "Floor item amount color"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:204
+msgid "Home place"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:207
+msgid "Home place border"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:210
+msgid "Road point"
+msgstr ""
+
+#: src/gui/widgets/characterdisplay.cpp:131
+#, c-format
+msgid "Level: %u"
+msgstr ""
+
+#. TRANSLATORS: status window label
+#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/windows/inventorywindow.cpp:592
+#: src/gui/windows/statuswindow.cpp:148 src/gui/windows/statuswindow.cpp:291
+#: src/gui/windows/statuswindow.cpp:344
+#, c-format
+msgid "Money: %s"
+msgstr "Novac: %s"
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
+msgid "black"
+msgstr ""
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+msgid "red"
+msgstr ""
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+msgid "green"
+msgstr ""
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+msgid "blue"
+msgstr ""
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+msgid "gold"
+msgstr ""
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+msgid "yellow"
+msgstr ""
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+msgid "pink"
+msgstr ""
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+msgid "purple"
+msgstr ""
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+msgid "grey"
+msgstr ""
+
+#. TRANSLATORS: color name
+#. TRANSLATORS: chat color
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+msgid "brown"
+msgstr ""
+
+#. TRANSLATORS: Text under equipped items (should be small)
+#: src/gui/widgets/itemcontainer.cpp:325
+msgid "Eq."
+msgstr ""
+
+#. TRANSLATORS: dialog message
+#: src/gui/widgets/itemlinkhandler.cpp:93
+msgid "Open url"
+msgstr ""
+
+#. TRANSLATORS: setup item button
+#. TRANSLATORS: servers dialog button
+#: src/gui/widgets/setupitem.cpp:301 src/gui/widgets/setupitem.cpp:429
+#: src/gui/windows/serverdialog.cpp:260
+msgid "Edit"
+msgstr ""
+
+#. TRANSLATORS: skills dialog. skill level
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:630
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#. TRANSLATORS: battle chat tab name
+#: src/gui/widgets/tabs/battletab.cpp:34
+msgid "Battle"
+msgstr ""
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chattab.cpp:154
+msgid "Global announcement:"
+msgstr "Javna obavijest:"
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chattab.cpp:160
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Javna obavijest od %s:"
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chattab.cpp:186
+#, c-format
+msgid "%s whispers: %s"
+msgstr ""
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chattab.cpp:544
+#, c-format
+msgid "%s is now Online."
+msgstr ""
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chattab.cpp:549
+#, c-format
+msgid "%s is now Offline."
+msgstr ""
+
+#. TRANSLATORS: gb tab name
+#: src/gui/widgets/tabs/gmtab.cpp:31
+msgid "GM"
+msgstr ""
+
+#. TRANSLATORS: guild chat tab name
+#. TRANSLATORS: tab in social window
+#. TRANSLATORS: guild chat tab name
+#: src/gui/widgets/tabs/guildchattab.cpp:37
+#: src/gui/windows/socialwindow.cpp:181 src/gui/windows/socialwindow.cpp:316
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Ceh"
+
+#. TRANSLATORS: guild chat tab help
+#. TRANSLATORS: guild chat help
+#. TRANSLATORS: party help message
+#: src/gui/widgets/tabs/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:94
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#. TRANSLATORS: guild chat tab help
+#. TRANSLATORS: guild chat help
+#: src/gui/widgets/tabs/guildchattab.cpp:64 src/net/ea/gui/guildtab.cpp:71
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#. TRANSLATORS: guild chat tab help
+#. TRANSLATORS: guild chat help
+#. TRANSLATORS: party help message
+#: src/gui/widgets/tabs/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:73
+#: src/net/ea/gui/partytab.cpp:98
+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 (\")."
+
+#. TRANSLATORS: guild chat tab help
+#. TRANSLATORS: guild chat help
+#. TRANSLATORS: party help message
+#: src/gui/widgets/tabs/guildchattab.cpp:72 src/net/ea/gui/guildtab.cpp:79
+#: src/net/ea/gui/partytab.cpp:104
+msgid "Command: /leave"
+msgstr ""
+
+#. TRANSLATORS: guild chat tab help
+#. TRANSLATORS: guild chat help
+#: src/gui/widgets/tabs/guildchattab.cpp:74 src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#. TRANSLATORS: guild chat tab help
+#. TRANSLATORS: guild chat help
+#. TRANSLATORS: party help message
+#: src/gui/widgets/tabs/guildchattab.cpp:119 src/net/ea/gui/guildtab.cpp:142
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/help > Display this help."
+msgstr ""
+
+#. TRANSLATORS: guild chat tab help
+#. TRANSLATORS: guild chat help
+#: src/gui/widgets/tabs/guildchattab.cpp:121 src/net/ea/gui/guildtab.cpp:144
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#. TRANSLATORS: guild chat tab help
+#. TRANSLATORS: guild chat help
+#: src/gui/widgets/tabs/guildchattab.cpp:123 src/net/ea/gui/guildtab.cpp:146
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#. TRANSLATORS: guild chat tab help
+#. TRANSLATORS: guild chat help
+#: src/gui/widgets/tabs/guildchattab.cpp:125 src/net/ea/gui/guildtab.cpp:148
+msgid "/kick > Kick someone from the guild you are in"
+msgstr ""
+
+#. TRANSLATORS: lang chat tab name
+#: src/gui/widgets/tabs/langtab.cpp:31
+msgid "Lang"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_audio.cpp:47
 msgid "(no sound)"
 msgstr ""
 
 #. TRANSLATORS: audio tab in settings
-#: src/gui/setup_audio.cpp:61
+#: src/gui/widgets/tabs/setup_audio.cpp:61
 msgid "Audio"
 msgstr "Zvuk"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:69
+#: src/gui/widgets/tabs/setup_audio.cpp:69
 msgid "Basic settings"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:72
+#: src/gui/widgets/tabs/setup_audio.cpp:72
 msgid "Enable Audio"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:75
 msgid "Enable music"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:79
 msgid "Enable game sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:83
 msgid "Enable gui sfx"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:87
 msgid "Sfx volume"
 msgstr "Glasnoća zvučnih efekata"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:91
 msgid "Music volume"
 msgstr "Glasnoća glazbe"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:95
 msgid "Enable music fade out"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:99
 msgid "Audio frequency"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/setup_audio.cpp:103
+#: src/gui/widgets/tabs/setup_audio.cpp:103
 msgid "mono"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/setup_audio.cpp:105
+#: src/gui/widgets/tabs/setup_audio.cpp:105
 msgid "stereo"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:107
 msgid "surround"
 msgstr ""
 
 #. TRANSLATORS: audio type
-#: src/gui/setup_audio.cpp:109
+#: src/gui/widgets/tabs/setup_audio.cpp:109
 msgid "surround+center+lfe"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:111
 msgid "Audio channels"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_audio.cpp:116
+#: src/gui/widgets/tabs/setup_audio.cpp:116
 msgid "Sound effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:119
 msgid "Information dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:123
 msgid "Request dialog sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:127
 msgid "Whisper message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:131
 msgid "Guild / Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:135
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:139
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:143
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:147
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:151
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:155
+#: src/gui/widgets/tabs/setup_audio.cpp:155
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Download music"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_chat.cpp:49
+#: src/gui/widgets/tabs/setup_chat.cpp:49
 msgid "Window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:52
+#: src/gui/widgets/tabs/setup_chat.cpp:52
 msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:56
+#: src/gui/widgets/tabs/setup_chat.cpp:56
 msgid "Protect chat focus"
 msgstr ""
 
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#. TRANSLATORS: emotes tab name
+#: src/gui/widgets/tabs/setup_chat.cpp:61
+#: src/gui/widgets/tabs/setup_colors.cpp:83
+#: src/gui/windows/emotewindow.cpp:109
+msgid "Colors"
+msgstr "Boje"
+
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:64
+#: src/gui/widgets/tabs/setup_chat.cpp:64
 msgid "Remove colors from received chat messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:68
+#: src/gui/widgets/tabs/setup_chat.cpp:68
 msgid "Show chat colors list"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:73
+#: src/gui/widgets/tabs/setup_chat.cpp:73
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:76
+#: src/gui/widgets/tabs/setup_chat.cpp:76
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_chat.cpp:81
+#: src/gui/widgets/tabs/setup_chat.cpp:81
 msgid "Limits"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:84
+#: src/gui/widgets/tabs/setup_chat.cpp:84
 msgid "Limit max chars in chat line"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:88
+#: src/gui/widgets/tabs/setup_chat.cpp:88
 msgid "Limit max lines in chat"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_chat.cpp:93
+#: src/gui/widgets/tabs/setup_chat.cpp:93
 msgid "Logs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:96
+#: src/gui/widgets/tabs/setup_chat.cpp:96
 msgid "Enable chat Log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:100
+#: src/gui/widgets/tabs/setup_chat.cpp:100
 msgid "Enable debug chat Log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:104
+#: src/gui/widgets/tabs/setup_chat.cpp:104
 msgid "Show chat history"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:108
+#: src/gui/widgets/tabs/setup_chat.cpp:108
 msgid "Show party online messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:112
+#: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid "Show guild online messages"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_chat.cpp:117
+#: src/gui/widgets/tabs/setup_chat.cpp:117
 msgid "Messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:120
+#: src/gui/widgets/tabs/setup_chat.cpp:120
 msgid "Hide shop messages"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Stavi sve šapate u kartice"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_chat.cpp:187
-msgid "Show MVP messages"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+msgid "Show emotes button in chat"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:47
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+msgid "Show motd server message on start"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Ovako izgleda boja"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:60
 msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:64 src/gui/setup_colors.cpp:332
+#: src/gui/widgets/tabs/setup_colors.cpp:64
+#: src/gui/widgets/tabs/setup_colors.cpp:335
 msgid "Delay:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:68
+#: src/gui/widgets/tabs/setup_colors.cpp:68
 msgid "Red:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:72
+#: src/gui/widgets/tabs/setup_colors.cpp:72
 msgid "Green:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:76
+#: src/gui/widgets/tabs/setup_colors.cpp:76
 msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:100 src/gui/setup_colors.cpp:399
+#: src/gui/widgets/tabs/setup_colors.cpp:102
+#: src/gui/widgets/tabs/setup_colors.cpp:402
 msgid "Static"
 msgstr "Statično"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:103 src/gui/setup_colors.cpp:106
-#: src/gui/setup_colors.cpp:401
+#: src/gui/widgets/tabs/setup_colors.cpp:105
+#: src/gui/widgets/tabs/setup_colors.cpp:108
+#: src/gui/widgets/tabs/setup_colors.cpp:404
 msgid "Pulse"
 msgstr "Pulsiranje"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:108 src/gui/setup_colors.cpp:111
-#: src/gui/setup_colors.cpp:403
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:113
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Duga"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:113 src/gui/setup_colors.cpp:116
-#: src/gui/setup_colors.cpp:403
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spektar"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:326
+#: src/gui/widgets/tabs/setup_colors.cpp:329
 msgid "Alpha:"
 msgstr ""
 
-#. TRANSLATORS: setup button
-#: src/gui/setup.cpp:83
-msgid "Apply"
-msgstr "Primjeni"
-
-#. TRANSLATORS: setup button
-#: src/gui/setup.cpp:89
-msgid "Reset Windows"
-msgstr "Ponovno pokreni prozore"
-
 #. TRANSLATORS: button in input settings tab
-#: src/gui/setup_input.cpp:97
+#: src/gui/widgets/tabs/setup_input.cpp:98
 msgid "Assign"
 msgstr "Dodijeli"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/setup_input.cpp:99
+#: src/gui/widgets/tabs/setup_input.cpp:100
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/setup_input.cpp:101
+#: src/gui/widgets/tabs/setup_input.cpp:102
 msgid "Default"
 msgstr "Zadano"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/setup_input.cpp:103
+#: src/gui/widgets/tabs/setup_input.cpp:104
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/setup_input.cpp:111
+#: src/gui/widgets/tabs/setup_input.cpp:113
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/setup_input.cpp:196
+#: src/gui/widgets/tabs/setup_input.cpp:198
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
 #. TRANSLATORS: input settings error
-#: src/gui/setup_input.cpp:198
+#: src/gui/widgets/tabs/setup_input.cpp:200
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
+#. TRANSLATORS: unknown key name
+#. TRANSLATORS: quests window quest name
+#: src/gui/widgets/tabs/setup_input.cpp:362
+#: src/gui/windows/questswindow.cpp:250
+msgid "unknown"
+msgstr ""
+
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:137
+#: src/gui/widgets/tabs/setup_joystick.cpp:46
+#: src/gui/widgets/tabs/setup_joystick.cpp:137
 msgid "Press the button to start calibration"
 msgstr "Pritisnite tipku za početak kalibracije"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/setup_joystick.cpp:48 src/gui/setup_joystick.cpp:134
+#: src/gui/widgets/tabs/setup_joystick.cpp:48
+#: src/gui/widgets/tabs/setup_joystick.cpp:134
 msgid "Calibrate"
 msgstr "Kalibriraj"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/setup_joystick.cpp:50
+#: src/gui/widgets/tabs/setup_joystick.cpp:50
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:53
 msgid "Enable joystick"
 msgstr "Omogući igraću palicu"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/setup_joystick.cpp:57
+#: src/gui/widgets/tabs/setup_joystick.cpp:57
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/setup_joystick.cpp:61
+#: src/gui/widgets/tabs/setup_joystick.cpp:61
 msgid "Joystick"
 msgstr "Igraća palica"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/setup_joystick.cpp:143
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/setup_joystick.cpp:146
+#: src/gui/widgets/tabs/setup_joystick.cpp:146
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/setup_other.cpp:41
+#: src/gui/widgets/tabs/setup_other.cpp:42
 msgid "Always show"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/setup_other.cpp:43
+#: src/gui/widgets/tabs/setup_other.cpp:44
 msgid "Auto hide in small resolution"
 msgstr ""
 
 #. TRANSLATORS: show buttons at top right corner type
-#: src/gui/setup_other.cpp:45
+#: src/gui/widgets/tabs/setup_other.cpp:46
 msgid "Always auto hide"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/setup_other.cpp:53
+#: src/gui/widgets/tabs/setup_other.cpp:54
 msgid "System proxy"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/setup_other.cpp:55
+#: src/gui/widgets/tabs/setup_other.cpp:56
 msgid "Direct connection"
 msgstr ""
 
 #. TRANSLATORS: Proxy type selection
-#: src/gui/setup_other.cpp:62
+#: src/gui/widgets/tabs/setup_other.cpp:63
 msgid "SOCKS5 hostname"
 msgstr ""
 
 #. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#: src/gui/widgets/tabs/setup_other.cpp:71
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
+#: src/gui/windows/inventorywindow.cpp:69
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/setup_other.cpp:72 src/gui/setup_visual.cpp:55
-#: src/gui/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_other.cpp:73
+#: src/gui/widgets/tabs/setup_visual.cpp:55
+#: src/gui/widgets/tabs/setup_visual.cpp:144
 msgid "low"
 msgstr "nisko"
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: particle details
-#: src/gui/setup_other.cpp:74 src/gui/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:75
+#: src/gui/widgets/tabs/setup_visual.cpp:146
 msgid "medium"
 msgstr "srednje"
 
 #. TRANSLATORS: screen density type
-#: src/gui/setup_other.cpp:76
+#: src/gui/widgets/tabs/setup_other.cpp:77
 msgid "tv"
 msgstr ""
 
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: particle details
-#: src/gui/setup_other.cpp:78 src/gui/setup_visual.cpp:57
-#: src/gui/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:57
+#: src/gui/widgets/tabs/setup_visual.cpp:148
 msgid "high"
 msgstr "visoko"
 
 #. TRANSLATORS: screen density type
-#: src/gui/setup_other.cpp:80
+#: src/gui/widgets/tabs/setup_other.cpp:81
 msgid "xhigh"
 msgstr ""
 
 #. TRANSLATORS: screen density type
-#: src/gui/setup_other.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:83
 msgid "xxhigh"
 msgstr ""
 
 #. TRANSLATORS: misc tab in settings
-#: src/gui/setup_other.cpp:92
+#: src/gui/widgets/tabs/setup_other.cpp:93
 msgid "Misc"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:99 src/gui/userpalette.cpp:128
-msgid "Monsters"
-msgstr "Čudovišta"
-
-#. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:102
+#: src/gui/widgets/tabs/setup_other.cpp:103
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:107
 msgid "Auto target only reachable monsters"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:110
+#: src/gui/widgets/tabs/setup_other.cpp:111
 msgid "Highlight monster attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:115
+#: src/gui/widgets/tabs/setup_other.cpp:116
 msgid "Show monster hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:119
+#: src/gui/widgets/tabs/setup_other.cpp:120
 msgid "Cycle monster targets"
 msgstr ""
 
+#. TRANSLATORS: settings group
+#. TRANSLATORS: debug window tab
+#. TRANSLATORS: mini map window name
+#: src/gui/widgets/tabs/setup_other.cpp:125 src/gui/windowmenu.cpp:103
+#: src/gui/windows/debugwindow.cpp:70 src/gui/windows/minimap.cpp:51
+#: src/gui/windows/minimap.cpp:113
+msgid "Map"
+msgstr "Karta"
+
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:127
+#: src/gui/widgets/tabs/setup_other.cpp:128
 msgid "Show warps particles"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:131
+#: src/gui/widgets/tabs/setup_other.cpp:132
 msgid "Highlight map portals"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:135
+#: src/gui/widgets/tabs/setup_other.cpp:136
 msgid "Highlight floor items"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:139
+#: src/gui/widgets/tabs/setup_other.cpp:140
 msgid "Highlight player attack range"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:143
+#: src/gui/widgets/tabs/setup_other.cpp:144
 msgid "Show extended minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:147
+#: src/gui/widgets/tabs/setup_other.cpp:148
 msgid "Draw path"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:151
+#: src/gui/widgets/tabs/setup_other.cpp:152
 msgid "Draw hotkeys on map"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:155
+#: src/gui/widgets/tabs/setup_other.cpp:156
 msgid "Enable lazy scrolling"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:159
+#: src/gui/widgets/tabs/setup_other.cpp:160
 msgid "Scroll laziness"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:163
+#: src/gui/widgets/tabs/setup_other.cpp:164
 msgid "Scroll radius"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:167
+#: src/gui/widgets/tabs/setup_other.cpp:168
 msgid "Auto resize minimaps"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_other.cpp:172
+#: src/gui/widgets/tabs/setup_other.cpp:173
 msgid "Moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:175
+#: src/gui/widgets/tabs/setup_other.cpp:176
 msgid "Auto fix position"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:179
+#: src/gui/widgets/tabs/setup_other.cpp:180
 msgid "Attack while moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:183
+#: src/gui/widgets/tabs/setup_other.cpp:184
 msgid "Attack next target"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:187
+#: src/gui/widgets/tabs/setup_other.cpp:188
 msgid "Sync player move"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:191
+#: src/gui/widgets/tabs/setup_other.cpp:192
 msgid "Crazy move A program"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:195
+#: src/gui/widgets/tabs/setup_other.cpp:196
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_other.cpp:200
+#: src/gui/widgets/tabs/setup_other.cpp:201
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/widgets/tabs/setup_other.cpp:203
 msgid "Show own hp bar"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:206
+#: src/gui/widgets/tabs/setup_other.cpp:207
 msgid "Enable quick stats"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:210
+#: src/gui/widgets/tabs/setup_other.cpp:211
 msgid "Cycle player targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:214
+#: src/gui/widgets/tabs/setup_other.cpp:215
 msgid "Show job exp messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:218
+#: src/gui/widgets/tabs/setup_other.cpp:219
 msgid "Show players popups"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:222
+#: src/gui/widgets/tabs/setup_other.cpp:223
 msgid "Afk message"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:226
+#: src/gui/widgets/tabs/setup_other.cpp:227
 msgid "Show job"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:230
+#: src/gui/widgets/tabs/setup_other.cpp:231
 msgid "Enable attack filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:234
+#: src/gui/widgets/tabs/setup_other.cpp:235
 msgid "Enable pickup filter"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:238
+#: src/gui/widgets/tabs/setup_other.cpp:239
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:241
+#: src/gui/widgets/tabs/setup_other.cpp:242
 msgid "Enable weight notifications"
 msgstr ""
 
+#. TRANSLATORS: settings group
+#. TRANSLATORS: full button name
+#. TRANSLATORS: shop window name
+#. TRANSLATORS: inventory button
+#: src/gui/widgets/tabs/setup_other.cpp:247 src/gui/windowmenu.cpp:144
+#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
+#: src/gui/windows/inventorywindow.cpp:223
+msgid "Shop"
+msgstr "Trgovina"
+
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:249
+#: src/gui/widgets/tabs/setup_other.cpp:250
 msgid "Accept sell/buy requests"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:253
+#: src/gui/widgets/tabs/setup_other.cpp:254
 msgid "Enable shop mode"
 msgstr ""
 
+#. TRANSLATORS: settings group
+#. TRANSLATORS: npc dialog name
+#. TRANSLATORS: npc post dialog caption
+#: src/gui/widgets/tabs/setup_other.cpp:259 src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcpostdialog.cpp:44
+msgid "NPC"
+msgstr "NPC"
+
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:261
+#: src/gui/widgets/tabs/setup_other.cpp:262
 msgid "Cycle npc targets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:265
+#: src/gui/widgets/tabs/setup_other.cpp:266
 msgid "Log NPC dialogue"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_other.cpp:270
+#: src/gui/widgets/tabs/setup_other.cpp:271
 msgid "Bots support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:273
+#: src/gui/widgets/tabs/setup_other.cpp:274
 msgid "Enable auction bot support"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:277
+#: src/gui/widgets/tabs/setup_other.cpp:278
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_other.cpp:283
+#: src/gui/widgets/tabs/setup_other.cpp:284
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:286
+#: src/gui/widgets/tabs/setup_other.cpp:287
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:290
+#: src/gui/widgets/tabs/setup_other.cpp:291
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:294
+#: src/gui/widgets/tabs/setup_other.cpp:295
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:302
+#: src/gui/widgets/tabs/setup_other.cpp:303
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:308
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:312
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:316
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:324
 msgid "Enable server side attack"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:327
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:331
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Enable bot checker"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:335
+#: src/gui/widgets/tabs/setup_other.cpp:336
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:340
+#: src/gui/widgets/tabs/setup_other.cpp:341
 msgid "Enable debug log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:345
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:349
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:353
 msgid "Low traffic mode"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:357
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:361
+#: src/gui/widgets/tabs/setup_other.cpp:362
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:366
+#: src/gui/widgets/tabs/setup_other.cpp:367
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:370
+#: src/gui/widgets/tabs/setup_other.cpp:371
 msgid "Show background"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
 msgid "Screen density override"
 msgstr ""
 
+#. TRANSLATORS: texture compression type
+#. TRANSLATORS: confirm dialog button
+#: src/gui/widgets/tabs/setup_perfomance.cpp:39
+#: src/gui/windows/confirmdialog.cpp:55
+msgid "No"
+msgstr "Ne"
+
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/widgets/tabs/setup_perfomance.cpp:58
 msgid "Better performance (enable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:62
+#: src/gui/widgets/tabs/setup_perfomance.cpp:62
 msgid "Auto adjust performance"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:66
+#: src/gui/widgets/tabs/setup_perfomance.cpp:66
 msgid "Hw acceleration"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/widgets/tabs/setup_perfomance.cpp:70
 msgid "Enable opacity cache (Software, can use much memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:75
+#: src/gui/widgets/tabs/setup_perfomance.cpp:75
 msgid "Enable map reduce (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/widgets/tabs/setup_perfomance.cpp:80
 msgid "Enable compound sprite delay (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:84
+#: src/gui/widgets/tabs/setup_perfomance.cpp:84
 msgid "Enable delayed images load (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:88
+#: src/gui/widgets/tabs/setup_perfomance.cpp:88
 msgid "Enable texture sampler (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:93
+#: src/gui/widgets/tabs/setup_perfomance.cpp:93
 msgid "Better quality (disable for better performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:97
+#: src/gui/widgets/tabs/setup_perfomance.cpp:97
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:102
+#: src/gui/widgets/tabs/setup_perfomance.cpp:102
 msgid "Show beings transparency"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:106
+#: src/gui/widgets/tabs/setup_perfomance.cpp:106
 msgid "Enable reorder sprites."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:111
+#: src/gui/widgets/tabs/setup_perfomance.cpp:111
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:116
+#: src/gui/widgets/tabs/setup_perfomance.cpp:116
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:120
+#: src/gui/widgets/tabs/setup_perfomance.cpp:120
 msgid "Disable beings caching (Software)"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_perfomance.cpp:125
+#: src/gui/widgets/tabs/setup_perfomance.cpp:125
 msgid "Different options (enable or disable can improve performance)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:131
+#: src/gui/widgets/tabs/setup_perfomance.cpp:131
 msgid "Enable texture compression (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:135
+#: src/gui/widgets/tabs/setup_perfomance.cpp:135
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:139
+#: src/gui/widgets/tabs/setup_perfomance.cpp:139
 msgid "Use new texture internal format (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:143
+#: src/gui/widgets/tabs/setup_perfomance.cpp:143
 msgid "Enable texture atlases (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:147
+#: src/gui/widgets/tabs/setup_perfomance.cpp:147
 msgid "Cache all sprites per map (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_perfomance.cpp:152
+#: src/gui/widgets/tabs/setup_perfomance.cpp:152
 msgid "Cache all sounds (can use additinal memory)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:44
+#: src/gui/widgets/tabs/setup_players.cpp:44
 msgid "Show gender"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:48
+#: src/gui/widgets/tabs/setup_players.cpp:48
 msgid "Show level"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:52
+#: src/gui/widgets/tabs/setup_players.cpp:52
 msgid "Show own name"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:56
+#: src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Enable extended mouse targeting"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:60
+#: src/gui/widgets/tabs/setup_players.cpp:60
 msgid "Target dead players"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:64
+#: src/gui/widgets/tabs/setup_players.cpp:64
 msgid "Visible names"
 msgstr "Vidljiva imena"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:68
+#: src/gui/widgets/tabs/setup_players.cpp:68
 msgid "Auto move names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:72
+#: src/gui/widgets/tabs/setup_players.cpp:72
 msgid "Secure trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:76
+#: src/gui/widgets/tabs/setup_players.cpp:76
 msgid "Unsecure chars in names"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:80
+#: src/gui/widgets/tabs/setup_players.cpp:80
 msgid "Show statuses"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:84
+#: src/gui/widgets/tabs/setup_players.cpp:84
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:88
+#: src/gui/widgets/tabs/setup_players.cpp:88
 msgid "Allow self heal with mouse click"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:92
+#: src/gui/widgets/tabs/setup_players.cpp:92
 msgid "Group friends in who is online window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:96
+#: src/gui/widgets/tabs/setup_players.cpp:96
 msgid "Hide erased players nicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_players.cpp:100
+#: src/gui/widgets/tabs/setup_players.cpp:100
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#: src/gui/setup_relations.cpp:60
+#. TRANSLATORS: bot checker window table header
+#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/windows/botcheckerwindow.cpp:298
+msgid "Name"
+msgstr "Ime"
+
+#. TRANSLATORS: relations table header
+#: src/gui/widgets/tabs/setup_relations.cpp:60
 msgid "Relation"
 msgstr "Odnos"
 
 #. TRANSLATORS: relation type
-#: src/gui/setup_relations.cpp:66
+#: src/gui/widgets/tabs/setup_relations.cpp:66
 msgid "Neutral"
 msgstr "Neutralno"
 
 #. TRANSLATORS: relation type
-#: src/gui/setup_relations.cpp:68
+#: src/gui/widgets/tabs/setup_relations.cpp:68
 msgid "Friend"
 msgstr "Prijatelj"
 
 #. TRANSLATORS: relation type
-#: src/gui/setup_relations.cpp:70
+#: src/gui/widgets/tabs/setup_relations.cpp:70
 msgid "Disregarded"
 msgstr "Zanemareno"
 
 #. TRANSLATORS: relation type
-#: src/gui/setup_relations.cpp:72
+#: src/gui/widgets/tabs/setup_relations.cpp:72
 msgid "Ignored"
 msgstr "Ignorirano"
 
 #. TRANSLATORS: relation type
-#: src/gui/setup_relations.cpp:74
+#: src/gui/widgets/tabs/setup_relations.cpp:74
 msgid "Erased"
 msgstr ""
 
 #. TRANSLATORS: relation type
-#: src/gui/setup_relations.cpp:76
+#: src/gui/widgets/tabs/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
 #. TRANSLATORS: relation type
-#: src/gui/setup_relations.cpp:78
+#: src/gui/widgets/tabs/setup_relations.cpp:78
 msgid "Enemy"
 msgstr ""
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/setup_relations.cpp:254
+#: src/gui/widgets/tabs/setup_relations.cpp:254
 msgid "Allow trading"
 msgstr "Dozvoli trgovanje"
 
 #. TRANSLATORS: relation dialog button
-#: src/gui/setup_relations.cpp:257
+#: src/gui/widgets/tabs/setup_relations.cpp:257
 msgid "Allow whispers"
 msgstr "Dozvoli šapate"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/setup_relations.cpp:264
+#: src/gui/widgets/tabs/setup_relations.cpp:264
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/setup_relations.cpp:288
+#: src/gui/widgets/tabs/setup_relations.cpp:288
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:83
+#: src/gui/widgets/tabs/setup_theme.cpp:82
 msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:85
+#: src/gui/widgets/tabs/setup_theme.cpp:84
 msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:87
+#: src/gui/widgets/tabs/setup_theme.cpp:86
 msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:89
+#: src/gui/widgets/tabs/setup_theme.cpp:88
 msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:91
+#: src/gui/widgets/tabs/setup_theme.cpp:90
 msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:93
+#: src/gui/widgets/tabs/setup_theme.cpp:92
 msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:95
+#: src/gui/widgets/tabs/setup_theme.cpp:94
 msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:97
+#: src/gui/widgets/tabs/setup_theme.cpp:96
 msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:99
+#: src/gui/widgets/tabs/setup_theme.cpp:98
 msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:101
+#: src/gui/widgets/tabs/setup_theme.cpp:100
 msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:103
+#: src/gui/widgets/tabs/setup_theme.cpp:102
 msgid "Big (18)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:105
+#: src/gui/widgets/tabs/setup_theme.cpp:104
 msgid "Big (19)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:107
+#: src/gui/widgets/tabs/setup_theme.cpp:106
 msgid "Very big (20)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:109
+#: src/gui/widgets/tabs/setup_theme.cpp:108
 msgid "Very big (21)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:111
+#: src/gui/widgets/tabs/setup_theme.cpp:110
 msgid "Very big (22)"
 msgstr ""
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:113
+#: src/gui/widgets/tabs/setup_theme.cpp:112
 msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:148
+#: src/gui/widgets/tabs/setup_theme.cpp:147
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:150
+#: src/gui/widgets/tabs/setup_theme.cpp:149
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:152
+#: src/gui/widgets/tabs/setup_theme.cpp:151
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:154
+#: src/gui/widgets/tabs/setup_theme.cpp:153
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:156
+#: src/gui/widgets/tabs/setup_theme.cpp:155
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:158
+#: src/gui/widgets/tabs/setup_theme.cpp:157
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:160
+#: src/gui/widgets/tabs/setup_theme.cpp:159
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:162
+#: src/gui/widgets/tabs/setup_theme.cpp:161
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:164
+#: src/gui/widgets/tabs/setup_theme.cpp:163
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:166
+#: src/gui/widgets/tabs/setup_theme.cpp:165
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:168
+#: src/gui/widgets/tabs/setup_theme.cpp:167
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:170
+#: src/gui/widgets/tabs/setup_theme.cpp:169
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:172
+#: src/gui/widgets/tabs/setup_theme.cpp:171
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:174
+#: src/gui/widgets/tabs/setup_theme.cpp:173
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:176
+#: src/gui/widgets/tabs/setup_theme.cpp:175
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:178
+#: src/gui/widgets/tabs/setup_theme.cpp:177
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/widgets/tabs/setup_theme.cpp:229
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:237
+#: src/gui/widgets/tabs/setup_theme.cpp:236
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:242
+#: src/gui/widgets/tabs/setup_theme.cpp:241
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:250
+#. TRANSLATORS: font size
+#: src/gui/widgets/tabs/setup_theme.cpp:245 src/gui/windows/emotewindow.cpp:44
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:249
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:254
+#: src/gui/widgets/tabs/setup_theme.cpp:253
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:258
+#: src/gui/widgets/tabs/setup_theme.cpp:257
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:262
+#: src/gui/widgets/tabs/setup_theme.cpp:261
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:267
+#: src/gui/widgets/tabs/setup_theme.cpp:266
 msgid "Font size"
 msgstr "Veličina fonta"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:272
+#: src/gui/widgets/tabs/setup_theme.cpp:271
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:276
+#: src/gui/widgets/tabs/setup_theme.cpp:275
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog
-#: src/gui/setup_theme.cpp:403
+#: src/gui/widgets/tabs/setup_theme.cpp:402
 msgid "Name: "
 msgstr ""
 
-#: src/gui/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
 msgid "Copyright:"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:461
+#: src/gui/widgets/tabs/setup_theme.cpp:460
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:486
+#: src/gui/widgets/tabs/setup_theme.cpp:485
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:486 src/gui/setup_video.cpp:490
-#: src/gui/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_theme.cpp:485
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/setup_touch.cpp:36
+#: src/gui/widgets/tabs/setup_touch.cpp:36
 msgid "Small"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/setup_touch.cpp:40
+#. TRANSLATORS: update type
+#: src/gui/widgets/tabs/setup_touch.cpp:38 src/gui/windows/logindialog.cpp:79
+msgid "Normal"
+msgstr ""
+
+#. TRANSLATORS: onscreen button size
+#: src/gui/widgets/tabs/setup_touch.cpp:40
 msgid "Medium"
 msgstr ""
 
 #. TRANSLATORS: onscreen button size
-#: src/gui/setup_touch.cpp:42
+#: src/gui/widgets/tabs/setup_touch.cpp:42
 msgid "Large"
 msgstr ""
 
 #. TRANSLATORS: touch settings tab
-#: src/gui/setup_touch.cpp:60
+#: src/gui/widgets/tabs/setup_touch.cpp:63
 msgid "Touch"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_touch.cpp:69
+#: src/gui/widgets/tabs/setup_touch.cpp:72
 msgid "Onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_touch.cpp:72
+#: src/gui/widgets/tabs/setup_touch.cpp:75
 msgid "Show onscreen keyboard icon"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_touch.cpp:76
+#: src/gui/widgets/tabs/setup_touch.cpp:79
 msgid "Keyboard icon action"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_touch.cpp:82
+#: src/gui/widgets/tabs/setup_touch.cpp:85
 msgid "Onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_touch.cpp:85
+#: src/gui/widgets/tabs/setup_touch.cpp:88
 msgid "Show onscreen joystick"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_touch.cpp:89
+#: src/gui/widgets/tabs/setup_touch.cpp:92
 msgid "Joystick size"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/setup_touch.cpp:94
+#: src/gui/widgets/tabs/setup_touch.cpp:97
 msgid "Onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_touch.cpp:97
+#: src/gui/widgets/tabs/setup_touch.cpp:100
 msgid "Show onscreen buttons"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_touch.cpp:101
+#: src/gui/widgets/tabs/setup_touch.cpp:104
 msgid "Buttons format"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_touch.cpp:105
+#: src/gui/widgets/tabs/setup_touch.cpp:108
 msgid "Buttons size"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_touch.cpp:109 src/gui/setup_touch.cpp:114
-#: src/gui/setup_touch.cpp:119 src/gui/setup_touch.cpp:124
+#: src/gui/widgets/tabs/setup_touch.cpp:116
 #, c-format
 msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:186
 msgid "Full screen"
 msgstr "Pregled na čitavom ekranu"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:189
 msgid "FPS limit:"
 msgstr ""
 
 #. TRANSLATORS: video settings label
-#: src/gui/setup_video.cpp:194 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:422 src/gui/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:194
+#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:424
+#: src/gui/widgets/tabs/setup_video.cpp:551
 msgid "Alt FPS limit: "
 msgstr ""
 
 #. TRANSLATORS: video settings button
-#: src/gui/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:197
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:206
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:209
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:213
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:216
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
-#: src/gui/setup_video.cpp:231 src/gui/setup_video.cpp:235
-#: src/gui/setup_video.cpp:420 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:545
+#: src/gui/widgets/tabs/setup_video.cpp:233
+#: src/gui/widgets/tabs/setup_video.cpp:237
+#: src/gui/widgets/tabs/setup_video.cpp:422
+#: src/gui/widgets/tabs/setup_video.cpp:535
+#: src/gui/widgets/tabs/setup_video.cpp:548
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/setup_video.cpp:342
+#: src/gui/widgets/tabs/setup_video.cpp:344
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/setup_video.cpp:349
+#: src/gui/widgets/tabs/setup_video.cpp:351
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_video.cpp:361
+#: src/gui/widgets/tabs/setup_video.cpp:363
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:365
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_video.cpp:381
+#: src/gui/widgets/tabs/setup_video.cpp:383
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:385
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/setup_video.cpp:461
+#: src/gui/widgets/tabs/setup_video.cpp:463
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:465
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:491
+#: src/gui/widgets/tabs/setup_video.cpp:500
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:491
+#: src/gui/widgets/tabs/setup_video.cpp:494
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #. TRANSLATORS: speach type
-#: src/gui/setup_visual.cpp:39
+#: src/gui/widgets/tabs/setup_visual.cpp:39
 msgid "No text"
 msgstr "Nema teksta"
 
 #. TRANSLATORS: speach type
-#: src/gui/setup_visual.cpp:41
+#: src/gui/widgets/tabs/setup_visual.cpp:41
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANSLATORS: speach type
-#: src/gui/setup_visual.cpp:43
+#: src/gui/widgets/tabs/setup_visual.cpp:43
 msgid "Bubbles, no names"
 msgstr "Mjehurići, bez imena"
 
 #. TRANSLATORS: speach type
-#: src/gui/setup_visual.cpp:45
+#: src/gui/widgets/tabs/setup_visual.cpp:45
 msgid "Bubbles with names"
 msgstr "Mjehurići s imenima"
 
 #. TRANSLATORS: ambient effect type
 #. TRANSLATORS: vsync type
-#: src/gui/setup_visual.cpp:53 src/gui/setup_visual.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:53
+#: src/gui/widgets/tabs/setup_visual.cpp:79
 msgid "off"
 msgstr "isključeno"
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/setup_visual.cpp:65
+#: src/gui/widgets/tabs/setup_visual.cpp:65
 msgid "best quality"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/setup_visual.cpp:67
+#: src/gui/widgets/tabs/setup_visual.cpp:67
 msgid "normal"
 msgstr ""
 
 #. TRANSLATORS: patricle effects type
-#: src/gui/setup_visual.cpp:69
+#: src/gui/widgets/tabs/setup_visual.cpp:69
 msgid "best performance"
 msgstr ""
 
 #. TRANSLATORS: vsync type
-#: src/gui/setup_visual.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:81
 msgid "on"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
-#: src/gui/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:93
 msgid "Visual"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:102
 msgid "Notifications"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:105
 msgid "Show pickup notifications in chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:109
 msgid "Show pickup notifications as particle effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:113
 msgid "Effects"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:117
 msgid "Grab mouse and keyboard input"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:122
 msgid "Blurring textures (OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:126
 msgid "Gui opacity"
 msgstr "Prozirnost sučelja"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:131
 msgid "Overhead text"
 msgstr "Tekst iznad glave"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:136
 msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
-#. TRANSLATORS: settings option
-#. TRANSLATORS: palette color
-#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:139
-msgid "Particle effects"
-msgstr "Efekt čestica"
-
 #. TRANSLATORS: particle details
-#: src/gui/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:150
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:151
 msgid "Particle detail"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:158
 msgid "Particle physics"
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:163 src/gui/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/widgets/tabs/setup_visual.cpp:170
 msgid "Gamma"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:166
 msgid "Enable gamma control"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:179
 msgid "Vsync"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:184
 msgid "Center game window"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:189
 msgid "Allow screensaver to run"
 msgstr ""
 
+#. TRANSLATORS: whisper tab help
+#: src/gui/widgets/tabs/whispertab.cpp:101
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#. TRANSLATORS: whisper tab help
+#: src/gui/widgets/tabs/whispertab.cpp:103
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#. TRANSLATORS: whisper tab help
+#: src/gui/widgets/tabs/whispertab.cpp:105
+msgid "/close > Close the whisper tab"
+msgstr "/close > Zatvara karticu za šaptaje"
+
+#. TRANSLATORS: whisper tab help
+#: src/gui/widgets/tabs/whispertab.cpp:116
+msgid "Command: /close"
+msgstr "Naredba: /close"
+
+#. TRANSLATORS: whisper tab help
+#: src/gui/widgets/tabs/whispertab.cpp:118
+msgid "This command closes the current whisper tab."
+msgstr "Ova naredba zatvara trenutnu karticu za šaptaje."
+
+#. TRANSLATORS: whisper tab help
+#: src/gui/widgets/tabs/whispertab.cpp:123
+msgid "Command: /ignore"
+msgstr ""
+
+#. TRANSLATORS: whisper tab help
+#: src/gui/widgets/tabs/whispertab.cpp:125
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+
+#. TRANSLATORS: whisper tab help
+#: src/gui/widgets/tabs/whispertab.cpp:131
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#. TRANSLATORS: whisper tab help
+#: src/gui/widgets/tabs/whispertab.cpp:133
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#. TRANSLATORS: short button name for who is online window.
+#: src/gui/windowmenu.cpp:68
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "Who is online"
+msgstr ""
+
+#. TRANSLATORS: short button name for help window.
+#: src/gui/windowmenu.cpp:71
+msgid "HLP"
+msgstr ""
+
+#. TRANSLATORS: short button name for quests window.
+#: src/gui/windowmenu.cpp:74
+msgid "QE"
+msgstr ""
+
+#. TRANSLATORS: quests window name
+#: src/gui/windowmenu.cpp:75 src/gui/windows/questswindow.cpp:122
+msgid "Quests"
+msgstr ""
+
+#. TRANSLATORS: short button name for bot checker window.
+#: src/gui/windowmenu.cpp:77
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:78
+msgid "Bot checker"
+msgstr ""
+
+#. TRANSLATORS: short button name for kill stats window.
+#: src/gui/windowmenu.cpp:80
+msgid "KS"
+msgstr ""
+
+#. TRANSLATORS: kill stats window name
+#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:42
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:83
+msgid "Smilies"
+msgstr ""
+
+#. TRANSLATORS: short button name for chat window.
+#: src/gui/windowmenu.cpp:85
+msgid "CH"
+msgstr ""
+
+#. TRANSLATORS: short button name for status window.
+#: src/gui/windowmenu.cpp:93
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Status"
+msgstr "Stanje"
+
+#. TRANSLATORS: short button name for equipment window.
+#: src/gui/windowmenu.cpp:96
+msgid "EQU"
+msgstr ""
+
+#. TRANSLATORS: equipment window name
+#. TRANSLATORS: inventory button
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windows/inventorywindow.cpp:225
+msgid "Equipment"
+msgstr "Oprema"
+
+#. TRANSLATORS: short button name for inventory window.
+#: src/gui/windowmenu.cpp:99
+msgid "INV"
+msgstr ""
+
+#. TRANSLATORS: inventory window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:158
+#: src/inventory.cpp:257
+msgid "Inventory"
+msgstr "Zalihe"
+
+#. TRANSLATORS: short button name for map window.
+#: src/gui/windowmenu.cpp:102
+msgid "MAP"
+msgstr ""
+
+#. TRANSLATORS: short button name for skills window.
+#: src/gui/windowmenu.cpp:108
+msgid "SKI"
+msgstr ""
+
+#. TRANSLATORS: skills dialog name
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:283
+msgid "Skills"
+msgstr "Vještine"
+
+#. TRANSLATORS: short button name for specials window.
+#: src/gui/windowmenu.cpp:116
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:117
+msgid "Specials"
+msgstr ""
+
+#. TRANSLATORS: short button name for social window.
+#: src/gui/windowmenu.cpp:122
+msgid "SOC"
+msgstr ""
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: social window name
+#: src/gui/windowmenu.cpp:124 src/gui/windows/socialwindow.cpp:1277
+msgid "Social"
+msgstr ""
+
+#. TRANSLATORS: short button name for shortcuts window.
+#: src/gui/windowmenu.cpp:126
+msgid "SH"
+msgstr ""
+
+#. TRANSLATORS: short button name for spells window.
+#: src/gui/windowmenu.cpp:130
+msgid "SP"
+msgstr ""
+
+#. TRANSLATORS: short button name for drops window.
+#: src/gui/windowmenu.cpp:134
+msgid "DR"
+msgstr ""
+
+#. TRANSLATORS: short button name for did you know window.
+#: src/gui/windowmenu.cpp:138
+msgid "YK"
+msgstr ""
+
+#. TRANSLATORS: full button name
+#: src/gui/windowmenu.cpp:140
+msgid "Did you know"
+msgstr ""
+
+#. TRANSLATORS: short button name for shop window.
+#: src/gui/windowmenu.cpp:142
+msgid "SHP"
+msgstr ""
+
+#. TRANSLATORS: short button name for outfits window.
+#: src/gui/windowmenu.cpp:146
+msgid "OU"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:150
+msgid "DBG"
+msgstr ""
+
+#. TRANSLATORS: short button name for windows list menu.
+#: src/gui/windowmenu.cpp:159
+msgid "WIN"
+msgstr ""
+
+#. TRANSLATORS: short button name for setup window.
+#: src/gui/windowmenu.cpp:163
+msgid "SET"
+msgstr ""
+
+#. TRANSLATORS: short key name
+#. TRANSLATORS: outfits window label
+#: src/gui/windowmenu.cpp:298 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windows/outfitwindow.cpp:560
+#, c-format
+msgid "Key: %s"
+msgstr ""
+
+#. TRANSLATORS: bot checker window header
+#: src/gui/windows/botcheckerwindow.cpp:262
+msgid "Bot Checker"
+msgstr ""
+
+#. TRANSLATORS: bot checker window button
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+msgid "Reset"
+msgstr "Poništi"
+
+#. TRANSLATORS: bot checker window table header
+#: src/gui/windows/botcheckerwindow.cpp:306
+msgid "Result"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/windows/buydialog.cpp:57
+msgid "unsorted"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/windows/buydialog.cpp:59
+msgid "by price"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:73
+msgid "by id"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:75
+msgid "by weight"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:77
+msgid "by amount"
+msgstr ""
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:79
+msgid "by type"
+msgstr ""
+
+#. TRANSLATORS: buy dialog name
+#: src/gui/windows/buydialog.cpp:195
+msgid "Create items"
+msgstr ""
+
+#. TRANSLATORS: buy dialog label
+#. TRANSLATORS: sell dialog label
+#: src/gui/windows/buydialog.cpp:253 src/gui/windows/buydialog.cpp:540
+#: src/gui/windows/selldialog.cpp:99 src/gui/windows/selldialog.cpp:365
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Cijena: %s / Ukupno: %s"
+
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:262
+msgid "Amount:"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: status window label (plus sign)
+#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:801
+msgid "+"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: status window label (minus sign)
+#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:814
+msgid "-"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: social window button
+#: src/gui/windows/buydialog.cpp:273 src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:591
+#: src/gui/windows/socialwindow.cpp:1299
+msgid "Create"
+msgstr "Stvori"
+
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
+#: src/gui/windows/statuswindow.cpp:540 src/gui/windows/statuswindow.cpp:595
+#: src/gui/windows/statuswindow.cpp:798 src/gui/windows/statuswindow.cpp:830
+msgid "Max"
+msgstr "Max"
+
+#. TRANSLATORS: change email dialog header
+#. TRANSLATORS: button in change email dialog
+#: src/gui/windows/changeemaildialog.cpp:47
+#: src/gui/windows/changeemaildialog.cpp:52
+msgid "Change Email Address"
+msgstr "Promijeni Email Adresu"
+
+#. TRANSLATORS: label in change email dialog
+#. TRANSLATORS: change password dialog label
+#: src/gui/windows/changeemaildialog.cpp:60
+#: src/gui/windows/changepassworddialog.cpp:63
+#, c-format
+msgid "Account: %s"
+msgstr "Korisnički račun: %s"
+
+#. TRANSLATORS: label in change email dialog
+#: src/gui/windows/changeemaildialog.cpp:64
+msgid "Type new email address twice:"
+msgstr ""
+
+#. TRANSLATORS: change email error
+#: src/gui/windows/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be at least %u characters long."
+msgstr ""
+
+#. TRANSLATORS: change email error
+#: src/gui/windows/changeemaildialog.cpp:147
+#, c-format
+msgid "The new email address needs to be less than %u characters long."
+msgstr ""
+
+#. TRANSLATORS: change email error
+#: src/gui/windows/changeemaildialog.cpp:155
+msgid "The email address entries mismatch."
+msgstr ""
+
+#. TRANSLATORS: change password window name
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/changepassworddialog.cpp:48
+#: src/gui/windows/changepassworddialog.cpp:54
+#: src/gui/windows/charselectdialog.cpp:97
+msgid "Change Password"
+msgstr "Promijeni Lozinku"
+
+#. TRANSLATORS: change password dialog label
+#. TRANSLATORS: login dialog label
+#. TRANSLATORS: register dialog. label.
+#. TRANSLATORS: unregister dialog. label.
+#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/logindialog.cpp:186 src/gui/windows/registerdialog.cpp:90
+#: src/gui/windows/unregisterdialog.cpp:65
+msgid "Password:"
+msgstr "Lozinka"
+
+#. TRANSLATORS: change password dialog label
+#: src/gui/windows/changepassworddialog.cpp:70
+msgid "Type new password twice:"
+msgstr ""
+
+#. TRANSLATORS: change password error
+#: src/gui/windows/changepassworddialog.cpp:120
+msgid "Enter the old password first."
+msgstr ""
+
+#. TRANSLATORS: change password error
+#: src/gui/windows/changepassworddialog.cpp:127
+#, c-format
+msgid "The new password needs to be at least %u characters long."
+msgstr ""
+
+#. TRANSLATORS: change password error
+#: src/gui/windows/changepassworddialog.cpp:135
+#, c-format
+msgid "The new password needs to be less than %u characters long."
+msgstr ""
+
+#. TRANSLATORS: change password error
+#: src/gui/windows/changepassworddialog.cpp:143
+msgid "The new password entries mismatch."
+msgstr ""
+
+#. TRANSLATORS: char create dialog name
+#: src/gui/windows/charcreatedialog.cpp:65
+msgid "New Character"
+msgstr ""
+
+#. TRANSLATORS: char create dialog label
+#. TRANSLATORS: edit server dialog label
+#. TRANSLATORS: login dialog label
+#. TRANSLATORS: register dialog. label.
+#: src/gui/windows/charcreatedialog.cpp:71
+#: src/gui/windows/editserverdialog.cpp:88 src/gui/windows/logindialog.cpp:184
+#: src/gui/windows/registerdialog.cpp:88
+msgid "Name:"
+msgstr "Ime:"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: outfits window button
+#: src/gui/windows/charcreatedialog.cpp:75
+#: src/gui/windows/charcreatedialog.cpp:84
+#: src/gui/windows/charcreatedialog.cpp:101
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
+#: src/gui/windows/outfitwindow.cpp:58
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: outfits window button
+#: src/gui/windows/charcreatedialog.cpp:79
+#: src/gui/windows/charcreatedialog.cpp:86
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
+#: src/gui/windows/outfitwindow.cpp:56
+msgid "<"
+msgstr ""
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:81
+msgid "Hair color:"
+msgstr ""
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:88
+msgid "Hair style:"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:99
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: register dialog. button.
+#: src/gui/windows/charcreatedialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:109
+msgid "Male"
+msgstr "Muško"
+
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: register dialog. button.
+#: src/gui/windows/charcreatedialog.cpp:105
+#: src/gui/windows/registerdialog.cpp:111
+msgid "Female"
+msgstr "Žensko"
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:466
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Molimo, rasporedi %d bodova"
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:174
+msgid "Race:"
+msgstr ""
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:184
+msgid "Look:"
+msgstr ""
+
+#. TRANSLATORS: char creation error
+#: src/gui/windows/charcreatedialog.cpp:359
+msgid "Your name needs to be at least 4 characters."
+msgstr "Ime mora imati barem 4 znaka."
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:456
+msgid "Character stats OK"
+msgstr "Podaci lika su u redu"
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:472
+#, c-format
+msgid "Please remove %d points"
+msgstr "Molimo, oduzmi %d bodova"
+
+#. TRANSLATORS: char deletion message
+#: src/gui/windows/charselectdialog.cpp:62
+msgid "Confirm Character Delete"
+msgstr "Potvrdi Brisanje Lika"
+
+#. TRANSLATORS: char deletion message
+#: src/gui/windows/charselectdialog.cpp:64
+msgid "Are you sure you want to delete this character?"
+msgstr "Da li ste sigurni da želite obrisati ovog lika?"
+
+#. TRANSLATORS: char select dialog name
+#: src/gui/windows/charselectdialog.cpp:88
+#, c-format
+msgid "Account %s (last login time %s)"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:95
+msgid "Switch Login"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: updater window button
+#: src/gui/windows/charselectdialog.cpp:102
+#: src/gui/windows/charselectdialog.cpp:586
+#: src/gui/windows/updaterwindow.cpp:181
+msgid "Play"
+msgstr "Igraj"
+
+#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: info message
+#: src/gui/windows/charselectdialog.cpp:104
+#: src/net/ea/charserverhandler.cpp:216
+msgid "Info"
+msgstr "Info"
+
+#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/charselectdialog.cpp:131
+#: src/gui/windows/unregisterdialog.cpp:47
+#: src/gui/windows/unregisterdialog.cpp:52
+msgid "Unregister"
+msgstr "Odjavi"
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:143
+msgid "Change Email"
+msgstr ""
+
+#. TRANSLATORS: char select dialog name
+#: src/gui/windows/charselectdialog.cpp:181
+#, c-format
+msgid "Account %s"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. player info message.
+#: src/gui/windows/charselectdialog.cpp:255
+#, c-format
+msgid ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Level: %u\n"
+"Experience: %u\n"
+"Money: %s"
+msgstr ""
+
+#: src/gui/windows/charselectdialog.cpp:297
+msgid "Incorrect password"
+msgstr ""
+
+#. TRANSLATORS: char deletion question.
+#: src/gui/windows/charselectdialog.cpp:433
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/windows/charselectdialog.cpp:433
+msgid "Enter password:"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/windows/chatwindow.cpp:172
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/windows/chatwindow.cpp:174
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/windows/chatwindow.cpp:176
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/chatwindow.cpp:740
+#, c-format
+msgid "Present: %s; %d players are present."
+msgstr ""
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/chatwindow.cpp:1154
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Šaptaj prema %s: %s"
+
+#. TRANSLATORS: confirm dialog button
+#: src/gui/windows/confirmdialog.cpp:53
+msgid "Yes"
+msgstr "Da"
+
+#. TRANSLATORS: debug window tab
+#: src/gui/windows/debugwindow.cpp:72
+msgid "Target"
+msgstr ""
+
+#. TRANSLATORS: debug window tab
+#: src/gui/windows/debugwindow.cpp:74
+msgid "Net"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:169 src/gui/windows/debugwindow.cpp:300
+#: src/gui/windows/debugwindow.cpp:351
+msgid "Music:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:171 src/gui/windows/debugwindow.cpp:306
+#: src/gui/windows/debugwindow.cpp:355
+msgid "Map:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:173 src/gui/windows/debugwindow.cpp:303
+#: src/gui/windows/debugwindow.cpp:353
+msgid "Minimap:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:176 src/gui/windows/debugwindow.cpp:297
+#: src/gui/windows/debugwindow.cpp:349
+msgid "Cursor:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:179
+msgid "Particle count:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:182 src/gui/windows/debugwindow.cpp:319
+#: src/gui/windows/debugwindow.cpp:359
+msgid "Map actors count:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:184 src/gui/windows/debugwindow.cpp:278
+#: src/gui/windows/debugwindow.cpp:284
+msgid "Player Position:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:190 src/gui/windows/debugwindow.cpp:332
+msgid "Draw calls:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:195 src/gui/windows/debugwindow.cpp:340
+msgid "Texture binds:"
+msgstr ""
+
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/windows/debugwindow.cpp:198
+#, c-format
+msgid "%d FPS"
+msgstr ""
+
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/windows/debugwindow.cpp:200 src/gui/windows/debugwindow.cpp:367
+#, c-format
+msgid "%d LPS"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:211 src/gui/windows/debugwindow.cpp:235
+#, c-format
+msgid "%d FPS (Software)"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:218
+#, c-format
+msgid "%d FPS (normal OpenGL)"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:222
+#, c-format
+msgid "%d FPS (safe OpenGL)"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:226
+#, c-format
+msgid "%d FPS (mobile OpenGL)"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:230
+#, c-format
+msgid "%d FPS (SDL2 default)"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:255 src/gui/windows/debugwindow.cpp:325
+msgid "Textures count:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:314
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:374 src/gui/windows/debugwindow.cpp:425
+#: src/gui/windows/debugwindow.cpp:487
+msgid "Target:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:376 src/gui/windows/debugwindow.cpp:431
+#: src/gui/windows/debugwindow.cpp:489
+msgid "Target Id:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:379 src/gui/windows/debugwindow.cpp:434
+#: src/gui/windows/debugwindow.cpp:491
+msgid "Target type:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:381
+msgid "Target level:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:383 src/gui/windows/debugwindow.cpp:450
+msgid "Target race:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:385
+msgid "Target party:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:387
+msgid "Target guild:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:389 src/gui/windows/debugwindow.cpp:475
+#: src/gui/windows/debugwindow.cpp:481 src/gui/windows/debugwindow.cpp:499
+msgid "Attack delay:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:391 src/gui/windows/debugwindow.cpp:462
+#: src/gui/windows/debugwindow.cpp:501
+msgid "Minimal hit:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:393 src/gui/windows/debugwindow.cpp:465
+#: src/gui/windows/debugwindow.cpp:503
+msgid "Maximum hit:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:395 src/gui/windows/debugwindow.cpp:468
+#: src/gui/windows/debugwindow.cpp:505
+msgid "Critical hit:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:439 src/gui/windows/debugwindow.cpp:445
+#: src/gui/windows/debugwindow.cpp:493
+msgid "Target Level:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:453 src/gui/windows/debugwindow.cpp:495
+msgid "Target Party:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:457 src/gui/windows/debugwindow.cpp:497
+msgid "Target Guild:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:542 src/gui/windows/debugwindow.cpp:548
+#, c-format
+msgid "Ping: %s ms"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:551
+#, c-format
+msgid "In: %d bytes/s"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/windows/debugwindow.cpp:554
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#. TRANSLATORS: did you know window name
+#: src/gui/windows/didyouknowwindow.cpp:50
+msgid "Did You Know?"
+msgstr ""
+
+#. TRANSLATORS: did you know window button
+#: src/gui/windows/didyouknowwindow.cpp:57
+msgid "< Previous"
+msgstr ""
+
+#. TRANSLATORS: did you know window button
+#: src/gui/windows/didyouknowwindow.cpp:59
+msgid "Next >"
+msgstr ""
+
+#. TRANSLATORS: did you know window checkbox
+#: src/gui/windows/didyouknowwindow.cpp:61
+msgid "Auto open this window"
+msgstr ""
+
+#. TRANSLATORS: edit dialog label
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: ok dialog button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: text dialog button
+#: src/gui/windows/editdialog.cpp:48 src/gui/windows/editserverdialog.cpp:76
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:50
+#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:46
+msgid "OK"
+msgstr "U redu"
+
+#. TRANSLATORS: edit server dialog name
+#: src/gui/windows/editserverdialog.cpp:65
+msgid "Edit Server"
+msgstr ""
+
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: servers dialog button
+#: src/gui/windows/editserverdialog.cpp:74
+#: src/gui/windows/serverdialog.cpp:256
+msgid "Connect"
+msgstr ""
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:90
+msgid "Address:"
+msgstr ""
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:92
+msgid "Port:"
+msgstr "Port:"
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:94
+msgid "Server type:"
+msgstr ""
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:96
+msgid "Description:"
+msgstr ""
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:98
+msgid "Online list url:"
+msgstr ""
+
+#. TRANSLATORS: edit server dialog error message
+#: src/gui/windows/editserverdialog.cpp:219
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/windows/emotewindow.cpp:42
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/windows/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
+#. TRANSLATORS: help window. button.
+#: src/gui/windows/helpwindow.cpp:53
+msgid "Did you know..."
+msgstr ""
+
+#. TRANSLATORS: item amount window button
+#: src/gui/windows/itemamountwindow.cpp:211
+msgid "All"
+msgstr "Sve"
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:267
+msgid "Select amount of items to trade."
+msgstr "Odaberi količinu predmeta za razmjenu."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:271
+msgid "Select amount of items to drop."
+msgstr "Odaberi količinu predmeta za ispuštanje."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:275
+msgid "Select amount of items to store."
+msgstr "Odaberite količinu predmeta za spremanje."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:279
+msgid "Select amount of items to retrieve."
+msgstr "Odaberite iznos predmeta za preuzimanje."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:283
+msgid "Select amount of items to split."
+msgstr "Odaberi količinu predmeta za razdvajanje."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:287
+msgid "Add to buy shop."
+msgstr ""
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:291
+msgid "Add to sell shop."
+msgstr ""
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:295
+msgid "Unknown."
+msgstr ""
+
+#. TRANSLATORS: kill stats window button
+#: src/gui/windows/killstats.cpp:50
+msgid "Reset stats"
+msgstr ""
+
+#. TRANSLATORS: kill stats window button
+#: src/gui/windows/killstats.cpp:52
+msgid "Reset timer"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:57 src/gui/windows/killstats.cpp:169
+#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:507
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:60 src/gui/windows/killstats.cpp:171
+#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
+#: src/gui/windows/killstats.cpp:509
+#, c-format
+msgid "Avg Exp: %s"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:62 src/gui/windows/killstats.cpp:174
+#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
+#: src/gui/windows/killstats.cpp:512
+#, c-format
+msgid "No. of avg mob to next level: %s"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:65 src/gui/windows/killstats.cpp:185
+#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:515
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:74
+#: src/gui/windows/killstats.cpp:79 src/gui/windows/killstats.cpp:335
+#: src/gui/windows/killstats.cpp:354 src/gui/windows/killstats.cpp:375
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:76
+#: src/gui/windows/killstats.cpp:82
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:283
+msgid "Last kill exp:"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:88 src/gui/windows/killstats.cpp:406
+#: src/gui/windows/killstats.cpp:413 src/gui/windows/killstats.cpp:420
+#: src/gui/windows/killstats.cpp:426
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:119 src/gui/windows/killstats.cpp:236
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:241
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:128 src/gui/windows/killstats.cpp:247
+#: src/gui/windows/killstats.cpp:261
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:341 src/gui/windows/killstats.cpp:350
+#: src/gui/windows/killstats.cpp:361 src/gui/windows/killstats.cpp:370
+#: src/gui/windows/killstats.cpp:383 src/gui/windows/killstats.cpp:392
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:413
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/windows/killstats.cpp:420
+msgid "jacko spawning"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/windows/logindialog.cpp:81
+msgid "Auto Close"
+msgstr ""
+
+#. TRANSLATORS: update type
+#: src/gui/windows/logindialog.cpp:83
+msgid "Skip"
+msgstr ""
+
+#. TRANSLATORS: login dialog name
+#. TRANSLATORS: login dialog button
+#: src/gui/windows/logindialog.cpp:145 src/gui/windows/logindialog.cpp:162
+msgid "Login"
+msgstr "Korisničko ime"
+
+#. TRANSLATORS: login dialog label
+#: src/gui/windows/logindialog.cpp:152
+msgid "Remember username"
+msgstr ""
+
+#. TRANSLATORS: login dialog label
+#: src/gui/windows/logindialog.cpp:155
+msgid "Update:"
+msgstr ""
+
+#. TRANSLATORS: login dialog button
+#: src/gui/windows/logindialog.cpp:160
+msgid "Change Server"
+msgstr ""
+
+#. TRANSLATORS: login dialog button
+#. TRANSLATORS: register dialog name
+#. TRANSLATORS: register dialog. button.
+#: src/gui/windows/logindialog.cpp:164 src/gui/windows/registerdialog.cpp:65
+#: src/gui/windows/registerdialog.cpp:74
+msgid "Register"
+msgstr "Registriraj se"
+
+#. TRANSLATORS: login dialog checkbox
+#: src/gui/windows/logindialog.cpp:166
+msgid "Custom update host"
+msgstr ""
+
+#. TRANSLATORS: login dialog label
+#: src/gui/windows/logindialog.cpp:180
+msgid "Server:"
+msgstr "Poslužitelj:"
+
+#. TRANSLATORS: login dialog label
+#: src/gui/windows/logindialog.cpp:190
+#, c-format
+msgid "Update host: %s"
+msgstr ""
+
+#: src/gui/windows/logindialog.cpp:305
+msgid "Open register url"
+msgstr ""
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:65
+msgid "health bar"
+msgstr ""
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:69
+msgid "mana bar"
+msgstr ""
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:73
+msgid "experience bar"
+msgstr ""
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:77
+msgid "weight bar"
+msgstr ""
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:80
+msgid "inventory slots bar"
+msgstr ""
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:83
+msgid "money bar"
+msgstr ""
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:86
+msgid "arrows bar"
+msgstr ""
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:90
+msgid "status bar"
+msgstr ""
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:113
+msgid "job bar"
+msgstr ""
+
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#: src/gui/windows/ministatuswindow.cpp:314
+#: src/gui/windows/statuswindow.cpp:302
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr ""
+
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#: src/gui/windows/ministatuswindow.cpp:321
+#: src/gui/windows/statuswindow.cpp:146 src/gui/windows/statuswindow.cpp:309
+#: src/gui/windows/statuswindow.cpp:380
+#, c-format
+msgid "Level: %d"
+msgstr "Nivo: %d"
+
+#. TRANSLATORS: status bar label
+#: src/gui/windows/ministatuswindow.cpp:337
+#: src/gui/windows/ministatuswindow.cpp:375
+msgid "Need"
+msgstr ""
+
+#. TRANSLATORS: job bar label
+#: src/gui/windows/ministatuswindow.cpp:361
+#, c-format
+msgid "Job level: %d"
+msgstr ""
+
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:67
+msgid "Stop waiting"
+msgstr ""
+
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:69
+msgid "Next"
+msgstr "Slijedeći"
+
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:73
+msgid "Submit"
+msgstr "Dostavi"
+
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/tradewindow.cpp:79
+msgid "Add"
+msgstr "Dodaj"
+
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/npcpostdialog.cpp:57
+msgid "To:"
+msgstr "Za:"
+
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/npcpostdialog.cpp:64
+msgid "Send"
+msgstr "Pošalji"
+
+#. TRANSLATORS: npc post message error
+#: src/gui/windows/npcpostdialog.cpp:111
+msgid "Failed to send as sender or letter invalid."
+msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
+
+#. TRANSLATORS: outfits window label
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:554
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#. TRANSLATORS: outfits window checkbox
+#: src/gui/windows/outfitwindow.cpp:64
+msgid "Unequip first"
+msgstr ""
+
+#. TRANSLATORS: outfits window checkbox
+#: src/gui/windows/outfitwindow.cpp:67
+msgid "Away outfit"
+msgstr ""
+
+#. TRANSLATORS: quit dialog button
+#: src/gui/windows/quitdialog.cpp:61
+msgid "Switch server"
+msgstr "Promijeni poslužitelj"
+
+#. TRANSLATORS: quit dialog button
+#: src/gui/windows/quitdialog.cpp:64
+msgid "Switch character"
+msgstr "Promijeni lika"
+
+#. TRANSLATORS: register dialog. label.
+#: src/gui/windows/registerdialog.cpp:92
+msgid "Confirm:"
+msgstr "Potvrdi:"
+
+#. TRANSLATORS: register dialog. label.
+#: src/gui/windows/registerdialog.cpp:132
+msgid "Email:"
+msgstr "E-pošta:"
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:204
+#, c-format
+msgid "The username needs to be at least %u characters long."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:213
+#, c-format
+msgid "The username needs to be less than %u characters long."
+msgstr ""
+
+#. TRANSLATORS: error message
+#. TRANSLATORS: unregister dialog. error message.
+#: src/gui/windows/registerdialog.cpp:222
+#: src/gui/windows/unregisterdialog.cpp:129
+#, c-format
+msgid "The password needs to be at least %u characters long."
+msgstr ""
+
+#. TRANSLATORS: error message
+#. TRANSLATORS: unregister dialog. error message.
+#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/unregisterdialog.cpp:136
+#, c-format
+msgid "The password needs to be less than %u characters long."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:239
+msgid "Passwords do not match."
+msgstr "Lozinke se ne podudaraju."
+
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/selldialog.cpp:245
+msgid "sell item"
+msgstr ""
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/selldialog.cpp:247
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr ""
+
+#. TRANSLATORS: servers dialog name
+#: src/gui/windows/serverdialog.cpp:247
+msgid "Choose Your Server"
+msgstr ""
+
+#. TRANSLATORS: servers dialog button
+#: src/gui/windows/serverdialog.cpp:264
+msgid "Load"
+msgstr ""
+
+#. TRANSLATORS: servers dialog name
+#: src/gui/windows/serverdialog.cpp:280
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
+
+#. TRANSLATORS: servers dialog checkbox
+#: src/gui/windows/serverdialog.cpp:289
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:529
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:535
+msgid "Waiting for server..."
+msgstr ""
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:540
+msgid "Preparing download"
+msgstr ""
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:545
+msgid "Error retreiving server list!"
+msgstr ""
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:635
+msgid "requires a newer version"
+msgstr ""
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:640
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#. TRANSLATORS: setup button
+#: src/gui/windows/setup.cpp:88
+msgid "Apply"
+msgstr "Primjeni"
+
+#. TRANSLATORS: setup button
+#: src/gui/windows/setup.cpp:94
+msgid "Reset Windows"
+msgstr "Ponovno pokreni prozore"
+
 #. TRANSLATORS: shop window name
-#: src/gui/shopwindow.cpp:73
+#: src/gui/windows/shopwindow.cpp:73
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/shopwindow.cpp:87
+#: src/gui/windows/shopwindow.cpp:87
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/shopwindow.cpp:89
+#: src/gui/windows/shopwindow.cpp:89
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/windows/shopwindow.cpp:95 src/gui/windows/shopwindow.cpp:102
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:106
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/shopwindow.cpp:163 src/gui/shopwindow.cpp:166
+#: src/gui/windows/shopwindow.cpp:166 src/gui/windows/shopwindow.cpp:169
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/shopwindow.cpp:775 src/net/ea/tradehandler.cpp:106
+#: src/gui/windows/shopwindow.cpp:783 src/net/ea/tradehandler.cpp:105
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
-#: src/gui/shopwindow.cpp:775
+#: src/gui/windows/shopwindow.cpp:783
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:279 src/gui/windowmenu.cpp:106
-msgid "Skills"
-msgstr "Vještine"
-
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:288
+#: src/gui/windows/skilldialog.cpp:292
 msgid "Up"
 msgstr "Gore"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:400
+#: src/gui/windows/skilldialog.cpp:408
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:453
+#: src/gui/windows/skilldialog.cpp:461
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:456
+#: src/gui/windows/skilldialog.cpp:464
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:493
+#: src/gui/windows/skilldialog.cpp:502
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:527
+#: src/gui/windows/skilldialog.cpp:536
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:621 src/gui/widgets/skillinfo.cpp:89
-#, c-format
-msgid "Lvl: %d"
-msgstr ""
-
-#. TRANSLATORS: tab in social window
-#. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:179 src/gui/socialwindow.cpp:312
-#: src/gui/widgets/guildchattab.cpp:37 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Ceh"
-
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:219
+#: src/gui/windows/socialwindow.cpp:222
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:234
+#: src/gui/windows/socialwindow.cpp:237
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:248
+#: src/gui/windows/socialwindow.cpp:251
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:250
+#: src/gui/windows/socialwindow.cpp:253
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:259
+#: src/gui/windows/socialwindow.cpp:263
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:261
+#: src/gui/windows/socialwindow.cpp:265
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/socialwindow.cpp:272
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/socialwindow.cpp:294 src/gui/socialwindow.cpp:364
-#: src/gui/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:298 src/gui/windows/socialwindow.cpp:369
+#: src/gui/windows/socialwindow.cpp:493
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:379 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:384 src/net/ea/gui/partytab.cpp:46
 msgid "Party"
 msgstr "Partija"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:418
+#: src/gui/windows/socialwindow.cpp:424
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:433
+#: src/gui/windows/socialwindow.cpp:439
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:447
+#: src/gui/windows/socialwindow.cpp:453
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:449
+#: src/gui/windows/socialwindow.cpp:455
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:465
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:467
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/socialwindow.cpp:684
+#: src/gui/windows/socialwindow.cpp:692
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:710
+#: src/gui/windows/socialwindow.cpp:719
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/socialwindow.cpp:812
+#: src/gui/windows/socialwindow.cpp:821
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:1038
+#: src/gui/windows/socialwindow.cpp:1048
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/windows/socialwindow.cpp:1067
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:1059
+#: src/gui/windows/socialwindow.cpp:1069
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:1061
+#: src/gui/windows/socialwindow.cpp:1071
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:1084
+#: src/gui/windows/socialwindow.cpp:1095
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:1103
+#: src/gui/windows/socialwindow.cpp:1114
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:1105
+#: src/gui/windows/socialwindow.cpp:1116
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/windows/socialwindow.cpp:1205
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1216 src/gui/socialwindow.cpp:1694
+#: src/gui/windows/socialwindow.cpp:1228 src/gui/windows/socialwindow.cpp:1717
 msgid "Create Party"
 msgstr ""
 
-#. TRANSLATORS: social window name
-#. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1263 src/gui/windowmenu.cpp:121
-msgid "Social"
-msgstr ""
-
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1276
+#: src/gui/windows/socialwindow.cpp:1290
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/windows/socialwindow.cpp:1295
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1287
+#: src/gui/windows/socialwindow.cpp:1301
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1473
+#: src/gui/windows/socialwindow.cpp:1493
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1484
+#: src/gui/windows/socialwindow.cpp:1504
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/windows/socialwindow.cpp:1521
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1515
+#: src/gui/windows/socialwindow.cpp:1535
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1555
+#: src/gui/windows/socialwindow.cpp:1575
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/windows/socialwindow.cpp:1596
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/windows/socialwindow.cpp:1611
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/windows/socialwindow.cpp:1613
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/windows/socialwindow.cpp:1629
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1616
+#: src/gui/windows/socialwindow.cpp:1637
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1644
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/windows/socialwindow.cpp:1660
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1650
+#: src/gui/windows/socialwindow.cpp:1672
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1655
+#: src/gui/windows/socialwindow.cpp:1677
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1664
+#: src/gui/windows/socialwindow.cpp:1686
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1692
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1680
+#: src/gui/windows/socialwindow.cpp:1702
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:1695
+#: src/gui/windows/socialwindow.cpp:1718
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1701
+#: src/gui/windows/socialwindow.cpp:1724
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1703
+#: src/gui/windows/socialwindow.cpp:1726
 msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:148
+#: src/gui/windows/statuswindow.cpp:150
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:151
+#: src/gui/windows/statuswindow.cpp:153
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:207
+#: src/gui/windows/statuswindow.cpp:209
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:238 src/gui/statuswindow.cpp:428
+#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:430
 #, c-format
 msgid "Job: %d"
 msgstr "Zadatak: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:240
+#: src/gui/windows/statuswindow.cpp:242
 msgid "Job:"
 msgstr "Zadatak:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:293 src/gui/statuswindow.cpp:350
+#: src/gui/windows/statuswindow.cpp:295 src/gui/windows/statuswindow.cpp:352
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:365
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
 #. TRANSLATORS: target type
-#: src/gui/textcommandeditor.cpp:98
+#: src/gui/windows/textcommandeditor.cpp:99
 msgid "No Target"
 msgstr ""
 
 #. TRANSLATORS: target type
-#: src/gui/textcommandeditor.cpp:100
+#: src/gui/windows/textcommandeditor.cpp:101
 msgid "Allow Target"
 msgstr ""
 
 #. TRANSLATORS: target type
-#: src/gui/textcommandeditor.cpp:102
+#: src/gui/windows/textcommandeditor.cpp:103
 msgid "Need Target"
 msgstr ""
 
 #. TRANSLATORS: magic school
-#: src/gui/textcommandeditor.cpp:108
+#: src/gui/windows/textcommandeditor.cpp:109
 msgid "General Magic"
 msgstr ""
 
 #. TRANSLATORS: magic school
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/windows/textcommandeditor.cpp:111
 msgid "Life Magic"
 msgstr ""
 
 #. TRANSLATORS: magic school
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/windows/textcommandeditor.cpp:113
 msgid "War Magic"
 msgstr ""
 
 #. TRANSLATORS: magic school
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/windows/textcommandeditor.cpp:115
 msgid "Transmute Magic"
 msgstr ""
 
 #. TRANSLATORS: magic school
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/windows/textcommandeditor.cpp:117
 msgid "Nature Magic"
 msgstr ""
 
 #. TRANSLATORS: magic school
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/windows/textcommandeditor.cpp:119
 msgid "Astral Magic"
 msgstr ""
 
 #. TRANSLATORS: command editor name
-#: src/gui/textcommandeditor.cpp:162
+#: src/gui/windows/textcommandeditor.cpp:162
 msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/windows/textcommandeditor.cpp:167
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:169
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:171
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/textcommandeditor.cpp:174
+#: src/gui/windows/textcommandeditor.cpp:174
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/textcommandeditor.cpp:177
+#: src/gui/windows/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/windows/textcommandeditor.cpp:181
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/windows/textcommandeditor.cpp:185
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/windows/textcommandeditor.cpp:188
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/textcommandeditor.cpp:191
+#: src/gui/windows/textcommandeditor.cpp:191
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/windows/textcommandeditor.cpp:195
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/windows/textcommandeditor.cpp:198
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/windows/textcommandeditor.cpp:203
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/tradewindow.cpp:58
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Propose trade"
 msgstr "Predloži razmjenu"
 
 #. TRANSLATORS: trade window button
-#: src/gui/tradewindow.cpp:60
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr "Potvrđeno. Čekanje..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/tradewindow.cpp:62
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agree trade"
 msgstr "Složi se za trgovanje"
 
 #. TRANSLATORS: trade window button
-#: src/gui/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Agreed. Waiting..."
 msgstr "Dogovoreno. Čekanje..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Trade: You"
 msgstr "Trgovanje: Vi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:76 src/gui/tradewindow.cpp:183
+#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/tradewindow.cpp:81
+#: src/gui/windows/tradewindow.cpp:82
 msgid "Change"
 msgstr "Izmijeni"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:125
+#: src/gui/windows/tradewindow.cpp:126
 msgid "You give:"
 msgstr "Daješ:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:388
+#: src/gui/windows/tradewindow.cpp:389
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:474
+#: src/gui/windows/tradewindow.cpp:475
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:62
 #, c-format
 msgid "Name: %s"
 msgstr "Ime: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:152
+#: src/gui/windows/updaterwindow.cpp:152
 msgid "Updating..."
 msgstr "Ažuriranje"
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:177
+#: src/gui/windows/updaterwindow.cpp:177
 msgid "Connecting..."
 msgstr "Spajanje..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:722
+#: src/gui/windows/updaterwindow.cpp:727
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:724
+#: src/gui/windows/updaterwindow.cpp:729
 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:726
+#: src/gui/windows/updaterwindow.cpp:731
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:904
+#: src/gui/windows/updaterwindow.cpp:909
 msgid "Completed"
 msgstr "Dovršeno"
 
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:110
-msgid "Being"
-msgstr "Biće"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:112
-msgid "Friend names"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:114
-msgid "Disregarded names"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
-msgid "Ignored names"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Erased names"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Other players names"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Own name"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "GM names"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "NPCs"
-msgstr "NPCs"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "Monster HP bar"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
-msgid "Monster HP bar (second color)"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:135
-msgid "Party members"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:137
-msgid "Guild members"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Pickup notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Exp notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Player HP bar"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Player HP bar (second color)"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
-msgid "Player hits monster"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:153
-msgid "Monster hits player"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Other player hits local player"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Critical Hit"
-msgstr "Kritični Udarac"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Local player hits monster"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
-msgid "Local player critical hit"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local player miss"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:171
-msgid "Misses"
-msgstr "Promašaji"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:173
-msgid "Portal highlight"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
-msgid "Default collision highlight"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Air collision highlight"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Water collision highlight"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Special ground collision highlight"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Walkable highlight"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Local player attack range"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Local player attack range border"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Monster attack range"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:201
-msgid "Floor item amount color"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
-msgid "Home place"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
-msgid "Home place border"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
-msgid "Road point"
-msgstr ""
-
 #. TRANSLATORS: who is online window name
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:622
+#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:640
 msgid "Who Is Online - Updating"
 msgstr ""
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/whoisonline.cpp:93
+#: src/gui/windows/whoisonline.cpp:95
 msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/whoisonline.cpp:206
+#: src/gui/windows/whoisonline.cpp:211
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/whoisonline.cpp:637
+#: src/gui/windows/whoisonline.cpp:655
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/whoisonline.cpp:679
+#: src/gui/windows/whoisonline.cpp:697
 msgid "Who Is Online - Update"
 msgstr ""
 
-#. TRANSLATORS: battle chat tab name
-#: src/gui/widgets/battletab.cpp:34
-msgid "Battle"
-msgstr ""
-
-#: src/gui/widgets/characterdisplay.cpp:126
-#, c-format
-msgid "Level: %u"
-msgstr ""
-
-#. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:152
-msgid "Global announcement:"
-msgstr "Javna obavijest:"
-
-#. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:158
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Javna obavijest od %s:"
-
-#. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:184
-#, c-format
-msgid "%s whispers: %s"
-msgstr ""
-
-#. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
-#, c-format
-msgid "%s is now Online."
-msgstr ""
-
-#. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
-#, c-format
-msgid "%s is now Offline."
-msgstr ""
-
-#. TRANSLATORS: gb tab name
-#: src/gui/widgets/gmtab.cpp:31
-msgid "GM"
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#. TRANSLATORS: party help message
-#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:94
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/guildchattab.cpp:64 src/net/ea/gui/guildtab.cpp:71
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#. TRANSLATORS: party help message
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:73
-#: src/net/ea/gui/partytab.cpp:98
-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 (\")."
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#. TRANSLATORS: party help message
-#: src/gui/widgets/guildchattab.cpp:72 src/net/ea/gui/guildtab.cpp:79
-#: src/net/ea/gui/partytab.cpp:104
-msgid "Command: /leave"
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/guildchattab.cpp:74 src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#. TRANSLATORS: party help message
-#: src/gui/widgets/guildchattab.cpp:119 src/net/ea/gui/guildtab.cpp:142
-#: src/net/ea/gui/partytab.cpp:74
-msgid "/help > Display this help."
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/guildchattab.cpp:121 src/net/ea/gui/guildtab.cpp:144
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/guildchattab.cpp:123 src/net/ea/gui/guildtab.cpp:146
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#. TRANSLATORS: guild chat tab help
-#. TRANSLATORS: guild chat help
-#: src/gui/widgets/guildchattab.cpp:125 src/net/ea/gui/guildtab.cpp:148
-msgid "/kick > Kick someone from the guild you are in"
-msgstr ""
-
-#. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:322
-msgid "Eq."
-msgstr ""
-
-#. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:87
-msgid "Open url"
-msgstr ""
-
-#. TRANSLATORS: lang chat tab name
-#: src/gui/widgets/langtab.cpp:31
-msgid "Lang"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/whispertab.cpp:101
-msgid "/ignore > Ignore the other player"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/whispertab.cpp:103
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/whispertab.cpp:105
-msgid "/close > Close the whisper tab"
-msgstr "/close > Zatvara karticu za šaptaje"
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/whispertab.cpp:116
-msgid "Command: /close"
-msgstr "Naredba: /close"
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/whispertab.cpp:118
-msgid "This command closes the current whisper tab."
-msgstr "Ova naredba zatvara trenutnu karticu za šaptaje."
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/whispertab.cpp:123
-msgid "Command: /ignore"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/whispertab.cpp:125
-msgid "This command ignores the other player regardless of current relations."
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/whispertab.cpp:131
-msgid "Command: /unignore <player>"
-msgstr ""
-
-#. TRANSLATORS: whisper tab help
-#: src/gui/widgets/whispertab.cpp:133
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr ""
-
-#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:65
-msgid "ONL"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:66
-msgid "Who is online"
-msgstr ""
-
-#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:68
-msgid "HLP"
-msgstr ""
-
-#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:71
-msgid "QE"
-msgstr ""
-
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:74
-msgid "BC"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:75
-msgid "Bot checker"
-msgstr ""
-
-#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:77
-msgid "KS"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:80
-msgid "Smilies"
-msgstr ""
-
-#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:82
-msgid "CH"
-msgstr ""
-
-#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:90
-msgid "STA"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:91
-msgid "Status"
-msgstr "Stanje"
-
-#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:93
-msgid "EQU"
-msgstr ""
-
-#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:96
-msgid "INV"
-msgstr ""
-
-#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:99
-msgid "MAP"
-msgstr ""
-
-#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:105
-msgid "SKI"
-msgstr ""
-
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:113
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:114
-msgid "Specials"
-msgstr ""
-
-#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:119
-msgid "SOC"
-msgstr ""
-
-#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:123
-msgid "SH"
-msgstr ""
-
-#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:127
-msgid "SP"
-msgstr ""
-
-#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:131
-msgid "DR"
-msgstr ""
-
-#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:135
-msgid "YK"
-msgstr ""
-
-#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:137
-msgid "Did you know"
-msgstr ""
-
-#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:139
-msgid "SHP"
-msgstr ""
-
-#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:143
-msgid "OU"
-msgstr ""
-
-#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:147
-msgid "DBG"
-msgstr ""
-
-#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:156
-msgid "WIN"
-msgstr ""
-
-#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:160
-msgid "SET"
-msgstr ""
-
 #. TRANSLATORS: world select dialog name
-#: src/gui/worldselectdialog.cpp:84
+#: src/gui/windows/worldselectdialog.cpp:84
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/worldselectdialog.cpp:90
+#: src/gui/windows/worldselectdialog.cpp:90
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/worldselectdialog.cpp:92
+#: src/gui/windows/worldselectdialog.cpp:92
 msgid "Choose World"
 msgstr ""
 
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:362 src/input/inputmanager.cpp:406
+#: src/input/inputmanager.cpp:366 src/input/inputmanager.cpp:410
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:368
+#: src/input/inputmanager.cpp:372
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:386
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:412
+#: src/input/inputmanager.cpp:416
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6488,137 +6689,137 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:426 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:430 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:261
+#: src/inventory.cpp:262
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:266
+#: src/inventory.cpp:267
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:62
+#: src/main.cpp:77
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:64
+#: src/main.cpp:79
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:67
+#: src/main.cpp:82
 msgid "                  used to set custom parameters"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:69
+#: src/main.cpp:84
 msgid "                  to the manaplus client."
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:72
+#: src/main.cpp:87
 msgid "Options:"
 msgstr "Opcije:"
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:74
+#: src/main.cpp:89
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:76
+#: src/main.cpp:91
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:78
+#: src/main.cpp:93
 msgid "  -v --version        : Display the version"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:80
+#: src/main.cpp:95
 msgid "  -h --help           : Display this help"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:82
+#: src/main.cpp:97
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:85
+#: src/main.cpp:100
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:87
+#: src/main.cpp:102
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:89
+#: src/main.cpp:104
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:91
+#: src/main.cpp:106
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:93
+#: src/main.cpp:108
 msgid "  -p --port           : Login server port"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:95
+#: src/main.cpp:110
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:97
+#: src/main.cpp:112
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:100
+#: src/main.cpp:115
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:102
+#: src/main.cpp:117
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:105
+#: src/main.cpp:120
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:108
+#: src/main.cpp:123
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:111
+#: src/main.cpp:126
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:113
+#: src/main.cpp:128
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/main.cpp:117
+#: src/main.cpp:132
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -6711,13 +6912,13 @@ msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:86
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:95
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
@@ -6998,35 +7199,35 @@ msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:97
+#: src/net/ea/network.cpp:99
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:198
+#: src/net/ea/network.cpp:201
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:276
+#: src/net/ea/network.cpp:280
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:299 src/net/ea/playerhandler.cpp:311
-#: src/net/ea/playerhandler.cpp:395
+#: src/net/ea/playerhandler.cpp:300 src/net/ea/playerhandler.cpp:312
+#: src/net/ea/playerhandler.cpp:396
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:301
+#: src/net/ea/playerhandler.cpp:302
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:313
+#: src/net/ea/playerhandler.cpp:314
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -7290,7 +7491,7 @@ msgid "Damage per sec."
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:108
+#: src/net/ea/tradehandler.cpp:107
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s želi trgovati s vama, prihvaćate li?"
@@ -7659,46 +7860,46 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
+#. TRANSLATORS: unknown info name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:67 src/resources/beinginfo.cpp:41
-#: src/resources/itemdb.cpp:294 src/resources/monsterdb.cpp:98
+#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:67
+#: src/resources/db/itemdb.cpp:315 src/resources/db/monsterdb.cpp:98
 msgid "unnamed"
 msgstr "neimenovano"
 
 #. TRANSLATORS: item info label
-#: src/resources/itemdb.cpp:70
+#: src/resources/db/itemdb.cpp:72
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label
-#: src/resources/itemdb.cpp:72
+#: src/resources/db/itemdb.cpp:74
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label
-#: src/resources/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:76
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label
-#: src/resources/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:78
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label
-#: src/resources/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:80
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/itemdb.cpp:183
+#: src/resources/db/itemdb.cpp:204
 msgid "Unknown item"
 msgstr "Nepoznati predmet"