1 files changed, 466 insertions, 445 deletions

diff --git a/po/manaplus.pot b/po/manaplus.pot
index a4346b7d8..1683d7d15 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,271 +22,271 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:550
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:550
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1525
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1530
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:909
+#: src/client.cpp:914
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:940
+#: src/client.cpp:945
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:973
+#: src/client.cpp:978
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1073
+#: src/client.cpp:1078
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1104
+#: src/client.cpp:1109
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1114
+#: src/client.cpp:1119
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1167
+#: src/client.cpp:1172
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1199
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1195
+#: src/client.cpp:1200
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1219
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1215
+#: src/client.cpp:1220
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1240
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1236
+#: src/client.cpp:1241
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1628
+#: src/client.cpp:1633
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1689
+#: src/client.cpp:1694
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:416
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:452 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:588
+#: src/commandhandler.cpp:629 src/commandhandler.cpp:659
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:978 src/commandhandler.cpp:1024
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1100
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1112
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1116
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1118
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1165 src/commandhandler.cpp:1172
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -295,43 +295,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:488
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:496
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:536
+#: src/game.cpp:553
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:548
+#: src/game.cpp:565
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1213
+#: src/game.cpp:1230
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1220
+#: src/game.cpp:1237
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1606
+#: src/game.cpp:1623
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1607
+#: src/game.cpp:1624
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -360,37 +360,37 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:135
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:648
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:299
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:304 src/gui/popupmenu.cpp:705
 msgid "Move"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:719
 msgid "Buy"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:972
 msgid "+"
 msgstr ""
 
@@ -412,20 +412,20 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:984
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr ""
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
 #: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/statuswindow.cpp:971 src/gui/statuswindow.cpp:1002
 msgid "Max"
 msgstr ""
 
@@ -434,8 +434,8 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:721
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -444,19 +444,19 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:518 src/gui/popupmenu.cpp:542
+#: src/gui/popupmenu.cpp:556 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:792 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:1736 src/gui/popupmenu.cpp:1764
+#: src/gui/popupmenu.cpp:1820 src/gui/popupmenu.cpp:1863
+#: src/gui/popupmenu.cpp:1898 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2025
 #: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:160
 msgid "Cancel"
 msgstr ""
 
@@ -531,14 +531,14 @@ msgstr ""
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
@@ -555,7 +555,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/socialwindow.cpp:1137
 msgid "Create"
 msgstr ""
 
@@ -622,9 +622,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/shopwindow.cpp:124 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr ""
 
@@ -709,12 +709,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -727,10 +727,10 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:671
 msgid "Ignore"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:590 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr ""
 
@@ -903,8 +903,8 @@ msgstr ""
 
 #: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1695 src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1835
 msgid "Unequip"
 msgstr ""
 
@@ -942,31 +942,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1697
+#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1837
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1840
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1844
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1853
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:551
 msgid "Outfits"
 msgstr ""
 
@@ -975,17 +975,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1856 src/gui/setup.cpp:72
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1849
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
@@ -1026,11 +1026,11 @@ msgstr ""
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1123,6 +1123,10 @@ msgstr ""
 msgid "jacko spawning"
 msgstr ""
 
+#: src/guildmanager.cpp:458 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr ""
+
 #: src/gui/logindialog.cpp:59
 msgid "Normal"
 msgstr ""
@@ -1139,7 +1143,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
@@ -1221,7 +1225,7 @@ msgstr ""
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
 msgid "Clear"
 msgstr ""
 
@@ -1241,338 +1245,338 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:647
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:395
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:652
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:659
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:409 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:669
+#: src/gui/popupmenu.cpp:693
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:680 src/gui/popupmenu.cpp:686
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:691
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:187
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:679 src/gui/popupmenu.cpp:695
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:703
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:704
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:741
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:746
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:239
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:763
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:768
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:778
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:262
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:264
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:706
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:2022
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:306
+#: src/gui/popupmenu.cpp:440 src/gui/popupmenu.cpp:709
+#: src/gui/popupmenu.cpp:788
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:726
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:728
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:318
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:335
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:337
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:340
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:353 src/gui/popupmenu.cpp:488
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:514
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:515 src/gui/popupmenu.cpp:1734
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1857
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:532
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:533
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:534 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:1993 src/gui/popupmenu.cpp:1998
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:539
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:553
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:569 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:571
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:572
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:598
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:608
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:613
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:618
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:623
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:629 src/gui/socialwindow.cpp:1139
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:800
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1236
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1288
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1290
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1659
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1665
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1668
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1670
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1682
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1726
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1861
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1922
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1928
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1935
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1937 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1955 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1985
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
 msgid "Move down"
 msgstr ""
 
@@ -1616,64 +1620,64 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1818,6 +1822,14 @@ msgstr ""
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:154
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -2046,34 +2058,38 @@ msgid "Log NPC dialogue"
 msgstr ""
 
 #: src/gui/setup_other.cpp:148
-msgid "Other"
+msgid "Bots support"
 msgstr ""
 
 #: src/gui/setup_other.cpp:150
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:156
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:159
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:165
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:168
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:171
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Show background"
 msgstr ""
 
@@ -2453,249 +2469,254 @@ msgstr ""
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:123
 #: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:122 src/gui/shopwindow.cpp:126
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:127
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:737 src/net/ea/tradehandler.cpp:106
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:340
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:417
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:429
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:496 src/gui/skilldialog.cpp:549
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1501
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1138
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1284
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1408
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1409
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1423
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1429
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1435
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1450
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1461
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1465
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1502
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1507
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1508
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2703,243 +2724,243 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3248,33 +3269,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
 msgid "Play"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
 msgid "Completed"
 msgstr ""
 
@@ -3507,7 +3528,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3545,6 +3567,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
 msgid "Edit"
 msgstr ""
@@ -4311,28 +4368,28 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
 msgid "MVP player: "
 msgstr ""
 
@@ -4349,38 +4406,6 @@ msgstr ""
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
 msgstr ""
@@ -4397,85 +4422,81 @@ msgstr ""
 msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
 msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""