summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/POTFILES.in2
-rw-r--r--po/de.po1467
-rw-r--r--po/es.po919
-rw-r--r--po/fi.po915
-rw-r--r--po/fr.po917
-rw-r--r--po/hr.po911
-rw-r--r--po/hu.po911
-rw-r--r--po/id.po917
-rw-r--r--po/ja.po913
-rw-r--r--po/manaplus.pot911
-rw-r--r--po/nl_BE.po919
-rw-r--r--po/pt.po919
-rw-r--r--po/pt_BR.po919
-rw-r--r--po/ru.po915
-rw-r--r--po/zh_CN.po915
15 files changed, 6836 insertions, 6534 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 311ca756d..2ebb99798 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,6 +24,7 @@ src/gui/inventorywindow.cpp
src/gui/itemamountwindow.cpp
src/gui/itempopup.cpp
src/gui/killstats.cpp
+src/guildmanager.cpp
src/gui/logindialog.cpp
src/gui/minimap.cpp
src/gui/ministatuswindow.cpp
@@ -66,6 +67,7 @@ src/gui/whoisonline.cpp
src/gui/widgets/battletab.cpp
src/gui/widgets/channeltab.cpp
src/gui/widgets/chattab.cpp
+src/gui/widgets/guildchattab.cpp
src/gui/widgets/setupitem.cpp
src/gui/widgets/tradetab.cpp
src/gui/widgets/whispertab.cpp
diff --git a/po/de.po b/po/de.po
index 7eb2d412b..03cf608eb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,15 +2,17 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
-# <Necromong@inbox.ru>, 2011.
+# <der.loisl@gmx.de>, 2011.
+# <clos3rlook@gmail.com>, 2011.
# <jack@krass.com>, 2011.
+# <Necromong@inbox.ru>, 2011.
# Andrei Karas <akaras@inbox.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
"de/)\n"
@@ -24,274 +26,274 @@ msgstr ""
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "dodge"
msgstr "ausweichen"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "miss"
msgstr "verfehlt"
#. 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 "Einstellungen"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
-msgstr ""
+msgstr "Verbinde zum Server"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
-msgstr ""
+msgstr "Anmelden"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
-msgstr ""
+msgstr "Spielfiguren werden angefragt"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
-msgstr ""
+msgstr "Verbinde zum Charakterserver"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
-msgstr ""
+msgstr "Charakterserver wechseln"
-#: 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 "Fehler"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
-msgstr "Fordere Registrierungsdetails an"
+msgstr "Anfrage der Registrierungsdetails"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
-msgstr "Passwort ändern:"
+msgstr "Passwort ändern"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "E-Mail ändern"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "erfolgreich abgemeldet."
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
-#: 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 "%s existiert nicht und kann nicht erstellt werden! Beende."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
-msgstr "Unbekannter Update-Rechner: %s"
+msgstr "Ungültiger Updateserver: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-"Fehler: %s existiert nicht und kann nicht erzeugt werden! Verlassend..."
+"Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
msgid "Unknown command."
msgstr "Unbekannter Befehl."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "Kann keine leeren Nachrichten versenden!"
-#: 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 ""
-"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
-"einer, oder der Spieler bist du."
+"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
+"oder du bist es selbst."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
-msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
+msgstr "Anfrage den Kanal %s betreten zu dürfen."
-#: 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 "Name der Party fehlt."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
msgid "Guild name is missing."
-msgstr ""
+msgstr "Name der Gilde fehlt."
-#: 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 "Bitte gib einen Namen an."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Return toggles chat."
-msgstr "Enter-Taste schließt Chatzeile."
+msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
-msgstr "Nachricht schließt Chatzeile."
+msgstr "Nachricht schließt den Chat."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
-msgstr "Jetzt schließt Enter die Chatzeile."
+msgstr "Enter aktiviert jetzt den Chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
-msgstr "Jetzt schließt jede Nachricht die Chatzeile."
+msgstr "Nachricht schließt jetzt den Chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
msgid "friend"
msgstr "Freund"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
msgid "disregarded"
-msgstr ""
+msgstr "unbeachtet"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
msgid "neutral"
-msgstr ""
+msgstr "neutral"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player already %s!"
-msgstr ""
+msgstr "Spieler ist bereits %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
-msgstr ""
+msgstr "Spieler erfolgreich %s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
-msgstr ""
+msgstr "Spieler konnte nicht %s werden!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
msgid "Player wasn't ignored!"
msgstr "Spieler wurde nicht ignoriert!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
msgid "Player no longer ignored!"
msgstr "Spieler wird nicht länger ignoriert!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
msgid "Player could not be unignored!"
-msgstr ""
+msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
msgid "Player already erased!"
-msgstr ""
+msgstr "Spieler ist bereits gelöscht!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
msgid "Player successfully erased!"
-msgstr ""
+msgstr "Spieler erfolgreich gelöscht!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
msgid "Player could not be erased!"
msgstr "Spieler konnte nicht gelöscht werden!"
-#: 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 ""
@@ -301,43 +303,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Allgemein"
-#: 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 "Debug"
-#: src/game.cpp:488
+#: src/game.cpp:505
msgid "Screenshot saved as "
-msgstr ""
+msgstr "Bildschirmfoto gespeichert unter"
-#: src/game.cpp:496
+#: src/game.cpp:513
msgid "Saving screenshot failed!"
msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
-#: src/game.cpp:536
+#: src/game.cpp:553
msgid "The connection to the server was lost."
-msgstr ""
+msgstr "Die Verbindung zum Server wurde getrennt."
-#: src/game.cpp:548
+#: src/game.cpp:565
msgid "Network Error"
msgstr "Netzwerkfehler"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Ignoriere eingehende Handelsanfragen"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Akzeptiere eingehende Handelsanfragen"
-#: src/game.cpp:1606
+#: src/game.cpp:1623
msgid "Could Not Load Map"
-msgstr ""
+msgstr "Karte konnte nicht geladen werden."
-#: src/game.cpp:1607
+#: src/game.cpp:1624
#, c-format
msgid "Error while loading %s"
msgstr "Fehler beim Laden von %s"
@@ -345,17 +347,17 @@ msgstr "Fehler beim Laden von %s"
#: src/gui/beingpopup.cpp:124
#, c-format
msgid "Party: %s"
-msgstr ""
+msgstr "Party: %s"
#: src/gui/beingpopup.cpp:138
#, c-format
msgid "Guild: %s"
-msgstr ""
+msgstr "Gilde: %s"
#: src/gui/beingpopup.cpp:151
#, c-format
msgid "Pvp rank: %d"
-msgstr ""
+msgstr "Pvp Rang: %d"
#: src/gui/beingpopup.cpp:162
#, c-format
@@ -364,39 +366,39 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:266
msgid "Bot Checker"
-msgstr ""
+msgstr "Bot-Prüfer"
-#: 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 "Name"
-#: 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 "Angriff"
-#: 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 "Sprechen"
-#: 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 ""
+msgstr "Bewegen"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
-msgstr ""
+msgstr "Resultat"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
msgid "Reset"
msgstr "Zurücksetzten"
#: 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 "Kaufen"
@@ -410,7 +412,7 @@ msgstr "Preis: %s / Gesamt: %s"
#. 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 "+"
@@ -418,30 +420,30 @@ 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 "Beenden"
#: 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 "Max"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
msgid "Shop"
-msgstr "Geschäft"
+msgstr "Laden"
-#: 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"
@@ -450,19 +452,19 @@ msgstr "Verkaufen"
#: 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 "Abbrechen"
@@ -491,7 +493,7 @@ msgstr "Die neue E-Mailadresse muss kürzer als %d Zeichen sein."
#: src/gui/changeemaildialog.cpp:146
msgid "The email address entries mismatch."
-msgstr "Die neuen E-Mailadresse stimmen nicht überein."
+msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
#: src/gui/charselectdialog.cpp:140
@@ -523,7 +525,7 @@ msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
#: src/gui/changepassworddialog.cpp:134
msgid "The new password entries mismatch."
-msgstr "Die neues Passwörter stimmen nicht überein."
+msgstr "Die Passwörter stimmen nicht überein."
#: src/gui/charcreatedialog.cpp:58
msgid "Create Character"
@@ -537,14 +539,14 @@ msgstr "Name :"
#. 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 "<"
@@ -561,7 +563,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 "Erstellen"
@@ -593,7 +595,7 @@ msgstr "Bitte entferne %d Punkte"
#: src/gui/charselectdialog.cpp:77
msgid "Confirm Character Delete"
-msgstr "Bestätige Charakter-Löschung"
+msgstr "Bestätige Löschung des Charakters."
#: src/gui/charselectdialog.cpp:78
msgid "Are you sure you want to delete this character?"
@@ -628,9 +630,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 "Löschen"
@@ -641,7 +643,7 @@ msgstr "Wähle"
#: src/gui/charselectdialog.cpp:470
#, c-format
msgid "Level %d"
-msgstr "Stufe: %d"
+msgstr "Level: %d"
#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
msgid "(empty)"
@@ -653,55 +655,55 @@ msgstr "Standard"
#: src/gui/chatwindow.cpp:113
msgid "black"
-msgstr ""
+msgstr "schwarz"
#: src/gui/chatwindow.cpp:114
msgid "red"
-msgstr ""
+msgstr "rot"
#: src/gui/chatwindow.cpp:115
msgid "green"
-msgstr ""
+msgstr "grün"
#: src/gui/chatwindow.cpp:116
msgid "blue"
-msgstr ""
+msgstr "blau"
#: src/gui/chatwindow.cpp:117
msgid "gold"
-msgstr ""
+msgstr "gold"
#: src/gui/chatwindow.cpp:118
msgid "yellow"
-msgstr ""
+msgstr "gelb"
#: src/gui/chatwindow.cpp:119
msgid "pink"
-msgstr ""
+msgstr "rosa"
#: src/gui/chatwindow.cpp:120
msgid "purple"
-msgstr ""
+msgstr "lila"
#: src/gui/chatwindow.cpp:121
msgid "grey"
-msgstr ""
+msgstr "grau"
#: src/gui/chatwindow.cpp:122
msgid "brown"
-msgstr ""
+msgstr "braun"
#: src/gui/chatwindow.cpp:123
msgid "rainbow 1"
-msgstr ""
+msgstr "Regenbogen 1"
#: src/gui/chatwindow.cpp:124
msgid "rainbow 2"
-msgstr ""
+msgstr "Regenbogen 2"
#: src/gui/chatwindow.cpp:125
msgid "rainbow 3"
-msgstr ""
+msgstr "Regenbogen 3"
#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
@@ -715,12 +717,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Anwesend: %s ;%d Spieler sind anwesend."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "Flüsternd zu %s: %s"
@@ -733,12 +735,12 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: 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 ""
+msgstr "ignorieren"
#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
#: src/gui/setup_other.cpp:64
@@ -756,27 +758,27 @@ msgstr ""
#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
#: src/gui/debugwindow.cpp:249
msgid "Music:"
-msgstr ""
+msgstr "Musik:"
#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
#: src/gui/debugwindow.cpp:251
msgid "Map:"
-msgstr ""
+msgstr "Karte:"
#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
#: src/gui/debugwindow.cpp:250
msgid "Minimap:"
-msgstr ""
+msgstr "Minikarte:"
#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
#: src/gui/debugwindow.cpp:247
msgid "Cursor:"
-msgstr ""
+msgstr "Zeiger:"
#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
#: src/gui/debugwindow.cpp:206
msgid "Player Position:"
-msgstr ""
+msgstr "Spieler-Position:"
#: src/gui/debugwindow.cpp:152
msgid "Particle count:"
@@ -790,17 +792,17 @@ msgstr ""
#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
#, c-format
msgid "%d FPS (Software)"
-msgstr ""
+msgstr "%d FPS (Software)"
#: src/gui/debugwindow.cpp:166
#, c-format
msgid "%d FPS (fast OpenGL)"
-msgstr ""
+msgstr "%d FPS (schnelles OpenGL)"
#: src/gui/debugwindow.cpp:169
#, c-format
msgid "%d FPS (old OpenGL)"
-msgstr ""
+msgstr "%d FPS (altes OpenGL)"
#: src/gui/debugwindow.cpp:176
#, c-format
@@ -819,27 +821,27 @@ msgstr "Partikelzählung: %d"
#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
#: src/gui/debugwindow.cpp:343
msgid "Target:"
-msgstr ""
+msgstr "Ziel:"
#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
#: src/gui/debugwindow.cpp:344
msgid "Target Id:"
-msgstr ""
+msgstr "Ziel ID:"
#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
msgid "Target Level:"
-msgstr ""
+msgstr "Ziel level:"
#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
#: src/gui/debugwindow.cpp:346
msgid "Target Party:"
-msgstr ""
+msgstr "Ziel Party:"
#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
#: src/gui/debugwindow.cpp:347
msgid "Target Guild:"
-msgstr ""
+msgstr "Ziel Gilde:"
#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
@@ -882,17 +884,17 @@ 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 "Schließen"
#: src/gui/didyouknowwindow.cpp:62
msgid "< Previous"
-msgstr ""
+msgstr "< Zurück"
#: src/gui/didyouknowwindow.cpp:63
msgid "Next >"
-msgstr ""
+msgstr "Vor >"
#: src/gui/didyouknowwindow.cpp:64
msgid "Auto open this window"
@@ -909,8 +911,8 @@ msgstr "Ausrüstung"
#: 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 "Ablegen"
@@ -929,11 +931,11 @@ msgstr "Plätze:"
#: src/gui/inventorywindow.cpp:115
msgid "Filter:"
-msgstr ""
+msgstr "Filter:"
#: src/gui/inventorywindow.cpp:116
msgid "Sort:"
-msgstr ""
+msgstr "Sortieren:"
#: src/gui/inventorywindow.cpp:122
msgid "na"
@@ -948,31 +950,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 "Ausrüsten"
#: 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 "Benutzen"
#: 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 "Wegwerfen"
-#: 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 "Aufteilen"
-#: 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 "Ausrüstung"
@@ -981,17 +983,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: 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 "Einlagern"
+msgstr "Aufbewahren"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Abholen"
-#: 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 "Wegwerfen"
@@ -1002,7 +1004,7 @@ msgstr "Alle"
#: src/gui/itemamountwindow.cpp:261
msgid "Select amount of items to trade."
-msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
+msgstr "Wähle aus, wie viele Gegenstände Du handeln möchtest."
#: src/gui/itemamountwindow.cpp:264
msgid "Select amount of items to drop."
@@ -1010,33 +1012,33 @@ msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
#: src/gui/itemamountwindow.cpp:267
msgid "Select amount of items to store."
-msgstr "Wähle aus, wie viele Gegenstände du einlagern möchtest."
+msgstr "Wähle aus, wie viele Gegenstände du aufbewahren möchtest."
#: src/gui/itemamountwindow.cpp:270
msgid "Select amount of items to retrieve."
-msgstr "Wähle aus, wie viele Gegenstände du wieder haben möchtest."
+msgstr "Wähle aus, wie viele Gegenstände du abholen möchtest."
#: src/gui/itemamountwindow.cpp:273
msgid "Select amount of items to split."
-msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
+msgstr "Wähle Anzahl der Gegenstände die Du aufteilen möchtest."
#: src/gui/itemamountwindow.cpp:276
msgid "Add to buy shop."
-msgstr ""
+msgstr "Füge zu Einkaufsladen hinzu."
#: src/gui/itemamountwindow.cpp:279
msgid "Add to sell shop."
-msgstr ""
+msgstr "Füge zu Verkaufsladen hinzu."
#: src/gui/itemamountwindow.cpp:282
msgid "Unknown."
-msgstr ""
+msgstr "Unbekannt."
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
-msgstr ""
+msgstr ","
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Gewicht: %s"
@@ -1047,11 +1049,11 @@ msgstr ""
#: src/gui/killstats.cpp:64
msgid "Reset stats"
-msgstr ""
+msgstr "Statistik zurücksetzen"
#: src/gui/killstats.cpp:65
msgid "Reset timer"
-msgstr ""
+msgstr "Timer zurücksetzen"
#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
#, c-format
@@ -1129,30 +1131,34 @@ msgstr ""
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:458 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Du hast die Guilde verlassen."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#: src/gui/logindialog.cpp:60
msgid "Auto Close"
-msgstr ""
+msgstr "automatisch schließen"
#: src/gui/logindialog.cpp:61
msgid "Skip"
-msgstr ""
+msgstr "überspringen"
#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
msgid "Login"
msgstr "Anmelden"
-#: 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 "Server:"
#: src/gui/logindialog.cpp:96
msgid "Custom update host"
-msgstr ""
+msgstr "Updateserver verwalten"
#: src/gui/logindialog.cpp:110
msgid "Remember username"
@@ -1160,7 +1166,7 @@ msgstr "Benutzername merken"
#: src/gui/logindialog.cpp:111
msgid "Update:"
-msgstr ""
+msgstr "Update:"
#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
msgid "Register"
@@ -1212,7 +1218,7 @@ msgstr "Muss"
#: src/gui/npcdialog.cpp:51
msgid "Waiting for server"
-msgstr "Warte auf den Server"
+msgstr "Warte auf Server"
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1227,9 +1233,9 @@ msgstr "Absenden"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
-msgstr ""
+msgstr "Frei"
#: src/gui/npcdialog.cpp:222
msgid "> Next"
@@ -1247,338 +1253,338 @@ msgstr "Senden"
msgid "Failed to send as sender or letter invalid."
msgstr "Es misslang den Brief zu senden oder er war ungültig."
-#: 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 "Ausrüstung: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
-msgstr ""
+msgstr "Taste: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
-msgstr "erstes ausziehen"
+msgstr "Zuerst ausziehen"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
-msgstr ""
+msgstr "Abwesend-Outfit"
-#: 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 "Handeln"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:395
msgid "Whisper"
-msgstr ""
+msgstr "Flüstern"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:652
msgid "Heal"
-msgstr ""
+msgstr "Heilen"
-#: 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 ""
+msgstr "Befreunden"
-#: 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 "@@ignore|Ignoriere %s komplett@@"
-#: 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 ""
+msgstr "Folgen"
-#: 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 ""
+msgstr "Kommentar hinzufügen"
-#: 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 ""
+msgstr "Aufheben"
-#: 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 "Zu Chat hinzufügen"
-#: 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 ""
+msgstr "Umbenennen"
-#: 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 ""
+msgstr "Entfernen"
-#: 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 ""
+msgstr "Zaubersprüche"
-#: 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 ""
+msgstr "Hervorhebung abschalten"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
msgid "Enable highlight"
-msgstr ""
+msgstr "Hervorhebung einschalten"
-#: 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 ""
+msgstr "Verlassen"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:800
msgid "Change guild position"
-msgstr ""
+msgstr "Position der Gilde ändern"
#. 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 ""
+msgstr "Kartenzeichen umbenennen"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
msgid "Name: "
-msgstr ""
+msgstr "Name:"
#. 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 ""
+msgstr "10 aufbewahren"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
msgid "Store half"
-msgstr ""
+msgstr "Die Hälfte aufbewahren"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
msgid "Store all"
-msgstr ""
+msgstr "Alles aufbewahren"
-#: 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 ""
+msgstr "10 abholen"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve half"
-msgstr ""
+msgstr "Die Hälfte abholen"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve all"
-msgstr ""
+msgstr "Alles abholen"
-#: 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 ""
@@ -1596,7 +1602,7 @@ msgstr "Bestätigen:"
#: src/gui/register.cpp:108
msgid "Email:"
-msgstr "eMail:"
+msgstr "E-Mail:"
#: src/gui/register.cpp:176
#, c-format
@@ -1622,87 +1628,87 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
msgid "Passwords do not match."
msgstr "Passwörter stimmen nicht überein."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Wähle deinen Server"
-#: 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 "Port:"
-#: 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 ""
+msgstr "Server Typ:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
-msgstr ""
+msgstr "Laden"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Verbinde..."
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
-msgstr ""
+msgstr "Server verwalten"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Bitte die Adresse und den Port eines Servers eingeben"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Lade Serverliste herunter...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Warte auf den Server"
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Download wird vorbereitet"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
-msgstr ""
+msgstr "Fehler beim Empfangen der Serverliste!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "benötigt eine neuere Version"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "benötigt v%s"
#: src/gui/setup_audio.cpp:50
msgid "Enable Audio"
-msgstr ""
+msgstr "Audio einschalten"
#: src/gui/setup_audio.cpp:51
msgid "Enable game sfx"
-msgstr ""
+msgstr "Spieltöne einschalten"
#: src/gui/setup_audio.cpp:52
msgid "Enable gui sfx"
-msgstr ""
+msgstr "Nachrichtentöne einschalten"
#: src/gui/setup_audio.cpp:53
msgid "Enable music"
-msgstr ""
+msgstr "Musik einschalten"
#: src/gui/setup_audio.cpp:54
msgid "Enable mumble voice chat"
-msgstr ""
+msgstr "\"mumble voice chat\" einschalten"
#: src/gui/setup_audio.cpp:56
msgid "Download music"
@@ -1722,7 +1728,7 @@ msgstr "Lautstärke der Musik"
#: src/gui/setup_audio.cpp:120
msgid "Notice"
-msgstr ""
+msgstr "Bemerkung"
#: src/gui/setup_audio.cpp:120
msgid "You may have to restart your client if you want to download new music"
@@ -1740,11 +1746,11 @@ msgstr "Farben"
#: src/gui/setup_chat.cpp:57
msgid "Remove colors from received chat messages"
-msgstr ""
+msgstr "Farben bei eingehenden Nachrichten abschalten"
#: src/gui/setup_chat.cpp:60
msgid "Show chat colors list"
-msgstr ""
+msgstr "Zeige Chatfarben-Liste"
#: src/gui/setup_chat.cpp:64
msgid "Commands"
@@ -1752,7 +1758,7 @@ msgstr ""
#: src/gui/setup_chat.cpp:66
msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+msgstr "Lasse magische und GM-Nachrichten in allen Chat Tabs zu"
#: src/gui/setup_chat.cpp:70
msgid "Limits"
@@ -1760,11 +1766,11 @@ msgstr ""
#: src/gui/setup_chat.cpp:72
msgid "Limit max chars in chat line"
-msgstr ""
+msgstr "Limitiere max Zeichen in Chatzeile"
#: src/gui/setup_chat.cpp:75
msgid "Limit max lines in chat"
-msgstr ""
+msgstr "Limitiere max Zeilen im Chat"
#: src/gui/setup_chat.cpp:79
msgid "Logs"
@@ -1772,19 +1778,19 @@ msgstr ""
#: src/gui/setup_chat.cpp:81
msgid "Enable chat Log"
-msgstr ""
+msgstr "Aufzeichnen des Chats einschalten"
#: src/gui/setup_chat.cpp:84
msgid "Show chat history"
-msgstr ""
+msgstr "Zeige Chat-Historie"
#: src/gui/setup_chat.cpp:88
msgid "Messages"
-msgstr ""
+msgstr "Nachrichten"
#: src/gui/setup_chat.cpp:90
msgid "Hide shop messages"
-msgstr ""
+msgstr "Verstecke Laden-Mitteilungen"
#: src/gui/setup_chat.cpp:94
msgid "Tabs"
@@ -1796,23 +1802,23 @@ msgstr "Alle privaten Nachrichten in Tabs öffnen"
#: src/gui/setup_chat.cpp:99
msgid "Log magic messages in debug tab"
-msgstr ""
+msgstr "Aufzeichnen der magischen Nachrichten im \"Debug Tab\""
#: src/gui/setup_chat.cpp:102
msgid "Show server messages in debug tab"
-msgstr ""
+msgstr "Zeige Servermitteilungen im \"Debug Tab\""
#: src/gui/setup_chat.cpp:105
msgid "Enable trade tab"
-msgstr ""
+msgstr "Handel-Tab einschalten"
#: src/gui/setup_chat.cpp:108
msgid "Enable battle tab"
-msgstr ""
+msgstr "Kampf-Tab einschalten"
#: src/gui/setup_chat.cpp:111
msgid "Show battle events"
-msgstr ""
+msgstr "Zeige Kampf-Ereignisse"
#: src/gui/setup_chat.cpp:114
msgid "Resize chat tabs if need"
@@ -1820,15 +1826,23 @@ msgstr ""
#: src/gui/setup_chat.cpp:118
msgid "Time"
-msgstr ""
+msgstr "Zeit"
#: src/gui/setup_chat.cpp:120
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 "So wird die Farbe aussehen"
+msgstr "So sieht die Farbe aus"
#: src/gui/setup_colors.cpp:75
msgid "Type:"
@@ -1871,7 +1885,7 @@ msgstr "Blau: "
#: src/gui/setup_colors.cpp:314
msgid "Alpha:"
-msgstr ""
+msgstr "Alpha:"
#: src/gui/setup.cpp:70
msgid "Apply"
@@ -1915,7 +1929,7 @@ msgstr "Zuordnen"
#: src/gui/setup_keyboard.cpp:93
msgid "Unassign"
-msgstr ""
+msgstr "Zurücksetzen"
#: src/gui/setup_keyboard.cpp:97
msgid "Default"
@@ -1923,11 +1937,11 @@ msgstr "Standard"
#: src/gui/setup_keyboard.cpp:133
msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "Wiedersprüchliche Tasteneinstellung(en) entdeckt"
#: src/gui/setup_other.cpp:39
msgid "Misc"
-msgstr ""
+msgstr "Sonstiges"
#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
msgid "Monsters"
@@ -1935,23 +1949,23 @@ msgstr "Monster"
#: src/gui/setup_other.cpp:47
msgid "Show damage inflicted to monsters"
-msgstr ""
+msgstr "Zeige zugefügten Schaden bei Monstern"
#: src/gui/setup_other.cpp:50
msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "Nur erreichbare Monster automatisch anvisieren"
#: src/gui/setup_other.cpp:53
msgid "Highlight monster attack range"
-msgstr ""
+msgstr "Angriffsbereich vom Monstern anzeigen"
#: src/gui/setup_other.cpp:57
msgid "Show monster hp bar"
-msgstr ""
+msgstr "HP-Balken von Monster anzeigen"
#: src/gui/setup_other.cpp:60
msgid "Cycle monster targets"
-msgstr ""
+msgstr "Angriffsziele der Monster einkreisen"
#: src/gui/setup_other.cpp:66
msgid "Show warps particles"
@@ -1959,15 +1973,15 @@ msgstr ""
#: src/gui/setup_other.cpp:69
msgid "Highlight map portals"
-msgstr ""
+msgstr "Karten Ein- und Ausgänge hervorheben"
#: src/gui/setup_other.cpp:72
msgid "Highlight floor items"
-msgstr ""
+msgstr "Gegenstände auf dem Boden hervorheben"
#: src/gui/setup_other.cpp:75
msgid "Highlight player attack range"
-msgstr ""
+msgstr "Angriffsbereich des Spielers hervorheben"
#: src/gui/setup_other.cpp:78
msgid "Show extended minimaps"
@@ -1975,11 +1989,11 @@ msgstr ""
#: src/gui/setup_other.cpp:81
msgid "Draw path"
-msgstr ""
+msgstr "Zeige Pfad"
#: src/gui/setup_other.cpp:84
msgid "Draw hotkeys on map"
-msgstr ""
+msgstr "Zeige Hotekeys auf der Karte"
#: src/gui/setup_other.cpp:88
msgid "Moving"
@@ -1987,27 +2001,27 @@ msgstr ""
#: src/gui/setup_other.cpp:90
msgid "Auto fix position"
-msgstr ""
+msgstr "Automatischen Berichtigen der Position"
#: src/gui/setup_other.cpp:93
msgid "Attack while moving"
-msgstr ""
+msgstr "Während des Bewegens angreifen"
#: src/gui/setup_other.cpp:96
msgid "Sync player move"
-msgstr ""
+msgstr "Synchronisiere Bewegungen des Spielers"
#: src/gui/setup_other.cpp:99
msgid "Crazy move A program"
-msgstr ""
+msgstr "Verrückte Bewegungen A-Programm"
#: src/gui/setup_other.cpp:103
msgid "Player"
-msgstr ""
+msgstr "Spieler"
#: src/gui/setup_other.cpp:105
msgid "Show own hp bar"
-msgstr ""
+msgstr "Eigenen HP-Balken anzeigen"
#: src/gui/setup_other.cpp:108
msgid "Enable quick stats"
@@ -2015,11 +2029,11 @@ msgstr ""
#: src/gui/setup_other.cpp:111
msgid "Cycle player targets"
-msgstr ""
+msgstr "Angriffsziele des Spielers einkreisen"
#: src/gui/setup_other.cpp:114
msgid "Show job exp messages"
-msgstr ""
+msgstr "Zeige \"job exp\"-Nachrichten"
#: src/gui/setup_other.cpp:117
msgid "Show players popups"
@@ -2031,7 +2045,7 @@ msgstr ""
#: src/gui/setup_other.cpp:123
msgid "Show job"
-msgstr ""
+msgstr "Zeige Job"
#: src/gui/setup_other.cpp:126
msgid "Enable attack filter"
@@ -2043,47 +2057,51 @@ msgstr ""
#: src/gui/setup_other.cpp:135
msgid "Accept sell/buy requests"
-msgstr ""
+msgstr "Verkauf- und Kaufanfragen akzeptieren"
#: src/gui/setup_other.cpp:138
msgid "Enable shop mode"
-msgstr ""
+msgstr "Laden-Modus einschalten"
#: src/gui/setup_other.cpp:144
msgid "Log NPC dialogue"
-msgstr "Protokoliere NPC Gespräche"
+msgstr "Protokolliere NPC Dialoge"
#: 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 ""
+msgstr "Botprüfer einschalten"
-#: 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 ""
+msgstr "Debug-Protokoll benutzen"
-#: 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 ""
+msgstr "Zeige Hintergrund"
#: src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
@@ -2143,19 +2161,19 @@ msgstr "Spieler"
#: src/gui/setup_players.cpp:54
msgid "Show gender"
-msgstr ""
+msgstr "Geschlecht anzeigen"
#: src/gui/setup_players.cpp:57
msgid "Show level"
-msgstr ""
+msgstr "Level anzeigen"
#: src/gui/setup_players.cpp:60
msgid "Show own name"
-msgstr ""
+msgstr "Eigenen Namen anzeigen"
#: src/gui/setup_players.cpp:63
msgid "Target dead players"
-msgstr ""
+msgstr "Anvisieren toter Spieler"
#: src/gui/setup_players.cpp:66
msgid "Visible names"
@@ -2175,7 +2193,7 @@ msgstr ""
#: src/gui/setup_players.cpp:78
msgid "Show ip addresses on screenshots"
-msgstr ""
+msgstr "IP auf Screenshots anzeigen."
#: src/gui/setup_relations.cpp:65
msgid "Relation"
@@ -2199,7 +2217,7 @@ msgstr "Ignoriert"
#: src/gui/setup_relations.cpp:74
msgid "Erased"
-msgstr ""
+msgstr "Gelöscht"
#: src/gui/setup_relations.cpp:239
msgid "Allow trading"
@@ -2211,7 +2229,7 @@ msgstr "Flüstern erlauben"
#: src/gui/setup_relations.cpp:244
msgid "Old"
-msgstr ""
+msgstr "Alt"
#: src/gui/setup_relations.cpp:246
msgid "Relations"
@@ -2223,47 +2241,47 @@ msgstr "Wenn ignorierend:"
#: src/gui/setup_theme.cpp:107
msgid "Tiny (10)"
-msgstr ""
+msgstr "Winzig"
#: src/gui/setup_theme.cpp:108
msgid "Small (11)"
-msgstr ""
+msgstr "Klein"
#: src/gui/setup_theme.cpp:109
msgid "Medium (12)"
-msgstr ""
+msgstr "Mittel"
#: src/gui/setup_theme.cpp:110
msgid "Large (13)"
-msgstr ""
+msgstr "Groß"
#: src/gui/setup_theme.cpp:111
msgid "Big (14)"
-msgstr ""
+msgstr "Sehr groß"
#: src/gui/setup_theme.cpp:112
msgid "Huge (15)"
-msgstr ""
+msgstr "Riesig"
#: src/gui/setup_theme.cpp:143
msgid "Theme"
-msgstr ""
+msgstr "Theme"
#: src/gui/setup_theme.cpp:145
msgid "Gui theme"
-msgstr ""
+msgstr "GUI Theme"
#: src/gui/setup_theme.cpp:146
msgid "Main Font"
-msgstr ""
+msgstr "Hauptschriftart"
#: src/gui/setup_theme.cpp:147
msgid "Bold font"
-msgstr ""
+msgstr "Dicke Schrift"
#: src/gui/setup_theme.cpp:148
msgid "Particle font"
-msgstr ""
+msgstr "Schrift von Spieleraktionen"
#: src/gui/setup_theme.cpp:149
msgid "Help font"
@@ -2283,7 +2301,7 @@ msgstr "Schriftgröße"
#: src/gui/setup_theme.cpp:299
msgid "Theme Changed"
-msgstr ""
+msgstr "Theme geändert"
#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
@@ -2292,15 +2310,15 @@ msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
#: src/gui/setup_video.cpp:194
msgid "Software"
-msgstr ""
+msgstr "Software"
#: src/gui/setup_video.cpp:195
msgid "Fast OpenGL"
-msgstr ""
+msgstr "Schnelles OpenGL"
#: src/gui/setup_video.cpp:196
msgid "Safe OpenGL"
-msgstr ""
+msgstr "Sicheres OpenGL"
#: src/gui/setup_video.cpp:223
msgid "No text"
@@ -2366,12 +2384,12 @@ msgstr "als Partikeleffekt"
#: src/gui/setup_video.cpp:302
msgid "FPS limit:"
-msgstr ""
+msgstr "FPS Limit:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
msgid "Alt FPS limit: "
-msgstr ""
+msgstr "Alt FPS Limit:"
#: src/gui/setup_video.cpp:315
msgid "Video"
@@ -2391,27 +2409,31 @@ msgstr "Hintergrundeffekte"
#: src/gui/setup_video.cpp:324
msgid "Particle detail"
-msgstr ""
+msgstr "Partikeldetail"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
#: src/gui/setup_video.cpp:707
msgid "None"
-msgstr ""
+msgstr "Kein(e)"
#: src/gui/setup_video.cpp:484
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
+"Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen "
+"Auflösung schlug fehl."
#: src/gui/setup_video.cpp:490
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
+"Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen "
+"Auflösung schlug fehl."
#: src/gui/setup_video.cpp:501
msgid "Switching to Full Screen"
-msgstr ""
+msgstr "Wechsle zum Vollbildmodus"
#: src/gui/setup_video.cpp:502
msgid "Restart needed for changes to take effect."
@@ -2429,15 +2451,15 @@ msgstr ""
#: src/gui/setup_video.cpp:602
msgid "Custom resolution (example: 1024x768)"
-msgstr ""
+msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
#: src/gui/setup_video.cpp:603
msgid "Enter new resolution: "
-msgstr ""
+msgstr "Neue Auflösung eingeben:"
#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
msgid "Screen Resolution Changed"
-msgstr ""
+msgstr "Bildschirmauflösung wurde geändert"
#: src/gui/setup_video.cpp:621
msgid "Some windows may be moved to fit the lowered resolution."
@@ -2455,503 +2477,508 @@ msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
#: src/gui/shopwindow.cpp:74
msgid "Personal Shop"
-msgstr ""
+msgstr "Persönlicher Laden"
#: src/gui/shopwindow.cpp:116
msgid "Buy items"
-msgstr ""
+msgstr "Kaufe Dinge"
#: src/gui/shopwindow.cpp:117
msgid "Sell items"
-msgstr ""
+msgstr "Verkaufe Dinge"
-#: 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 "Hinzufügen"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
msgid "Announce"
+msgstr "Teile mit"
+
+#: src/gui/shopwindow.cpp:122 src/gui/shopwindow.cpp:126
+msgid "Auction"
msgstr ""
-#: src/gui/shopwindow.cpp:125
+#: 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 "Erbitte einen Handel"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
#, c-format
msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%s möchte %s %s akzeptierst du?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
-msgstr "Fertigkeiten"
+msgstr "Fähigkeiten"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
msgid "Up"
msgstr "Erhöhen"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:340
#, c-format
msgid "Skill points available: %d"
-msgstr ""
+msgstr "Fähigkeitspunkte verfügbar: %d"
-#: 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 ""
+msgstr "Lvl: %d"
-#: 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 "Gilde"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "%s in die Gilde %s einladen."
-#: 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 ""
+msgstr "Wenn willst du in die Gilde %s einladen?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
-msgstr ""
+msgstr "Guilde verlassen?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?"
-#: 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 "Party"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
-msgstr ""
+msgstr "%s zur Party einladen."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Partie %s Auflösung beauftragt."
-#: 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 ""
+msgstr "Wenn willst du zur Party %s einladen?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Partie verlassen?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
-msgstr ""
+msgstr "Bist du sicher, dass du die Party %s verlassen willst?"
-#: 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 "Gilde erstellen"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1501
msgid "Create Party"
-msgstr ""
+msgstr "Party erstellen"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
-msgstr ""
+msgstr "Sozial"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1138
msgid "Invite"
-msgstr ""
+msgstr "Einladen"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1284
#, c-format
msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "Partyeinladung von %s angenommen."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "Partyeinladung von %s abgelehnt."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "Guildeneinladung von %s angenommen."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "Guildeneinladung von %s abgelehnt."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "Erstelle der Gilde %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
-msgstr ""
+msgstr "Erstelle die Party \"%s\""
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1408
msgid "Guild Name"
msgstr "Gildenname"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1409
msgid "Choose your guild's name."
msgstr "Wähle den Namen deiner Gilde"
-#: 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 "%s hat dich eingeladen, seiner Gilde %s beizutreten."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1435
msgid "Accept Guild Invite"
msgstr "Nehme Gildeneinladung an"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1450
msgid "Received party request, but one already exists."
msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1461
msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "Du wurdest zu einer Party eingeladen."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1465
#, c-format
msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "Du wurdest zu der Party %s eingeladen."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s hat dich in seine Party eingeladen."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "Nehme Partyeinladung an"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1502
msgid "Cannot create party. You are already in a party"
msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1507
msgid "Party Name"
-msgstr ""
+msgstr "Partyname"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1508
msgid "Choose your party's name."
-msgstr ""
+msgstr "Name deiner Party wählen."
#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
msgid "Specials"
msgstr "Special"
-#: 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 ""
@@ -2996,7 +3023,7 @@ msgstr ""
#: src/gui/statuswindow.cpp:267
#, c-format
msgid "Level: %d (GM %d)"
-msgstr ""
+msgstr "Level: %d (GM %d)"
#: src/gui/statuswindow.cpp:323
#, c-format
@@ -3132,39 +3159,39 @@ msgstr ""
#: src/gui/textcommandeditor.cpp:113
msgid "No Target"
-msgstr ""
+msgstr "Kein Ziel"
#: src/gui/textcommandeditor.cpp:114
msgid "Allow Target"
-msgstr ""
+msgstr "Ziel erlauben"
#: src/gui/textcommandeditor.cpp:115
msgid "Need Target"
-msgstr ""
+msgstr "Brauche Ziel"
#: src/gui/textcommandeditor.cpp:120
msgid "General Magic"
-msgstr ""
+msgstr "Generelle Magie"
#: src/gui/textcommandeditor.cpp:121
msgid "Life Magic"
-msgstr ""
+msgstr "Lebensmagie"
#: src/gui/textcommandeditor.cpp:122
msgid "War Magic"
-msgstr ""
+msgstr "Kriegsmagie"
#: src/gui/textcommandeditor.cpp:123
msgid "Transmute Magic"
-msgstr ""
+msgstr "Verwandlungsmagie"
#: src/gui/textcommandeditor.cpp:124
msgid "Nature Magic"
-msgstr ""
+msgstr "Naturmagie"
#: src/gui/textcommandeditor.cpp:125
msgid "Astral Magic"
-msgstr ""
+msgstr "Astralmagie"
#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
@@ -3172,7 +3199,7 @@ msgstr ""
#: src/gui/textcommandeditor.cpp:185
msgid "magic"
-msgstr ""
+msgstr "magisch"
#: src/gui/textcommandeditor.cpp:189
msgid "other"
@@ -3180,15 +3207,15 @@ msgstr "andere"
#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
-msgstr ""
+msgstr "Symbol:"
#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
-msgstr ""
+msgstr "Befehl:"
#: src/gui/textcommandeditor.cpp:200
msgid "Mana:"
-msgstr ""
+msgstr "Mana:"
#: src/gui/textcommandeditor.cpp:206
msgid "Target Type:"
@@ -3196,15 +3223,15 @@ msgstr ""
#: src/gui/textcommandeditor.cpp:212
msgid "Icon:"
-msgstr ""
+msgstr "Icon:"
#: src/gui/textcommandeditor.cpp:218
msgid "Magic level:"
-msgstr ""
+msgstr "Magielevel:"
#: src/gui/textcommandeditor.cpp:224
msgid "Magic School:"
-msgstr ""
+msgstr "Magieschule:"
#: src/gui/textcommandeditor.cpp:230
msgid "School level:"
@@ -3212,7 +3239,7 @@ msgstr ""
#: src/gui/textcommandeditor.cpp:235
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: src/gui/tradewindow.cpp:60
msgid "Propose trade"
@@ -3262,33 +3289,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Name : %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Aktualisiere..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Verbinde..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Los!"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Es wird dringend empfohlen,"
#. 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 "Fertig"
@@ -3521,7 +3548,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
#: 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 ""
"Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
@@ -3563,9 +3591,44 @@ msgstr "Globale Ansage von %s:"
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 ""
+msgstr "Ändern"
#: src/gui/widgets/whispertab.cpp:107
msgid "/ignore > Ignore the other player"
@@ -3625,11 +3688,11 @@ msgstr ""
#: src/gui/windowmenu.cpp:71
msgid "Smilies"
-msgstr ""
+msgstr "Similies"
#: src/gui/windowmenu.cpp:73
msgid "STA"
-msgstr ""
+msgstr "STA"
#: src/gui/windowmenu.cpp:73
msgid "Status"
@@ -3637,23 +3700,23 @@ msgstr "Status"
#: src/gui/windowmenu.cpp:74
msgid "EQU"
-msgstr ""
+msgstr "EQU"
#: src/gui/windowmenu.cpp:76
msgid "INV"
-msgstr ""
+msgstr "INV"
#: src/gui/windowmenu.cpp:81
msgid "SKI"
-msgstr ""
+msgstr "FÄH"
#: src/gui/windowmenu.cpp:88
msgid "SPE"
-msgstr ""
+msgstr "SPE"
#: src/gui/windowmenu.cpp:93
msgid "SOC"
-msgstr ""
+msgstr "SOZ"
#: src/gui/windowmenu.cpp:94
msgid "SH"
@@ -3685,11 +3748,11 @@ msgstr ""
#: src/gui/worldselectdialog.cpp:77
msgid "Select World"
-msgstr ""
+msgstr "Welt wählen"
#: src/gui/worldselectdialog.cpp:82
msgid "Change Login"
-msgstr ""
+msgstr "Login ändern"
#: src/gui/worldselectdialog.cpp:83
msgid "Choose World"
@@ -4139,7 +4202,7 @@ msgstr "Abwesend"
#: src/localplayer.cpp:3476
msgid "Follow: "
-msgstr ""
+msgstr "Folgen:"
#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
msgid "Follow canceled"
@@ -4155,7 +4218,7 @@ msgstr ""
#: src/localplayer.cpp:3847
msgid "You see "
-msgstr ""
+msgstr "Du siehst"
#: src/main.cpp:47
msgid "manaplus [options] [mana-file]"
@@ -4263,27 +4326,27 @@ msgstr "Kauf fehlgeschlagen."
#: src/net/ea/charserverhandler.cpp:63
msgid "Strength:"
-msgstr ""
+msgstr "Stärke:"
#: src/net/ea/charserverhandler.cpp:64
msgid "Agility:"
-msgstr ""
+msgstr "Beweglichkeit:"
#: src/net/ea/charserverhandler.cpp:65
msgid "Vitality:"
-msgstr ""
+msgstr "Gesundheit:"
#: src/net/ea/charserverhandler.cpp:66
msgid "Intelligence:"
-msgstr ""
+msgstr "Intelligenz:"
#: src/net/ea/charserverhandler.cpp:67
msgid "Dexterity:"
-msgstr ""
+msgstr "Geschicklichkeit:"
#: src/net/ea/charserverhandler.cpp:68
msgid "Luck:"
-msgstr ""
+msgstr "Glück:"
#: src/net/ea/charserverhandler.cpp:102
msgid "Access denied. Most likely, there are too many players on this server."
@@ -4303,7 +4366,7 @@ msgstr ""
#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
msgid "Wrong name."
-msgstr ""
+msgstr "Falscher Name."
#: src/net/ea/charserverhandler.cpp:145
msgid "Incorrect stats."
@@ -4329,28 +4392,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 ""
@@ -4361,44 +4424,12 @@ msgstr ""
#: src/net/ea/gamehandler.cpp:98
msgid "Game"
-msgstr ""
+msgstr "Spiel"
#: src/net/ea/gamehandler.cpp:98
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 "Gilde erstellt."
@@ -4415,85 +4446,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 ""
+msgstr "Deine Guilde ist voll."
-#: 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 ""
@@ -4612,7 +4639,7 @@ msgstr ""
#: src/net/ea/loginhandler.cpp:131
msgid "Account was not found. Please re-login."
-msgstr ""
+msgstr "Account nicht gefunden. Bitte noch einmal anmelden."
#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
msgid "Old password incorrect."
@@ -4620,7 +4647,7 @@ msgstr "Altes Passwort fehlerhaft"
#: src/net/ea/loginhandler.cpp:137
msgid "New password too short."
-msgstr ""
+msgstr "Das neue Passwort ist zu kurz."
#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
@@ -4631,15 +4658,15 @@ msgstr "Unbekannter Fehler"
#: src/net/ea/loginhandler.cpp:205
msgid "Unregistered ID."
-msgstr ""
+msgstr "Unbekannte ID"
#: src/net/ea/loginhandler.cpp:208
msgid "Wrong password."
-msgstr ""
+msgstr "Falsches Passwort."
#: src/net/ea/loginhandler.cpp:211
msgid "Account expired."
-msgstr ""
+msgstr "Account abgelaufen."
#: src/net/ea/loginhandler.cpp:214
msgid "Rejected from server."
@@ -4811,7 +4838,7 @@ msgstr ""
#: src/net/ea/playerhandler.cpp:123
msgid "You're a stiff."
-msgstr ""
+msgstr "Du bist eine Leiche."
#: src/net/ea/playerhandler.cpp:124
msgid "Bereft of life, you rest in peace."
@@ -4850,7 +4877,7 @@ msgstr ""
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
#: src/net/ea/playerhandler.cpp:425
msgid "Message"
-msgstr ""
+msgstr "Nachricht"
#: src/net/ea/playerhandler.cpp:337
msgid ""
@@ -4897,7 +4924,7 @@ msgstr ""
#: src/net/ea/specialhandler.cpp:161
msgid "Could not join party!"
-msgstr ""
+msgstr "Konnte Party nicht beitreten!"
#: src/net/ea/specialhandler.cpp:164
msgid "Cannot shout!"
@@ -5210,7 +5237,7 @@ msgstr "Bereits angemeldet"
#: src/net/manaserv/loginhandler.cpp:99
msgid "Account banned."
-msgstr ""
+msgstr "Account gesperrt."
#: src/net/manaserv/loginhandler.cpp:124
msgid "New password incorrect."
@@ -5249,7 +5276,7 @@ msgstr "Benutzername oder Passwort falsch"
#: src/net/manaserv/loginhandler.cpp:284
msgid "Account banned"
-msgstr ""
+msgstr "Account gesperrt."
#: src/net/manaserv/loginhandler.cpp:287
msgid "Login attempt too soon after previous attempt."
diff --git a/po/es.po b/po/es.po
index e367da940..d4b3edc50 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-17 18:06+0000\n"
-"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
"manaplus/team/es/)\n"
"Language: es\n"
@@ -26,119 +26,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Visible sobre el mapa"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "dodge"
msgstr "evade"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1525
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1530
msgid "I"
msgstr "I"
-#: 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 "Configuración"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Conectando al servidor"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Accediendo a la cuenta"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Cargando personajes"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
-#: 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 "Error"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Cambio de contraseña"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Cambio de Email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Registro cancelado"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
-#: 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 "¡%s no existe y no puede ser creado! Saliendo."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Servidor de actualización inválido: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
msgid "Unknown command."
msgstr "Comando desconocido."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "¡No puedes enviar susurros vacíos!"
-#: 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 "
@@ -147,152 +147,152 @@ msgstr ""
"¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
"existe, o eres tú."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando la entrada del canal %s."
-#: 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 "Falta el nombre del grupo."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
msgid "Guild name is missing."
msgstr "Falta el nombre del gremio."
-#: 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 "Por favor, especifique un nombre."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Return toggles chat."
msgstr "Volver a alternar el chat."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
msgstr "Mensaje cierra la charla."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
msgstr "Volver ahora a cambiar de chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
msgstr "Mensaje ahora cierra el chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
msgid "disregarded"
msgstr "desatendido"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
msgid "neutral"
msgstr "neutral"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player already %s!"
msgstr "¡Jugador ya es %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "¡Jugador %s exitosamente!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr "¡Jugador no pudo ser %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
msgid "Player wasn't ignored!"
msgstr "El jugador no estaba ignorado!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
msgid "Player no longer ignored!"
msgstr "¡El jugador ya no es ignorado!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
msgid "Player could not be unignored!"
msgstr "¡Al jugador no se le puede dejar de ignorar!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
msgid "Player already erased!"
msgstr "¡Jugador ya borrado!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
msgid "Player successfully erased!"
msgstr "¡Jugador borrado con éxito!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
msgid "Player could not be erased!"
msgstr "¡Jugador no pudo ser borrado!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:978 src/commandhandler.cpp:1024
#, c-format
msgid "Client uptime: %s"
msgstr "Tiempo de actividad del cliente: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d día"
msgstr[1] "%d días"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1100
msgid "font cache size"
msgstr "tamaño de caché de fuente"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1112
msgid "Cache size:"
msgstr "Tám. caché:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1116
msgid "Created:"
msgstr "Creado:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1118
msgid "Deleted:"
msgstr "Borrado:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1165 src/commandhandler.cpp:1172
msgid "Resource images:"
msgstr "Imágenes de recurso:"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource orphaned images:"
msgstr "Imágenes de recurso huérfano:"
@@ -302,43 +302,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "General"
-#: 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 "Depurador"
-#: src/game.cpp:488
+#: src/game.cpp:505
msgid "Screenshot saved as "
msgstr "Captura de pantalla guardada como "
-#: src/game.cpp:496
+#: src/game.cpp:513
msgid "Saving screenshot failed!"
msgstr "¡El guardado de la captura de pantalla ha fallado!"
-#: src/game.cpp:536
+#: src/game.cpp:553
msgid "The connection to the server was lost."
msgstr "Se ha perdido la conexión con elservidor."
-#: src/game.cpp:548
+#: src/game.cpp:565
msgid "Network Error"
msgstr "Error de Red"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Ignorando las peticiones de intercambio"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Aceptando las peticiones de intercambio"
-#: src/game.cpp:1606
+#: src/game.cpp:1623
msgid "Could Not Load Map"
msgstr "No se pudo cargar el mapa"
-#: src/game.cpp:1607
+#: src/game.cpp:1624
#, c-format
msgid "Error while loading %s"
msgstr "Error mientras cargaba %s"
@@ -367,37 +367,37 @@ msgstr "Comentario: %s"
msgid "Bot Checker"
msgstr "Bot Checker"
-#: 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 "Nombre"
-#: 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 "Atacar"
-#: 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 "Hablar"
-#: 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 "Mover"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
msgid "Reset"
msgstr "Restablecer"
#: 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 "Comprar"
@@ -411,7 +411,7 @@ msgstr "Precio: %s / Total: %s"
#. 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 "+"
@@ -419,20 +419,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 "Salir"
#: 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 "Máximo"
@@ -441,8 +441,8 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Tienda"
-#: 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"
@@ -451,19 +451,19 @@ msgstr "Vender"
#: 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 "Cancelar"
@@ -538,14 +538,14 @@ msgstr "Nombre:"
#. 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 "<"
@@ -562,7 +562,7 @@ msgid "Race:"
msgstr "Race:"
#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/socialwindow.cpp:1137
msgid "Create"
msgstr "Crear"
@@ -629,9 +629,9 @@ msgstr "Ingrese la contraseña para borrar el personaje"
msgid "Enter password:"
msgstr "Ingrese contraseña:"
-#: 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 "Borrar"
@@ -716,12 +716,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jugadores estan presentes."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando mensaje privado para %s: %s"
@@ -734,10 +734,10 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-#: 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 "Ignorar"
@@ -883,7 +883,7 @@ msgstr "¿Sabías que...?"
#: 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 "Cerrar"
@@ -910,8 +910,8 @@ msgstr "Equipamiento"
#: 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 "Quitárselo"
@@ -949,31 +949,31 @@ msgid "id"
msgstr "id"
#: 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 "Equipar"
#: 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 "Usar"
#: 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 "Tirar..."
-#: 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 "Dividir"
-#: 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 "Conjuntos"
@@ -982,17 +982,17 @@ msgid "Weight:"
msgstr "Peso:"
#: 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 "Almacenar"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Recuperar"
-#: 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 "Tirar"
@@ -1033,11 +1033,11 @@ msgstr "Agregar a las ventas de la tienda."
msgid "Unknown."
msgstr "Desconocido."
-#: 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 "Peso: %s"
@@ -1130,6 +1130,10 @@ msgstr "¿%s %d?"
msgid "jacko spawning"
msgstr "desove de jacko"
+#: src/guildmanager.cpp:458 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Has dejado el gremio."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normal"
@@ -1146,7 +1150,7 @@ msgstr "Saltar"
msgid "Login"
msgstr "Login"
-#: 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 "Servidor:"
@@ -1228,7 +1232,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "Limpiar"
@@ -1248,338 +1252,338 @@ msgstr "Enviar"
msgid "Failed to send as sender or letter invalid."
msgstr "Fallo al enviar o mensaje inválido."
-#: 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 "Conjuntos: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Tecla: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Quitárselo antes"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Fuera conjunto"
-#: 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 "Intercambio"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:395
msgid "Whisper"
msgstr "Susurrar"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:652
msgid "Heal"
msgstr "Sanar"
-#: 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 "Ser amigo"
-#: 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 "Desatender"
-#: 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 "Borrar"
-#: 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 "Des-ignorar"
-#: 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 "Ignorar completamente"
-#: 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 "Seguir"
-#: 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 "Imitación"
-#: 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 "Invitar a grupo"
-#: 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 "Sacar del grupo"
-#: 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 "Sacar del gremio"
-#: 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 "Cambiar posición en el gremio"
-#: 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 "Invitar al gremio"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:262
msgid "Kick player"
msgstr "Sacar jugador"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:264
msgid "Nuke"
msgstr "Eliminar"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:706
msgid "Show Items"
msgstr "Mostrar artículos"
-#: 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 "Desvestir"
-#: 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 "Agregar comentario"
-#: 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 "Comprar (?)"
-#: 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 "Vender (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:318
msgid "Kick"
msgstr "Sacar"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
msgid "Remove from attack list"
msgstr "Remover de la lista de ataque"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:335
msgid "Add to priority attack list"
msgstr "Añadir a la lista de ataque prioritaria"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:337
msgid "Add to attack list"
msgstr "Agregar a la lista de ataque"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:340
msgid "Add to ignore list"
msgstr "Agregar a la lista de ignorados"
-#: 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 "Agregar nombre al chat"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:514
msgid "Pick up"
msgstr "Recoger"
-#: 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 "Añadir al chat"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:532
msgid "Map Item"
msgstr "Mapa Objeto"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:533
msgid "Rename"
msgstr "Renombrar"
-#: 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 "Quitar"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:539
msgid "Warp"
msgstr "Deformar"
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:553
msgid "Load old outfits"
msgstr "Cargar conjuntos antiguos"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:569 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Hechizos"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:571
msgid "Load old spells"
msgstr "Cargar hechizos antiguos"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:572
msgid "Edit spell"
msgstr "Editar hechizo"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:598
msgid "Disable highlight"
msgstr "Deshabilitar resaltado"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
msgid "Enable highlight"
msgstr "Habilitar resaltado"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "No remover nombre"
+#: 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 "Remover nombre"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:618
msgid "Enable away"
msgstr "Habilitar ausencia"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:623
msgid "Disable away"
msgstr "Deshabilitar ausencia"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:629 src/gui/socialwindow.cpp:1139
msgid "Leave"
msgstr "Dejar"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:800
msgid "Change guild position"
msgstr "Cambiar posición del gremio"
#. 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 "Renombrar señal del mapa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
msgid "Name: "
msgstr "Nombre:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1288
msgid "Player comment "
msgstr "Comentario del jugador "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1290
msgid "Comment: "
msgstr "Comentario: "
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1659
msgid "Add to trade"
msgstr "Agredar al intercambio"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1665
msgid "Add to trade 10"
msgstr "Agregar 10 al intercambio"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade half"
msgstr "Agregar la mitad al intercambio"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1670
msgid "Add to trade all"
msgstr "Agregar todo al intercambio"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1682
msgid "Store 10"
msgstr "Almacenar 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
msgid "Store half"
msgstr "Almacenar la mitad"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
msgid "Store all"
msgstr "Almacenar todo"
-#: 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 "Tirar todo"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1726
msgid "Retrieve 10"
msgstr "Recuperar 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve half"
msgstr "Recuperar la mitad"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve all"
msgstr "Recuperar todo"
-#: 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 "Cargar atajos antiguos de artículos"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1861
msgid "Load old drop shortcuts"
msgstr "Cargar atajos antiguos de soltar (drop)"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1922
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1928
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1935
msgid "Reset yellow bar"
msgstr "Restablecer barra amarilla"
-#: 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 "Copiar al chat"
-#: 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 "(predeterminado)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1985
msgid "Move up"
msgstr "Subir"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
msgid "Move down"
msgstr "Bajar"
@@ -1623,64 +1627,64 @@ msgstr "La contraseña debe tener como mínimo %d caracteres."
msgid "Passwords do not match."
msgstr "Las contraseñas no coinciden."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Escoja tu servidor"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Elige tu servidor *** MODO SEGURO ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Puerto:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Usar el mismo ip para los subservidores del juego"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Cargar"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Conectar"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Servidor propio"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Por favor especifique el nombre y el puerto del servidor."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Bajando la lista de servidores...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Esperando al servidor..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Preparando la descarga"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Error al recuperar la lista de servers!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "requiere una version mas nueva"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "requiere v%s"
@@ -1827,6 +1831,14 @@ msgstr "Tiempo"
msgid "Use local time"
msgstr "Usar hora local"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:154
+msgid "Other"
+msgstr "Otro"
+
+#: 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 "Así es como se verá el color"
@@ -2055,34 +2067,38 @@ msgid "Log NPC dialogue"
msgstr "Registro de diálogo de NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Otro"
+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 "Habilitar los ataques colaterales de servidor"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:159
msgid "Enable bot checker"
msgstr "Habilitar el control de robot"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
msgid "Enable buggy servers protection"
msgstr "Habilitar la proteción contra servidores defectuosos"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:165
msgid "Enable debug log"
msgstr "Habilitar registro de depuración"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:168
msgid "Low traffic mode"
msgstr "Modo de bajo tráfico"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:171
msgid "Hide shield sprite"
msgstr "Ocultar los objetos escudos"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
msgid "Show background"
msgstr "Mostrar fondo"
@@ -2465,249 +2481,254 @@ msgstr "Comprar artículos"
msgid "Sell items"
msgstr "Vender artículos"
-#: 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 "Anadir"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
msgid "Announce"
msgstr "Anunciar"
-#: 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 "Mostrar enlaces en anuncio"
-#: 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 "Propuesta de intercambio"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s quiere %s %s ¿aceptas?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Habilidades"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
msgid "Up"
msgstr "Incrementar"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:340
#, c-format
msgid "Skill points available: %d"
msgstr "Puntos de habilidades: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:417
#, c-format
msgid "Skill Set %d"
msgstr "Habilidades %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:429
#, c-format
msgid "Skill %d"
msgstr "Habilidad %d"
-#: 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 "Nivel: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nivel: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Clan"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Invita al jugador %s para su clan %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Clan %s pidiendo salir."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Miembro invitado al clan."
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "A quién te gustaría invitar al clan %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Salir del clan?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Estás seguro de dejar el clan %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Grupo"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Jugador %s invitado al grupo."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Grupo %s requisitado."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Invitación de un miembro al grupo"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "¿A quién te gustaría invitar al grupo %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "¿Dejar grupo?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "¿Estás seguro de que quieres dejar el grupo %s?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Navegación"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Ataque"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Pandillas prioritarias"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Ataques de las pandillas"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ignorar pandillas"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Crear clan"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1501
msgid "Create Party"
msgstr "Crear grupo"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1138
msgid "Invite"
msgstr "Invitar"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1284
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceptada la invitación de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
msgstr "Cancelada la invitación de %s."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceptada la invitación a la guild de %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Cancelada la invitación a la guild de %s."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "Creando clan llamado %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
msgstr "Creando grupo llamado %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1408
msgid "Guild Name"
msgstr "Nombre del clan"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1409
msgid "Choose your guild's name."
msgstr "Escoja el nombre de su clan."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1423
msgid "Received guild request, but one already exists."
msgstr "Recibida petición de creación del clan, pero ya existe."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1429
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te ha invitado al clan %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1435
msgid "Accept Guild Invite"
msgstr "Aceptar invitación al clan"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1450
msgid "Received party request, but one already exists."
msgstr "Recibida petición de creación del grupo, pero ya existe."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1461
msgid "You have been invited you to join a party."
msgstr "Fuiste invitado a un grupo."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1465
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Has sido invitado para unirte al grupo %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te ha invitado a unirte a su grupo."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s te ha invitado para unirte al grupo %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "Aceptar invitación al grupo"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1502
msgid "Cannot create party. You are already in a party"
msgstr "No se pudo crear un grupo. Ya estás en uno."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1507
msgid "Party Name"
msgstr "Nombre del grupo"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1508
msgid "Choose your party's name."
msgstr "Escoja el nombre del grupo."
@@ -2715,243 +2736,243 @@ msgstr "Escoja el nombre del grupo."
msgid "Specials"
msgstr "Especiales"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) moverse predeterminado"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) moverse invertido"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) moverse con algunos movimientos locos"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) moverse con movimientos locos"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) doble normal + loco"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) maniobra"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) maniobra alocada personalizada"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) maniobra loca"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) moverse por defecto hacia el objetivo"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) moverse al objetivo en distancia 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) moverse al objetivo en distancia 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) moverse al objetivo en distancia 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) moverse al objetivo en distancia 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) moverse al objetivo en distancia 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) desplazarse al objetivo en el rango de ataque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) mover al objetivo"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) seguimiento predeterminado"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) seguimiento relativo"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) seguimiento tipo espejo"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) seguimiento como mascota"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) seguimiento desconoicido"
-#: 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 "(D) ataque predeterminado"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) intercambiar ataque sin escudo"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) intercambiar ataque con escudo"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) atacar"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) ir y atacar"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) ir, atacar, recoger"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) sin atacar automáticamente"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) recoger a 1x1 celdas (pequeño)"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) recoger a 2x1 celdas (predeterminado)"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) recoger interesadamente a 2x3 celda"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) recoger a 3x3 celdas"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) ir y recoger en distancia 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) ir y recoger en distancia 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) ir y recoger a máxima distancia"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) recoger"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) vista normal del mapa"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) vista depurar del mapa"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) ultra vista del mapa"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) ultra vista del mapa 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) vista vacía del mapa"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) vista del mapa en blanco y negro"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) vista del mapa"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) usar #flar para ataque mágico"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) usar #chiza para ataque mágico"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) usar #ingrav para ataque mágico"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) usar #frillyar para ataque mágico"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) usar #upmarmu para ataque mágico"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) ataque mágico"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) imitación predeterminada"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) imitación de conjuntos"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) imitación"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) en el teclado"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) lejos del teclado"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) afuera"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) modo de cámara de juego"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) modo de cámara libre"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) Definir el modo operativo de la cámara"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Modificadores del juego están deshabilitados"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Modificadores del juego están habilitados"
@@ -3262,33 +3283,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nombre: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Actualizando..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Jugar"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 El proceso de actualización esta incompleto."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Es altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 lo intentes de nuevo más tarde."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Completado"
@@ -3521,7 +3542,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Hacer al jugador <nick> operador del canal."
#: 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 "Si el <nick> tiene espacios, enciérralo entre comillas dobles (\")."
@@ -3561,6 +3583,41 @@ msgstr "Anuncio global de %s:"
msgid "%s whispers: %s"
msgstr "%s envía mensaje privado: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando invita a <nick> para el clan en el que estás ."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Comando: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando hace que dejes el clan."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Para la ayuda."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invita un jugador a tu clan"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Deja el clan en la que estas"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa a alguien del clan en el que estás."
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Editar"
@@ -4331,28 +4388,28 @@ msgstr "Personaje Borrado."
msgid "Failed to delete character."
msgstr "Fallo al borrar el personaje."
-#: 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 "Canales no son soportados!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "No pudo ser enviado el Susurro, ya que %s está desconectado."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Jugador VIP."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "Jugador MVP: "
@@ -4369,38 +4426,6 @@ msgstr "Juego"
msgid "Request to quit denied!"
msgstr "Petición de salida denegada!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Este comando invita a <nick> para el clan en el que estás ."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Comando: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Este comando hace que dejes el clan."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Para la ayuda."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invita un jugador a tu clan"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Deja el clan en la que estas"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa a alguien del clan en el que estás."
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Clan creado."
@@ -4417,85 +4442,81 @@ msgstr "La verificación de la guild no se effectuó."
msgid "Unknown server response."
msgstr "Respuesta del servidor desconocida."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Nombre del gremio: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Maestro del gremio: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Nivel en gremio: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Miembros conectados: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Máx. Miembros: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Nivel promedio: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Experiencia del gremio: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Experiencia siguiente del gremio: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Castillo del gremio: %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "No se puede invitar jugadores al clan."
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "El jugador cancel la invitacion a tu guild."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "El usuario es ahora de tu clan."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Tu clan está lleno."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Invitación desconocida a una guild."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "Has dejado el gremio."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s ha dejado tu gremio."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Usted fue expulsado del gremio."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s saco alguien de tu gremio."
diff --git a/po/fi.po b/po/fi.po
index fd66fa93a..dce533a38 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fi\n"
@@ -22,119 +22,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Näkyvillä kartalla"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "dodge"
msgstr "väistö"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "miss"
msgstr "huti"
#. 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 "Asetukset"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Kirjaudun sisään"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
-#: 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 "Virhe"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Salasanan vaihto"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Sähköpostin vaihto"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
-#: 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 "%s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Epäkelpo päivitysosoite: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
msgid "Unknown command."
msgstr "Tuntematon komento."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "Et voi lähettää tyhjiä kuiskauksia!"
-#: 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 "
@@ -143,152 +143,152 @@ msgstr ""
"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
"käytit omaa nimeäsi."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Pyyntö liittyä kanavalle %s lähetetty."
-#: 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 "Ryhmän nimi puuttuu."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
msgid "Guild name is missing."
msgstr "Killan nimi puuttuu."
-#: 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 "Anna nimi."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Return toggles chat."
msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
msgstr "Viesti sulkee keskustelun."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
msgstr "Nyt viesti sulkee keskustelun."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
msgid "friend"
msgstr "ystävä"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
msgid "disregarded"
msgstr "vaimennettu"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
msgid "neutral"
msgstr "neutraali"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player already %s!"
msgstr "Pelaaja on jo %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "Pelaaja on nyt %s."
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
msgid "Player wasn't ignored!"
msgstr "Pelaajaa ei ollut jätetty huomiotta!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
msgid "Player no longer ignored!"
msgstr "Pelaaja huomioidaan taas."
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
msgid "Player could not be unignored!"
msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
msgid "Player already erased!"
msgstr "Pelaaja on jo pyyhitty!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
msgid "Player successfully erased!"
msgstr "Pelaaja pyyhitty."
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
msgid "Player could not be erased!"
msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:978 src/commandhandler.cpp:1024
#, c-format
msgid "Client uptime: %s"
msgstr "Ohjelma ollut käynnissä: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d viikon"
msgstr[1] "%d viikkoa"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d päivän"
msgstr[1] "%d päivää"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d tunnin"
msgstr[1] "%d tuntia"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuutin"
msgstr[1] "%d minuuttia"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d sekunnin"
msgstr[1] "%d sekuntia"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1100
msgid "font cache size"
msgstr "kirjasinvälimuistin koko"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1112
msgid "Cache size:"
msgstr "Välimuistin koko:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1116
msgid "Created:"
msgstr "Luotu:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1118
msgid "Deleted:"
msgstr "Poistettu:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1165 src/commandhandler.cpp:1172
msgid "Resource images:"
msgstr "Resurssikuvat:"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource orphaned images:"
msgstr "Orvot resurssikuvat:"
@@ -299,43 +299,43 @@ msgstr ""
"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
"\"true\", \"false\", \"1\" tai \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Yleiset"
-#: 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 "Debug"
-#: src/game.cpp:488
+#: src/game.cpp:505
msgid "Screenshot saved as "
msgstr "Ruutukaappaus tallennettu nimellä "
-#: src/game.cpp:496
+#: src/game.cpp:513
msgid "Saving screenshot failed!"
msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
-#: src/game.cpp:536
+#: src/game.cpp:553
msgid "The connection to the server was lost."
msgstr "Yhteys palvelimeen katkesi."
-#: src/game.cpp:548
+#: src/game.cpp:565
msgid "Network Error"
msgstr "Verkkovirhe"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Et huomioi kaupankäyntipyyntöjä"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Hyväksyt kaupankäyntipyynnöt"
-#: src/game.cpp:1606
+#: src/game.cpp:1623
msgid "Could Not Load Map"
msgstr "Kartan lataaminen epäonnistui"
-#: src/game.cpp:1607
+#: src/game.cpp:1624
#, c-format
msgid "Error while loading %s"
msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -364,37 +364,37 @@ msgstr ""
msgid "Bot Checker"
msgstr "Bottitutka"
-#: 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 "Nimi"
-#: 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 "Hyökkää"
-#: 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 "Keskustele"
-#: 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 "Liiku"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Tulos"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
msgid "Reset"
msgstr "Nollaa"
#: 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 "Osta"
@@ -408,7 +408,7 @@ msgstr "Hinta: %s / Kaikkiaan: %s"
#. 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 "+"
@@ -416,20 +416,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 "Sulje"
#: 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 "Max"
@@ -438,8 +438,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Kauppa"
-#: 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"
@@ -448,19 +448,19 @@ msgstr "Myy"
#: 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 "Peru"
@@ -535,14 +535,14 @@ msgstr "Nimi:"
#. 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 "<"
@@ -559,7 +559,7 @@ msgid "Race:"
msgstr "Rotu: "
#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/socialwindow.cpp:1137
msgid "Create"
msgstr "Luo"
@@ -626,9 +626,9 @@ msgstr "Anna salasana hahmon poistamiseksi"
msgid "Enter password:"
msgstr "Salasana:"
-#: 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 "Poista"
@@ -713,12 +713,12 @@ msgstr "???"
msgid "Chat"
msgstr "Keskustelu"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Läsnä: %s; %d pelaajaa paikalla."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "Kuiskaat pelaajalle %s: %s"
@@ -731,10 +731,10 @@ msgstr "Kyllä"
msgid "No"
msgstr "Ei"
-#: 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 "Ohita"
@@ -880,7 +880,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 "Sulje"
@@ -907,8 +907,8 @@ msgstr "Varusteet"
#: 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 "Poista varuste käytöstä"
@@ -946,31 +946,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 "Ota käyttöön"
#: 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 "Käytä"
#: 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 "Pudota..."
-#: 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 "Jaa"
-#: 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 "Asukokonaisuudet"
@@ -979,17 +979,17 @@ msgid "Weight:"
msgstr "Paino:"
#: 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 "Varastoi"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Ota"
-#: 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 "Pudota"
@@ -1030,11 +1030,11 @@ msgstr "Lisää myyntikauppaan."
msgid "Unknown."
msgstr "Tuntematon."
-#: 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 "Paino: %s"
@@ -1127,6 +1127,10 @@ msgstr ""
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:458 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Olet eronnut killasta."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Oletus"
@@ -1143,7 +1147,7 @@ msgstr "Ohita"
msgid "Login"
msgstr "Kirjaudu sisään"
-#: 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 "Palvelin:"
@@ -1225,7 +1229,7 @@ msgstr "Lähetä"
msgid "NPC"
msgstr "Ei-pelaajahahmo (NPC)"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "Tyhjennä"
@@ -1245,338 +1249,338 @@ msgstr "Lähetä"
msgid "Failed to send as sender or letter invalid."
msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
-#: 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 "Asu: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Näppäin: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Riisu ensin"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Poissaoloasu"
-#: 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 "Tee kaupat"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:395
msgid "Whisper"
msgstr "Kuiskaa"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:652
msgid "Heal"
msgstr "Paranna"
-#: 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 "Ystävysty"
-#: 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 "Vaimenna"
-#: 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 "Pyyhi"
-#: 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 "Huomioi jälleen"
-#: 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 "Jätä täysin huomiotta"
-#: 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 "Seuraa"
-#: 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 "Matki"
-#: 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 "Kutsu ryhmään"
-#: 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 "Potki ryhmästä"
-#: 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 "Potki killasta"
-#: 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 "Muuta kilta-asemaa"
-#: 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 "Kutsu kiltaan"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:262
msgid "Kick player"
msgstr "Potki pelaaja"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:264
msgid "Nuke"
msgstr "Pommita"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:706
msgid "Show Items"
msgstr "Näytä tavarat"
-#: 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 "Riisu"
-#: 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 "Potki"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
msgid "Remove from attack list"
msgstr "Poista hyökkäyslistasta"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:335
msgid "Add to priority attack list"
msgstr "Lisää prioriteettihyökkäyslistalle"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:337
msgid "Add to attack list"
msgstr "Lisää hyökkäyslistaan"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:340
msgid "Add to ignore list"
msgstr "Lisää ohitettavien listaan"
-#: 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 "Lisää nimi keskusteluun"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:514
msgid "Pick up"
msgstr "Nosta"
-#: 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 "Lisää keskusteluun"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:532
msgid "Map Item"
msgstr "Karttaolio"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:533
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: 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 "Poista"
-#: 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 "Lataa vanhat asut"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:569 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Loitsut"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:571
msgid "Load old spells"
msgstr "Lataa vanhat loitsut"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:572
msgid "Edit spell"
msgstr "Muokkaa loitsua"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:598
msgid "Disable highlight"
msgstr "Estä korostus"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
msgid "Enable highlight"
msgstr "Salli korostus"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "Älä poista nimeä"
+#: 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 "Poista nimi"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:618
msgid "Enable away"
msgstr "Ota poissaolo käyttöön"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:623
msgid "Disable away"
msgstr "Poista poissaolo käytöstä"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:629 src/gui/socialwindow.cpp:1139
msgid "Leave"
msgstr "Eroa"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:800
msgid "Change guild position"
msgstr "Muuta asemaa killassa"
#. 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 "Muuta merkin nimeä "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
msgid "Name: "
msgstr "Nimi: "
#. 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 "Lisää kauppaan"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1665
msgid "Add to trade 10"
msgstr "Lisää 10 kauppaan"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade half"
msgstr "Lisää puolet kauppaan"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1670
msgid "Add to trade all"
msgstr "Lisää kaikki kauppaan"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1682
msgid "Store 10"
msgstr "Varastoi 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
msgid "Store half"
msgstr "Varastoi puolet"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
msgid "Store all"
msgstr "Varastoi kaikki"
-#: 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 "Ota 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve half"
msgstr "Ota puolet"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve all"
msgstr "Ota kaikki"
-#: 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 "Lataa vanhat tavarapikavalinnat"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1861
msgid "Load old drop shortcuts"
msgstr "Lataa vanhat pudotuspikavalinnat"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1922
msgid "Hide"
msgstr "Piilota"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1928
msgid "Show"
msgstr "Näytä"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1935
msgid "Reset yellow bar"
msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
-#: 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 "(oletus)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1985
msgid "Move up"
msgstr "Siirrä ylös"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
msgid "Move down"
msgstr "Siirrä alas"
@@ -1620,64 +1624,64 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
msgid "Passwords do not match."
msgstr "Salasanat eivät täsmää."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Valitse palvelimesi"
-#: 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 "Portti:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Käytä samaa IP-osoitetta alipalvelimille"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Palvelintyyppi:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Lataa"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Yhdistä"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Muu palvelin"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Lataan palvelinluettelon...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Odotan palvelinta..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Valmistelen latausta"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Palvelinluettelon hakeminen epäonnistui!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "vaatii uudemman version"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "vaatii version %s"
@@ -1824,6 +1828,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 "Väri näyttää tältä"
@@ -2052,34 +2064,38 @@ msgid "Log NPC dialogue"
msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
#: 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 "Ota käyttöön palvelinpuolen hyökkäys"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:159
msgid "Enable bot checker"
msgstr "Ota bottitutka käyttöön"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
msgid "Enable buggy servers protection"
msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:165
msgid "Enable debug log"
msgstr "Ota käyttöön debug-loki"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:168
msgid "Low traffic mode"
msgstr "Matalan liikenteen tila"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:171
msgid "Hide shield sprite"
msgstr "Piilota kilpihahmo"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
msgid "Show background"
msgstr "Näytä tausta"
@@ -2460,249 +2476,254 @@ msgstr "Osta tavaroita"
msgid "Sell items"
msgstr "Myy tavaroita"
-#: 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 "Lisää"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
msgid "Announce"
msgstr "Ilmoita"
-#: 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 "Näytä linkit ilmoituksessa"
-#: 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 "Kaupantekoehdotus"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s haluaa %s %s - hyväksytkö?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Taidot"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
msgid "Up"
msgstr "Ylös"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:340
#, c-format
msgid "Skill points available: %d"
msgstr "%d taitopistettä käyttämättä"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:417
#, c-format
msgid "Skill Set %d"
msgstr "Taitojoukko %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:429
#, c-format
msgid "Skill %d"
msgstr "Taito %d"
-#: 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 "Taso: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Taso: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Kilta"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Kutsuit käyttäjän %s kiltaan %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Killasta %s eroa pyydetty."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Jäsenen kutsuminen kiltaan"
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Kenet haluaisit kutsua kiltaan %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Eroa killasta?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Haluatko varmasti erota killasta %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Ryhmä"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Käyttäjä %s kutsuttu ryhmään."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Ryhmästä %s eroamista pyydetty."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Jäsenen kutsuminen ryhmään"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Kenet haluaisit kutsua ryhmään %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Eroa ryhmästä?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Haluatko varmasti erota ryhmästä %s?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Hyö"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Priorisoidut kohteet"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Hyökkäyskohteet"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ohitettavat kohteet"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Luo kilta"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1501
msgid "Create Party"
msgstr "Luo ryhmä"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Suhteet"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1138
msgid "Invite"
msgstr "Kutsu"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1284
#, c-format
msgid "Accepted party invite from %s."
msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Otit vastaan kiltakutsun pelaajalta %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "Luon killan %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
msgstr "Luon ryhmän %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1408
msgid "Guild Name"
msgstr "Killan nimi"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1409
msgid "Choose your guild's name."
msgstr "Valitse killallesi nimi."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1423
msgid "Received guild request, but one already exists."
msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1429
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s on kutsunut sinut liittymään kiltaan %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1435
msgid "Accept Guild Invite"
msgstr "Ota kiltakutsu vastaan"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1450
msgid "Received party request, but one already exists."
msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1461
msgid "You have been invited you to join a party."
msgstr "Sinut on kutsuttu liittymään ryhmään."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1465
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Sinut on kutsuttu liittymään ryhmään %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "Ota ryhmäkutsu vastaan"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1502
msgid "Cannot create party. You are already in a party"
msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1507
msgid "Party Name"
msgstr "Ryhmän nimi"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1508
msgid "Choose your party's name."
msgstr "Anna ryhmällesi nimi."
@@ -2710,243 +2731,243 @@ msgstr "Anna ryhmällesi nimi."
msgid "Specials"
msgstr "Erikoisuudet"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) oletusliikkeet"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) käännetyt liikkeet"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) liikkuu osin villiliikkein"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) liikkuu villiliikkein"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) tuplaa tavallinen + villi"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) liiku"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) oma villiliike"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) villiliike"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) oletussiirtymä kohteen luo"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) siirry kohteen luo etäisyydellä 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) siirry kohteen luo etäisyydellä 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) siirry kohteen luo etäisyydellä 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) siirry kohteen luo etäisyydellä 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) siirry kohteen luo etäisyydellä 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) siirry kohteen luo"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) oletusseuraaminen"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) suhteellinen seuraaminen"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) peilikuvaseuraaminen"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) lemmikkiseuraaminen"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) tuntematon seuraaminen"
-#: 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 "(D) oletushyökkäys"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) vaihda hyökkäystä, ei kilpeä"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) vaihda hyökkäystä, kilpi mukana"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) hyökkäys"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) mene ja hyökkää"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) mene, hyökkää, nosta"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) ei automaattista hyökkäystä"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) pieni nosto 1x1 ruutua"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) oletusnosto 2x1 ruutua"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) nosto edestä 2x3 ruutua"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) nosto 3x3 ruutua"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) mene ja nosta etäisyydellä 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) mene ja nosta etäisyydellä 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) mene ja nosta maksimietäisyydellä"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) nosta"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) normaali karttanäkymä"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) debug-karttanäkymä"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) ultra-karttanäkymä"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) ultra-karttanäkymä 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) tyhjä karttanäkymä"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) mustavalkoinen karttanäkymä"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) karttanäkymä"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) #flar taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) #chiza taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) #ingrav taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) #frillyar taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) #upmarmu taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) taikahyökkäys"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) oletusmatkinta"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) asun matkinta"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) matkinta"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) paikalla"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) poissa"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) poissaolo"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) pelin kameratila"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) vapaa kamera"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) suunnittelukamera"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Pelimuokkaimet poissa käytöstä"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Pelimuokkaimet käytössä"
@@ -3255,33 +3276,33 @@ msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
msgid "Name: %s"
msgstr "Nimi: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Päivitetään..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Yhdistetään..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Pelaa"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Päivitysprosessi keskeytyi"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Suosittelemme vahvasti että"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 yrität myöhemmin uudelleen"
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Valmis"
@@ -3514,7 +3535,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Tämä komento tekee annetunnimisestä käyttäjästä kanavaoperaattorin."
#: 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 "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")."
@@ -3554,6 +3576,41 @@ msgstr "%s ilmoittaa kaikille:"
msgid "%s whispers: %s"
msgstr "%s kuiskaa: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Komento: /invite <nimi>"
+
+#: 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 "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Komento: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Tämä komento saa sinut eroamaan killasta."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Näytä tämä ohje."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Kutsu pelaaja kiltaasi"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Eroa nykyisestä killastasi"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Poista käyttäjä killastasi"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Muokkaa"
@@ -4326,28 +4383,28 @@ msgstr "Hahmo poistettu."
msgid "Failed to delete character."
msgstr "Hahmon poisto epäonnistui."
-#: 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 "Kanavia ei tueta!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Kuiskausta ei voitu lähettää, %s ei ole kirjautuneena sisään."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "MVP-pelaaja."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "MVP-pelaaja: "
@@ -4364,38 +4421,6 @@ msgstr "Peli"
msgid "Request to quit denied!"
msgstr "Lopetuspyyntö evätty!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Komento: /invite <nimi>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Komento: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Tämä komento saa sinut eroamaan killasta."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Näytä tämä ohje."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Kutsu pelaaja kiltaasi"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Eroa nykyisestä killastasi"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Poista käyttäjä killastasi"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Kilta luotu."
@@ -4412,85 +4437,81 @@ msgstr "Emperium-tarkistus epäonnistui."
msgid "Unknown server response."
msgstr "Tuntematon palvelimen vastaus."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Killan nimi: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Kiltamestari: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Kiltataso: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Jäseniä linjoilla: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Jäsenmaksimi: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Keskim. taso: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Kiltakokemusta: %d kkp"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Seuraavaan tasoon: %d kkp"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Killan linna: %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "Pelaajan kutsuminen kiltaan epäonnistui."
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "Käyttäjä ei ottanut kiltakutsua vastaan."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "Käyttäjä liittyi kiltaasi."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Kiltasi on täynnä."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Tuntematon vastaus kiltakutsuun."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "Olet eronnut killasta."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s on eronnut killastasi."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Sinut on potkittu killasta."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s on potkittu ulos killastasi."
diff --git a/po/fr.po b/po/fr.po
index 4727011b8..c2ad7fd50 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
"fr/)\n"
@@ -25,120 +25,120 @@ msgstr ""
msgid "Visible on map"
msgstr "Visible sur la carte"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "dodge"
msgstr "esquivé"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "miss"
msgstr "raté"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1525
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1530
msgid "I"
msgstr "I"
-#: 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 "Configuration"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Connexion au serveur"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Connexion"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Vous entrez dans un nouveau monde"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
-#: 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 "Erreur"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Changement de mot de passe"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Changer d'e-mail"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Désinscription réussie"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "A bientôt, revenez quand vous voudrez..."
-#: 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 "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Site de mise à jour invalide : %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
"Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
msgid "Unknown command."
msgstr "Commande inconnue."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "Vous ne pouvez pas envoyer de messages vides."
-#: 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 "
@@ -147,153 +147,153 @@ msgstr ""
"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
"\". Soit elle existe déjà, soit il s'agit de vous même."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Demande de rejoindre le canal %s."
-#: 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 "Le nom du groupe est manquant."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
msgid "Guild name is missing."
msgstr "Le nom de la guilde est manquant."
-#: 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 "Veuillez indiquer un nom."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Return toggles chat."
msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
msgstr "Le message ferme la conversation."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
msgstr ""
"La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
msgstr "Le message ferme maintenant la conversation."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
msgid "friend"
msgstr "ami"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
msgid "disregarded"
msgstr "écarté"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
msgid "neutral"
msgstr "neutre"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player already %s!"
msgstr "Joueur déjà %s !"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "Joueur %s avec succès!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr "Le joueur n'a pas pu %s !"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
msgid "Player wasn't ignored!"
msgstr "Le joueur n'était pas ignoré !"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
msgid "Player no longer ignored!"
msgstr "Le joueur n'est plus ignoré !"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
msgid "Player could not be unignored!"
msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
msgid "Player already erased!"
msgstr "Joueur déjà effacé !"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
msgid "Player successfully erased!"
msgstr "Joueur éliminé avec succès !"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
msgid "Player could not be erased!"
msgstr "le joueur n'a pas pu être effacé !"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:978 src/commandhandler.cpp:1024
#, c-format
msgid "Client uptime: %s"
msgstr "Heure de lancement du client : %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semaine"
msgstr[1] "%d semaines"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d jour"
msgstr[1] "%d jours"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d heure"
msgstr[1] "%d heures"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minute"
msgstr[1] "%d minutes"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d secondes"
msgstr[1] "%d secondes"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1100
msgid "font cache size"
msgstr "Taille du cache de polices"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1112
msgid "Cache size:"
msgstr "Dimension du cache :"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1116
msgid "Created:"
msgstr "Créé : "
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1118
msgid "Deleted:"
msgstr "Effacé :"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1165 src/commandhandler.cpp:1172
msgid "Resource images:"
msgstr "Images des ressources :"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource orphaned images:"
msgstr "Images des ressources non affectées :"
@@ -303,44 +303,44 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Général"
-#: 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 "Informations"
-#: src/game.cpp:488
+#: src/game.cpp:505
msgid "Screenshot saved as "
msgstr "Capture d'écran sauvegardée sous"
-#: src/game.cpp:496
+#: src/game.cpp:513
msgid "Saving screenshot failed!"
msgstr "La sauvegarde de la capture d'écran a échoué !"
-#: src/game.cpp:536
+#: src/game.cpp:553
msgid "The connection to the server was lost."
msgstr ""
"La connexion au serveur a été coupée, le programme va maintenant se fermer."
-#: src/game.cpp:548
+#: src/game.cpp:565
msgid "Network Error"
msgstr "Erreur Réseau"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Ignorer les requêtes d'échanges entrantes"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
-#: src/game.cpp:1606
+#: src/game.cpp:1623
msgid "Could Not Load Map"
msgstr "La carte n'a pu être chargée"
-#: src/game.cpp:1607
+#: src/game.cpp:1624
#, c-format
msgid "Error while loading %s"
msgstr "Erreur durant le chargement %s"
@@ -369,37 +369,37 @@ msgstr "Commentaire : %s"
msgid "Bot Checker"
msgstr "Testeur de Robot"
-#: 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 "Nom"
-#: 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 "Attaquer"
-#: 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 "Parler"
-#: 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 "Déplacement"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Résultat"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
msgid "Reset"
msgstr "Réinitialiser"
#: 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 "Acheter"
@@ -413,7 +413,7 @@ msgstr "Prix : %s / Total : %s"
#. 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 "+"
@@ -421,20 +421,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 "Quitter"
#: 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 "Max."
@@ -443,8 +443,8 @@ msgstr "Max."
msgid "Shop"
msgstr "Boutique"
-#: 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"
@@ -453,19 +453,19 @@ msgstr "Vendre"
#: 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 "Annuler"
@@ -540,14 +540,14 @@ msgstr "Nom :"
#. 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 "<"
@@ -564,7 +564,7 @@ msgid "Race:"
msgstr "Race:"
#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/socialwindow.cpp:1137
msgid "Create"
msgstr "Créer"
@@ -631,9 +631,9 @@ msgstr "Entrer le mot de passe pour effacer le personnage"
msgid "Enter password:"
msgstr "Entrer le mot de passe :"
-#: 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 "Supprimer"
@@ -718,12 +718,12 @@ msgstr "???"
msgid "Chat"
msgstr "Conversation"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Présents : %s ; %d joueurs sont présents."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "Message envoyé à %s : %s"
@@ -736,10 +736,10 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: 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 "Ignorer"
@@ -885,7 +885,7 @@ msgstr "Le saviez-vous ?"
#: 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 "Fermer"
@@ -912,8 +912,8 @@ msgstr "Équipement"
#: 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 "Retirer"
@@ -951,31 +951,31 @@ msgid "id"
msgstr "id"
#: 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 "Équiper"
#: 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 "Utiliser"
#: 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 "Jeter..."
-#: 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 "Partager"
-#: 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 "Tenues"
@@ -984,17 +984,17 @@ msgid "Weight:"
msgstr "Poids :"
#: 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 "Entreposer"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Récupérer"
-#: 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 "Jeter"
@@ -1035,11 +1035,11 @@ msgstr "Ajouter à la boutique de ventes."
msgid "Unknown."
msgstr "Inconnu."
-#: 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 "Poids : %s"
@@ -1132,6 +1132,10 @@ msgstr "%s %d?"
msgid "jacko spawning"
msgstr "Arrivée de Jack0"
+#: src/guildmanager.cpp:458 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "vous avez quitté la guilde."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normal"
@@ -1148,7 +1152,7 @@ msgstr "Sauter"
msgid "Login"
msgstr "Compte"
-#: 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 "Serveur :"
@@ -1230,7 +1234,7 @@ msgstr "Soumettre"
msgid "NPC"
msgstr "PNJ"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "Effacer"
@@ -1250,338 +1254,338 @@ msgstr "Envoyer"
msgid "Failed to send as sender or letter invalid."
msgstr "Échec de l'envoi comme émetteur ou caractère invalide."
-#: 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 "Tenue : %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Touche : %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Retirer d'abord l'équipement"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Équipement en absence"
-#: 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 "Échange"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:395
msgid "Whisper"
msgstr "Message"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:652
msgid "Heal"
msgstr "Soigner"
-#: 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 "Être ami"
-#: 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 "Éviter"
-#: 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 "Éliminer"
-#: 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 "Ne plus ignorer"
-#: 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 "Ignorer complètement"
-#: 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 "Suivre"
-#: 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 "Imiter"
-#: 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 "Inviter dans le groupe"
-#: 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 "Sortir du groupe"
-#: 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 "Sortir de la guilde"
-#: 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 "Changer la position dans la guilde"
-#: 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 "Inviter dans la guilde"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:262
msgid "Kick player"
msgstr "Sortir le joueur"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:264
msgid "Nuke"
msgstr "Annihiler"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:706
msgid "Show Items"
msgstr "Montrer les objets"
-#: 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 "Déshabiller"
-#: 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 "Ajouter commentaire"
-#: 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 "Acheter (?)"
-#: 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 "Vendre (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:318
msgid "Kick"
msgstr "Virer"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
msgid "Remove from attack list"
msgstr "Enlever de la liste d'attaque"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:335
msgid "Add to priority attack list"
msgstr "Ajouter à la liste de priorités d'attaque"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:337
msgid "Add to attack list"
msgstr "Ajouter à la liste d'attaque"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:340
msgid "Add to ignore list"
msgstr "Ajouter à la liste d'ignorés"
-#: 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 "Ajouter le nom dans la boite de dialogue"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:514
msgid "Pick up"
msgstr "Ramasser"
-#: 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 "Ajouter à la conversation"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:532
msgid "Map Item"
msgstr "Objet de carte"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:533
msgid "Rename"
msgstr "Renommer"
-#: 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 "Enlever"
-#: 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 "Charger les anciennes tenues"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:569 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Sortilèges"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:571
msgid "Load old spells"
msgstr "Charger les anciens sorts"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:572
msgid "Edit spell"
msgstr "Éditer le sortilège"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:598
msgid "Disable highlight"
msgstr "Désactiver la surbrillance"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
msgid "Enable highlight"
msgstr "Activer la surbrillance"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "N'enlève pas le nom"
+#: 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 "Enlève le nom"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:618
msgid "Enable away"
msgstr "Active la fonction Absence"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:623
msgid "Disable away"
msgstr "Désactive la fonction Absence"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:629 src/gui/socialwindow.cpp:1139
msgid "Leave"
msgstr "Quitter"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:800
msgid "Change guild position"
msgstr "Changer la position de la Guilde"
#. 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 "Renommer le panneau de carte"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
msgid "Name: "
msgstr "Nom : "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1288
msgid "Player comment "
msgstr "Le joueur commente "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1290
msgid "Comment: "
msgstr "Commentaire : "
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1659
msgid "Add to trade"
msgstr "Ajouter à la transaction"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1665
msgid "Add to trade 10"
msgstr "Ajouter 10 dans l'échange"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade half"
msgstr "Ajouter la moitié dans l'échange"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1670
msgid "Add to trade all"
msgstr "Ajouter tout dans l'échange"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1682
msgid "Store 10"
msgstr "Entreposer 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
msgid "Store half"
msgstr "Entreposer la moitié"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
msgid "Store all"
msgstr "Entreposer tout"
-#: 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 "Jeter tout"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1726
msgid "Retrieve 10"
msgstr "Reprendre 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve half"
msgstr "Reprendre la moitié"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve all"
msgstr "Reprendre tout"
-#: 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 "Charger les anciens raccourcis d'objets"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1861
msgid "Load old drop shortcuts"
msgstr "Charger les anciens raccourcis de jets d'objets"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1922
msgid "Hide"
msgstr "Cacher"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1928
msgid "Show"
msgstr "Montrer"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1935
msgid "Reset yellow bar"
msgstr "Remise aux valeurs de défaut de la barre jaune"
-#: 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 "Copier dans la conversation"
-#: 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 "(défaut)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1985
msgid "Move up"
msgstr "Aller vers le haut"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
msgid "Move down"
msgstr "Aller vers le bas"
@@ -1625,64 +1629,64 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
msgid "Passwords do not match."
msgstr "Les deux mots de passe sont différents"
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Choisissez le serveur"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Choisissez votre serveur *** Mode Sûr ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Port :"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Type de Serveur :"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Charger"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Connexion..."
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Serveur personnalisé"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Veuillez entrer l'adresse et le port du serveur."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "En attente du serveur..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Préparation du téléchargement"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Erreur lors du téléchargement de la liste de serveur !"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "requiert une nouvelle version"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "requiert la v%s"
@@ -1828,6 +1832,14 @@ msgstr "Temps"
msgid "Use local time"
msgstr "Utiliser l’horaire local"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:154
+msgid "Other"
+msgstr "Autre"
+
+#: 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 "Voilà à quoi ressemble cette couleur"
@@ -2056,34 +2068,38 @@ msgid "Log NPC dialogue"
msgstr "Enregistrer les conversations des PNJ"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Autre"
+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 "Activer l'attaque de la part du serveur"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:159
msgid "Enable bot checker"
msgstr "Activer le testeur de robots"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
msgid "Enable buggy servers protection"
msgstr "Activer la protection contre les serveurs instables"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:165
msgid "Enable debug log"
msgstr "Activer l'enregistrement des informations"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:168
msgid "Low traffic mode"
msgstr "Mode traffic faible"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:171
msgid "Hide shield sprite"
msgstr "Cacher le bouclier"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
msgid "Show background"
msgstr "Montrer le fond"
@@ -2471,253 +2487,258 @@ msgstr "Acheter des objets"
msgid "Sell items"
msgstr "Vendre des objets"
-#: 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 "Ajouter"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
msgid "Announce"
msgstr "Annoncer"
-#: 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 "Montrer les liens dans l'annonce"
-#: 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 "Demande d'échange"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s souhaite %s %s Acceptez-vous ?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Compétences"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
msgid "Up"
msgstr "Augmenter"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:340
#, c-format
msgid "Skill points available: %d"
msgstr "Points de compétences : %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:417
#, c-format
msgid "Skill Set %d"
msgstr "Compétence choisie : %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:429
#, c-format
msgid "Skill %d"
msgstr "Compétence %d"
-#: 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 "Niveau : %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Niveau : %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Guilde"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Le joueur %s a été invité dans la guilde %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Demande pour quitter la guilde %s effectuée."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Inviter le membre de la guilde"
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Qui voudriez-vous inviter dans la guilde %s ?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Quitter la guilde ?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Groupe"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "/party > Inviter l'utilisateur %s dans le groupe."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Vous avez demandé à quitter le groupe %s."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Inviter un joueur dans le groupe"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Qui voudriez vous inviter dans le groupe %s ?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Quitter le groupe ?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Atq"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Monstres prioritaires"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Attaquer les monstres"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ignorer les monstres"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Créer une Guilde"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1501
msgid "Create Party"
msgstr "Créer un groupe"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1138
msgid "Invite"
msgstr "Inviter"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1284
#, c-format
msgid "Accepted party invite from %s."
msgstr "Invitation dans le groupe acceptée de la part de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
msgstr "Invitation dans le groupe de la part de %s refusée."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Invitation dans la guilde acceptée de la part de %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Invitation dans la guilde de la part de %s refusée."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "La guilde %s a été créée."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
msgstr "Le groupe %s a été créé."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1408
msgid "Guild Name"
msgstr "Nom de la guilde"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1409
msgid "Choose your guild's name."
msgstr "Choisissez le nom de la guilde."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1423
msgid "Received guild request, but one already exists."
msgstr ""
"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
"dans une."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1429
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s vous a invité à rejoindre la guilde %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1435
msgid "Accept Guild Invite"
msgstr "Accepter l'invitation dans cette guilde"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1450
msgid "Received party request, but one already exists."
msgstr ""
"Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
"dans un groupe."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1461
msgid "You have been invited you to join a party."
msgstr "Vous avez été invité à rejoindre un groupe."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1465
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Vous avez été invité à rejoindre le groupe %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s vous a invité à rejoindre son groupe."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s vous a invité à rejoindre le groupe %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "Accepter l'invitation pour ce groupe"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1502
msgid "Cannot create party. You are already in a party"
msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1507
msgid "Party Name"
msgstr "Nom du groupe"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1508
msgid "Choose your party's name."
msgstr "Choisissez le nom du groupe."
@@ -2725,243 +2746,243 @@ msgstr "Choisissez le nom du groupe."
msgid "Specials"
msgstr "Cpt. spéciales"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) Mouvements par défaut"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) Mouvements inversés"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) Mouvements un peu fous"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) Mouvement complètement fous"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) double normal et fou"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) Mouvements"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) Mouvements fous personnalisés"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) Mouvements fous"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) Aller à la cible distante par défaut"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) Aller à la cible en distante de 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) Aller à la cible en distante de 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) Aller à la cible en distante de 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) Aller à la cible en distante de 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) Aller à la cible dans le champ d'attaque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) Aller à la cible"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) Suivre : défaut"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) Suivre: mouvement relatif"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) Suivre effet miroir"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) Suivre comme un toutou"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) Suivre : mode inconnu"
-#: 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 "(D) Attaque : défaut"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) Attaquer sans protection"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) Attaquer avec protection"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) Attaque"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) Se déplacer et attaquer"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) Se déplacer, attaquer et ramasser"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) Sans attaque automatique"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) Ramassage sur 1x1 case"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) Ramassage par défaut sur 2x1 cases"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) Ramassage avant sur 2x3 cases"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) Ramassage sur 3x3 cases"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) Aller et ramasser jusqu'à la distance max"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) Ramassage"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) Vue normale du jeu"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) Vue du jeu mode déverminage"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) Vue du jeu mode Ultra 1"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(u) Vue du jeu mode Ultra 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) Vue de la carte vide"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) Vue de la carte en N&B"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) Carte"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) Utiliser #flar comme sort d'attaque"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) Utiliser #chiza comme sort d'attaque"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) Utiliser #ingrav comme sort d'attaque"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) Utiliser #frillyar comme sort d'attaque"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) Sorts d'attaque"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) Imitation par défaut"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) Imiter les équipements"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) Imitation"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) Présent sur le jeu"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) Absent"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) Absent"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) Mode camera du jeu"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) Mode camera libre"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) Définir le mode camera"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Modificateurs de mode de jeu désactivés"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Modificateurs de mode de jeu activés"
@@ -3272,33 +3293,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nom : %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Mise à jour en cours..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Connexion..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Jouer"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Le processus de mise à jour n'est pas achevé"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Il est fortement recommandé que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 Essayez à nouveau plus tard"
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Terminé"
@@ -3533,7 +3554,8 @@ msgstr ""
"Cette commande donne les droit d'opérateur du salon à <nom du personnage>"
#: 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 ""
"Si le <nom du personnage> contient des espaces, entourez le de guillemets "
@@ -3575,6 +3597,41 @@ msgstr "Annonce globale de %s :"
msgid "%s whispers: %s"
msgstr "Message de %s : %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Commande : /invite <nom du personnage>"
+
+#: 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 "Cette commande invite <nom du personnage> à rejoindre votre groupe."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Commande : /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Cette commande vous fait quitter la guilde actuelle."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Affiche cette aide."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invite un joueur à rejoindre votre guilde"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Quitter la guilde courante"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Éditer"
@@ -4354,28 +4411,28 @@ msgstr "Personnage supprimé."
msgid "Failed to delete character."
msgstr "La suppression du personnage n'a pu s'effectuer."
-#: 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 "Les salons ne sont pas gérés !"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Le message n'a pu être envoyé, %s n'est pas en ligne."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Le message privé n'a pu être envoyé, vous êtes ignoré par %s."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Joueur MVP"
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "MVP joueur :"
@@ -4392,38 +4449,6 @@ msgstr "Jeu"
msgid "Request to quit denied!"
msgstr "Requête de départ refusée !"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Commande : /invite <nom du personnage>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Commande : /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Cette commande vous fait quitter la guilde actuelle."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Affiche cette aide."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invite un joueur à rejoindre votre guilde"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Quitter la guilde courante"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Guilde créée."
@@ -4440,85 +4465,81 @@ msgstr "Erreur dans la création de la guilde."
msgid "Unknown server response."
msgstr "Réponse inconnue du serveur."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Nom de la guilde : %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Maître de la guilde : %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Niveau de la guilde : %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Membres en ligne : %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Membres maximums : %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Niveau moyen : %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Expérience Groupe : %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Expérience suivante pour la guilde : %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Château de la guilde : %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "N'a pas pu inviter le joueur dans la guilde. "
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "Le joueur a refusé l'invitation dans la guilde."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "%s est maintenant membre de la guilde."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Votre guilde est complète."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Réponse d'invitation à la guilde inconnue."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "vous avez quitté la guilde."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s a quitté votre guilde."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Vous avez été renvoyé de la guilde."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s a sorti quelqu'un de votre guilde."
diff --git a/po/hr.po b/po/hr.po
index e52a56bdc..6d9817c09 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\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: 2011-08-09 22:16+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,119 +22,119 @@ 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 "Podešavanje"
-#: 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 "Greška"
-#: 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 "Nepoznata naredba."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "Ne mogu poslati prazan šapate!"
-#: 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 "
@@ -143,97 +143,97 @@ msgstr ""
"Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
"vi."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Zahtjev za pridruživanje kanalu %s."
-#: 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 "Ime partije nedostaje."
-#: 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 "Poruka zatvara chat."
-#: 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 "Poruka sada zatvara chat."
-#: 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"
@@ -241,7 +241,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -249,7 +249,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -257,7 +257,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -265,7 +265,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -273,27 +273,27 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: 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 ""
@@ -302,43 +302,43 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Općenito"
-#: 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 "Spremanje screenshot-a nije uspjelo!"
-#: 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 "Mreža Greška"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
-#: 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 "Greška prilikom učitavanja %s"
@@ -367,37 +367,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 "Ime"
-#: 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 "Napad"
-#: 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 "Govori"
-#: 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 "Poništi"
#: 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 "Kupi"
@@ -411,7 +411,7 @@ msgstr "Cijena: %s / Ukupno: %s"
#. 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 ""
@@ -419,20 +419,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 "Izlaz"
#: 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 "Max"
@@ -441,8 +441,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Trgovina"
-#: 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"
@@ -451,19 +451,19 @@ msgstr "Prodaj"
#: 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 "Poništi"
@@ -538,14 +538,14 @@ msgstr "Ime:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
#: src/gui/charcreatedialog.cpp: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 ""
@@ -562,7 +562,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 "Stvori"
@@ -629,9 +629,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 "Obriši"
@@ -716,12 +716,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: 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 "Šaptaj prema %s: %s"
@@ -734,10 +734,10 @@ msgstr "Da"
msgid "No"
msgstr "Ne"
-#: 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 ""
@@ -883,7 +883,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 "Zatvori"
@@ -910,8 +910,8 @@ msgstr "Oprema"
#: 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 "Skini opremu"
@@ -949,31 +949,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 "Opremi"
#: 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 "Upotrijebi"
#: 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 "Razdvoji"
-#: 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 ""
@@ -982,17 +982,17 @@ msgid "Weight:"
msgstr "Težina:"
#: 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 "Pohrani"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Preuzmi"
-#: 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 "Ispusti"
@@ -1033,11 +1033,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 ""
@@ -1132,6 +1132,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 ""
@@ -1148,7 +1152,7 @@ msgstr ""
msgid "Login"
msgstr "Korisničko ime"
-#: 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 "Poslužitelj:"
@@ -1230,7 +1234,7 @@ msgstr "Dostavi"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr ""
@@ -1250,338 +1254,338 @@ msgstr "Pošalji"
msgid "Failed to send as sender or letter invalid."
msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
-#: src/gui/outfitwindow.cpp: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 "Trgovanje"
-#: 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 ""
@@ -1625,64 +1629,64 @@ msgstr "Lozinka mora biti kraća od %d znakova."
msgid "Passwords do not match."
msgstr "Lozinke se ne podudaraju."
-#: 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 "Port:"
-#: 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 "Molimo upišite adresu poslužitelja i port poslužitelja."
-#: 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 ""
@@ -1827,6 +1831,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 "Ovako izgleda boja"
@@ -2055,34 +2067,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 ""
@@ -2462,249 +2478,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 "Dodaj"
-#: 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 "Zahtjev za Trgovanje"
-#: 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 "Vještine"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
msgid "Up"
msgstr "Gore"
-#: 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 "Ceh"
-#: 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 "Partija"
-#: 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 "Formiraj Ceh"
-#: 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 "Primljen zahtjev za partiju, ali ona već postoji."
-#: 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 "%s vas je pozvao/la da se pridružite njihovoj partiji."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s vas je pozvao/la da se pridružite %s partiji."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "Prihvati Pozivnicu za Partiju"
-#: 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 ""
@@ -2712,243 +2733,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 ""
@@ -3257,33 +3278,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Ime: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Ažuriranje"
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Spajanje..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Igraj"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Proces ažuriranja je nepotpun."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
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: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 "Dovršeno"
@@ -3516,7 +3537,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Ova naredba čini <nadimak> operatorom kanala."
#: 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 ""
"Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
@@ -3555,6 +3577,41 @@ msgstr "Javna obavijest od %s:"
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 ""
@@ -4322,28 +4379,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 ""
@@ -4360,38 +4417,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 "Ceh, ustanovljen."
@@ -4408,85 +4433,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 ""
diff --git a/po/hu.po b/po/hu.po
index 489ebc42c..2b6c1a75c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\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: 2011-08-09 22:16+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,119 +21,119 @@ 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 "Beállítások"
-#: 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 "Hiba"
-#: 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 "Hiba a frissítési könyvtár létrehozása közben!"
-#: 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 "Ismeretlen parancs."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "Nem küldhetsz üres üzenetet!"
-#: 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 "
@@ -141,152 +141,152 @@ msgid ""
msgstr ""
"Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Kapcsolódási kérelem a %s nevű csatornába."
-#: 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 "A csapatnév hiányzik."
-#: 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 "Az enter megnyitja a bevitelt."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
msgstr "Az üzenet bezárja a bevitelt."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
msgstr "Az enter mostantól megnyitja a bevitelt."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
msgstr "Az üzenet mostantól bezárja a bevitelt."
-#: 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 ""
@@ -297,43 +297,43 @@ msgstr ""
"Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Általános"
-#: 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 "Hiba a képernyő mentése során!"
-#: 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 "Hálózati hiba"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Kereskedési kérelmek elutasítása"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Kereskedési kérelmek elfogadása"
-#: 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 "Hiba %s betöltése közben"
@@ -362,37 +362,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 "Név"
-#: 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 "Támadás"
-#: 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 "Csevegés"
-#: 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 "Alaphelyzet"
#: 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 "Vétel"
@@ -406,7 +406,7 @@ msgstr "Ár: %s / Teljes: %s"
#. 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 ""
@@ -414,20 +414,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 "Kilépés"
#: 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 "Max."
@@ -436,8 +436,8 @@ msgstr "Max."
msgid "Shop"
msgstr "Üzlet"
-#: 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"
@@ -446,19 +446,19 @@ msgstr "Eladás"
#: 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 "Mégse"
@@ -533,14 +533,14 @@ msgstr "Név:"
#. 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 ""
@@ -557,7 +557,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 "Létrehozás"
@@ -624,9 +624,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 "Törlés"
@@ -711,12 +711,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: 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 "Üzenet %s számára: %s"
@@ -729,10 +729,10 @@ msgstr "Igen"
msgid "No"
msgstr "Nem"
-#: 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 ""
@@ -878,7 +878,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 "Bezár"
@@ -905,8 +905,8 @@ msgstr "Felszerelés"
#: 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 "Nem használ"
@@ -944,31 +944,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 "Használ"
#: 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 "Bevet"
#: 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 "Felosztás"
-#: 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 ""
@@ -977,17 +977,17 @@ msgid "Weight:"
msgstr "Súly:"
#: 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 "Raktároz"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Magához vesz"
-#: 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 "Eldob"
@@ -1028,11 +1028,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 ""
@@ -1125,6 +1125,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 ""
@@ -1141,7 +1145,7 @@ msgstr ""
msgid "Login"
msgstr "Belépés"
-#: 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 "Szerver:"
@@ -1223,7 +1227,7 @@ msgstr "Küldés"
msgid "NPC"
msgstr "Gépjátékos"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr ""
@@ -1243,338 +1247,338 @@ msgstr "Küldés"
msgid "Failed to send as sender or letter invalid."
msgstr "A levél elküldése sikertelen. A feladó, vagy a címzett nem található."
-#: 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 "Üzlet"
-#: 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 ""
@@ -1618,64 +1622,64 @@ msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
msgid "Passwords do not match."
msgstr "A jelszavak nem egyeznek."
-#: 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 "Port:"
-#: 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 "Kérlek írd be a szerver címét és portját egyaránt."
-#: 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 ""
@@ -1820,6 +1824,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 "Így fog kinézni a felirat."
@@ -2048,34 +2060,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 ""
@@ -2455,249 +2471,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 "Hozzáad"
-#: 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 "Üzleti ajánlat"
-#: 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 "Képességek"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
msgid "Up"
msgstr "Fejleszt"
-#: 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 "Klán"
-#: 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 "Csapat"
-#: 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 "Klán létrehozása"
-#: 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 "Csapatba hívtak, de neked van csapatod."
-#: 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 "%s a csapatába hívott."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s behívott %s csapatába."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "Ajánlat elfogadása"
-#: 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 ""
@@ -2705,243 +2726,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 ""
@@ -3251,33 +3272,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Név: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Frissítés…"
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Csatlakozás…"
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Játék"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 A frissítési folyamat befejezetlen"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Erősen ajánljuk, hogy"
#. 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 "Kész"
@@ -3511,7 +3532,8 @@ msgstr ""
"Ez a parancs a <név> alatt megadott személyt csatorna operátorrá teszi."
#: 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 ""
"Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
@@ -3550,6 +3572,41 @@ msgstr "Globális bejelentés (%s) :"
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 ""
@@ -4316,28 +4373,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 ""
@@ -4354,38 +4411,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 "Klán létrehozva."
@@ -4402,85 +4427,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 ""
diff --git a/po/id.po b/po/id.po
index 24a18204f..e09598ec2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
"id/)\n"
@@ -24,119 +24,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Terlihat di peta"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "dodge"
msgstr "Menghindar"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "miss"
msgstr "Luput"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1525
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1530
msgid "I"
msgstr "l"
-#: 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 "Pengaturan"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Terhubung dengan server"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Masuk"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Memasuki arena permainan"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Pemilihan karakter"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "terhubung dengan server"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Pergantian server"
-#: 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 "Kesalahan"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Ubah sandi"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Perubahan email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
-#: 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 "%s tidak ada dan tidak dapat dibuat!keluar."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Gagal mengupdate host: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
msgid "Unknown command."
msgstr "Perintah tidak dikenal."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "Tidak dapat mengirimkan pesan tanpa nama"
-#: 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 "
@@ -145,147 +145,147 @@ msgstr ""
"Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
"atau nama anda sendiri"
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Meminta untuk masuk ke channel %s."
-#: 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 "Nama kelompok tidak dapat di temukan"
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
msgid "Guild name is missing."
msgstr "Nama organisasi tidak ditemukan."
-#: 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 "Tetapkan sebuah nama"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Return toggles chat."
msgstr "Kembalikan pengalihan obrolan"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
msgstr "Tutup pesan obrolan"
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
msgstr "Kembalikan sekarang pengalihan obrolan"
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
msgstr "Pesan menutup obrolan"
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
msgid "friend"
msgstr "Teman"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
msgid "disregarded"
msgstr "Diabaikan"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
msgid "neutral"
msgstr "netral"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player already %s!"
msgstr "Pemain telah %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "Pemain telah berhasil %s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr "Pemain tidak bisa %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
msgid "Player wasn't ignored!"
msgstr "Pemain tidak diabaikan!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
msgid "Player no longer ignored!"
msgstr "Pemain tidak lagi diabaikan!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
msgid "Player could not be unignored!"
msgstr "Pemain tidak dapat diabaikan"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
msgid "Player already erased!"
msgstr "Pemain telah terhapus"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
msgid "Player successfully erased!"
msgstr "Pemain telah berhasil dihapus"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
msgid "Player could not be erased!"
msgstr "Pemain tidak dapat dihapus"
-#: 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] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1100
msgid "font cache size"
msgstr "Ukuran jenis huruf cache"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1112
msgid "Cache size:"
msgstr "Ukuran Cache:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1116
msgid "Created:"
msgstr "Buat"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1118
msgid "Deleted:"
msgstr "Hapus"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1165 src/commandhandler.cpp:1172
msgid "Resource images:"
msgstr "Sumber gambar"
-#: 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 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Umum"
-#: 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 "Debug"
-#: src/game.cpp:488
+#: src/game.cpp:505
msgid "Screenshot saved as "
msgstr "Screenshot disimpan sebagai"
-#: src/game.cpp:496
+#: src/game.cpp:513
msgid "Saving screenshot failed!"
msgstr "Gagal menyimpan screenshot!"
-#: src/game.cpp:536
+#: src/game.cpp:553
msgid "The connection to the server was lost."
msgstr "Koneksi ke server terputus"
-#: src/game.cpp:548
+#: src/game.cpp:565
msgid "Network Error"
msgstr "Kesalahan jaringan"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Abaikan permohonan transaksi"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Terima permohonan transaksi"
-#: src/game.cpp:1606
+#: src/game.cpp:1623
msgid "Could Not Load Map"
msgstr "Tidak dapat menampilkan peta"
-#: src/game.cpp:1607
+#: src/game.cpp:1624
#, c-format
msgid "Error while loading %s"
msgstr "Error ketika menunggu %s"
@@ -360,37 +360,37 @@ msgstr "Komentar: %s"
msgid "Bot Checker"
msgstr "Pengecek Bot"
-#: 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 "Nama"
-#: 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 "Pukul"
-#: 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 "Berbicara"
-#: 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 "Jalan"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Hasil"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
msgid "Reset"
msgstr "Reset"
#: 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 "Beli"
@@ -404,7 +404,7 @@ msgstr "Harga: %s/ Total: %s"
#. 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 "Keluar"
#: 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 "Max"
@@ -434,8 +434,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Toko"
-#: 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 "Jual"
#: 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 "Batal"
@@ -531,14 +531,14 @@ msgstr "Nama:"
#. 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 "Ras:"
#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/socialwindow.cpp:1137
msgid "Create"
msgstr "Buat"
@@ -622,9 +622,9 @@ msgstr "Masukan Sandi untuk menghapus karakter"
msgid "Enter password:"
msgstr "Masukkan sandi"
-#: 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 "Hapus"
@@ -709,12 +709,12 @@ msgstr "???"
msgid "Chat"
msgstr "Obrolan"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Kehadiran: %s; %d pemain yang hadir."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "Berbisik ke %s: %s"
@@ -727,10 +727,10 @@ msgstr "Ya"
msgid "No"
msgstr "Tidak"
-#: 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 "Abaikan"
@@ -876,7 +876,7 @@ msgstr "Apakah kamu tahu?"
#: 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 "Tutup"
@@ -903,8 +903,8 @@ msgstr "Perlengkapan"
#: 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 "Lepaskan"
@@ -942,31 +942,31 @@ msgid "id"
msgstr "id"
#: 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 "Pakai"
#: 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 "Gunakan"
#: 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 "Buang..."
-#: 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 "Pecah"
-#: 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 "Setelan"
@@ -975,17 +975,17 @@ msgid "Weight:"
msgstr "Berat"
#: 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 "Simpan"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Kembalikan"
-#: 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 "Buang"
@@ -1026,11 +1026,11 @@ msgstr "Tambahkan ke daftar jual"
msgid "Unknown."
msgstr "Tidak diketahui"
-#: 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 "Berat: %s"
@@ -1121,6 +1121,10 @@ msgstr "%s %d?"
msgid "jacko spawning"
msgstr "Jacko bertelur"
+#: 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 "Normal"
@@ -1137,7 +1141,7 @@ msgstr "lanjutkan"
msgid "Login"
msgstr "Login"
-#: 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 "Server:"
@@ -1219,7 +1223,7 @@ msgstr "Masukan"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "Hapus"
@@ -1239,338 +1243,338 @@ msgstr "Kirim"
msgid "Failed to send as sender or letter invalid."
msgstr "Gagal untuk mengirim sebagai pengirim atau surat tidak valid."
-#: 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 "Setelan: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Kunci: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Copot lebih dahulu"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Setelan saat bepergian"
-#: 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 "Tukar"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:395
msgid "Whisper"
msgstr "Berbisik"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:652
msgid "Heal"
msgstr "Menyembuhkan"
-#: 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 "Jadikan teman"
-#: 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 "Hapus"
-#: 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 "Batalkan pengabaian"
-#: 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 "Mengikuti"
-#: 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 "Tirukan"
-#: 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 "Undang ke kelompok"
-#: 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 "Keluarkan dari kelompok"
-#: 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 "Keluarkan dari organisasi"
-#: 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 "Ubah posisi di organisasi"
-#: 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 "Undang ke organisasi"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:262
msgid "Kick player"
msgstr "keluarkan pemain"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:264
msgid "Nuke"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:706
msgid "Show Items"
msgstr "Perlihatkan item"
-#: 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 "Tanggalkan pakaian"
-#: 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 "Penambahan komentar"
-#: 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 "Beli(?)"
-#: 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 "Jual(?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:318
msgid "Kick"
msgstr "keluarkan"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
msgid "Remove from attack list"
msgstr "Hapus dari daftar menyerang"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:335
msgid "Add to priority attack list"
msgstr "Tambahkan prioritas daftar menyerang"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:337
msgid "Add to attack list"
msgstr "Tambahkan ke daftar menyerang"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:340
msgid "Add to ignore list"
msgstr "Tambahkan ke daftar Abaikan"
-#: 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 "Tambahkan nama ke Obrolan"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:514
msgid "Pick up"
msgstr "Ambil"
-#: 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 "Ambil ke obrolan"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:532
msgid "Map Item"
msgstr "Daftar barang"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:533
msgid "Rename"
msgstr "Ganti nama"
-#: 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 "Hapus"
-#: 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 "Memuat setelan lama"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:569 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Mantra"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:571
msgid "Load old spells"
msgstr "Memuat mantra lama"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:572
msgid "Edit spell"
msgstr "Edit mantra"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:598
msgid "Disable highlight"
msgstr "Nonaktifkan sorotan"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
msgid "Enable highlight"
msgstr "Aktifkan sorotan"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "Nama jangan di hapus"
+#: 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 "hapus nama"
-#: 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 "Ubah posisi Organisasi"
#. 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 "Ubah nama tanda peta"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
msgid "Name: "
msgstr "Nama:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1288
msgid "Player comment "
msgstr "Komentar pemain"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1290
msgid "Comment: "
msgstr "komentar"
-#: 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 "Tambahkan semua ke Penukaran"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1682
msgid "Store 10"
msgstr "Masukkan 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
msgid "Store half"
msgstr "Masukkan setengah"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
msgid "Store all"
msgstr "Masukkan semua"
-#: 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 "Buang semuanya"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1726
msgid "Retrieve 10"
msgstr "Ambil 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve half"
msgstr "Ambil setengah"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve all"
msgstr "Ambil semua"
-#: 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 "Muat jalan pintas iItem lama"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1861
msgid "Load old drop shortcuts"
msgstr "Muat jalan pintas Buang yang lama"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1922
msgid "Hide"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1928
msgid "Show"
msgstr "Tampilkan"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1935
msgid "Reset yellow bar"
msgstr "Atur ulang bar kuning"
-#: 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 "Pindahkan ke chat"
-#: 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 "(kembalikan)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1985
msgid "Move up"
msgstr "Bergerak keatas"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
msgid "Move down"
msgstr "Bergerak kebawah"
@@ -1614,64 +1618,64 @@ msgstr "Panjang kata sandi tidak boleh kurang dari %d karakter."
msgid "Passwords do not match."
msgstr "Kata sandi cocok."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Pilih Server Anda"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Pilih Servermu *** SAFE MODE ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Port:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Gunakan ip yang sama untuk sub server game"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Tipe server:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Memuat"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Menyambung"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Modifikasi server"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Tolong tulis address dan port dari server"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Mengunduh daftar server... %2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Menyambung ke server..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Menyiapkan pengunduhan"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Gagal mengunduh data server!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "Membutuhkan versi terbaru"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "Membutuhkan v%s"
@@ -1816,6 +1820,14 @@ msgstr "Waktu"
msgid "Use local time"
msgstr "Pengunaan waktu lokal"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:154
+msgid "Other"
+msgstr "Lainnya"
+
+#: 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 "Warnanya terlihat seperti ini"
@@ -2044,34 +2056,38 @@ msgid "Log NPC dialogue"
msgstr "Riwayat dialog NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Lainnya"
+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 "Perbolehkan pengecekan bot"
-#: 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 "Perlihatkan latar belakang"
@@ -2451,249 +2467,254 @@ msgstr "Beli barang"
msgid "Sell items"
msgstr "Jual barang"
-#: 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 "Tambah"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
msgid "Announce"
msgstr "Umumkan"
-#: 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 "Perlihatkan link di Umumkan"
-#: 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 "Meminta untuk menukar"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s ingin %s %s apakah anda bersedia?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Keahlian"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
msgid "Up"
msgstr "Naik"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:340
#, c-format
msgid "Skill points available: %d"
msgstr "poin Skill yang tersedia: %d"
-#: 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 "Skill %d"
-#: 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 "Level: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Level: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Organisasi"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Pengguna yang diajak %s ke organisasi %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Permintaan %s keluar dari Organisasi "
-#: 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 "Tinggalkan organisasi?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Kelompok"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Pengguna yang diajak %s ke kelompok"
-#: 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 "Mengundang pengguna ke kelompok"
-#: 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 "Sedang meninggalkan keyboard"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "mob prioritas"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "serang mob"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Abaikan mobs"
-#: 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 ""
@@ -2701,243 +2722,243 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) jalan normal"
-#: 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 "(d) normal ganda + mode gila"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) jalan"
-#: 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 "(2) jalan ke target di jarak 2"
-#: 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 "(?)bergerak ke target"
-#: 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 "(D) pukulan normal"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) ganti pukulan tanpa pelindung"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) pukulan dengan pelindung"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?)serangan"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) jalan dan serang"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) jalan, serang, ambil"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) tanpa penyerangan otomatis"
-#: 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 "(?)mengambil"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) penampilan peta normal"
-#: 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 "(e) penampilan peta kosong"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b)penampilan peta hitam & putih"
-#: 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 "(f) gunakan #flar untuk serangan magic"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) gunakan #chiza untuk serangan magic"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(l) gunakan #ingrav untuk serangan magic"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) gunakan #frillyar untuk serangan magic"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) gunakan #upmarmu untuk serangan magic"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) serangan magic"
-#: 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 "(O) pada keyboard"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) pergi"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) pergi"
-#: 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 "Perombakan game tidak diperbolehkan"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Perombakan game diperbolehkan"
@@ -3246,33 +3267,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nama: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Mengupdate..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Menyambung..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Main"
-#: 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 ""
@@ -3505,7 +3526,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 "Jika <nama> mempunyai spasi, ditutup dengan tanda (\")."
@@ -3543,6 +3565,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 "Ganti"
@@ -4308,28 +4365,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 ""
@@ -4346,38 +4403,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 ""
@@ -4394,85 +4419,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 ""
diff --git a/po/ja.po b/po/ja.po
index 4832693a3..c07260164 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
"ja/)\n"
@@ -25,119 +25,119 @@ 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 "服:%d"
-#: 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 "%s は存在しないので作成することが不可能!終了中…"
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "無効なアップデートホスト: %s"
-#: 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 "エラー: %s は存在しないので作成することが不可能!終了中…"
-#: 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 "
@@ -146,147 +146,147 @@ msgstr ""
"%sと言うメッセージタブの作成ができません!それはもう既に存在しているか、自分"
"です。"
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "%sというチャンネルへの参加を要求しています。"
-#: 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 "プレイヤーはもう%s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "プレイヤーは%s成功!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr "選手は%sを居られなかった "
-#: 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 "Playerはunignoredことができなかった!"
-#: 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 "クライアントの稼働時間:%s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: 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 ""
@@ -297,43 +297,43 @@ msgstr ""
"/%sへの可能なオプションは:\"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"。"
-#: 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 "%sをロードしている間にエラーが起きました。"
@@ -362,37 +362,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 "買う"
@@ -406,7 +406,7 @@ msgstr "価格:%s /合計:%s"
#. 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 "+"
@@ -414,20 +414,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 "最大"
@@ -436,8 +436,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"
@@ -446,19 +446,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 "キャンセル"
@@ -533,14 +533,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 "<"
@@ -557,7 +557,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 "作成"
@@ -624,9 +624,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 "削除"
@@ -711,12 +711,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 "%sに送信中: %s"
@@ -729,10 +729,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 "無視"
@@ -878,7 +878,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 "閉じる"
@@ -905,8 +905,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 "外す"
@@ -944,31 +944,31 @@ msgid "id"
msgstr "id"
#: 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 "服"
@@ -977,17 +977,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 "落とす"
@@ -1028,11 +1028,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 "重力:%s"
@@ -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 "NPC"
-#: 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 "服: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "鍵:%s"
-#: 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 "10保存"
-#: 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 "10取る"
-#: 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 "パスワードは%d文字より短くなくてはいけません。"
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 "要る v%s"
@@ -1820,6 +1824,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 "これがその色がどのように見えるかです。"
@@ -2048,34 +2060,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 "背景を表示する"
@@ -2455,249 +2471,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 "スキルポイント: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:417
#, c-format
msgid "Skill Set %d"
msgstr "スキルセット %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:429
#, c-format
msgid "Skill %d"
msgstr "スキル %d"
-#: 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 "Lvl: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Lvl:%d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "ギルド"
-#: 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 "%sはあなたをパーティに招待しました。"
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%sはあなたを%sというパーティに招待しました。"
-#: 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 "パーティ名を選んでください"
@@ -2705,243 +2726,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 "(A) "
-#: 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 ""
@@ -3252,33 +3273,33 @@ msgstr ""
msgid "Name: %s"
msgstr "名前: %s"
-#: 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 "##1 アップデートは完了していません。"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 とても推奨されます。"
#. 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 "完了"
@@ -3511,7 +3532,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 ""
"入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で"
@@ -3553,6 +3575,41 @@ msgstr "%sからのアナウンス:"
msgid "%s whispers: %s"
msgstr "%s ささやく: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "コマンド: /invite <プレイヤー名>"
+
+#: 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 "コマンド: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/helpでこのヘルプを表示する。"
+
+#: 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 "エディット"
@@ -4319,28 +4376,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 "プレイヤー MVP"
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "プレイヤー MVP "
@@ -4357,38 +4414,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 "コマンド: /invite <プレイヤー名>"
-
-#: 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 "コマンド: /leave"
-
-#: 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 "/helpでこのヘルプを表示する。"
-
-#: 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 "ギルド作成成功"
@@ -4405,85 +4430,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 "ギルド名:%s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "ギルドマスタ: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "ギルドレベル:%d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "オンラインウザー: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "最大のメンバー: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "平均レベル: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "ギルド経験:%d"
-#: 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 "ギルド城:%s"
-#: 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 ""
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 ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 15fa66fb7..5c3333b53 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-17 21:39+0000\n"
-"Last-Translator: AL13N <maarten.vanraes@gmail.com>\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
"manaplus/team/nl_BE/)\n"
"Language: nl_BE\n"
@@ -23,119 +23,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Zichtbaar op de map"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "dodge"
msgstr "ontwijkt"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1525
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1530
msgid "I"
msgstr "I"
-#: 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 "Configureren"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Verbinden met server"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Inloggen"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Aanvragen personage"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
-#: 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 "Fout"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Paswoord Wijziging"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Email Wijziging"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
-#: 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 "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige update host %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
msgid "Unknown command."
msgstr "Onbekend commando."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "Kan geen lege berichten sturen!"
-#: 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 "
@@ -144,152 +144,152 @@ msgstr ""
"Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
"bestaat, of het is jezelf."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
-#: 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 "Groepsnaam ontbreekt."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
msgid "Guild name is missing."
msgstr "Guild-naam ontbreekt."
-#: 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 "Gelieve een naam te specifiëren"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Return toggles chat."
msgstr "Ga terug naar chat"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
msgstr "Bericht sluit chat."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
msgstr "Ga nu terug naar chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
msgstr "Bericht sluit nu chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
msgid "friend"
msgstr "vriend"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
msgid "disregarded"
msgstr "genegeerd"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
msgid "neutral"
msgstr "neutraal"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player already %s!"
msgstr "Speler reeds %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "Speler succesvol %s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr "Speler kan niet %s zijn!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
msgid "Player wasn't ignored!"
msgstr "Speler is niet genegeerd!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
msgid "Player no longer ignored!"
msgstr "Speler niet langer genegeerd!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
msgid "Player could not be unignored!"
msgstr "Speler kan niet worden genegeerd!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
msgid "Player already erased!"
msgstr "Speler reeds verwijderd!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
msgid "Player successfully erased!"
msgstr "Speler succesvol verwijderd!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
msgid "Player could not be erased!"
msgstr "Speler kan niet worden verwijderd!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:978 src/commandhandler.cpp:1024
#, c-format
msgid "Client uptime: %s"
msgstr "Client uptime: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d week"
msgstr[1] "%d weken"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dag"
msgstr[1] "%d dagen"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d uur"
msgstr[1] "%d uren"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuut"
msgstr[1] "%d minuten"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d seconde"
msgstr[1] "%d seconden"
-#: 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 "Aangemaakt:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1118
msgid "Deleted:"
msgstr "Verwijdered:"
-#: 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 ""
@@ -299,43 +299,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Algemeen"
-#: 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 "Debug"
-#: src/game.cpp:488
+#: src/game.cpp:505
msgid "Screenshot saved as "
msgstr "Scherafdruk opgeslagen als:"
-#: src/game.cpp:496
+#: src/game.cpp:513
msgid "Saving screenshot failed!"
msgstr "Opslaan van screenshot mislukt!"
-#: src/game.cpp:536
+#: src/game.cpp:553
msgid "The connection to the server was lost."
msgstr "De verbinding met de server is verbroken."
-#: src/game.cpp:548
+#: src/game.cpp:565
msgid "Network Error"
msgstr "Netwerkfout"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Inkomende handelsaanvragen negeren"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
-#: src/game.cpp:1606
+#: src/game.cpp:1623
msgid "Could Not Load Map"
msgstr "Kon Map Niet Laden"
-#: src/game.cpp:1607
+#: src/game.cpp:1624
#, c-format
msgid "Error while loading %s"
msgstr "Fout bij het laden van %s"
@@ -364,37 +364,37 @@ msgstr ""
msgid "Bot Checker"
msgstr "Bot Controleerder"
-#: 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 "Naam"
-#: 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 "Aanvallen"
-#: 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 "Spreken"
-#: 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 "Beweeg"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Resultaat"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
msgid "Reset"
msgstr "Reset"
#: 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 "Kopen"
@@ -408,7 +408,7 @@ msgstr "Prijs: %s / Totaal: %s"
#. 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 "+"
@@ -416,20 +416,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 "Afsluiten"
#: 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 "Maximum"
@@ -438,8 +438,8 @@ msgstr "Maximum"
msgid "Shop"
msgstr "Winkel"
-#: 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"
@@ -448,19 +448,19 @@ msgstr "Verkopen"
#: 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 "Annuleren"
@@ -535,14 +535,14 @@ msgstr "Naam:"
#. 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 "<"
@@ -559,7 +559,7 @@ msgid "Race:"
msgstr "Ras:"
#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/socialwindow.cpp:1137
msgid "Create"
msgstr "Aanmaken"
@@ -626,9 +626,9 @@ msgstr "Geef uw wachtwoord om uw personage te verwijderen"
msgid "Enter password:"
msgstr "Geef wachtwoord:"
-#: 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 "Verwijderen"
@@ -713,12 +713,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Aanwezig: %s; %d speler zijn aanwezig."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
@@ -731,10 +731,10 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: 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 "Negeer"
@@ -880,7 +880,7 @@ msgstr "Weet u?"
#: 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 "Sluiten"
@@ -907,8 +907,8 @@ msgstr "Uitrusting"
#: 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 "Afdoen"
@@ -946,31 +946,31 @@ msgid "id"
msgstr "id"
#: 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 "Uitrusten"
#: 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 "Gebruiken"
#: 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 "Neerleggen..."
-#: 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 "Splitsen"
-#: 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 "Kleren"
@@ -979,17 +979,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: 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 "Opslaan"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Afhalen"
-#: 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 "Neerleggen"
@@ -1030,11 +1030,11 @@ msgstr "Toevoegen om te verkopen"
msgid "Unknown."
msgstr "Onbekend."
-#: 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 "Gewicht: %s"
@@ -1127,6 +1127,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 "Normaal"
@@ -1143,7 +1147,7 @@ msgstr "Overslaan"
msgid "Login"
msgstr "Inloggen"
-#: 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 "Server:"
@@ -1225,7 +1229,7 @@ msgstr "Indienen"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "Wissen"
@@ -1245,338 +1249,338 @@ msgstr "Verzenden"
msgid "Failed to send as sender or letter invalid."
msgstr "Kon niet zenden als zender, of de brief is ongeldig."
-#: 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 "Kleren: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Sleutel: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Verwijder uitrusting eerst"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Kleren om weg te gaan"
-#: 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 "Handel"
-#: 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 "Word vriend"
-#: 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 "Geen rekening mee houden"
-#: 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 "Wis"
-#: 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 "Volledig genegeerd"
-#: 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 "Volg"
-#: 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 "Imiteer"
-#: 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 "Schop speler"
-#: 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 "Toon Voorwerpen"
-#: 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 "ontkleed"
-#: 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 "Koop (?)"
-#: 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 "Verkoop (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:318
msgid "Kick"
msgstr "Schop"
-#: 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 "Raap op"
-#: 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 "Aan chat toevoegen"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:532
msgid "Map Item"
msgstr "Plaats voorwerp op de kaart"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:533
msgid "Rename"
msgstr "Hernoem"
-#: 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 "Verwijder"
-#: 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 "Inladen oude kleren"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:569 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Spreuken"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:571
msgid "Load old spells"
msgstr "Laad oude spreuken"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:572
msgid "Edit spell"
msgstr "Wijzig spreuk"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:598
msgid "Disable highlight"
msgstr "Markering afzetten"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
msgid "Enable highlight"
msgstr "Markering aanzetten"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "De naam niet verwijderen"
+#: 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 "Verwijder naam"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:618
msgid "Enable away"
msgstr "away aanzetten"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:623
msgid "Disable away"
msgstr "away afzetten"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:629 src/gui/socialwindow.cpp:1139
msgid "Leave"
msgstr "Verlaat"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:800
msgid "Change guild position"
msgstr "Wijzig uw guild positie"
#. 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 "Kaart bordje hernoemen "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
msgid "Name: "
msgstr "Naam: "
#. 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 "Plaats 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
msgid "Store half"
msgstr "Plaats de helft"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
msgid "Store all"
msgstr "Plaats alles"
-#: 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 "Laat alles vallen"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1726
msgid "Retrieve 10"
msgstr "Haal 10 op"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve half"
msgstr "Haal de helft op"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve all"
msgstr "Haal alles op"
-#: 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 "Laden van oude voorwerpsnelkoppelingen"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1861
msgid "Load old drop shortcuts"
msgstr "Laden van oude neerleggingsnelkoppeling"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1922
msgid "Hide"
msgstr "Verberg"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1928
msgid "Show"
msgstr "Toon"
-#: 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 "Kopieer naar chat"
-#: 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 "(standaard)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1985
msgid "Move up"
msgstr "Beweeg naar boven"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
msgid "Move down"
msgstr "Beweeg naar beneden"
@@ -1620,64 +1624,64 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
msgid "Passwords do not match."
msgstr "Wachtwoorden komen niet overeen."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Kies Uw Server"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Kies Uw Server *** VEILIGE MODUS ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Poort:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Gebruik hetzelfde ip voor spel sub-servers"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Server type:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Laden"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Verbinden"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Manuele Server"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Typ aub zowel het adres van de server, als de poort."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Downloaden van server lijst...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Wachten op server..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Download voorbereiden"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Fout tijdens ophalen server lijst"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "vereist een nieuwere versie"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "vereist v%s"
@@ -1824,6 +1828,14 @@ msgstr "Tijd"
msgid "Use local time"
msgstr "Gebruik lokale tijd"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:154
+msgid "Other"
+msgstr "Andere"
+
+#: 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 "Dit is hoe de kleur eruit ziet"
@@ -2052,34 +2064,38 @@ msgid "Log NPC dialogue"
msgstr ""
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Andere"
+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 "Zet debug log aan"
-#: 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 "Toon achtergrond"
@@ -2465,249 +2481,254 @@ msgstr "Koop voorwerpen"
msgid "Sell items"
msgstr "Verkoop voorwerpen"
-#: 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 "Toevoegen"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
msgid "Announce"
msgstr "Aankondigingen"
-#: 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 "Toon links in aankondigingen"
-#: 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 "Handel aanvragen"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s wilt %s %s ga je akkoord?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Vaardigheden"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:287
msgid "Up"
msgstr "Omhoog"
-#: 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 "Niv: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Niv: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Guild"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "gebruiker %s uitgenodigd in guild %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Guild %s verlating aangevraagd."
-#: 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 "Wie zou u willen uitnodigen in guild %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Verlaten Guild?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Bent u zeker dat u guild %s wilt verlaten?"
-#: 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 "Groep"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Gebruiker %s uitgenodigd in groep."
-#: 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 "Wie zou u willen uitnodigen in group %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Verlaten Groep?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Bent u zeker dat u groep %s wilt verlaten?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Aanv"
-#: 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 "Guild aanmaken"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1501
msgid "Create Party"
msgstr "Groep aanmaken"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Sociaal"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1138
msgid "Invite"
msgstr "Nodig uit"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1284
#, c-format
msgid "Accepted party invite from %s."
msgstr "Uitnodiging voor groep %s aanvaard."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
msgstr "Uitnodiging voor groep %s geweigerd."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Uitnodiging voor guild %s aanvaard."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Uitnodiging voor guild %s geweigerd."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "Maken van guild %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
msgstr "Maken van groep %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1408
msgid "Guild Name"
msgstr "Guild Naam"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1409
msgid "Choose your guild's name."
msgstr "Kies uw guild naam"
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1423
msgid "Received guild request, but one already exists."
msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
-#: 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 "Guild Uitnodiging Aanvaarden"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1450
msgid "Received party request, but one already exists."
msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1461
msgid "You have been invited you to join a party."
msgstr "U bent uitgenodigd om je bij een groep te voegen."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1465
#, c-format
msgid "You have been invited to join the %s party."
msgstr "U bent uitgenodigd om je bij groep %s te voegen."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "Groepsuitnodiging aanvaarden"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1502
msgid "Cannot create party. You are already in a party"
msgstr "Kan groep niet aanmaken. Je bent al in een groep."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1507
msgid "Party Name"
msgstr "Groep Naam"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1508
msgid "Choose your party's name."
msgstr "Kies uw groepsnaam."
@@ -2715,243 +2736,243 @@ msgstr "Kies uw groepsnaam."
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) standaard bewegingen"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) geïnverteerde bewegingen"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) bewegingen met enkele vreemde bewegingen"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) bewegingen met vreemde bewegingen"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) dubbel normaal + raar"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) beweeg"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) manuele vreemde beweging"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) vreemde beweging"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) standaard bewegingen tot aan doel"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) bewegen tot aan doel in bereik 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) bewegen tot aan doel in bereik 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) bewegen tot aan doel in bereik 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) bewegen tot aan doel in bereik 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) bewegen tot aan doel in bereik 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) beweeg tot aan doel in aanvalsbereik"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) beweeg tot aan doel"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) standaard volgen"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) relatief volgen"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) gespiegeld volgen"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) huisdier volgen"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) onbekend volgen"
-#: 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 "(D) standaard aanval"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) wissel aanval zonder schild"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) wissel aanval met schild"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) aanval"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) ga en val aan"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) ga, val aan, raap op"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) zonder auto aanval"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) klein raap op 1x1 velden"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) standaard raap op 2x1 velden"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) vooruit raap op 2x3 velden"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) raap op 3x3 velden"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) go en raap op met bereik 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) ga en raap op met bereik 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) ga en raap op zonder bereiklimiet"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) raap op"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) normale map tonen"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) debug map tonen"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) ultra map tonen"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) ultra map tonen 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) lege map tonen"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) zwart & witte map tonen"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) map tonen"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) gebruik #flar voor magie aanval"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) gebruik #chiza voor magie aanval"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) gebruik #ingrav voor magie aanval"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) gebruik #frillyar voor magie aanval"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) gebruik #upmarmu voor magie aanval"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) magie aanval"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) standaard imitatie"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) kleren imitatie"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) imitatie"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) op toetsenbord"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) weg"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) weg"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) spel camera modus"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) vrije camera modus"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) design camera modus"
-#: 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 ""
@@ -3262,33 +3283,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Naam: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Actualiseren..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Verbinden..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Spelen"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Het updateproces is onvolledig."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Het is ten sterkste aanbevolen dat"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 probeer later opnieuw."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Voltooid"
@@ -3523,7 +3544,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
#: 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 ""
"Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
@@ -3565,6 +3587,41 @@ msgstr "Globale aankondiging van %s:"
msgid "%s whispers: %s"
msgstr "%s fluistert: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Commando: /invite <nick>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Commando: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Geeft deze help weer."
+
+#: 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 "Wijzig"
@@ -4336,28 +4393,28 @@ msgstr "Personage verwijderd."
msgid "Failed to delete character."
msgstr "Kon personage niet verwijderen."
-#: 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 "Kanalen worden niet ondersteund!"
-#: 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 ""
@@ -4374,38 +4431,6 @@ msgstr "Spel"
msgid "Request to quit denied!"
msgstr "Aanvraag op de stoppen is geweigerd!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Commando: /invite <nick>"
-
-#: 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 "Commando: /leave"
-
-#: 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 "/help > Geeft deze help weer."
-
-#: 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 "Guild aangemaakt."
@@ -4422,85 +4447,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 ""
diff --git a/po/pt.po b/po/pt.po
index 513dc8b00..ae600183a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-18 15:20+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
"pt/)\n"
"Language: pt\n"
@@ -24,119 +24,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Visivel no mapa"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "dodge"
msgstr "desviou"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1525
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1530
msgid "I"
msgstr "l"
-#: 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 "Configurar"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: 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 "Erro"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: 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 "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: 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 "
@@ -145,152 +145,152 @@ msgstr ""
"Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
"já existe ou é você mesmo."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: 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 "Falta o nome do grupo."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: 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 "Por favor, especifique um nome."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:978 src/commandhandler.cpp:1024
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1100
msgid "font cache size"
msgstr "Tamanho do cache de fonte"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1112
msgid "Cache size:"
msgstr "Tamanho de Cache:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1116
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1118
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1165 src/commandhandler.cpp:1172
msgid "Resource images:"
msgstr "Recursos de imagens:"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource orphaned images:"
msgstr "Recursos de imagens orfãos:"
@@ -300,43 +300,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Geral"
-#: 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 "Depurador"
-#: src/game.cpp:488
+#: src/game.cpp:505
msgid "Screenshot saved as "
msgstr "Screenshot salva como "
-#: src/game.cpp:496
+#: src/game.cpp:513
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
-#: src/game.cpp:536
+#: src/game.cpp:553
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:548
+#: src/game.cpp:565
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1606
+#: src/game.cpp:1623
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1607
+#: src/game.cpp:1624
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -365,37 +365,37 @@ msgstr "Comentário: %s"
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: 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 "Nome"
-#: 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 "Atacar"
-#: 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 "Falar"
-#: 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 "Mover"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
msgid "Reset"
msgstr "Resetar"
#: 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 "Comprar"
@@ -409,7 +409,7 @@ msgstr "Preço: %s / Total: %s"
#. 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 "+"
@@ -417,20 +417,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 "Sair"
#: 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 "Máximo"
@@ -439,8 +439,8 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Loja"
-#: 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"
@@ -449,19 +449,19 @@ msgstr "Vender"
#: 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 "Cancelar"
@@ -536,14 +536,14 @@ msgstr "Nome:"
#. 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 "<"
@@ -560,7 +560,7 @@ msgid "Race:"
msgstr "Corrida:"
#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/socialwindow.cpp:1137
msgid "Create"
msgstr "Criar"
@@ -627,9 +627,9 @@ msgstr "Entre com a Senha para Deletar o usuario"
msgid "Enter password:"
msgstr "Entre com a senha"
-#: 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 "Excluir"
@@ -714,12 +714,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -732,10 +732,10 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: 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 "Ignora"
@@ -881,7 +881,7 @@ msgstr "Você sabia?"
#: 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 "Fechar"
@@ -908,8 +908,8 @@ msgstr "Equipamento"
#: 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 "Desequipar"
@@ -947,31 +947,31 @@ msgid "id"
msgstr "id"
#: 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 "Equipar"
#: 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 "Usar"
#: 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 "Descartar..."
-#: 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 "Dividir"
-#: 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 "Roupas"
@@ -980,17 +980,17 @@ msgid "Weight:"
msgstr "Peso:"
#: 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 "Armazenar"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Retirar"
-#: 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 "Descartar"
@@ -1031,11 +1031,11 @@ msgstr "Adicionar na loja de venda"
msgid "Unknown."
msgstr "Desconhecido"
-#: 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 "Peso: %s"
@@ -1128,6 +1128,10 @@ msgstr "%s %d?"
msgid "jacko spawning"
msgstr "JackOvai aparecer"
+#: src/guildmanager.cpp:458 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Você saiu da Guilda."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normal"
@@ -1144,7 +1148,7 @@ msgstr "Passar"
msgid "Login"
msgstr "Login"
-#: 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 "Servidor:"
@@ -1226,7 +1230,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "Limpar"
@@ -1246,338 +1250,338 @@ msgstr "Enviar"
msgid "Failed to send as sender or letter invalid."
msgstr "Falha ao enviar como remetente ou a carta é inválida."
-#: 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 "Roupas: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Tecla: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Desequipar antes"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Roupas de ocupado"
-#: 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 "Negócios"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:395
msgid "Whisper"
msgstr "Sussuro"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:652
msgid "Heal"
msgstr "Curar:"
-#: 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 "Ser Amigo"
-#: 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 "Ser inimigo"
-#: 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 "Apagar"
-#: 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 "Não ignorar"
-#: 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 "Ignorar completamente"
-#: 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 "Seguir"
-#: 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 "Imitar"
-#: 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 "Convidar para grupo"
-#: 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 "Chutar do grupo"
-#: 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 "Chutar da Guilda"
-#: 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 "Mudar posição da Guilda"
-#: 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 "Convidar para Guilda"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:262
msgid "Kick player"
msgstr "Chutar Jogador"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:264
msgid "Nuke"
msgstr "Deixar pelado"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:706
msgid "Show Items"
msgstr "Mostar itens:"
-#: 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 "Deixar sem Roupas"
-#: 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 "Adicionar comentário"
-#: 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 "Comprar (?)"
-#: 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 "Vender (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:318
msgid "Kick"
msgstr "Chutar"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
msgid "Remove from attack list"
msgstr "Remover da Lista de Ataques"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:335
msgid "Add to priority attack list"
msgstr "Adicionar a prioridade na lista de ataques"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:337
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:340
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
-#: 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 "Adicionar nome ao chat"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:514
msgid "Pick up"
msgstr "Pegar"
-#: 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 "Nome no chat"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:532
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:533
msgid "Rename"
msgstr "Renomear"
-#: 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 "A Remover"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:539
msgid "Warp"
msgstr "Urdidura"
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:553
msgid "Load old outfits"
msgstr "Carregar Antigas Roupas"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:569 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:571
msgid "Load old spells"
msgstr "Carregar Antigos Feitiços"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:572
msgid "Edit spell"
msgstr "Editar Feitiços"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:598
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "Não remover nome"
+#: 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 "Remover nome"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:618
msgid "Enable away"
msgstr "Habilitar longe do teclado"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:623
msgid "Disable away"
msgstr "Desabilitar longe do teclado"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:629 src/gui/socialwindow.cpp:1139
msgid "Leave"
msgstr "Sair"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:800
msgid "Change guild position"
msgstr "Mudar a posição da guilda"
#. 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 "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1288
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1290
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1659
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1665
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1670
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1682
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
msgid "Store all"
msgstr "Guardar tudo"
-#: 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 "Descartar tudo"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1726
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: 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 "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1861
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1922
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1928
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1935
msgid "Reset yellow bar"
msgstr "Resetar barra amarela"
-#: 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 "Copiar para o chat"
-#: 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 "(padrão)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1985
msgid "Move up"
msgstr "Mover a cima"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
msgid "Move down"
msgstr "Mover a baixo"
@@ -1621,64 +1625,64 @@ msgstr "A senha deve ser menor que %d caracteres."
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Escolha seu servidor"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Escolha seu servidor *** MODO SEGURO ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Porta:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Usar o mesmo ip para os sub servidores do jogo"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Carregar"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Conectar"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Servidor customizado"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Por favor especifique o endereço e a porta do servidor."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Baixando lista de servidores...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Aguardando servidor..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Preparando download"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Erro ao recuperar lista!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "requer uma versão mais nova"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "requer v%s"
@@ -1824,6 +1828,14 @@ msgstr "Tempo"
msgid "Use local time"
msgstr "Usar hora local"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:154
+msgid "Other"
+msgstr "Outro"
+
+#: 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 "A cor vai ficar assim"
@@ -2052,34 +2064,38 @@ msgid "Log NPC dialogue"
msgstr "Salvar diálogos com NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Outro"
+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 "Habilitar ataque do lado do servidor"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:159
msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
msgid "Enable buggy servers protection"
msgstr "Habilitar proteção contra servidores com bugs"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:165
msgid "Enable debug log"
msgstr "Habilitar Depurador"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:168
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:171
msgid "Hide shield sprite"
msgstr "Ocultar sprite de escudo"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
msgid "Show background"
msgstr "Mostrar imagem de fundo"
@@ -2463,249 +2479,254 @@ msgstr "Comprar itens"
msgid "Sell items"
msgstr "Vender itens"
-#: 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 "Adicionar"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
msgid "Announce"
msgstr "Anúncio"
-#: 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 "Mostrar links em anúncio"
-#: 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 "Proposta de negociação"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s quer %s %s você aceita?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Habilidades"
-#: 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 "Pontos de habilidade disponíveis: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:417
#, c-format
msgid "Skill Set %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:429
#, c-format
msgid "Skill %d"
msgstr "Habilidade %d"
-#: 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 "Nível: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nível: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Guilda"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Convidou o jogador %s para a guilda %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Saída da Guilda %s requisitada."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Convite de membros para a Guilda."
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Quem você gostaria de convidar para a guilda %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Sair da guilda?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Tem certeza que deseja sair da guilda %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Grupo"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Convidou usuário %s para o grupo."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Saída do grupo %s requisitada."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Convite de membros para o grupo"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Quem você gostaria de convidar para o grupo %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Sair do grupo?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Tem certeza que deseja sair do grupo %s?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Atq"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Mobs Prioritarios"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Atacar Mobs"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ignorar mobss"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Criar guilda"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1501
msgid "Create Party"
msgstr "Criar grupo"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1138
msgid "Invite"
msgstr "Convidar"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1284
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
msgstr "Rejeitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rejeitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "Criando guilda chamada %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
msgstr "Criando grupo chamado %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1408
msgid "Guild Name"
msgstr "Nome da guilda"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1409
msgid "Choose your guild's name."
msgstr "Escolha o nome da sua guilda."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1423
msgid "Received guild request, but one already exists."
msgstr "Requisição de guilda recebida, mas já existe uma."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1429
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te convidou para entrar na guilda %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1435
msgid "Accept Guild Invite"
msgstr "Aceitar convite para a guilda"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1450
msgid "Received party request, but one already exists."
msgstr "Requisição de grupo recebida, mas já existe um."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1461
msgid "You have been invited you to join a party."
msgstr "Você foi convidado para entrar em um grupo."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1465
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Você foi convidado para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te convidou para entrar em seu grupo."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s te convidou para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1502
msgid "Cannot create party. You are already in a party"
msgstr "Não foi possível criar o grupo. Você já faz parte de um."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1507
msgid "Party Name"
msgstr "Nome do grupo"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1508
msgid "Choose your party's name."
msgstr "Escolha o nome do seu grupo."
@@ -2713,243 +2734,243 @@ msgstr "Escolha o nome do seu grupo."
msgid "Specials"
msgstr "Especiais"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) movimentos padrão"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(l) inserir movimentos"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) Alguns movimentos loucos"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) Movimentos loucos"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) dobro normal + louco"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) mover"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) movimentos loucos customizados"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) movimentos loucos"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) Mover ao alvo padrão"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) Mover ao alvo com distância 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) mover ao alvo em distância 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) Mover ao alvo com distância 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) Mover ao alvo com distância 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) Mover ao alvo com distância 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) Mover ao alvo com a distância de ataque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) Mover ao alvo"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) Seguir em modo padrão"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) Seguir em modo relativo"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) Seguir em modo espelhado"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) Seguir em modo animal de extimação"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) Seguir em modo desconhecido"
-#: 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 "(D) Ataque padrão"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) Trocar ataque sem escudo"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) Trocar ataque com escudo"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) Ataque"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) Ir e atacar"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) Ir, atacar, pegar"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) sem auto ataque"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) Pequeno pegar 1x1 celulas"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) Pegar padrão 2x1 células"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) Pegar em frente 2x3 células"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) Pegar 3x3 células"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) Ir e pegar em distância 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) Ir e pegar em distância 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) Ir e pegar em distância mâxima"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) Pegar item"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) Visualizardor de mapa normal"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) Visualizador de mapa depurador"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) Visualizador de mapa ultra"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) Visualizador de mapa ultra 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) Visualizador de mapa vazio"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) Visualizador de mapa preto e branco"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) Visualizador de mapa"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) Usar #flar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) Usar #chiza para feitiço de ataque"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) Usar #ingrav para feitiço de ataque"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) Usar #frillyar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) Usar #upmarmu para feitiço de ataque"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) Feitiço de ataque"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) Mímica padrão"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) Mímica de roupas"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) Mímica"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) No teclado"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) Ausente"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) Ausente"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) Modo de jogo câmera"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) Modo de jogo câmera livre"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) Modo de jogo câmera design"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Modificadores de jogo desativados"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Modificadores de jogo ativados"
@@ -3259,33 +3280,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nome: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Atualizando..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Jogar"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 O processo de update está incompleto."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 É altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 tente novamente mais tarde."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Concluído"
@@ -3518,7 +3539,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Tornar <nick> operador do canal."
#: 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 "Se <nick> possuir espaços, coloque entre aspas (\")."
@@ -3557,6 +3579,41 @@ msgstr "Anúncio geral de %s:"
msgid "%s whispers: %s"
msgstr "%s envia mensagem privada: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando convida <nick> para a guilda em que você está."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Comando: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando faz com que o jogador saia da guilda."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Exibe esta ajuda."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Convida um jogador para a sua guilda"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Sai da guilda em que você está"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa alguém da guilda em que você está"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Editar"
@@ -4330,28 +4387,28 @@ msgstr "Personagem deletado."
msgid "Failed to delete character."
msgstr "Falha ao deletar personagem."
-#: 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 "Não há suporte para canais!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Mensagem privada não pode ser enviada, %s está offline."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Jogador VIP."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "Jogador VIP: "
@@ -4368,38 +4425,6 @@ msgstr "Jogo"
msgid "Request to quit denied!"
msgstr "Requisição de saída negada!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Este comando convida <nick> para a guilda em que você está."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Comando: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Este comando faz com que o jogador saia da guilda."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Exibe esta ajuda."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Convida um jogador para a sua guilda"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Sai da guilda em que você está"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa alguém da guilda em que você está"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Guilda criada."
@@ -4416,85 +4441,81 @@ msgstr "Falha ao checar Emperium"
msgid "Unknown server response."
msgstr "Resposta do servidor desconhecida."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Nome Guilda: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Mestre da guilda: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Nível Guilda: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Membros Online: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Max Membros: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Nível médio: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Guilda exp: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Guilda prox. exp: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Castelo Guilda : %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "Não foi possível convidar jogador para a guilda."
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "O jogador rejeitou o convite."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "Usuário agora é um membro da sua guilda."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Sua guilda está cheia."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Resposta desconhecida de convite para guilda."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "Você saiu da Guilda."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s saiu de sua Guilda."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Você foi expulso da Guilda."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s foi expulso da Guilda."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f7a2bf6a1..7d9e94c62 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-18 15:20+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
"manaplus/team/pt_BR/)\n"
"Language: pt_BR\n"
@@ -26,119 +26,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Mapa visivel "
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "dodge"
msgstr "desviou"
-#: src/being.cpp:542
+#: src/being.cpp:550
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1525
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1530
msgid "I"
msgstr "I"
-#: 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 "Configurar"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: 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 "Erro"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: 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 "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:302
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: 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 "
@@ -147,152 +147,152 @@ msgstr ""
"Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
"já existe ou é você mesmo."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: 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 "Falta o nome do grupo."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:463
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: 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 "Por favor, especifique um nome."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:522
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:539
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:567
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:572
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:577
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:640
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:647
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:649
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:666
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:677
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:679
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:978 src/commandhandler.cpp:1024
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1100
msgid "font cache size"
msgstr "Tamanho de fonte Cache"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1112
msgid "Cache size:"
msgstr "Tamanho de cache:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1116
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1118
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1165 src/commandhandler.cpp:1172
msgid "Resource images:"
msgstr "Recursos de imagem:"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource orphaned images:"
msgstr "Recurso de imagem orfão:"
@@ -302,43 +302,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Geral"
-#: 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 "Depurador"
-#: src/game.cpp:488
+#: src/game.cpp:505
msgid "Screenshot saved as "
msgstr "Screenshot salva como "
-#: src/game.cpp:496
+#: src/game.cpp:513
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
-#: src/game.cpp:536
+#: src/game.cpp:553
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:548
+#: src/game.cpp:565
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1213
+#: src/game.cpp:1230
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1220
+#: src/game.cpp:1237
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1606
+#: src/game.cpp:1623
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1607
+#: src/game.cpp:1624
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -367,37 +367,37 @@ msgstr "Comentário: %s"
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: 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 "Nome"
-#: 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 "Atacar"
-#: 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 "Falar"
-#: 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 "Mover"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
msgid "Reset"
msgstr "Resetar"
#: 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 "Comprar"
@@ -411,7 +411,7 @@ msgstr "Preço: %s / Total: %s"
#. 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 "+"
@@ -419,20 +419,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 "Sair"
#: 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 "Máximo"
@@ -441,8 +441,8 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Loja"
-#: 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"
@@ -451,19 +451,19 @@ msgstr "Vender"
#: 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 "Cancelar"
@@ -538,14 +538,14 @@ msgstr "Nome:"
#. 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 "<"
@@ -562,7 +562,7 @@ msgid "Race:"
msgstr "Corrida:"
#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/socialwindow.cpp:1137
msgid "Create"
msgstr "Criar"
@@ -629,9 +629,9 @@ msgstr "Entre com a senha para apagar o personagem"
msgid "Enter password:"
msgstr "Entre com a senha:"
-#: 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 "Excluir"
@@ -716,12 +716,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:607
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -734,10 +734,10 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: 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 "Ignora"
@@ -883,7 +883,7 @@ msgstr "Você Sabia?"
#: 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 "Fechar"
@@ -910,8 +910,8 @@ msgstr "Equipamento"
#: 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 "Desequipar"
@@ -949,31 +949,31 @@ msgid "id"
msgstr "id"
#: 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 "Equipar"
#: 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 "Usar"
#: 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 "Descartar..."
-#: 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 "Dividir"
-#: 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 "Roupas"
@@ -982,17 +982,17 @@ msgid "Weight:"
msgstr "Peso:"
#: 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 "Armazenar"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1720
msgid "Retrieve"
msgstr "Retirar"
-#: 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 "Descartar"
@@ -1033,11 +1033,11 @@ msgstr "Adicionar na loja de venda"
msgid "Unknown."
msgstr "Desconhecido"
-#: 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 "Peso: %s"
@@ -1130,6 +1130,10 @@ msgstr "%s %d?"
msgid "jacko spawning"
msgstr "Aparição do JackO"
+#: src/guildmanager.cpp:458 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Você saiu da Guilda."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normal"
@@ -1146,7 +1150,7 @@ msgstr "Passar"
msgid "Login"
msgstr "Login"
-#: 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 "Servidor:"
@@ -1228,7 +1232,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "Limpar"
@@ -1248,338 +1252,338 @@ msgstr "Enviar"
msgid "Failed to send as sender or letter invalid."
msgstr "Falha ao enviar como remetente ou a carta é inválida."
-#: 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 "Roupas: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Tecla: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Desequipar antes"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Roupas de ocupado"
-#: 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 "Negócios"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:395
msgid "Whisper"
msgstr "Mensagem Privada:"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:652
msgid "Heal"
msgstr "Cura"
-#: 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 "Ser amigo"
-#: 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 "Ser inimigo"
-#: 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 "Apagar"
-#: 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 "Não ignorar"
-#: 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 "Ignorar completamente"
-#: 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 "Seguir"
-#: 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 "Imitar"
-#: 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 "Convidar para grupo"
-#: 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 "Expulsar do grupo"
-#: 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 "Expulsar da guilda"
-#: 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 "Mudar pos na Guilda"
-#: 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 "Convidar pra Guilda"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:262
msgid "Kick player"
msgstr "Chutar Jogador"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:264
msgid "Nuke"
msgstr "Nu"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:706
msgid "Show Items"
msgstr "Mostrar itens:"
-#: 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 "Despir"
-#: 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 "Add comentário"
-#: 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 "Comprar (?)"
-#: 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 "vender (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:318
msgid "Kick"
msgstr "Chutar"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
msgid "Remove from attack list"
msgstr "Remover da lista de ataque"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:335
msgid "Add to priority attack list"
msgstr "Adicionar na prioridade da lista de ataques"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:337
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:340
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
-#: 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 "Adicionar nome ao chat"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:514
msgid "Pick up"
msgstr "Pegar"
-#: 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 "Nome no chat"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:532
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:533
msgid "Rename"
msgstr "Renomear"
-#: 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 "Remover"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:539
msgid "Warp"
msgstr "Urdidura"
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:553
msgid "Load old outfits"
msgstr "Carregar velhas roupas"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:569 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:571
msgid "Load old spells"
msgstr "Carregar velhos feitiços"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:572
msgid "Edit spell"
msgstr "Editar feitiços"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:598
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:603
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "Não remover o nome"
+#: 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 "Remover o nome"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:618
msgid "Enable away"
msgstr "Habilitar modo indisponível"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:623
msgid "Disable away"
msgstr "Desabilitar modo indisponível"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:629 src/gui/socialwindow.cpp:1139
msgid "Leave"
msgstr "Sair"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:800
msgid "Change guild position"
msgstr "Mudar a posição da guilda"
#. 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 "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1238
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1288
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1290
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1659
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1665
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1670
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1682
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1685
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1687
msgid "Store all"
msgstr "Guardar tudo"
-#: 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 "Descartar tudo"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1726
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: 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 "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1861
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1922
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1893 src/gui/popupmenu.cpp:1928
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1935
msgid "Reset yellow bar"
msgstr "Zerar barra amarela"
-#: 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 "Copiar para chat"
-#: 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 "(padrão)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1985
msgid "Move up"
msgstr "Mover para cima"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
msgid "Move down"
msgstr "Mover para baixo"
@@ -1623,64 +1627,64 @@ msgstr "A senha deve ser menor que %d caracteres."
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Escolha seu servidor"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Escolha seu servidor *** MODO SEGURO ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Porta:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Usar o mesmo ip para os sub servidores do jogo"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Carregar"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Conectar"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Servidor customizado"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Por favor especifique o endereço e a porta do servidor."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Baixando lista de servidores...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Aguardando servidor..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Preparando download"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Erro ao recuperar lista!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "requer uma versão mais nova"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "requer v%s"
@@ -1826,6 +1830,14 @@ msgstr "Tempo"
msgid "Use local time"
msgstr "Usar tempo local"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:154
+msgid "Other"
+msgstr "Outro"
+
+#: 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 "A cor vai ficar assim"
@@ -2054,34 +2066,38 @@ msgid "Log NPC dialogue"
msgstr "Salvar diálogos com NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Outro"
+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 "Habilitar ataque do lado do servidor"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:159
msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
msgid "Enable buggy servers protection"
msgstr "Habilitar proteção contra servidores com bugs"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:165
msgid "Enable debug log"
msgstr "Habilitar Depurador"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:168
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:171
msgid "Hide shield sprite"
msgstr "Ocultar sprite de escudo"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
msgid "Show background"
msgstr "Mostrar imagem de fundo"
@@ -2465,249 +2481,254 @@ msgstr "Comprar itens"
msgid "Sell items"
msgstr "Vender itens"
-#: 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 "Adicionar"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:125
msgid "Announce"
msgstr "Anúncio"
-#: 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 "Mostrar links em anúncio"
-#: 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 "Proposta de negociação"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:738
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s quer %s %s você aceita?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Habilidades"
-#: 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 "Pontos de habilidade disponíveis: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:417
#, c-format
msgid "Skill Set %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:429
#, c-format
msgid "Skill %d"
msgstr "Habilidade %d"
-#: 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 "Nível: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nível: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Guilda"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Convidou o jogador %s para a guilda %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Saída da Guilda %s requisitada."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Convite de membros para a Guilda."
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Quem você gostaria de convidar para a guilda %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Sair da guilda?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Tem certeza que deseja sair da guilda %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Grupo"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Convidou usuário %s para o grupo."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Saída do grupo %s requisitada."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Convite de membros para o grupo"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Quem você gostaria de convidar para o grupo %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Sair do grupo?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Tem certeza que deseja sair do grupo %s?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Ataque"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Mobs prioritarios "
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Atacar mobs"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ignorar mobs"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Criar guilda"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1501
msgid "Create Party"
msgstr "Criar grupo"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1138
msgid "Invite"
msgstr "Convidar"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1284
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
msgstr "Rejeitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rejeitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "Criando guilda chamada %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
msgstr "Criando grupo chamado %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1408
msgid "Guild Name"
msgstr "Nome da guilda"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1409
msgid "Choose your guild's name."
msgstr "Escolha o nome da sua guilda."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1423
msgid "Received guild request, but one already exists."
msgstr "Requisição de guilda recebida, mas já existe uma."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1429
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te convidou para entrar na guilda %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1435
msgid "Accept Guild Invite"
msgstr "Aceitar convite para a guilda"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1450
msgid "Received party request, but one already exists."
msgstr "Requisição de grupo recebida, mas já existe um."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1461
msgid "You have been invited you to join a party."
msgstr "Você foi convidado para entrar em um grupo."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1465
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Você foi convidado para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te convidou para entrar em seu grupo."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s te convidou para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1487
msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1502
msgid "Cannot create party. You are already in a party"
msgstr "Não foi possível criar o grupo. Você já faz parte de um."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1507
msgid "Party Name"
msgstr "Nome do grupo"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1508
msgid "Choose your party's name."
msgstr "Escolha o nome do seu grupo."
@@ -2715,243 +2736,243 @@ msgstr "Escolha o nome do seu grupo."
msgid "Specials"
msgstr "Especiais"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) movimentos padrão"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(l) inserir movimentos"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) Alguns movimentos loucos"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) Movimentos loucos"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) dobro normal + louco"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) mover"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) movimentos loucos customizados"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) Movimentos loucos"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) Mover ao alvo padrão"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) Mover ao alvo com distância 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) mover ao alvo em distância 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) Mover ao alvo com distância 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) Mover ao alvo com distância 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) Mover ao alvo com distância 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) Mover ao alvo com a distância de ataque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) Mover ao alvo"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) Seguir em modo padrão"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) Seguir em modo relativo"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) Seguir em modo espelhado"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) Seguir em modo animal de extimação"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) Seguir em modo desconhecido"
-#: 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 "(D) Ataque padrão"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) Trocar ataque sem escudo"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) Trocar ataque com escudo"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) Ataque"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) Ir e atacar"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) Ir, atacar, pegar"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) sem auto ataque"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) Pequeno pegar 1x1 celulas"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) Pegar padrão 2x1 células"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) Pegar em frente 2x3 células"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) Pegar 3x3 células"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) Ir e pegar em distância 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) Ir e pegar em distância 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) Ir e pegar em distância mâxima"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) Pegar item"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) Visualizardor de mapa normal"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) Visualizador de mapa depurador"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) Visualizador de mapa ultra"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) Visualizador de mapa ultra 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) Visualizador de mapa vazio"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) Visualizador de mapa preto e branco"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) Visualizador de mapa"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) Usar #flar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) Usar #chiza para feitiço de ataque"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) Usar #ingrav para feitiço de ataque"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) Usar #frillyar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) Usar #upmarmu para feitiço de ataque"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) Feitiço de ataque"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) Mímica padrão"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) Mímica de roupas"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) Mímica"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) No teclado"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) Ausente"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) Ausente"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) Modo de jogo câmera"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) Modo de jogo câmera livre"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) Modo de jogo câmera design"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Modificadores de jogo desativados"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Modificadores de jogo desativados"
@@ -3261,33 +3282,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nome: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:137
msgid "Updating..."
msgstr "Atualizando..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:158
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:161
msgid "Play"
msgstr "Jogar"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 O processo de update está incompleto."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 É altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 tente novamente mais tarde."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Concluído"
@@ -3520,7 +3541,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Tornar <nick> operador do canal."
#: 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 "Se <nick> possuir espaços, coloque entre aspas (\")."
@@ -3559,6 +3581,41 @@ msgstr "Anúncio geral de %s:"
msgid "%s whispers: %s"
msgstr "%s envia mensagem privada: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando convida <nick> para a guilda em que você está."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Comando: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando faz com que o jogador saia da guilda."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Exibe esta ajuda."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Convida um jogador para a sua guilda"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Sai da guilda em que você está"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa alguém da guilda em que você está"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Editar"
@@ -4332,28 +4389,28 @@ msgstr "Personagem deletado."
msgid "Failed to delete character."
msgstr "Falha ao deletar personagem."
-#: 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 "Não há suporte para canais!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Mensagem privada não pode ser enviada, %s está offline."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Jogador VIP."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "Jogador VIP: "
@@ -4370,38 +4427,6 @@ msgstr "Jogo"
msgid "Request to quit denied!"
msgstr "Requisição de saída negada!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Este comando convida <nick> para a guilda em que você está."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Comando: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Este comando faz com que o jogador saia da guilda."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Exibe esta ajuda."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Convida um jogador para a sua guilda"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Sai da guilda em que você está"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa alguém da guilda em que você está"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Guilda criada."
@@ -4418,85 +4443,81 @@ msgstr "Falha ao checar Emperium"
msgid "Unknown server response."
msgstr "Resposta do servidor desconhecida."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Nome Guilda: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Mestre da guilda: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Nível Guilda: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Membros Online: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Max Membros: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Nível médio: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Guilda exp: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Guilda prox. exp: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Castelo Guilda : %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "Não foi possível convidar jogador para a guilda."
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "O jogador rejeitou o convite."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "Usuário agora é um membro da sua guilda."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Sua guilda está cheia."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Resposta desconhecida de convite para guilda."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "Você saiu da Guilda."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s saiu de sua Guilda."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Você foi expulso da Guilda."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s foi expulso da Guilda."
diff --git a/po/ru.po b/po/ru.po
index 4011f51f9..4905a72b2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:10+0000\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:42+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
"ru/)\n"
@@ -26,119 +26,119 @@ 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 "Сменить Email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#: 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 "%s не существует, и не может быть создано! Выход."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Некорректный сервер обновлений: %s"
-#: 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 "Ошибка: %s не существует, и не может быть создан! Выход."
-#: 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 "
@@ -147,97 +147,97 @@ msgstr ""
"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
"уже создана, или этот игрок Вы сами."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "Запрос на присоединение к каналу %s."
-#: 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 "Enter переключает Вас на окно чата."
-#: 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 "Теперь Return переключает чат."
-#: 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 "Игрок уже %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "Игрок удачно %s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:618
#, c-format
msgid "Player could not be %s!"
msgstr "Игрок не может быть %s!"
-#: 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 "Время работы клиента: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:988
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -245,7 +245,7 @@ msgstr[0] "%d неделя"
msgstr[1] "%d недели"
msgstr[2] "%d недель"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -253,7 +253,7 @@ msgstr[0] "%d день"
msgstr[1] "%d дня"
msgstr[2] "%d дней"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -261,7 +261,7 @@ msgstr[0] "%d час"
msgstr[1] "%d часа"
msgstr[2] "%d часов"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -269,7 +269,7 @@ msgstr[0] "%d минута"
msgstr[1] "%d минуты"
msgstr[2] "%d минут"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -277,27 +277,27 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
-#: 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 "Удаленных изображений:"
@@ -308,43 +308,43 @@ msgstr ""
"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
"\"0\"."
-#: 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 "Ошибка во время загрузки %s"
@@ -373,37 +373,37 @@ msgstr "Комментарий: %s"
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 "Купить"
@@ -417,7 +417,7 @@ msgstr "Цена: %s / Всего: %s"
#. 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 "+"
@@ -425,20 +425,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 "Макс"
@@ -447,8 +447,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"
@@ -457,19 +457,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 "Отмена"
@@ -544,14 +544,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 "<"
@@ -568,7 +568,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 "Создать"
@@ -635,9 +635,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 "Удалить"
@@ -722,12 +722,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 "Присутствуют: %s; Всего %d игроков."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:994
#, c-format
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
@@ -740,10 +740,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 "Игнорировать"
@@ -889,7 +889,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 "Закрыть"
@@ -916,8 +916,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 "Снять"
@@ -955,31 +955,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 "Наряды"
@@ -988,17 +988,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 "Бросить"
@@ -1039,11 +1039,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 "Вес: %s"
@@ -1138,6 +1138,10 @@ msgstr "%s %d?"
msgid "jacko spawning"
msgstr "jacko появляется"
+#: 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 "Нормально"
@@ -1154,7 +1158,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 "Сервер:"
@@ -1236,7 +1240,7 @@ msgstr "Применить"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "Очистить"
@@ -1256,338 +1260,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 "Наряд: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Клавиша: %s"
-#: 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 "@@ignore|Полностью игнорировать@@"
-#: 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 "Добавить к сделке 10"
-#: 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 "Сохранить 10"
-#: 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 "Получить 10"
-#: 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 "Передвинуть ниже"
@@ -1631,64 +1635,64 @@ msgstr "Пароль не должен содержать более %d симв
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 "Использовать одинаковый IP для игровых суб-серверов"
-#: 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 "Получение списка серверов...%2.2f%%"
-#: 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 "требуется v%s"
@@ -1834,6 +1838,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 "Вот, как выглядит сей цвет"
@@ -2062,34 +2074,38 @@ msgid "Log NPC dialogue"
msgstr "Сохранять текст NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Другое"
+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 "Показать фон"
@@ -2480,249 +2496,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 "%s хочет %s %s, вы принимаете предложение?"
-#: 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 "Очков навыков осталось: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:417
#, c-format
msgid "Skill Set %d"
msgstr "Умение %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:429
#, c-format
msgid "Skill %d"
msgstr "Умение %d"
-#: 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 "Уровень: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Уровень: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Гильдия"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Пользователь %s приглашен в гильдию %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Выход из гильдии %s запрошен."
-#: 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 "Кого вы хотите пригласить в гильдию %s?"
-#: 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 "Вы действительно хотите выйти из гильдии %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Группа"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Пригласить пользователя %s в группу."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Запрошен выход из группы %s."
-#: 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 "Кого вы хотите пригласить в группу %s?"
-#: 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 "Вы действительно хотите покинуть группу %s?"
-#: 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 "Принято приглашение в группу от %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
msgstr "Отклонено приглашение в группу от %s."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Принято приглашение в гильдию от %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Отклонено приглашение в гильдию от %s."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "Создание гильдии с именем %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
msgstr "Создание группы с именем %s."
-#: 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 "%s приглашает присоединиться к гильдии %s."
-#: 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 "Вас приглашают присоединиться к группе %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s приглашает Вас к себе в группу."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s приглашает присоединиться к %s группе."
-#: 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 "Выберите имя будущей группы."
@@ -2730,243 +2751,243 @@ msgstr "Выберите имя будущей группы."
msgid "Specials"
msgstr "Особые"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) движения по умолчанию"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) обратное движение"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) обычное движение иногда с сумашедшими движениями"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) движение с сумашедшими движениями"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) нормальные и сумашедшие движения"
-#: 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 "(a) пользовательские сумашедшие движения"
-#: 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 "(0) обычное движение к цели"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) движение к цели на расстояние 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) движение к цели на расстояние 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) движение к цели на расстояние 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) движение к цели на расстояние 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) движение к цели на расстояние 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) движение к цели на расстояние атаки"
-#: 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 "(D) следование по умолчанию"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) относительное следование"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) зеркальное следование"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) следование как животное"
-#: 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 "(D) обычная атака"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) переключение атаки без щита"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) переключение атаки со щитом"
-#: 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 "(G) идти и атаковать"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) идти, атаковать, собирать"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) без автоатаки"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) поднятие в области 1x1"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) поднятие из области 2x1"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) поднятие из области спереди 2x3"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) поднятие из области 3x3"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) движение и поднятие на расстоянии 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(g) движение и поднятие на расстоянии 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) движение и поднятие на максимальном расстоянии"
-#: 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 "(N) обычный режим карты"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) отладочный режим карты"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) специальный режим карты"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) специальный режим карты 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) режим пустой карты"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) черно-белый режим карты"
-#: 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 "(f) использовать #flar для атаки"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) использовать #chiza для атаки"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) использовать #ingrav для атаки"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) использовать #frillyar для атаки"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) использовать #upmarmu для атаки"
-#: 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 "(D) имитация по умолчанию"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) имитация нарядов"
-#: 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 "(O) возле компьютера"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) отошел"
-#: 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 "(G) игровая камера"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) свободная камера"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) камера в режиме разработки"
-#: 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 "Игровые модификаторы включены"
@@ -3277,33 +3298,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Имя: %s"
-#: 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 "##1 Процесс обновления не завершен!"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Настоятельно рекомендуется"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 попытаться еще раз немного погодя."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Завершено"
@@ -3536,7 +3557,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 "Если ник содержит пробелы, заключите его в кавычки (\")."
@@ -3575,6 +3597,41 @@ msgstr "Глобальное объявление от %s:"
msgid "%s whispers: %s"
msgstr "%s шепчет: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Команда: /invite <игрок>"
+
+#: 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 "Команда: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Эта команда заставляет игрока покинуть гильдию."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Показать эту справку"
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Пригласить игрока в Вашу гильдию"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Покинуть текущую гильдию"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Изменить"
@@ -4348,28 +4405,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 "Сообщение не может быть отправлено, %s оффлайн."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Игрок MVP."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "Игрок MVP: "
@@ -4386,38 +4443,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 "Команда: /invite <игрок>"
-
-#: 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 "Команда: /leave"
-
-#: 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 "/help > Показать эту справку"
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Пригласить игрока в Вашу гильдию"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Покинуть текущую гильдию"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Гильдия создана."
@@ -4434,85 +4459,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 "Имя гильдии: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Мастер гильдии: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Уровень гильдии: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Пользователей онлайн: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Макс. членов: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Средний уровень: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Опыт гильдии: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Нужно опыта до следующего уровня: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Замки: %s"
-#: 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 "%s покинул Вашу гильдию."
-#: 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 "%s был вышвырнут из Вашей гильдии."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 779f21790..aeeba6e52 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-08-29 14:30+0300\n"
+"PO-Revision-Date: 2011-08-29 11:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
"team/zh_CN/)\n"
@@ -23,266 +23,266 @@ 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 "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1530
msgid "I"
msgstr "I"
-#: 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 "无法同 \"%s\" 建立一个私人谈话标签页!或者已经存在,或者那就是自己。"
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:436
#, c-format
msgid "Requesting to join channel %s."
msgstr "请求加入频道%s。"
-#: 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 "玩家已经%s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:610
#, c-format
msgid "Player successfully %s!"
msgstr "玩家成功%s!"
-#: 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] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:997
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1005
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1013
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1021
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: 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 ""
@@ -291,43 +291,43 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "/%s的选项是\"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"。"
-#: 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 "加载%s时出现错误"
@@ -356,37 +356,37 @@ msgstr "评论: %s"
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 "购买"
@@ -400,7 +400,7 @@ msgstr "价格:%s / 总价:%s"
#. 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 "+"
@@ -408,20 +408,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 "最大"
@@ -430,8 +430,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"
@@ -440,19 +440,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 "取消"
@@ -527,14 +527,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 "<"
@@ -551,7 +551,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 "建立"
@@ -618,9 +618,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 "删除"
@@ -705,12 +705,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 "对%s密语到:%s"
@@ -723,10 +723,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 "忽略"
@@ -872,7 +872,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 "关闭"
@@ -899,8 +899,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 "卸下装备"
@@ -938,31 +938,31 @@ msgid "id"
msgstr "id"
#: 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 "装具"
@@ -971,17 +971,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 "丢弃"
@@ -1022,11 +1022,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 "重量:%s"
@@ -1117,6 +1117,10 @@ msgstr "%s %d?"
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 "正常"
@@ -1133,7 +1137,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 "服务器:"
@@ -1215,7 +1219,7 @@ msgstr "提交"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:592
msgid "Clear"
msgstr "清除"
@@ -1235,338 +1239,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 "商店10"
-#: 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 "拿出10"
-#: 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 "x"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1972 src/gui/popupmenu.cpp:1990
msgid "Move down"
msgstr ""
@@ -1610,64 +1614,64 @@ msgstr "密码不能少于%d个字符。"
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 "游戏分服务器使用相同的IP"
-#: 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 "请输入服务器的IP地址和端口"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "下载服务器列表...%2.2f%%"
-#: 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 "错误retreiving的服务器列表!"
-#: 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 "需要 v%s"
@@ -1812,6 +1816,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 "这就是该色彩看起来的样子"
@@ -2040,34 +2052,38 @@ msgid "Log NPC dialogue"
msgstr "NPC对话"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "其他"
+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 "启用BOT检查"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
msgid "Enable buggy servers protection"
msgstr "启用BUG保护"
-#: 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 "显示背景"
@@ -2447,249 +2463,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 "%s想要%s %s 你接受吗?"
-#: 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 "技能点:%d个"
-#: 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 "技能为%d"
-#: 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 "等级: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:541
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "等级: %d(%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "帮会"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "邀请用户%s加入公会%s"
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "退出公会%s的请求。"
-#: 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 "你要邀请谁加入工会%s?"
-#: 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 "你确定要离开工会%s吗?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "t"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "邀请用户%s加入团队."
-#: 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 "接受%s团队的邀请."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1294
#, c-format
msgid "Rejected party invite from %s."
msgstr "拒绝%s的团队邀请."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1311
#, c-format
msgid "Accepted guild invite from %s."
msgstr "已接受公会邀请来自%s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1324
#, c-format
msgid "Rejected guild invite from %s."
msgstr "拒绝%s的公会邀请."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1371
#, c-format
msgid "Creating guild called %s."
msgstr "创建公会的名为%s"
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1394
#, c-format
msgid "Creating party called %s."
msgstr "创建团队名字为%s的"
-#: 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 "%s邀请你加入公会%s"
-#: 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 "您已被邀请加入%s的团队。"
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1473
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s已经邀请你加入他们的帮会。"
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1478
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s已经邀请你加入帮会%s。"
-#: 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 "选择n的名称。"
@@ -2697,243 +2718,243 @@ msgstr "选择n的名称。"
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 "(G) 去攻击"
-#: 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 ""
@@ -3242,33 +3263,33 @@ msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
msgid "Name: %s"
msgstr "姓名:%s"
-#: 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 "##1 更新过程不完整。"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 强烈建议"
#. 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 "已完成"
@@ -3501,7 +3522,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 "如果<昵称>之间有空格,用双引号(\")括起来。"
@@ -3539,6 +3561,41 @@ msgstr "%s 全局公告:"
msgid "%s whispers: %s"
msgstr "%s私语:%s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "命令:/invite <昵称>"
+
+#: 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 "命令:/leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > 显示该帮助信息。"
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > "
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > "
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick >"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "编辑"
@@ -4304,28 +4361,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 "密语无法发送,%s离线。"
-#: 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 "MVP球员。"
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "MVP球员:"
@@ -4342,38 +4399,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 "命令:/invite <昵称>"
-
-#: 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 "命令:/leave"
-
-#: 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 "/help > 显示该帮助信息。"
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > "
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > "
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick >"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "帮会已创建"
@@ -4390,85 +4415,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 "工会会长: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "工会等级: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "在线玩家: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "最大成员: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "平均等级: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "工会经验值: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "工会下一级所需经验: %d"
-#: 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 "%s已经离开工会."
-#: 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 "%s已经被工会开除."