summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--po/da.po928
-rw-r--r--po/de.po875
-rw-r--r--po/en_GB.po935
-rw-r--r--po/es.po989
-rw-r--r--po/fr.po985
-rw-r--r--po/hr.po935
-rw-r--r--po/hu.po935
-rw-r--r--po/it.po918
-rw-r--r--po/manaplus.pot777
-rw-r--r--po/nl.po894
-rw-r--r--po/nl_BE.po821
-rw-r--r--po/pl.po935
-rw-r--r--po/pt.po975
-rw-r--r--po/pt_BR.po975
-rw-r--r--po/ru.po977
-rw-r--r--po/sv.po935
16 files changed, 7737 insertions, 7052 deletions
diff --git a/po/da.po b/po/da.po
index 03c1974e7..85ba5f1da 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mana\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2009-07-25 17:33+0000\n"
"Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
"Language-Team: Danish <none@none.none>\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
#, fuzzy
msgid "Visible on map"
msgstr "Synlige navne"
@@ -32,95 +32,95 @@ msgstr ""
msgid "miss"
msgstr ""
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Opsætning"
-#: src/client.cpp:824
+#: src/client.cpp:826
#, fuzzy
msgid "Connecting to server"
msgstr "Opretter forbindelse til kort-serveren..."
-#: src/client.cpp:855
+#: src/client.cpp:857
#, fuzzy
msgid "Logging in"
msgstr "Log Ind"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:980
+#: src/client.cpp:982
#, fuzzy
msgid "Requesting characters"
msgstr "Vælg Karakter"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
#, fuzzy
msgid "Connecting to the game server"
msgstr "Opretter forbindelse til kort-serveren..."
-#: src/client.cpp:1021
+#: src/client.cpp:1023
#, fuzzy
msgid "Changing game servers"
msgstr "Server"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Fejl"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1099
+#: src/client.cpp:1101
#, fuzzy
msgid "Password Change"
msgstr "Adgangskode:"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1119
+#: src/client.cpp:1121
#, fuzzy
msgid "Email Change"
msgstr "Ændre"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1140
+#: src/client.cpp:1142
#, fuzzy
msgid "Unregister Successful"
msgstr "Frameld"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, fuzzy, c-format
msgid "Invalid update host: %s"
msgstr "Ugyldig opdaterings host: "
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Fejl under oprettelsen af opdateringen mappen!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -273,19 +273,24 @@ msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
#, fuzzy
msgid "font cache size"
msgstr "Skriftstørrelse"
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1082
#, fuzzy
-msgid "Created: "
+msgid "Cache size:"
+msgstr "Skriftstørrelse"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Opret"
-#: src/commandhandler.cpp:1077
+#: src/commandhandler.cpp:1086
#, fuzzy
-msgid "Deleted: "
+msgid "Deleted:"
msgstr "Slet"
#: src/commandhandler.h:40
@@ -293,46 +298,46 @@ msgstr "Slet"
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr ""
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr ""
-#: src/game.cpp:445
+#: src/game.cpp:444
#, fuzzy
msgid "Screenshot saved as "
msgstr "Skærmbillede gemt under ~/"
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Gemningen af skærmbilledet fejlede!"
-#: src/game.cpp:492
+#: src/game.cpp:491
#, fuzzy
msgid "The connection to the server was lost."
msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Netværksfejl"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignorerer indkomne handels anmodninger"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Accepterer indkomne handels anmodninger"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
#, fuzzy
msgid "Could Not Load Map"
msgstr "Kunne ikke loade kortet"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Kunne ikke loade %s."
@@ -352,39 +357,44 @@ msgstr "Guilds"
msgid "Pvp rank: %d"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
#, fuzzy
msgid "Bot Checker"
msgstr "Chat-vindue"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Navn"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Angrib"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Snak"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
#, fuzzy
msgid "Move"
msgstr "Flyt op"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Nulstil"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Køb"
@@ -427,7 +437,9 @@ msgstr "Maks"
msgid "Shop"
msgstr "butik"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Sælg"
@@ -435,14 +447,18 @@ msgstr "Sælg"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Fortryd"
@@ -476,7 +492,7 @@ msgid "The email address entries mismatch."
msgstr "Den nye email-adresse eksisterer allerede."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Skift adgangskode"
@@ -545,8 +561,8 @@ msgstr "Frisure:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Opret"
@@ -576,136 +592,151 @@ msgstr "Du har brugt alle dine points"
msgid "Please remove %d points"
msgstr "Du skal fjerne %d points"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Bekræft sletning af karakter"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Er du sikker på at du vil slette denne karakter?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Ret konto og karakter"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Frameld"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
#, fuzzy
msgid "Change Email"
msgstr "Skift e-mail adresse"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Forkert brugernavn eller password"
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Kunne ikke slette karakteren."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Forkert brugernavn eller password"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Slet"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
#, fuzzy
msgid "Choose"
msgstr "Luk"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, fuzzy, c-format
msgid "Level %d"
msgstr "Niveau: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
#, fuzzy
msgid "default"
msgstr "Standard"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr ""
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
#, fuzzy
msgid "red"
msgstr "Ven"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
#, fuzzy
msgid "green"
msgstr "Grøn: "
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
#, fuzzy
msgid "blue"
msgstr "Blå: "
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr ""
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
#, fuzzy
msgid "yellow"
msgstr "lav"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
#, fuzzy
msgid "pink"
msgstr "Hyperlink"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr ""
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr ""
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
#, fuzzy
msgid "brown"
msgstr "Kastevåben"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
#, fuzzy
msgid "rainbow 1"
msgstr "Regnbuefarvet"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
#, fuzzy
msgid "rainbow 2"
msgstr "Regnbuefarvet"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
#, fuzzy
msgid "rainbow 3"
msgstr "Regnbuefarvet"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr ""
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, fuzzy, c-format
msgid "Present: %s; %d players are present."
msgstr "Der er %d spillere til stede"
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Hvisker til %s: %s"
@@ -718,7 +749,10 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
#, fuzzy
msgid "Ignore"
msgstr "Ignorer"
@@ -737,148 +771,152 @@ msgstr "Flyt til venstre"
msgid "Net"
msgstr "Næste"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
#, fuzzy
msgid "Music:"
msgstr "Lydstyrke på musik"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
#, fuzzy
msgid "Map:"
msgstr "Navn: %s"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
#, fuzzy
msgid "Minimap:"
msgstr "MiniKort"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr ""
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
#, fuzzy
msgid "Player Position:"
msgstr "Spiller rammer monster"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, fuzzy, c-format
msgid "Particle count: %d"
msgstr "Partikeleffekter"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, fuzzy, c-format
msgid "Map actors count: %d"
msgstr "Du har brugt alle dine points"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
#, fuzzy
msgid "Cursor:"
msgstr "Brugerdefineret cursor"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
#, fuzzy
msgid "Target:"
msgstr "Flyt til venstre"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
#, fuzzy
msgid "Target Id:"
msgstr "Vælg spiller som ny modstander"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
#, fuzzy
msgid "Target Level:"
msgstr "Vælg spiller som ny modstander"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
#, fuzzy
msgid "Target Party:"
msgstr "Vælg spiller som ny modstander"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
#, fuzzy
msgid "Target Guild:"
msgstr "Vælg spiller som ny modstander"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Angreb %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "MiniKort"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Kritisk sår"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "OK"
@@ -889,8 +927,8 @@ msgstr "Udstyr"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Tag af"
@@ -899,7 +937,8 @@ msgid "Help"
msgstr "Hjælp"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Luk"
@@ -936,32 +975,32 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Tag på"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Brug"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
#, fuzzy
msgid "Drop..."
msgstr "Smid"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Opdel"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr ""
@@ -970,17 +1009,17 @@ msgid "Weight:"
msgstr "Vægt:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Gem på lager"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Hent fra lager"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Smid"
@@ -1255,7 +1294,7 @@ msgstr "Send forespørgsel"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
#, fuzzy
msgid "Clear"
msgstr "Hellebard"
@@ -1297,381 +1336,317 @@ msgstr "Tag af"
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-#, fuzzy
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Handl med %s@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Handl"
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Angrib %s@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr "Hvisk"
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-#, fuzzy
-msgid "@@whisper|Whisper@@"
-msgstr "@@use|Brug@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:589
#, fuzzy
-msgid "@@heal|Heal@@"
-msgstr "@@cancel|Annuller@@"
+msgid "Be friend"
+msgstr "Ven"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
#, fuzzy
-msgid "@@friend|Be friend@@"
-msgstr "@@retrieve|Hent fra lager@@"
+msgid "Disregard"
+msgstr "Se bort fra"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
#, fuzzy
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignorer %s@@"
+msgid "Unignore"
+msgstr "Ignorer"
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
#, fuzzy
-msgid "@@erase|Erase@@"
-msgstr "@@use|Brug@@"
+msgid "Completely ignore"
+msgstr "@@ignore||Ignorer %s fuldstændigt@@"
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
#, fuzzy
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Hold op med at ignorere %s@@"
+msgid "Follow"
+msgstr "lav"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
#, fuzzy
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore||Ignorer %s fuldstændigt@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr ""
+msgid "Imitation"
+msgstr "Skift e-mail adresse"
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
#, fuzzy
-msgid "@@party|Invite to party@@"
+msgid "Invite to party"
msgstr "/party > Inviter en spiller til din gruppe"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
#, fuzzy
-msgid "@@kick party|Kick from party@@"
+msgid "Kick from party"
msgstr "@@admin-kick|Spark spiller ud@@"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
#, fuzzy
-msgid "@@guild-kick|Kick from guild@@"
+msgid "Kick from guild"
msgstr "@@admin-kick|Spark spiller ud@@"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "Ændre"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
#, fuzzy
-msgid "@@guild|Invite to guild@@"
+msgid "Invite to guild"
msgstr "/party > Inviter en spiller til din gruppe"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Spark spiller ud@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Du kunne ikke sparke denne bruger af kanalen"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-#, fuzzy
-msgid "@@undress|Undress@@"
-msgstr "@@unignore|Hold op med at ignorere %s@@"
-
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:267
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-#, fuzzy
-msgid "@@sell|Sell@@"
-msgstr "@@use|Brug@@"
-
-#: src/gui/popupmenu.cpp:235
-#, fuzzy
-msgid "@@talk|Talk@@"
-msgstr "@@attack|Angrib %s@@"
-
-#: src/gui/popupmenu.cpp:251
-#, fuzzy
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Spark spiller ud@@"
-
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:284
#, fuzzy
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Add to priority attack list"
msgstr "@@attack|Angrib %s@@"
-#: src/gui/popupmenu.cpp:270
+#: src/gui/popupmenu.cpp:286
#, fuzzy
-msgid "@@add attack|Add to attack list@@"
+msgid "Add to attack list"
msgstr "@@attack|Angrib %s@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:289
#, fuzzy
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Tilføj navn til chat@@"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Annuller@@"
+msgid "Add to ignore list"
+msgstr "Gem på lager"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@chat|Tilføj til chat@@"
-#: src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:450
#, fuzzy
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Saml %s op@@"
+msgid "Pick up"
+msgstr "Saml op"
-#: src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
#, fuzzy
-msgid "@@chat|Add to chat@@"
+msgid "Add to chat"
msgstr "@@chat|Tilføj til chat@@"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Husk Brugernavn"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#, fuzzy
+msgid "Remove"
+msgstr "Husk Brugernavn"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@use|Brug@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
#, fuzzy
msgid "Disable highlight"
msgstr "Fremhæv tab"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
#, fuzzy
msgid "Enable highlight"
msgstr "Fremhæv tab"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
#, fuzzy
msgid "Remove name"
msgstr "Husk Brugernavn"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
#, fuzzy
msgid "Enable away"
msgstr "Du kan ikke købe."
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
#, fuzzy
msgid "Disable away"
msgstr "Slå handler fra/til"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#, fuzzy
+msgid "Leave"
+msgstr "Stor"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
#, fuzzy
msgid "Change guild position"
msgstr "Ændre"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
#, fuzzy
msgid "Add to trade"
msgstr "@@chat|Tilføj til chat@@"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
#, fuzzy
msgid "Add to trade 10"
msgstr "@@chat|Tilføj til chat@@"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
#, fuzzy
msgid "Add to trade half"
msgstr "Gem på lager"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
#, fuzzy
msgid "Add to trade all"
msgstr "Gem på lager"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
#, fuzzy
msgid "Store 10"
msgstr "Gem på lager"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
#, fuzzy
msgid "Store half"
msgstr "Gem på lager"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
#, fuzzy
msgid "Store all"
msgstr "Gem på lager"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
#, fuzzy
msgid "Retrieve 10"
msgstr "Hent fra lager"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
#, fuzzy
msgid "Retrieve half"
msgstr "Hent fra lager"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
#, fuzzy
msgid "Retrieve all"
msgstr "Hent fra lager"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Tilføj til chat@@"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "Standard"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Flyt op"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Flyt ned"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-#, fuzzy
-msgid "Remove"
-msgstr "Husk Brugernavn"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2615,135 +2590,130 @@ msgstr ""
msgid "Atk"
msgstr "Angrib"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Angrib"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Ignorer"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Opret en guild"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
#, fuzzy
msgid "Create Party"
msgstr "Lav en ny karakter."
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
#, fuzzy
msgid "Invite"
msgstr "Inviter en spiller"
-#: src/gui/socialwindow.cpp:1018
-#, fuzzy
-msgid "Leave"
-msgstr "Stor"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, fuzzy, c-format
msgid "Accepted party invite from %s."
msgstr "Du har accepteret en invitation fra %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, fuzzy, c-format
msgid "Rejected party invite from %s."
msgstr "Du har ignoreret en invitation fra %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, fuzzy, c-format
msgid "Accepted guild invite from %s."
msgstr "Du har accepteret en invitation fra %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, fuzzy, c-format
msgid "Rejected guild invite from %s."
msgstr "Du har ignoreret en invitation fra %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, fuzzy, c-format
msgid "Creating guild called %s."
msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
#, fuzzy
msgid "Guild Name"
msgstr "Opret en guild"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
#, fuzzy
msgid "Choose your guild's name."
msgstr "Vælg din server"
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, fuzzy, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s har inviteret med i %s's gruppe."
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
#, fuzzy
msgid "Accept Guild Invite"
msgstr "Accepter invitationen"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
#, fuzzy
msgid "You have been invited you to join a party."
msgstr "%s har inviteret med i sin gruppe"
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, fuzzy, c-format
msgid "You have been invited to join the %s party."
msgstr "%s har inviteret med i %s's gruppe."
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s har inviteret med i sin gruppe"
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s har inviteret med i %s's gruppe."
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Accepter invitationen"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
#, fuzzy
msgid "Party Name"
msgstr "Gruppe"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
#, fuzzy
msgid "Choose your party's name."
msgstr "Vælg din server"
@@ -3176,99 +3146,99 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
#, fuzzy
msgid "No Target"
msgstr "Flyt til venstre"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
#, fuzzy
msgid "Allow Target"
msgstr "Tillad handel"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
#, fuzzy
msgid "Need Target"
msgstr "Flyt til venstre"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
#, fuzzy
msgid "General Magic"
msgstr "Alment formål"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
#, fuzzy
msgid "Life Magic"
msgstr "Magi"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
#, fuzzy
msgid "War Magic"
msgstr "Magi"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
#, fuzzy
msgid "Command Editor"
msgstr "Kommando: /item"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
#, fuzzy
msgid "magic"
msgstr "Magi"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
#, fuzzy
msgid "Command:"
msgstr "Kommando: /who"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
#, fuzzy
msgid "Target Type:"
msgstr "Vælg spiller som ny modstander"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
#, fuzzy
msgid "Magic level:"
msgstr "Maks. level"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
#, fuzzy
msgid "School level:"
msgstr "Vis navn"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3292,10 +3262,6 @@ msgstr "Godkendt. Venter..."
msgid "Trade: You"
msgstr "Handel: Dig"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Handl"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, fuzzy, c-format
msgid "You get %s"
@@ -4183,73 +4149,73 @@ msgid ""
"strange behaviour."
msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Du kunne ikke bruge denne genstand."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
#, fuzzy
msgid "Inventory is full."
msgstr "Serveren er fuld"
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr ""
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, fuzzy, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Du samlede %s [@@%d|%s@@] op."
msgstr[1] "Du samlede %s [@@%d|%s@@] op."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
#, fuzzy
msgid "Follow canceled"
msgstr "Handel annulleret."
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
#, fuzzy
msgid "Imitation: "
msgstr "Skift e-mail adresse"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
#, fuzzy
msgid "Imitation canceled"
msgstr "Handel annulleret."
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
#, fuzzy
msgid "You see "
msgstr "Du får %s."
@@ -4999,17 +4965,17 @@ msgid "M.Defense"
msgstr "M.Forsvar:"
#: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
+#, fuzzy, c-format
msgid "% Accuracy"
msgstr "% præcission:"
#: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy
+#, fuzzy, c-format
msgid "% Evade"
msgstr "% Undgå angreb."
#: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy
+#, fuzzy, c-format
msgid "% Critical"
msgstr "Kritisk sår"
@@ -5637,11 +5603,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr "Fejlede i at tilføje genstand af en ukendt grund."
-#: src/playerrelations.cpp:404
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore||Ignorer %s fuldstændigt@@"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
@@ -5688,6 +5649,84 @@ msgid "Unknown item"
msgstr "Ukendt genstand"
#, fuzzy
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Handl med %s@@"
+
+#, fuzzy
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Angrib %s@@"
+
+#, fuzzy
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@use|Brug@@"
+
+#, fuzzy
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@cancel|Annuller@@"
+
+#, fuzzy
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@retrieve|Hent fra lager@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignorer %s@@"
+
+#, fuzzy
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@use|Brug@@"
+
+#, fuzzy
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Hold op med at ignorere %s@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore||Ignorer %s fuldstændigt@@"
+
+#, fuzzy
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "/party > Inviter en spiller til din gruppe"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Spark spiller ud@@"
+
+#, fuzzy
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@unignore|Hold op med at ignorere %s@@"
+
+#, fuzzy
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@use|Brug@@"
+
+#, fuzzy
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@attack|Angrib %s@@"
+
+#, fuzzy
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Spark spiller ud@@"
+
+#, fuzzy
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Tilføj navn til chat@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuller@@"
+
+#, fuzzy
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Saml %s op@@"
+
+#, fuzzy
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Tilføj til chat@@"
+
+#, fuzzy
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@use|Brug@@"
+
+#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "Vælg OK"
@@ -6088,10 +6127,6 @@ msgstr "Ukendt genstand"
#~ msgstr "@@party|Inviter %s med i din gruppe@@"
#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "Du kunne ikke sparke denne bruger af kanalen"
-
-#, fuzzy
#~ msgid "Talk to %s"
#~ msgstr "@@talk|Tal til %s@@"
@@ -6126,9 +6161,6 @@ msgstr "Ukendt genstand"
#~ msgid "Player"
#~ msgstr "Bruger"
-#~ msgid "Whisper"
-#~ msgstr "Hvisk"
-
#~ msgid "Is"
#~ msgstr "Er"
diff --git a/po/de.po b/po/de.po
index 887b17c41..a6c5c33be 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2010-01-02 15:26+0000\n"
"Last-Translator: Jonathan Raphael Joachim Kolberg\n"
"Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
#, fuzzy
msgid "Visible on map"
msgstr "Sichtbare Namen"
@@ -51,94 +51,94 @@ msgstr ""
msgid "miss"
msgstr "verfehlt"
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Einstellungen"
-#: src/client.cpp:824
+#: src/client.cpp:826
#, fuzzy
msgid "Connecting to server"
msgstr "Verbinde mit [Benutzerdatenserver]..."
-#: src/client.cpp:855
+#: src/client.cpp:857
#, fuzzy
msgid "Logging in"
msgstr "Anmelden"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
-#: src/client.cpp:980
+#: src/client.cpp:982
#, fuzzy
msgid "Requesting characters"
msgstr "Spielfigur auswählen"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
#, fuzzy
msgid "Connecting to the game server"
msgstr "Verbinde mit [Charakterserver]..."
-#: src/client.cpp:1021
+#: src/client.cpp:1023
#, fuzzy
msgid "Changing game servers"
msgstr "Wechsle den Server"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Fehler"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr "Fordere Registrierungsdetails an"
-#: src/client.cpp:1099
+#: src/client.cpp:1101
msgid "Password Change"
msgstr "Passwort ändern:"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
-#: src/client.cpp:1119
+#: src/client.cpp:1121
msgid "Email Change"
msgstr "E-Mail ändern"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
#, fuzzy
msgid "Email changed successfully!"
msgstr "Mitglied wurde erfolgreich Befördert."
-#: src/client.cpp:1140
+#: src/client.cpp:1142
#, fuzzy
msgid "Unregister Successful"
msgstr "Abmelden"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, 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:1533
+#: src/client.cpp:1535
#, fuzzy, c-format
msgid "Invalid update host: %s"
msgstr "Ungültiger Updateserver: "
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, fuzzy, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
@@ -295,19 +295,24 @@ msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
#, fuzzy
msgid "font cache size"
msgstr "Schriftgröße"
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1082
#, fuzzy
-msgid "Created: "
+msgid "Cache size:"
+msgstr "Schriftgröße"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Erstellen"
-#: src/commandhandler.cpp:1077
+#: src/commandhandler.cpp:1086
#, fuzzy
-msgid "Deleted: "
+msgid "Deleted:"
msgstr "Löschen"
#: src/commandhandler.h:40
@@ -316,47 +321,47 @@ 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:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Öffentlich"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:445
+#: src/game.cpp:444
#, fuzzy
msgid "Screenshot saved as "
msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
-#: src/game.cpp:492
+#: src/game.cpp:491
#, fuzzy
msgid "The connection to the server was lost."
msgstr ""
"Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Netzwerkfehler"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignoriere eingehende Handelsanfragen"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Akzeptiere eingehende Handelsanfragen"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
#, fuzzy
msgid "Could Not Load Map"
msgstr "Karte konnte nicht geladen werden"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Fehler beim Laden von %s"
@@ -376,38 +381,43 @@ msgstr "Gilden"
msgid "Pvp rank: %d"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
msgid "Bot Checker"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Name"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Angriff"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Sprechen"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
#, fuzzy
msgid "Move"
msgstr "Laufe Hoch"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Zurücksetzten"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Kaufen"
@@ -450,7 +460,9 @@ msgstr "Max"
msgid "Shop"
msgstr "Geschäft"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Verkaufen"
@@ -458,14 +470,18 @@ msgstr "Verkaufen"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Abbrechen"
@@ -497,7 +513,7 @@ msgid "The email address entries mismatch."
msgstr "Die neuen E-Mailadresse stimmen nicht überein."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Passwort ändern"
@@ -563,8 +579,8 @@ msgstr "Frisur:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Erstellen"
@@ -594,130 +610,145 @@ msgstr "Spielfigurattribute OK"
msgid "Please remove %d points"
msgstr "Bitte entferne %d Punkte"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Bestätige Charakter-Löschung"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Account- und Charakterverwaltung"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr "Login wechseln"
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Abmelden"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
msgid "Change Email"
msgstr "E-Mailadresse ändern"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Kein freier Slot."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Spieler konnte nicht gelöscht werden."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Passwort:"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Löschen"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
msgid "Choose"
msgstr "Wähle"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, c-format
msgid "Level %d"
msgstr "Stufe: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr "(leer)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
msgid "default"
msgstr "Standard"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr ""
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
#, fuzzy
msgid "red"
msgstr "Freund"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
#, fuzzy
msgid "green"
msgstr "Grün: "
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
msgid "blue"
msgstr ""
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr ""
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
msgid "yellow"
msgstr ""
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
msgid "pink"
msgstr ""
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr ""
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr ""
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
#, fuzzy
msgid "brown"
msgstr "geworfen"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
#, fuzzy
msgid "rainbow 1"
msgstr "Regenbogen"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
#, fuzzy
msgid "rainbow 2"
msgstr "Regenbogen"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
#, fuzzy
msgid "rainbow 3"
msgstr "Regenbogen"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Anwesend: %s ;%d Spieler sind anwesend."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Flüsternd zu %s: %s"
@@ -730,7 +761,10 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
#, fuzzy
msgid "Ignore"
msgstr "Ignoriert"
@@ -749,148 +783,152 @@ msgstr "NPC anvisieren"
msgid "Net"
msgstr "Weiter"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
#, fuzzy
msgid "Music:"
msgstr "Lautstärke der Musik: "
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
#, fuzzy
msgid "Map:"
msgstr "Karte: "
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
#, fuzzy
msgid "Minimap:"
msgstr "Übersichtskarte: "
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Cursor: (%d, %d)"
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
#, fuzzy
msgid "Player Position:"
msgstr "Spieler"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, c-format
msgid "Particle count: %d"
msgstr "Partikelzählung: %d"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, fuzzy, c-format
msgid "Map actors count: %d"
msgstr "Spielfigurattribute OK"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, fuzzy, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (OpenGL)"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, fuzzy, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (OpenGL)"
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, fuzzy, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (OpenGL)"
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
#, fuzzy
msgid "Cursor:"
msgstr "Cursor: (%d, %d)"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
#, fuzzy
msgid "Target:"
msgstr "NPC anvisieren"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
#, fuzzy
msgid "Target Id:"
msgstr "NPC anvisieren"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
#, fuzzy
msgid "Target Level:"
msgstr "Spieler anvisieren"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
#, fuzzy
msgid "Target Party:"
msgstr "Spieler anvisieren"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
#, fuzzy
msgid "Target Guild:"
msgstr "Gilde erstellen"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Angriff %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Übersichtskarte: "
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Kritischer Treffer"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "Ok"
@@ -901,8 +939,8 @@ msgstr "Ausrüstung"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Ablegen"
@@ -911,7 +949,8 @@ msgid "Help"
msgstr "Hilfe"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Schließen"
@@ -948,31 +987,31 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Ausrüsten"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Benutzen"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
msgid "Drop..."
msgstr "Wegwerfen"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Aufteilen"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr "Ausrüstung"
@@ -981,17 +1020,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Einlagern"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Abholen"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Wegwerfen"
@@ -1265,7 +1304,7 @@ msgstr "Absenden"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
#, fuzzy
msgid "Clear"
msgstr "Waffenarm"
@@ -1309,365 +1348,314 @@ msgstr "erstes ausziehen"
msgid "Away outfit"
msgstr "Ausrüstung anziehen"
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-msgid "@@trade|Trade@@"
-msgstr ""
-
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-msgid "@@attack|Attack@@"
-msgstr ""
-
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-msgid "@@whisper|Whisper@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
-msgid "@@heal|Heal@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-#, fuzzy
-msgid "@@friend|Be friend@@"
-msgstr "/ignore > Ignoriere einen Spieler"
-
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Handeln"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr "geflüsterte Nachricht"
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
-msgid "@@erase|Erase@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
#, fuzzy
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Ignoriere %s komplett@@"
+msgid "Be friend"
+msgstr "Freund"
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+#, fuzzy
+msgid "Disregard"
+msgstr "Unbeachtet"
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
#, fuzzy
-msgid "@@party|Invite to party@@"
-msgstr "/party > Lade einen Benutzer zu deiner Party ein"
+msgid "Unignore"
+msgstr "nicht ignorieren"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
+msgstr "@@ignore|Ignoriere %s komplett@@"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+#, fuzzy
+msgid "Imitation"
+msgstr "Email-Adresse ändern"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
-msgid "@@guild|Invite to guild@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#, fuzzy
+msgid "Invite to party"
+msgstr "Spieler einladen"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+#, fuzzy
+msgid "Kick from party"
+msgstr "Spieler rauswerfen"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+#, fuzzy
+msgid "Kick from guild"
+msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "Ändern"
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
+#, fuzzy
+msgid "Invite to guild"
+msgstr "Spieler einladen"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:232
+msgid "Kick player"
+msgstr "Spieler rauswerfen"
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-msgid "@@sell|Sell@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
+#: src/gui/popupmenu.cpp:267
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:284
#, fuzzy
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Add to priority attack list"
msgstr "Zu Chat hinzufügen"
-#: src/gui/popupmenu.cpp:270
+#: src/gui/popupmenu.cpp:286
#, fuzzy
-msgid "@@add attack|Add to attack list@@"
+msgid "Add to attack list"
msgstr "Zu Chat hinzufügen"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:289
#, fuzzy
-msgid "@@name|Add name to chat@@"
-msgstr "Füge Namen zu Chat hinzu"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr ""
+msgid "Add to ignore list"
+msgstr "Einlagern"
-#: src/gui/popupmenu.cpp:428
-msgid "@@pickup|Pick up@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "Zu Chat hinzufügen"
-#: src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:450
#, fuzzy
-msgid "@@chat|Add to chat@@"
+msgid "Pick up"
+msgstr "Aufheben"
+
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
msgstr "Zu Chat hinzufügen"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Name"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#, fuzzy
+msgid "Remove"
+msgstr "Benutzername merken"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:480
-msgid "@@edit spell|Edit spell@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
#, fuzzy
msgid "Disable highlight"
msgstr "Hervorgehobener Tab"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
#, fuzzy
msgid "Enable highlight"
msgstr "Hervorgehobener Tab"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
#, fuzzy
msgid "Remove name"
msgstr "Benutzername merken"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
#, fuzzy
msgid "Enable away"
msgstr "Kauf fehlgeschlagen."
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
#, fuzzy
msgid "Disable away"
msgstr "Handeln erlauben/verbieten"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#, fuzzy
+msgid "Leave"
+msgstr "Stufe: %d"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
#, fuzzy
msgid "Change guild position"
msgstr "Ändern"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
#, fuzzy
msgid "Add to trade"
msgstr "Zu Chat hinzufügen"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
#, fuzzy
msgid "Add to trade 10"
msgstr "Zu Chat hinzufügen"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
#, fuzzy
msgid "Add to trade half"
msgstr "Einlagern"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
#, fuzzy
msgid "Add to trade all"
msgstr "Einlagern"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
#, fuzzy
msgid "Store 10"
msgstr "Einlagern"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
#, fuzzy
msgid "Store half"
msgstr "Einlagern"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
#, fuzzy
msgid "Store all"
msgstr "Einlagern"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
#, fuzzy
msgid "Retrieve 10"
msgstr "Abholen"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
#, fuzzy
msgid "Retrieve half"
msgstr "Abholen"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
#, fuzzy
msgid "Retrieve all"
msgstr "Abholen"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr "Zu Chat hinzufügen"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
#, fuzzy
msgid "Show"
msgstr "Zeigen"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "Standard"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Laufe Hoch"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Laufe Runter"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-#, fuzzy
-msgid "Remove"
-msgstr "Benutzername merken"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2606,134 +2594,129 @@ msgstr ""
msgid "Atk"
msgstr "Angriff"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Angriff"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Ignoriere %s"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Gilde erstellen"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
#, fuzzy
msgid "Create Party"
msgstr "Charakter erstellen"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
#, fuzzy
msgid "Social"
msgstr "Special"
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
#, fuzzy
msgid "Invite"
msgstr "einladen"
-#: src/gui/socialwindow.cpp:1018
-#, fuzzy
-msgid "Leave"
-msgstr "Stufe: %d"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, fuzzy, c-format
msgid "Accepted party invite from %s."
msgstr "Partyeinladung von %s angenommen."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, fuzzy, c-format
msgid "Rejected party invite from %s."
msgstr "Partyeinladung von %s abgelehnt."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, fuzzy, c-format
msgid "Accepted guild invite from %s."
msgstr "Partyeinladung von %s angenommen."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, fuzzy, c-format
msgid "Rejected guild invite from %s."
msgstr "Partyeinladung von %s abgelehnt."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, c-format
msgid "Creating guild called %s."
msgstr "Erstelle der Gilde %s."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, fuzzy, c-format
msgid "Creating party called %s."
msgstr "Erstelle der Gilde %s."
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
msgid "Guild Name"
msgstr "Gildenname"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
msgid "Choose your guild's name."
msgstr "Wähle den Namen deiner Gilde"
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
#, fuzzy
msgid "Received guild request, but one already exists."
msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, 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:1304
+#: src/gui/socialwindow.cpp:1305
msgid "Accept Guild Invite"
msgstr "Nehme Gildeneinladung an"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
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:1330
+#: src/gui/socialwindow.cpp:1331
#, fuzzy
msgid "You have been invited you to join a party."
msgstr "%s hat dich in seine Party eingeladen."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, fuzzy, c-format
msgid "You have been invited to join the %s party."
msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s hat dich in seine Party eingeladen."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, 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:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Nehme Partyeinladung an"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
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:1376
+#: src/gui/socialwindow.cpp:1377
#, fuzzy
msgid "Party Name"
msgstr "Party"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
#, fuzzy
msgid "Choose your party's name."
msgstr "Wähle den Namen deiner Gilde"
@@ -3168,96 +3151,96 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
#, fuzzy
msgid "No Target"
msgstr "NPC anvisieren"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
#, fuzzy
msgid "Allow Target"
msgstr "Handeln erlauben"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
#, fuzzy
msgid "Need Target"
msgstr "NPC anvisieren"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
#, fuzzy
msgid "General Magic"
msgstr "Öffentlich"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
msgid "Life Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
msgid "War Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
#, fuzzy
msgid "Command Editor"
msgstr "Befehl: /item"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
msgid "magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr "andere"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
#, fuzzy
msgid "Command:"
msgstr "Befehl: /who"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
#, fuzzy
msgid "Mana:"
msgstr "Mana"
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
#, fuzzy
msgid "Target Type:"
msgstr "Spieler anvisieren"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
#, fuzzy
msgid "Magic level:"
msgstr "Max Level"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
msgid "School level:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3281,10 +3264,6 @@ msgstr "Zugestimmt. Warten..."
msgid "Trade: You"
msgstr "Handel: Du"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Handeln"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, fuzzy, c-format
msgid "You get %s"
@@ -4172,74 +4151,74 @@ msgid ""
"strange behaviour."
msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Kann das nicht aufheben."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
#, fuzzy
msgid "Inventory is full."
msgstr "Server ist voll"
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
#, fuzzy
msgid "Unknown problem picking up item."
msgstr "Kann das nicht aufheben."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, fuzzy, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Du hast %s [@@%d|%s@@] aufgehoben."
msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr "Abwesend"
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
#, fuzzy
msgid "Follow canceled"
msgstr " abgebrochen"
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
#, fuzzy
msgid "Imitation: "
msgstr "Email-Adresse ändern"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
#, fuzzy
msgid "Imitation canceled"
msgstr " abgebrochen"
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
#, fuzzy
msgid "You see "
msgstr "Du erhältst %s."
@@ -4959,14 +4938,17 @@ msgid "M.Defense"
msgstr "M.Verteidigung:"
#: src/net/tmwa/generalhandler.cpp:259
+#, c-format
msgid "% Accuracy"
msgstr "% Accuracy"
#: src/net/tmwa/generalhandler.cpp:260
+#, c-format
msgid "% Evade"
msgstr "% Evade"
#: src/net/tmwa/generalhandler.cpp:261
+#, c-format
msgid "% Critical"
msgstr "% Critical"
@@ -5605,10 +5587,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr "@@ignore|Ignoriere %s komplett@@"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr "Drucke '..'"
@@ -5655,6 +5633,26 @@ msgid "Unknown item"
msgstr "Unbekannter Gegenstand"
#, fuzzy
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "/ignore > Ignoriere einen Spieler"
+
+#, fuzzy
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Ignoriere %s komplett@@"
+
+#, fuzzy
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "/party > Lade einen Benutzer zu deiner Party ein"
+
+#, fuzzy
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "Füge Namen zu Chat hinzu"
+
+#, fuzzy
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "Zu Chat hinzufügen"
+
+#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "OK auswählen"
@@ -6019,9 +6017,6 @@ msgstr "Unbekannter Gegenstand"
#~ msgid "Invite %s to join your party"
#~ msgstr "Lade %s in deine Party ein"
-#~ msgid "Kick player"
-#~ msgstr "Spieler rauswerfen"
-
#~ msgid "Talk to %s"
#~ msgstr "Rede mit %s"
@@ -6186,9 +6181,6 @@ msgstr "Unbekannter Gegenstand"
#~ msgid "GM"
#~ msgstr "GM"
-#~ msgid "Whisper"
-#~ msgstr "geflüsterte Nachricht"
-
#~ msgid "Is"
#~ msgstr "Handlungen"
@@ -6270,9 +6262,6 @@ msgstr "Unbekannter Gegenstand"
#~ msgid "ignore"
#~ msgstr "Ignoriere"
-#~ msgid "unignore"
-#~ msgstr "nicht ignorieren"
-
#, fuzzy
#~ msgid "join"
#~ msgstr "Anmelden"
@@ -6496,9 +6485,6 @@ msgstr "Unbekannter Gegenstand"
#~ msgid "retrieve"
#~ msgstr "Abholen"
-#~ msgid "name"
-#~ msgstr "Name"
-
#~ msgid "PopupMenu: Warning, unknown action '%s'"
#~ msgstr "PopupMenu: Warnung, unbekannte Aktion '%s'"
@@ -6932,9 +6918,6 @@ msgstr "Unbekannter Gegenstand"
#~ msgid "The Mana World %s"
#~ msgstr "The Mana World %s"
-#~ msgid "password"
-#~ msgstr "Passwort:"
-
#~ msgid "character"
#~ msgstr "Spielfigur"
diff --git a/po/en_GB.po b/po/en_GB.po
index 96f6ac7b7..e3cc3296e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mana\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2010-03-04 21:01+0000\n"
"Last-Translator: issyl0 <isabell121@gmail.com>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
#, fuzzy
msgid "Visible on map"
msgstr "Visible names"
@@ -32,96 +32,96 @@ msgstr ""
msgid "miss"
msgstr ""
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Setup"
-#: src/client.cpp:824
+#: src/client.cpp:826
#, fuzzy
msgid "Connecting to server"
msgstr "Connecting to map server..."
-#: src/client.cpp:855
+#: src/client.cpp:857
#, fuzzy
msgid "Logging in"
msgstr "Login"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:980
+#: src/client.cpp:982
#, fuzzy
msgid "Requesting characters"
msgstr "Select Character"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
#, fuzzy
msgid "Connecting to the game server"
msgstr "Connecting to map server..."
-#: src/client.cpp:1021
+#: src/client.cpp:1023
#, fuzzy
msgid "Changing game servers"
msgstr "Server"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Error"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1099
+#: src/client.cpp:1101
#, fuzzy
msgid "Password Change"
msgstr "Password:"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1119
+#: src/client.cpp:1121
#, fuzzy
msgid "Email Change"
msgstr "Change"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
#, fuzzy
msgid "Email changed successfully!"
msgstr "Member was promoted successfully."
-#: src/client.cpp:1140
+#: src/client.cpp:1142
#, fuzzy
msgid "Unregister Successful"
msgstr "Unregister"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, fuzzy, c-format
msgid "Invalid update host: %s"
msgstr "Invalid update host: "
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Error creating updates directory!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -276,19 +276,24 @@ msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
#, fuzzy
msgid "font cache size"
msgstr "Font size"
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1082
#, fuzzy
-msgid "Created: "
+msgid "Cache size:"
+msgstr "Font size"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Create"
-#: src/commandhandler.cpp:1077
+#: src/commandhandler.cpp:1086
#, fuzzy
-msgid "Deleted: "
+msgid "Deleted:"
msgstr "Delete"
#: src/commandhandler.h:40
@@ -296,46 +301,46 @@ msgstr "Delete"
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "General"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr ""
-#: src/game.cpp:445
+#: src/game.cpp:444
#, fuzzy
msgid "Screenshot saved as "
msgstr "Screenshot saved to ~/"
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Saving screenshot failed!"
-#: src/game.cpp:492
+#: src/game.cpp:491
#, fuzzy
msgid "The connection to the server was lost."
msgstr "The connection to the server was lost, the program will now quit."
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Network Error"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignoring incoming trade requests"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Accepting incoming trade requests"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
#, fuzzy
msgid "Could Not Load Map"
msgstr "Could not load map"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Error while loading %s"
@@ -355,39 +360,44 @@ msgstr "Guilds"
msgid "Pvp rank: %d"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
#, fuzzy
msgid "Bot Checker"
msgstr "Chat Window"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Name"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Attack"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Talk"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
#, fuzzy
msgid "Move"
msgstr "Move Up"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Reset"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Buy"
@@ -430,7 +440,9 @@ msgstr "Max"
msgid "Shop"
msgstr "Shop"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Sell"
@@ -438,14 +450,18 @@ msgstr "Sell"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Cancel"
@@ -479,7 +495,7 @@ msgid "The email address entries mismatch."
msgstr "The new Email Address already exists."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Change Password"
@@ -548,8 +564,8 @@ msgstr "Hair Style:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Create"
@@ -579,136 +595,151 @@ msgstr "Character stats OK"
msgid "Please remove %d points"
msgstr "Please remove %d points"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Confirm Character Delete"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Are you sure you want to delete this character?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Account and Character Management"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Unregister"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
#, fuzzy
msgid "Change Email"
msgstr "Change Email Address"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Wrong password"
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Failed to delete character."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Wrong password"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Delete"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
#, fuzzy
msgid "Choose"
msgstr "Close"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, fuzzy, c-format
msgid "Level %d"
msgstr "Level: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
#, fuzzy
msgid "default"
msgstr "Default"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr ""
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
#, fuzzy
msgid "red"
msgstr "Friend"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
#, fuzzy
msgid "green"
msgstr "Green: "
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
#, fuzzy
msgid "blue"
msgstr "Blue: "
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr ""
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
#, fuzzy
msgid "yellow"
msgstr "low"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
#, fuzzy
msgid "pink"
msgstr "Hyperlink"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr ""
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr ""
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
#, fuzzy
msgid "brown"
msgstr "Thrown"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
#, fuzzy
msgid "rainbow 1"
msgstr "Rainbow"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
#, fuzzy
msgid "rainbow 2"
msgstr "Rainbow"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
#, fuzzy
msgid "rainbow 3"
msgstr "Rainbow"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, fuzzy, c-format
msgid "Present: %s; %d players are present."
msgstr "%d players are present."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Whispering to %s: %s"
@@ -721,7 +752,10 @@ msgstr "Yes"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
#, fuzzy
msgid "Ignore"
msgstr "Ignored"
@@ -740,148 +774,152 @@ msgstr "Move Left"
msgid "Net"
msgstr "Next"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
#, fuzzy
msgid "Music:"
msgstr "Topic: %s"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
#, fuzzy
msgid "Map:"
msgstr "Name: %s"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
#, fuzzy
msgid "Minimap:"
msgstr "MiniMap"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr ""
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
#, fuzzy
msgid "Player Position:"
msgstr "Player hits Monster"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, fuzzy, c-format
msgid "Particle count: %d"
msgstr "Particle Effects"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, fuzzy, c-format
msgid "Map actors count: %d"
msgstr "Character stats OK"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
#, fuzzy
msgid "Cursor:"
msgstr "Custom cursor"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
#, fuzzy
msgid "Target:"
msgstr "Move Left"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
#, fuzzy
msgid "Target Id:"
msgstr "Target Player"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
#, fuzzy
msgid "Target Level:"
msgstr "Target Player"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
#, fuzzy
msgid "Target Party:"
msgstr "Target Player"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
#, fuzzy
msgid "Target Guild:"
msgstr "Target Player"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Attack %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "MiniMap"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Critical Hit"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "OK"
@@ -892,8 +930,8 @@ msgstr "Equipment"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Unequip"
@@ -902,7 +940,8 @@ msgid "Help"
msgstr "Help"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Close"
@@ -939,32 +978,32 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Equip"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Use"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
#, fuzzy
msgid "Drop..."
msgstr "Drop"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Split"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr ""
@@ -973,17 +1012,17 @@ msgid "Weight:"
msgstr "Weight:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Store"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Retrieve"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Drop"
@@ -1258,7 +1297,7 @@ msgstr "Submit"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
#, fuzzy
msgid "Clear"
msgstr "Polearm"
@@ -1300,382 +1339,317 @@ msgstr "Unequip"
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-#, fuzzy
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Trade With %s@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Trade"
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Attack %s@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr "Whisper"
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-#, fuzzy
-msgid "@@whisper|Whisper@@"
-msgstr "@@use|Use@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:589
#, fuzzy
-msgid "@@heal|Heal@@"
-msgstr "@@cancel|Cancel@@"
+msgid "Be friend"
+msgstr "Friend"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
#, fuzzy
-msgid "@@friend|Be friend@@"
-msgstr "@@retrieve|Retrieve@@"
+msgid "Disregard"
+msgstr "Disregarded"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-#, fuzzy
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Disregard %s@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
+msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
#, fuzzy
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignore %s@@"
+msgid "Unignore"
+msgstr "Ignored"
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
#, fuzzy
-msgid "@@erase|Erase@@"
-msgstr "@@use|Use@@"
+msgid "Completely ignore"
+msgstr "@@ignore|Completely ignore %s@@"
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
#, fuzzy
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Un-Ignore %s@@"
+msgid "Follow"
+msgstr "low"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
#, fuzzy
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Completely ignore %s@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr ""
+msgid "Imitation"
+msgstr "Change Email Address"
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
#, fuzzy
-msgid "@@party|Invite to party@@"
+msgid "Invite to party"
msgstr "/party > Invite a user to party"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
#, fuzzy
-msgid "@@kick party|Kick from party@@"
+msgid "Kick from party"
msgstr "@@admin-kick|Kick player@@"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
#, fuzzy
-msgid "@@guild-kick|Kick from guild@@"
+msgid "Kick from guild"
msgstr "@@admin-kick|Kick player@@"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "Change"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
#, fuzzy
-msgid "@@guild|Invite to guild@@"
+msgid "Invite to guild"
msgstr "/party > Invite a user to party"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Kick failed!"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-#, fuzzy
-msgid "@@undress|Undress@@"
-msgstr "@@unignore|Un-Ignore %s@@"
-
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:267
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-#, fuzzy
-msgid "@@sell|Sell@@"
-msgstr "@@use|Use@@"
-
-#: src/gui/popupmenu.cpp:235
-#, fuzzy
-msgid "@@talk|Talk@@"
-msgstr "@@attack|Attack %s@@"
-
-#: src/gui/popupmenu.cpp:251
-#, fuzzy
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Kick player@@"
-
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:284
#, fuzzy
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Add to priority attack list"
msgstr "@@attack|Attack %s@@"
-#: src/gui/popupmenu.cpp:270
+#: src/gui/popupmenu.cpp:286
#, fuzzy
-msgid "@@add attack|Add to attack list@@"
+msgid "Add to attack list"
msgstr "@@attack|Attack %s@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:289
#, fuzzy
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Add name to chat@@"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Cancel@@"
+msgid "Add to ignore list"
+msgstr "Store"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@chat|Add to chat@@"
-#: src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:450
#, fuzzy
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Pick up %s@@"
+msgid "Pick up"
+msgstr "Pick up"
-#: src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
#, fuzzy
-msgid "@@chat|Add to chat@@"
+msgid "Add to chat"
msgstr "@@chat|Add to chat@@"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Remember Username"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#, fuzzy
+msgid "Remove"
+msgstr "Remember Username"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@use|Use@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
#, fuzzy
msgid "Disable highlight"
msgstr "Tab Highlight"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
#, fuzzy
msgid "Enable highlight"
msgstr "Tab Highlight"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
#, fuzzy
msgid "Remove name"
msgstr "Remember Username"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
#, fuzzy
msgid "Enable away"
msgstr "Unable to buy."
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
#, fuzzy
msgid "Disable away"
msgstr "Allow/Disallow Trading"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#, fuzzy
+msgid "Leave"
+msgstr "Large"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
#, fuzzy
msgid "Change guild position"
msgstr "Change"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
#, fuzzy
msgid "Add to trade"
msgstr "@@chat|Add to chat@@"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
#, fuzzy
msgid "Add to trade 10"
msgstr "@@chat|Add to chat@@"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
#, fuzzy
msgid "Add to trade half"
msgstr "Store"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
#, fuzzy
msgid "Add to trade all"
msgstr "Store"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
#, fuzzy
msgid "Store 10"
msgstr "Store"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
#, fuzzy
msgid "Store half"
msgstr "Store"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
#, fuzzy
msgid "Store all"
msgstr "Store"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
#, fuzzy
msgid "Retrieve 10"
msgstr "Retrieve"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
#, fuzzy
msgid "Retrieve half"
msgstr "Retrieve"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
#, fuzzy
msgid "Retrieve all"
msgstr "Retrieve"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Add to chat@@"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "Default"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Move Up"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Move Down"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-#, fuzzy
-msgid "Remove"
-msgstr "Remember Username"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2619,136 +2593,131 @@ msgstr ""
msgid "Atk"
msgstr "Attack"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Attack"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Ignored"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Create Guild"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
#, fuzzy
msgid "Create Party"
msgstr "Create Character"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
#, fuzzy
msgid "Invite"
msgstr "Invite User"
-#: src/gui/socialwindow.cpp:1018
-#, fuzzy
-msgid "Leave"
-msgstr "Large"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, fuzzy, c-format
msgid "Accepted party invite from %s."
msgstr "Accepted invite from %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, fuzzy, c-format
msgid "Rejected party invite from %s."
msgstr "Rejected invite from %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, fuzzy, c-format
msgid "Accepted guild invite from %s."
msgstr "Accepted invite from %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, fuzzy, c-format
msgid "Rejected guild invite from %s."
msgstr "Rejected invite from %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, fuzzy, c-format
msgid "Creating guild called %s."
msgstr "Error creating guild."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
#, fuzzy
msgid "Guild Name"
msgstr "Guild"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
#, fuzzy
msgid "Choose your guild's name."
msgstr "Choose your server"
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
#, fuzzy
msgid "Received guild request, but one already exists."
msgstr "Received party request, but one already exists."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, fuzzy, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s has invited you to join the %s party."
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
#, fuzzy
msgid "Accept Guild Invite"
msgstr "Accept Party Invite"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Received party request, but one already exists."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
#, fuzzy
msgid "You have been invited you to join a party."
msgstr "%s has invited you to join their party."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, fuzzy, c-format
msgid "You have been invited to join the %s party."
msgstr "%s has invited you to join the %s party."
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s has invited you to join their party."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s has invited you to join the %s party."
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Accept Party Invite"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
#, fuzzy
msgid "Party Name"
msgstr "Party"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
#, fuzzy
msgid "Choose your party's name."
msgstr "Choose your server"
@@ -3179,99 +3148,99 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
#, fuzzy
msgid "No Target"
msgstr "Move Left"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
#, fuzzy
msgid "Allow Target"
msgstr "Allow trading"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
#, fuzzy
msgid "Need Target"
msgstr "Move Left"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
#, fuzzy
msgid "General Magic"
msgstr "General"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
#, fuzzy
msgid "Life Magic"
msgstr "Magic"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
#, fuzzy
msgid "War Magic"
msgstr "Magic"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
#, fuzzy
msgid "Command Editor"
msgstr "Command: /item"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
#, fuzzy
msgid "magic"
msgstr "Magic"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
#, fuzzy
msgid "Command:"
msgstr "Command: /who"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
#, fuzzy
msgid "Target Type:"
msgstr "Target Player"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
#, fuzzy
msgid "Magic level:"
msgstr "Max level"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
#, fuzzy
msgid "School level:"
msgstr "Show name"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3295,10 +3264,6 @@ msgstr "Agreed. Waiting..."
msgid "Trade: You"
msgstr "Trade: You"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Trade"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, fuzzy, c-format
msgid "You get %s"
@@ -4176,74 +4141,74 @@ msgid ""
"strange behaviour."
msgstr "Resolve them, or gameplay may result in strange behaviour."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Unable to pick up item."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
#, fuzzy
msgid "Inventory is full."
msgstr "Server is full"
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
#, fuzzy
msgid "Unknown problem picking up item."
msgstr "Unable to pick up item."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, fuzzy, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "You picked up %s [@@%d|%s@@]."
msgstr[1] "You picked up %s [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
#, fuzzy
msgid "Follow canceled"
msgstr "Trade canceled."
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
#, fuzzy
msgid "Imitation: "
msgstr "Change Email Address"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
#, fuzzy
msgid "Imitation canceled"
msgstr "Trade canceled."
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
#, fuzzy
msgid "You see "
msgstr "You get %s."
@@ -4998,17 +4963,17 @@ msgid "M.Defense"
msgstr "M.Defense:"
#: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
+#, fuzzy, c-format
msgid "% Accuracy"
msgstr "% Accuracy:"
#: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy
+#, fuzzy, c-format
msgid "% Evade"
msgstr "% Evade:"
#: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy
+#, fuzzy, c-format
msgid "% Critical"
msgstr "Critical Hit"
@@ -5639,11 +5604,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr "Failed to add item for unknown reason."
-#: src/playerrelations.cpp:404
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Completely ignore %s@@"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
@@ -5690,6 +5650,88 @@ msgid "Unknown item"
msgstr "Unknown item"
#, fuzzy
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Trade With %s@@"
+
+#, fuzzy
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Attack %s@@"
+
+#, fuzzy
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@use|Use@@"
+
+#, fuzzy
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@cancel|Cancel@@"
+
+#, fuzzy
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@retrieve|Retrieve@@"
+
+#, fuzzy
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Disregard %s@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignore %s@@"
+
+#, fuzzy
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@use|Use@@"
+
+#, fuzzy
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Un-Ignore %s@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Completely ignore %s@@"
+
+#, fuzzy
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "/party > Invite a user to party"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Kick player@@"
+
+#, fuzzy
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@unignore|Un-Ignore %s@@"
+
+#, fuzzy
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@use|Use@@"
+
+#, fuzzy
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@attack|Attack %s@@"
+
+#, fuzzy
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Kick player@@"
+
+#, fuzzy
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Add name to chat@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancel@@"
+
+#, fuzzy
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Pick up %s@@"
+
+#, fuzzy
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Add to chat@@"
+
+#, fuzzy
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@use|Use@@"
+
+#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "Select OK"
@@ -6094,10 +6136,6 @@ msgstr "Unknown item"
#~ msgstr "@@party|Invite %s to join your party@@"
#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "Kick failed!"
-
-#, fuzzy
#~ msgid "Talk to %s"
#~ msgstr "@@talk|Talk To %s@@"
@@ -6138,9 +6176,6 @@ msgstr "Unknown item"
#~ msgid "Player"
#~ msgstr "Player"
-#~ msgid "Whisper"
-#~ msgstr "Whisper"
-
#~ msgid "Is"
#~ msgstr "Is"
diff --git a/po/es.po b/po/es.po
index 7eb66f2c3..c582911e9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2011-04-29 16:22+0000\n"
"Last-Translator: nelson6e65 <nelson6eeduardo65@gmail.com>\n"
"Language-Team: Spanish (Castilian) <>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
msgid "Visible on map"
msgstr "Visible sobre el mapa"
@@ -29,87 +29,87 @@ msgstr "evade"
msgid "miss"
msgstr "falla"
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Configuración"
-#: src/client.cpp:824
+#: src/client.cpp:826
msgid "Connecting to server"
msgstr "Conectando al servidor"
-#: src/client.cpp:855
+#: src/client.cpp:857
msgid "Logging in"
msgstr "Accediendo a la cuenta"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
-#: src/client.cpp:980
+#: src/client.cpp:982
msgid "Requesting characters"
msgstr "Cargando jugadores"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
-#: src/client.cpp:1021
+#: src/client.cpp:1023
msgid "Changing game servers"
msgstr "Cambiando el servidor del juego"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Error"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
-#: src/client.cpp:1099
+#: src/client.cpp:1101
msgid "Password Change"
msgstr "Cambio de contraseña"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr "¡La contraseña se cambió correctamente!"
-#: src/client.cpp:1119
+#: src/client.cpp:1121
msgid "Email Change"
msgstr "Cambio de Email"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
msgid "Email changed successfully!"
msgstr "¡Email modificado correctamente!"
-#: src/client.cpp:1140
+#: src/client.cpp:1142
msgid "Unregister Successful"
msgstr "Registro cancelado"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, 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:1533
+#: src/client.cpp:1535
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de actualización inválido: %s"
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "¡Error creando la carpeta de actualizaciones!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, 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."
@@ -256,16 +256,23 @@ msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
msgid "font cache size"
msgstr "tamaño de caché de fuente"
-#: src/commandhandler.cpp:1076
-msgid "Created: "
+#: src/commandhandler.cpp:1082
+#, fuzzy
+msgid "Cache size:"
+msgstr "tamaño de caché de fuente"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Creado: "
-#: src/commandhandler.cpp:1077
-msgid "Deleted: "
+#: src/commandhandler.cpp:1086
+#, fuzzy
+msgid "Deleted:"
msgstr "Eliminado: "
#: src/commandhandler.h:40
@@ -274,43 +281,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "General"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr "Depurador"
-#: src/game.cpp:445
+#: src/game.cpp:444
msgid "Screenshot saved as "
msgstr "Captura de pantalla guardada como "
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "¡El guardado de la captura de pantalla ha fallado!"
-#: src/game.cpp:492
+#: src/game.cpp:491
msgid "The connection to the server was lost."
msgstr "Se ha perdido la conexión del servidor."
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Error de conexión"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignorando las propuestas de intercambio"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Aceptando las propuestas de intercambio"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
msgid "Could Not Load Map"
msgstr "No se pudo cargar el mapa"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Error mientras cargaba %s"
@@ -330,37 +337,42 @@ msgstr "Gremio: %s"
msgid "Pvp rank: %d"
msgstr "Rango PVP: %d"
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
msgid "Bot Checker"
msgstr "Control de bot"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Nombre"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Hablar"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
msgid "Move"
msgstr "Mover"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Restablecer"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Comprar"
@@ -403,7 +415,9 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Tienda"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Vender"
@@ -411,14 +425,18 @@ msgstr "Vender"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Cancelar"
@@ -450,7 +468,7 @@ msgid "The email address entries mismatch."
msgstr "Los e-mail son distintos."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Cambiar contraseña"
@@ -516,8 +534,8 @@ msgstr "Estilo del cabello:"
msgid "Race:"
msgstr "Race:"
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Crear"
@@ -547,124 +565,139 @@ msgstr "Puntos de estado del jugador correctamente asignados"
msgid "Please remove %d points"
msgstr "Por favor extraiga %d puntos de estado"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Confirmar la supresión del personaje"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "¿Estás seguro de que deseas borrar este personaje?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Configuración de la cuenta y los personajes"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr "Salir del Login"
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Cancelar Registro"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
msgid "Change Email"
msgstr "Cambiar e-mail"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Cabello incorecto."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Fallo al borrar el personaje."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Contrasena incorrecta."
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Borrar"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
msgid "Choose"
msgstr "Seleccionar"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, c-format
msgid "Level %d"
msgstr "Nivel: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr "(vacío)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
msgid "default"
msgstr "Por defecto"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr "negro"
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
msgid "red"
msgstr "rojo"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
msgid "green"
msgstr "verde"
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
msgid "blue"
msgstr "azul"
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr "dorado"
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
msgid "yellow"
msgstr "amarillo"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
msgid "pink"
msgstr "rosa"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr "púrpura"
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr "gris"
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
msgid "brown"
msgstr "marrón"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
msgid "rainbow 1"
msgstr "arco iris 1"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
msgid "rainbow 2"
msgstr "arco iris 2"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
msgid "rainbow 3"
msgstr "arco iris 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jugadores estan presentes."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando mensaje privado para %s: %s"
@@ -677,7 +710,10 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
msgid "Ignore"
msgstr "Ignorar"
@@ -695,138 +731,143 @@ msgstr "Objetivo:"
msgid "Net"
msgstr "Siguiente"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
msgid "Music:"
msgstr "Música:"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
msgid "Map:"
msgstr "Mapa:"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
msgid "Minimap:"
msgstr "Minimapa:"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Cursor: (%d, %d)"
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
msgid "Player Position:"
msgstr "Posición del jugador:"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, c-format
msgid "Particle count: %d"
msgstr "Recuento de partículas: %d"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, c-format
msgid "Map actors count: %d"
msgstr "Numero de agentes en el mapa: %d"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Programa)"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (OpenGL rapido)"
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (Antiguo OpenGL)"
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#, fuzzy
+msgid "Textures count:"
+msgstr "Numero de agentes en el mapa:"
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
msgid "Cursor:"
msgstr "Cursor:"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr "Numero de agentes en el mapa:"
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
msgid "Target:"
msgstr "Objetivo:"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
msgid "Target Id:"
msgstr "Seccionar ID:"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
msgid "Target Level:"
msgstr "Diana de nivel:"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
msgid "Target Party:"
msgstr "Grupo de destino:"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
msgid "Target Guild:"
msgstr "Diana de Guild:"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Retardo de Ataque"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Minimapa:"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Golpe Critico"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr "Ping: %d ms"
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr "Ping: ? ms"
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr "In: %d bytes/s"
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr "Out: %d bytes/s"
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "OK"
@@ -837,8 +878,8 @@ msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Quitárselo"
@@ -847,7 +888,8 @@ msgid "Help"
msgstr "Ayuda"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Cerrar"
@@ -881,31 +923,31 @@ msgid "id"
msgstr "id"
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
msgid "Drop..."
msgstr "Tirar..."
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Dividir"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr "Conjuntos"
@@ -914,17 +956,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Almacenar"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Tirar"
@@ -1186,7 +1228,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
msgid "Clear"
msgstr "Limpiar"
@@ -1225,337 +1267,298 @@ msgstr "Quitárselo antes"
msgid "Away outfit"
msgstr "Fuera conjunto"
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Intercambio@@"
-
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Ataque@@"
-
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-msgid "@@whisper|Whisper@@"
-msgstr "@@whisper|Susurrar@@"
-
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
-msgid "@@heal|Heal@@"
-msgstr "@@heal|Curar@@"
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-msgid "@@friend|Be friend@@"
-msgstr "@@friend|Ser amigos@@"
-
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Desatender@@"
-
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignorar@@"
-
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
-msgid "@@erase|Erase@@"
-msgstr "@@erase|Eliminar@@"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Intercambio"
+
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Dejar de Ignorar@@"
-
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Ignorar completamente@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr "@@follow|Seguir@@"
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr "@@imitation|Imitación@@"
-
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
-msgid "@@party|Invite to party@@"
-msgstr "@@party|Invitar al grupo@@"
-
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
-msgstr "@@kick party|Sacar del grupo@@"
+#, fuzzy
+msgid "Be friend"
+msgstr "amigo"
+
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+#, fuzzy
+msgid "Disregard"
+msgstr "Desconocido"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
-msgstr "@@guild-kick|Sacar dela gremio@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+#, fuzzy
+msgid "Erase"
+msgstr "Borrado"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr "@@guild-pos|Cambiar la posición en en gremio >@@"
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
+#, fuzzy
+msgid "Unignore"
+msgstr "Ignorar"
+
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
+msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
-msgid "@@guild|Invite to guild@@"
-msgstr "@@guild|Invitar al gremio@@"
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+#, fuzzy
+msgid "Follow"
+msgstr "Seguir: "
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Expulsar jugador@@"
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+#, fuzzy
+msgid "Imitation"
+msgstr "Imitacion: "
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
-msgstr "@@nuke|Borar@@"
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#, fuzzy
+msgid "Invite to party"
+msgstr "Invitación de un miembro al grupo"
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
-msgstr "@@move|Mover@@"
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+#, fuzzy
+msgid "Kick from party"
+msgstr "@@kick party|Sacar del grupo@@"
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
-msgstr "@@undress|Desnudar@@"
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+#, fuzzy
+msgid "Kick from guild"
+msgstr "Usted fue expulsado del gremio."
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
-msgstr "@@buy|Comprar@@"
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "@@guild-pos|Cambiar la posición en en gremio >@@"
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-msgid "@@sell|Sell@@"
-msgstr "@@sell|Vender@@"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
+#, fuzzy
+msgid "Invite to guild"
+msgstr "Miembro invitado al clan."
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
-msgstr "@@talk|Hablar@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Jugador VIP."
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Sacar@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
+msgstr ""
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
-msgstr "@@remove attack|Quitar de la lista de ataque@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
+msgstr ""
#: src/gui/popupmenu.cpp:267
-msgid "@@add attack priority|Add to priority attack list@@"
-msgstr "@@add attack priority|Agregar a lista de ataque prioritaria@@"
+msgid "Kick"
+msgstr ""
-#: src/gui/popupmenu.cpp:270
-msgid "@@add attack|Add to attack list@@"
-msgstr "@@add attack|Añadir a la lista de ataque@@"
+#: src/gui/popupmenu.cpp:278
+#, fuzzy
+msgid "Remove from attack list"
+msgstr "@@remove attack|Quitar de la lista de ataque@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr "@@add attack ignore|Añadir a la lista de ignorados@@"
+#: src/gui/popupmenu.cpp:284
+#, fuzzy
+msgid "Add to priority attack list"
+msgstr "@@add attack priority|Agregar a lista de ataque prioritaria@@"
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Agregar nombre al chat@@"
+#: src/gui/popupmenu.cpp:286
+#, fuzzy
+msgid "Add to attack list"
+msgstr "@@add attack|Añadir a la lista de ataque@@"
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Cancelar@@"
+#: src/gui/popupmenu.cpp:289
+#, fuzzy
+msgid "Add to ignore list"
+msgstr "Agregar todo al intercambio"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr "@@player_%u|%s >@@"
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "Añadir al chat"
-#: src/gui/popupmenu.cpp:428
-msgid "@@pickup|Pick up@@"
-msgstr "@@recojer|Recoger@@"
+#: src/gui/popupmenu.cpp:450
+#, fuzzy
+msgid "Pick up"
+msgstr "Coger"
-#: src/gui/popupmenu.cpp:429
-msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Agregar al chat@@"
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
+msgstr "Añadir al chat"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr "Mapa Objeto"
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr "@@rename map|Renombrar@@"
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Remover nombre"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr "@@remove map|Quitar@@"
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+msgid "Remove"
+msgstr "Quitar"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
-msgstr "@@load old outfits|Cargar los vestidos antiguos@@"
+#: src/gui/popupmenu.cpp:484
+#, fuzzy
+msgid "Load old outfits"
+msgstr "Cargar atajos antiguos de artículos"
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr "Hechizos"
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+#, fuzzy
+msgid "Load old spells"
msgstr "@@load old spells|Cargar los hechizos antiguos@@"
-#: src/gui/popupmenu.cpp:480
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@edit spell|Editar hechizos@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
-msgstr "@@chat close|Cerrar@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
+msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
msgid "Disable highlight"
msgstr "Deshabilitar resaltado"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
msgid "Enable highlight"
msgstr "Habilitar resaltado"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr "No remover nombre"
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
msgid "Remove name"
msgstr "Remover nombre"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
msgid "Enable away"
msgstr "Habilitar ausencia"
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
msgid "Disable away"
msgstr "Deshabilitar ausencia"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr "@@leave party|Dejar@@"
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+msgid "Leave"
+msgstr "Dejar"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
msgid "Change guild position"
msgstr "Cambiar posición del gremio"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr "@@guild-pos-%d|%s@@"
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr "Renombrar señal del mapa"
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr "Nombre:"
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
msgid "Add to trade"
msgstr "Agredar al intercambio"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
msgid "Add to trade 10"
msgstr "Agregar 10 al intercambio"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
msgid "Add to trade half"
msgstr "Agregar la mitad al intercambio"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
msgid "Add to trade all"
msgstr "Agregar todo al intercambio"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
msgid "Store 10"
msgstr "Almacenar 10"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
msgid "Store half"
msgstr "Almacenar la mitad"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
msgid "Store all"
msgstr "Almacenar todo"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
msgid "Retrieve 10"
msgstr "Recuperar 10"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
msgid "Retrieve half"
msgstr "Recuperar la mitad"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
msgid "Retrieve all"
msgstr "Recuperar todo"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr "Añadir al chat"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr "Cargar atajos antiguos de artículos"
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr "Cargar atajos antiguos de soltar (drop)"
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr "Restablecer barra amarilla"
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
msgid "(default)"
msgstr "(predeterminado)"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
msgid "Move up"
msgstr "Subir"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
msgid "Move down"
msgstr "Bajar"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-msgid "Remove"
-msgstr "Quitar"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr "Guardar estado"
@@ -2446,125 +2449,121 @@ msgstr "Navegación"
msgid "Atk"
msgstr "Atk"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr "Turbas prioritarias"
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
msgid "Attack mobs"
msgstr "Turbas de ataque"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
msgid "Ignore mobs"
msgstr "Ignorar pandillas"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Crear clan"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
msgid "Create Party"
msgstr "Crear grupo"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
msgid "Invite"
msgstr "Invitar"
-#: src/gui/socialwindow.cpp:1018
-msgid "Leave"
-msgstr "Dejar"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceptada la invitación de %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, c-format
msgid "Rejected party invite from %s."
msgstr "Cancelada la invitación de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceptada la invitación a la guild de %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Cancelada la invitación a la guild de %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, c-format
msgid "Creating guild called %s."
msgstr "Creando clan llamado %s."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr "Creando grupo llamado %s."
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
msgid "Guild Name"
msgstr "Nombre del clan"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
msgid "Choose your guild's name."
msgstr "Escoja el nombre de su clan."
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
msgid "Received guild request, but one already exists."
msgstr "Recibida petición de creación del clan, pero ya existe."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te ha invitado al clan %s."
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
msgid "Accept Guild Invite"
msgstr "Aceptar invitación al clan"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Recibida petición de creación del grupo, pero ya existe."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
msgid "You have been invited you to join a party."
msgstr "Fuiste invitado a un grupo."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, 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:1342
+#: src/gui/socialwindow.cpp:1343
#, 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:1347
+#: src/gui/socialwindow.cpp:1348
#, 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:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Aceptar invitación al grupo"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
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:1376
+#: src/gui/socialwindow.cpp:1377
msgid "Party Name"
msgstr "Nombre del grupo"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
msgid "Choose your party's name."
msgstr "Escoja el nombre del grupo."
@@ -2987,87 +2986,87 @@ msgstr "(b)"
msgid "(O)"
msgstr "(O)"
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
msgid "No Target"
msgstr "Ningún objetivo"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
msgid "Allow Target"
msgstr "Permitir fijar objetivo"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
msgid "Need Target"
msgstr "Necesita fijar objetivo."
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
msgid "General Magic"
msgstr "Magia General"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
msgid "Life Magic"
msgstr "Magia de Vida"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
msgid "War Magic"
msgstr "Magia Bélica"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr "Magia de Transmutación"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr "Magia de Naturaleza"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr "Magia Astral"
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
msgid "Command Editor"
msgstr "Editor de comando"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
msgid "magic"
msgstr "magia"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr "otro"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr "Símbolo:"
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
msgid "Command:"
msgstr "Comando:"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr "Maná:"
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
msgid "Target Type:"
msgstr "Tipo de objetivo:"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr "Ícono:"
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
msgid "Magic level:"
msgstr "Nivel de Magia:"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr "Escuela de Magia:"
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
msgid "School level:"
msgstr "Nivel de Escuela:"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr "Guardar"
@@ -3091,10 +3090,6 @@ msgstr "Aceptado. Esperando..."
msgid "Trade: You"
msgstr "Intercambio: Tú"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Intercambio"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, c-format
msgid "You get %s"
@@ -3927,68 +3922,68 @@ msgstr ""
"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
"puede presentar un comportamiento raro."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr "Fuiste eliminado por "
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
msgid "Tried to pick up nonexistent item."
msgstr "Intentaste recoger un objeto inexistante."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr "El artículo es muy pesado."
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr "El artículo está muy lejos"
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
msgid "Inventory is full."
msgstr "El inventario está lleno."
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr "El agrupamiento es demasiado grande."
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr "El artículo pertenece a alguien más."
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr "Problema desconocido al intentar recoger el artículo."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr "Fuera del Teclado"
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr "Seguir: "
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
msgid "Imitation: "
msgstr "Imitacion: "
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
msgid "Imitation canceled"
msgstr "Imitar cancelado"
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
msgid "You see "
msgstr "Ves "
@@ -4678,15 +4673,17 @@ msgid "M.Defense"
msgstr "Defensa M."
#: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
+#, fuzzy, c-format
msgid "% Accuracy"
msgstr "% Presición"
#: src/net/tmwa/generalhandler.cpp:260
+#, c-format
msgid "% Evade"
msgstr "% Evasión"
#: src/net/tmwa/generalhandler.cpp:261
+#, c-format
msgid "% Critical"
msgstr "% Crítico"
@@ -5286,10 +5283,6 @@ msgstr "Fallo al agregar artículo. No puedes intercambiar este artículo."
msgid "Failed adding item for unknown reason."
msgstr "Fallo al anadir objeto por una razón desconocida."
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr "Ignorar completamente"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr "Imprimir '...'"
@@ -5334,3 +5327,111 @@ msgstr "PM %+d"
#: src/resources/itemdb.cpp:166
msgid "Unknown item"
msgstr "Objeto desconocido"
+
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Intercambio@@"
+
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Ataque@@"
+
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@whisper|Susurrar@@"
+
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@heal|Curar@@"
+
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@friend|Ser amigos@@"
+
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Desatender@@"
+
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignorar@@"
+
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@erase|Eliminar@@"
+
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Dejar de Ignorar@@"
+
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Ignorar completamente@@"
+
+#~ msgid "@@follow|Follow@@"
+#~ msgstr "@@follow|Seguir@@"
+
+#~ msgid "@@imitation|Imitation@@"
+#~ msgstr "@@imitation|Imitación@@"
+
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "@@party|Invitar al grupo@@"
+
+#~ msgid "@@guild-kick|Kick from guild@@"
+#~ msgstr "@@guild-kick|Sacar dela gremio@@"
+
+#~ msgid "@@guild|Invite to guild@@"
+#~ msgstr "@@guild|Invitar al gremio@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Expulsar jugador@@"
+
+#~ msgid "@@nuke|Nuke@@"
+#~ msgstr "@@nuke|Borar@@"
+
+#~ msgid "@@move|Move@@"
+#~ msgstr "@@move|Mover@@"
+
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@undress|Desnudar@@"
+
+#~ msgid "@@buy|Buy@@"
+#~ msgstr "@@buy|Comprar@@"
+
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@sell|Vender@@"
+
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@talk|Hablar@@"
+
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Sacar@@"
+
+#~ msgid "@@add attack ignore|Add to ignore list@@"
+#~ msgstr "@@add attack ignore|Añadir a la lista de ignorados@@"
+
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Agregar nombre al chat@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancelar@@"
+
+#~ msgid "@@player_%u|%s >@@"
+#~ msgstr "@@player_%u|%s >@@"
+
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@recojer|Recoger@@"
+
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Agregar al chat@@"
+
+#~ msgid "@@rename map|Rename@@"
+#~ msgstr "@@rename map|Renombrar@@"
+
+#~ msgid "@@remove map|Remove@@"
+#~ msgstr "@@remove map|Quitar@@"
+
+#~ msgid "@@load old outfits|Load old outfits@@"
+#~ msgstr "@@load old outfits|Cargar los vestidos antiguos@@"
+
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@edit spell|Editar hechizos@@"
+
+#~ msgid "@@chat close|Close@@"
+#~ msgstr "@@chat close|Cerrar@@"
+
+#~ msgid "@@leave party|Leave@@"
+#~ msgstr "@@leave party|Dejar@@"
+
+#~ msgid "@@guild-pos-%d|%s@@"
+#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/fr.po b/po/fr.po
index fe8fb620b..084f580b0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2011-04-30 10:43+0000\n"
"Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
"Language-Team: French <>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
msgid "Visible on map"
msgstr "Visible sur la carte"
@@ -29,87 +29,87 @@ msgstr "esquivé"
msgid "miss"
msgstr "raté"
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Configuration"
-#: src/client.cpp:824
+#: src/client.cpp:826
msgid "Connecting to server"
msgstr "Connexion au serveur"
-#: src/client.cpp:855
+#: src/client.cpp:857
msgid "Logging in"
msgstr "Connexion"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr "Vous entrez dans un nouveau monde"
-#: src/client.cpp:980
+#: src/client.cpp:982
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
-#: src/client.cpp:1021
+#: src/client.cpp:1023
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Erreur"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
-#: src/client.cpp:1099
+#: src/client.cpp:1101
msgid "Password Change"
msgstr "Changement de mot de passe"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
-#: src/client.cpp:1119
+#: src/client.cpp:1121
msgid "Email Change"
msgstr "Changer d'e-mail"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
-#: src/client.cpp:1140
+#: src/client.cpp:1142
msgid "Unregister Successful"
msgstr "Désinscription réussie"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr "A bientôt, revenez quand vous voudrez..."
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, 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:1533
+#: src/client.cpp:1535
#, c-format
msgid "Invalid update host: %s"
msgstr "Site de mise à jour invalide : %s"
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -258,16 +258,23 @@ msgid_plural "%d seconds"
msgstr[0] "%d segondes"
msgstr[1] "%d secondes"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
msgid "font cache size"
msgstr "Cache de polices"
-#: src/commandhandler.cpp:1076
-msgid "Created: "
+#: src/commandhandler.cpp:1082
+#, fuzzy
+msgid "Cache size:"
+msgstr "Cache de polices"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Créé : "
-#: src/commandhandler.cpp:1077
-msgid "Deleted: "
+#: src/commandhandler.cpp:1086
+#, fuzzy
+msgid "Deleted:"
msgstr "Effacé : "
#: src/commandhandler.h:40
@@ -277,44 +284,44 @@ msgstr ""
"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
"\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Général"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr "Informations"
-#: src/game.cpp:445
+#: src/game.cpp:444
msgid "Screenshot saved as "
msgstr "Capture d'écran sauvegardée en tant que"
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Impossible de sauvegarder la capture d'écran !"
-#: src/game.cpp:492
+#: src/game.cpp:491
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:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Erreur Réseau"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignorer les requêtes d'échanges entrantes"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
msgid "Could Not Load Map"
msgstr "La carte n'a pu être chargé"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Erreur durant le chargement %s"
@@ -334,37 +341,42 @@ msgstr "Guilde : %s"
msgid "Pvp rank: %d"
msgstr "Rang PvP : %d"
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
msgid "Bot Checker"
msgstr "Contrôle Robot"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Nom"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Attaquer"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Parler"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
msgid "Move"
msgstr "Déplacement"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr "Résultat"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Réinitialiser"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Acheter"
@@ -407,7 +419,9 @@ msgstr "Max."
msgid "Shop"
msgstr "Magasin"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Vendre"
@@ -415,14 +429,18 @@ msgstr "Vendre"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Annuler"
@@ -454,7 +472,7 @@ msgid "The email address entries mismatch."
msgstr "Les deux adresses e-mail ne correspondent pas."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Changer le mot de passe"
@@ -520,8 +538,8 @@ msgstr "Coupe :"
msgid "Race:"
msgstr "Race:"
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Créer"
@@ -551,124 +569,139 @@ msgstr "Caractéristiques du personnage Ok"
msgid "Please remove %d points"
msgstr "Veuillez retirer %d points"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Confirmer la suppression du personnage"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Gestion du compte et du personnage"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr "Changer de login"
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Se désinscrire"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
msgid "Change Email"
msgstr "Modifier l'adresse e-mail"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Cheveux incorrects."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "La suppression du personnage n'a pu s'effectuer."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Mauvais mot de passe."
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Supprimer"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
msgid "Choose"
msgstr "Choisir"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, c-format
msgid "Level %d"
msgstr "Niveau %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr "(vide)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
msgid "default"
msgstr "défaut"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr "noir"
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
msgid "red"
msgstr "rouge"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
msgid "green"
msgstr "vert"
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
msgid "blue"
msgstr "bleu"
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr "or"
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
msgid "yellow"
msgstr "jaune"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
msgid "pink"
msgstr "rose"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr "violet"
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr "gris"
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
msgid "brown"
msgstr "marron"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
msgid "rainbow 1"
msgstr "arc en ciel 1"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
msgid "rainbow 2"
msgstr "arc en ciel 2"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
msgid "rainbow 3"
msgstr "arc en ciel 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Conversation"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Présents : %s ; %d joueurs sont présents."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Message privé envoyé à %s : %s"
@@ -681,7 +714,10 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
msgid "Ignore"
msgstr "Ignorer"
@@ -699,138 +735,143 @@ msgstr "Cible :"
msgid "Net"
msgstr "Suivant"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
msgid "Music:"
msgstr "Musique :"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
msgid "Map:"
msgstr "Carte :"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
msgid "Minimap:"
msgstr "Mini carte :"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Curseur : (%d, %d)"
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
msgid "Player Position:"
msgstr "Position du joueur :"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, c-format
msgid "Particle count: %d"
msgstr "Effets de particules : %d"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, c-format
msgid "Map actors count: %d"
msgstr "Nombre d'agents interactifs sur la carte : %d"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Logiciel)"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (OpenGl rapide)"
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (ancien OpenGL)"
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#, fuzzy
+msgid "Textures count:"
+msgstr "Nombre d'acteurs sur la carte :"
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
msgid "Cursor:"
msgstr "Curseur :"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr "Nombre d'acteurs sur la carte :"
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
msgid "Target:"
msgstr "Cible :"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
msgid "Target Id:"
msgstr "Id de la Cible :"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
msgid "Target Level:"
msgstr "Choisir le niveau :"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
msgid "Target Party:"
msgstr "Choisir le Groupe :"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
msgid "Target Guild:"
msgstr "Choisir la Guilde :"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Temps de l'attaque"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Mini carte :"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Coup critique"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr "Ping : %d ms"
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr "Ping : ? ms"
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr "Entrée : %d bytes/s"
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr "Sortie : %d bytes/s"
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "Ok"
@@ -841,8 +882,8 @@ msgstr "Équipement"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Retirer"
@@ -851,7 +892,8 @@ msgid "Help"
msgstr "Aide"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Fermer"
@@ -885,31 +927,31 @@ msgid "id"
msgstr "id"
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Équiper"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Utiliser"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
msgid "Drop..."
msgstr "Jeter..."
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Partager"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr "Tenues"
@@ -918,17 +960,17 @@ msgid "Weight:"
msgstr "Poids :"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Entreposer"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Récupérer"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Jeter"
@@ -1189,7 +1231,7 @@ msgstr "Soumettre"
msgid "NPC"
msgstr "PNJ"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
msgid "Clear"
msgstr "Effacer"
@@ -1228,337 +1270,298 @@ msgstr "Retirer d'abord l'équipement"
msgid "Away outfit"
msgstr "Équipement en absence"
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Echange@@"
-
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Attaque@@"
-
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-msgid "@@whisper|Whisper@@"
-msgstr "@@whisper|Chuchoter@@"
-
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
-msgid "@@heal|Heal@@"
-msgstr "@@heal|Soigner@@"
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-msgid "@@friend|Be friend@@"
-msgstr "@@friend|Être ami@@"
-
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Ecarter@@"
-
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignorer@@"
-
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
-msgid "@@erase|Erase@@"
-msgstr "@@erase|Effacer@@"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Échange"
+
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Ne plus ignorer@@"
-
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Complètement ignorer@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr "@@follow|Suivre@@"
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr "@@imitation|Imitation@@"
-
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
-msgid "@@party|Invite to party@@"
-msgstr "@@party|Inviter dans le groupe@@"
-
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
-msgstr "@@kick party|Renvoyer du groupe@@"
+#, fuzzy
+msgid "Be friend"
+msgstr "ami"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
-msgstr "@@guild-kick|Renvoyer de la guilde@@"
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+#, fuzzy
+msgid "Disregard"
+msgstr "Négligé"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr "@@guild-pos|Changer de position dans la guilde >@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+#, fuzzy
+msgid "Erase"
+msgstr "Effacé"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
-msgid "@@guild|Invite to guild@@"
-msgstr "@@guild|Inviter dans la guilde@@"
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
+#, fuzzy
+msgid "Unignore"
+msgstr "Ignorer"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Renvoyer un joueur@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
+msgstr "Ignorer complètement"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
-msgstr "@@nuke|Atomiser@@"
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+#, fuzzy
+msgid "Follow"
+msgstr "Suivre : "
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
-msgstr "@@move|Bouger@@"
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+#, fuzzy
+msgid "Imitation"
+msgstr "Imitation: "
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
-msgstr "@@undress|Déshabiller@@"
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inviter un joueur dans le groupe"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
-msgstr "@@buy|Acheter@@"
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+#, fuzzy
+msgid "Kick from party"
+msgstr "@@kick party|Renvoyer du groupe@@"
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-msgid "@@sell|Sell@@"
-msgstr "@@sell|Vendre@@"
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+#, fuzzy
+msgid "Kick from guild"
+msgstr "Vous avez été renvoyé de la guilde."
+
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "@@guild-pos|Changer de position dans la guilde >@@"
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
-msgstr "@@talk|Parler@@"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
+#, fuzzy
+msgid "Invite to guild"
+msgstr "Inviter le membre de la guilde"
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Renvoyer@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Joueur MVP"
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
-msgstr "@@remove attack|Enlever de la liste d'attaque@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
+msgstr ""
#: src/gui/popupmenu.cpp:267
-msgid "@@add attack priority|Add to priority attack list@@"
-msgstr "@@add attack priority|Ajouter à la liste des priorités d'attaque@@"
+msgid "Kick"
+msgstr ""
-#: src/gui/popupmenu.cpp:270
-msgid "@@add attack|Add to attack list@@"
-msgstr "@@add attack|Ajouter à la liste d'attaque@@"
+#: src/gui/popupmenu.cpp:278
+#, fuzzy
+msgid "Remove from attack list"
+msgstr "@@remove attack|Enlever de la liste d'attaque@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr "@@add attack ignore|Ajouter à la liste d'ignorés@@"
+#: src/gui/popupmenu.cpp:284
+#, fuzzy
+msgid "Add to priority attack list"
+msgstr "@@add attack priority|Ajouter à la liste des priorités d'attaque@@"
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Ajouter le nom dans la boite de dialogue@@"
+#: src/gui/popupmenu.cpp:286
+#, fuzzy
+msgid "Add to attack list"
+msgstr "@@add attack|Ajouter à la liste d'attaque@@"
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Annuler@@"
+#: src/gui/popupmenu.cpp:289
+#, fuzzy
+msgid "Add to ignore list"
+msgstr "Ajouter tout dans l'échange"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr "@@player_%u|%s >@@"
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "Ajouter à la conversation"
-#: src/gui/popupmenu.cpp:428
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Ramasser@@"
+#: src/gui/popupmenu.cpp:450
+#, fuzzy
+msgid "Pick up"
+msgstr "Ramasser"
-#: src/gui/popupmenu.cpp:429
-msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Ajouter au dialogue@@"
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
+msgstr "Ajouter à la conversation"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr "Objet de carte"
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr "@@rename map|Renommer la carte@@"
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Enlève le nom"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr "@@remove map|Retirer@@"
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+msgid "Remove"
+msgstr "Enlever"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
-msgstr "@@load old outfits|Charger les anciennes tenues@@"
+#: src/gui/popupmenu.cpp:484
+#, fuzzy
+msgid "Load old outfits"
+msgstr "Charger les anciens raccourcis d'objets"
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr "Sortilèges"
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+#, fuzzy
+msgid "Load old spells"
msgstr "@@load old spells|Charger les anciens sorts@@"
-#: src/gui/popupmenu.cpp:480
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@edit spell|Editer le sort@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
-msgstr "@@chat close|Fermer le dialogue@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
+msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
msgid "Disable highlight"
msgstr "Désactiver la surbrillance"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
msgid "Enable highlight"
msgstr "Activer la surbrillance"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr "N'enlève pas le nom"
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
msgid "Remove name"
msgstr "Enlève le nom"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
msgid "Enable away"
msgstr "Active la fonction Absence"
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
msgid "Disable away"
msgstr "Désactive la fonction Absence"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr "@@leave party|Quitter le groupe@@"
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+msgid "Leave"
+msgstr "Quitter"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
msgid "Change guild position"
msgstr "Changer la position de la Guilde"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr "@@guild-pos-%d|%s@@"
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr "Renommer le panneau de carte"
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr "Nom : "
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
msgid "Add to trade"
msgstr "Ajouter dans l'échange"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
msgid "Add to trade 10"
msgstr "Ajouter 10 dans l'échange"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
msgid "Add to trade half"
msgstr "Ajouter la moitié dans l'échange"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
msgid "Add to trade all"
msgstr "Ajouter tout dans l'échange"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
msgid "Store 10"
msgstr "Entreposer 10"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
msgid "Store half"
msgstr "Entreposer la moitié"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
msgid "Store all"
msgstr "Entreposer tout"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
msgid "Retrieve 10"
msgstr "Reprendre 10"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
msgid "Retrieve half"
msgstr "Reprendre la moitié"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
msgid "Retrieve all"
msgstr "Reprendre tout"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr "Ajouter à la conversation"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr "Charger les anciens raccourcis d'objets"
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr "Charger les anciens raccourcis de jets d'objets"
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr "Cacher"
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr "Montrer"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr "Remise aux valeurs de défaut de la barre jaune"
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
msgid "(default)"
msgstr "(défaut)"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
msgid "Move up"
msgstr "Aller vers le haut"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
msgid "Move down"
msgstr "Aller vers le bas"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-msgid "Remove"
-msgstr "Enlever"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr "Sauvegarder l'état"
@@ -2454,129 +2457,125 @@ msgstr "Nav"
msgid "Atk"
msgstr "Atq"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr "Priorité sur les monstres"
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
msgid "Attack mobs"
msgstr "Attaquer les monstres"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
msgid "Ignore mobs"
msgstr "Ignorer les monstres"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Créer une Guilde"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
msgid "Create Party"
msgstr "Créer un groupe"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
msgid "Invite"
msgstr "Inviter"
-#: src/gui/socialwindow.cpp:1018
-msgid "Leave"
-msgstr "Quitter"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, c-format
msgid "Accepted party invite from %s."
msgstr "Invitation dans le groupe acceptée de la part de %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, c-format
msgid "Rejected party invite from %s."
msgstr "Invitation dans le groupe de la part de %s refusée."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Invitation dans la guilde acceptée de la part de %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Invitation dans la guilde de la part de %s refusée."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, c-format
msgid "Creating guild called %s."
msgstr "La guilde %s a été créée."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr "Le groupe %s a été créé."
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
msgid "Guild Name"
msgstr "Nom de la guilde"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
msgid "Choose your guild's name."
msgstr "Choisissez le nom de la guilde."
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
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:1298
+#: src/gui/socialwindow.cpp:1299
#, 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:1304
+#: src/gui/socialwindow.cpp:1305
msgid "Accept Guild Invite"
msgstr "Accepter l'invitation dans cette guilde"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
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:1330
+#: src/gui/socialwindow.cpp:1331
msgid "You have been invited you to join a party."
msgstr "Vous avez été invité à rejoindre un groupe."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, 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:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s vous a invité à rejoindre son groupe."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, 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:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Accepter l'invitation pour ce groupe"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
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:1376
+#: src/gui/socialwindow.cpp:1377
msgid "Party Name"
msgstr "Nom du groupe"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
msgid "Choose your party's name."
msgstr "Choisissez le nom du groupe."
@@ -2999,87 +2998,87 @@ msgstr "(b)"
msgid "(O)"
msgstr "(O)"
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
msgid "No Target"
msgstr "Pas de cible"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
msgid "Allow Target"
msgstr "Autoriser le ciblage"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
msgid "Need Target"
msgstr "Nécessite une cible"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
msgid "General Magic"
msgstr "Les bases de la magie"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
msgid "Life Magic"
msgstr "Magie de Vie"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
msgid "War Magic"
msgstr "Magie de Guerre"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr "Magie de Transformation"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr "Magie de la Nature"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr "Magie Astrale"
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
msgid "Command Editor"
msgstr "Éditeur de commande"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
msgid "magic"
msgstr "Magie"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr "Autre"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr "Symbole : "
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
msgid "Command:"
msgstr "Commande :"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr "Mana : "
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
msgid "Target Type:"
msgstr "Type de cible"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr "Icône : "
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
msgid "Magic level:"
msgstr "Niveau de Magie :"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr "École de magie : "
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
msgid "School level:"
msgstr "Niveau scolaire : "
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr "Sauvegarder"
@@ -3103,10 +3102,6 @@ msgstr "Accepté. En attente..."
msgid "Trade: You"
msgstr "Échange : Vous"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Échange"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, c-format
msgid "You get %s"
@@ -3943,68 +3938,68 @@ msgstr ""
"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
"des touches ou attendez vous à un possible comportement étrange du jeu."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr "Vous avez été tué par "
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
msgid "Tried to pick up nonexistent item."
msgstr "Vous avez essayé de prendre un item qui n'existe pas."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr "L'objet est trop lourd."
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr "L'item est trop loin"
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
msgid "Inventory is full."
msgstr "L'inventaire est plein"
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr "Le regroupement est trop plein"
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr "L'objet appartient a quelqu'un d'autre"
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr "Problème inconnu pour ramasser l'objet."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr "Inactif"
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr "Suivre : "
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
msgid "Follow canceled"
msgstr "Suivi annulé"
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
msgid "Imitation: "
msgstr "Imitation: "
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
msgid "Imitation canceled"
msgstr "Imitation annulée"
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
msgid "You see "
msgstr "Vous voyez "
@@ -5331,10 +5326,6 @@ msgstr "L'item ne peut être ajouté. Vous ne pouvez marchandez cet item."
msgid "Failed adding item for unknown reason."
msgstr "Impossible de rajouter un objet pour une raison inconnue."
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr "Ignorer complètement"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr "Affiche '...'"
@@ -5379,3 +5370,111 @@ msgstr "PM %+d"
#: src/resources/itemdb.cpp:166
msgid "Unknown item"
msgstr "Objet inconnu"
+
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Echange@@"
+
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Attaque@@"
+
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@whisper|Chuchoter@@"
+
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@heal|Soigner@@"
+
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@friend|Être ami@@"
+
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Ecarter@@"
+
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignorer@@"
+
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@erase|Effacer@@"
+
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Ne plus ignorer@@"
+
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Complètement ignorer@@"
+
+#~ msgid "@@follow|Follow@@"
+#~ msgstr "@@follow|Suivre@@"
+
+#~ msgid "@@imitation|Imitation@@"
+#~ msgstr "@@imitation|Imitation@@"
+
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "@@party|Inviter dans le groupe@@"
+
+#~ msgid "@@guild-kick|Kick from guild@@"
+#~ msgstr "@@guild-kick|Renvoyer de la guilde@@"
+
+#~ msgid "@@guild|Invite to guild@@"
+#~ msgstr "@@guild|Inviter dans la guilde@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Renvoyer un joueur@@"
+
+#~ msgid "@@nuke|Nuke@@"
+#~ msgstr "@@nuke|Atomiser@@"
+
+#~ msgid "@@move|Move@@"
+#~ msgstr "@@move|Bouger@@"
+
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@undress|Déshabiller@@"
+
+#~ msgid "@@buy|Buy@@"
+#~ msgstr "@@buy|Acheter@@"
+
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@sell|Vendre@@"
+
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@talk|Parler@@"
+
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Renvoyer@@"
+
+#~ msgid "@@add attack ignore|Add to ignore list@@"
+#~ msgstr "@@add attack ignore|Ajouter à la liste d'ignorés@@"
+
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Ajouter le nom dans la boite de dialogue@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuler@@"
+
+#~ msgid "@@player_%u|%s >@@"
+#~ msgstr "@@player_%u|%s >@@"
+
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Ramasser@@"
+
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Ajouter au dialogue@@"
+
+#~ msgid "@@rename map|Rename@@"
+#~ msgstr "@@rename map|Renommer la carte@@"
+
+#~ msgid "@@remove map|Remove@@"
+#~ msgstr "@@remove map|Retirer@@"
+
+#~ msgid "@@load old outfits|Load old outfits@@"
+#~ msgstr "@@load old outfits|Charger les anciennes tenues@@"
+
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@edit spell|Editer le sort@@"
+
+#~ msgid "@@chat close|Close@@"
+#~ msgstr "@@chat close|Fermer le dialogue@@"
+
+#~ msgid "@@leave party|Leave@@"
+#~ msgstr "@@leave party|Quitter le groupe@@"
+
+#~ msgid "@@guild-pos-%d|%s@@"
+#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/hr.po b/po/hr.po
index 37e193b14..04b34ee7d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mana\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2009-12-13 09:30+0000\n"
"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
"Language-Team: Croatian <hr@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
#, fuzzy
msgid "Visible on map"
msgstr "Vidljiva imena"
@@ -33,96 +33,96 @@ msgstr ""
msgid "miss"
msgstr ""
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Podešavanje"
-#: src/client.cpp:824
+#: src/client.cpp:826
#, fuzzy
msgid "Connecting to server"
msgstr "Spajanje na poslužitelja karti..."
-#: src/client.cpp:855
+#: src/client.cpp:857
#, fuzzy
msgid "Logging in"
msgstr "Korisničko ime"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:980
+#: src/client.cpp:982
#, fuzzy
msgid "Requesting characters"
msgstr "Odaberi lika"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
#, fuzzy
msgid "Connecting to the game server"
msgstr "Spajanje na poslužitelja karti..."
-#: src/client.cpp:1021
+#: src/client.cpp:1023
#, fuzzy
msgid "Changing game servers"
msgstr "Server"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Greška"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1099
+#: src/client.cpp:1101
#, fuzzy
msgid "Password Change"
msgstr "Lozinka"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1119
+#: src/client.cpp:1121
#, fuzzy
msgid "Email Change"
msgstr "Izmijeni"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
#, fuzzy
msgid "Email changed successfully!"
msgstr "Član je uspješno unaprijeđen."
-#: src/client.cpp:1140
+#: src/client.cpp:1142
#, fuzzy
msgid "Unregister Successful"
msgstr "Odjavi"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -282,19 +282,24 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
#, fuzzy
msgid "font cache size"
msgstr "Veličina fonta"
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1082
#, fuzzy
-msgid "Created: "
+msgid "Cache size:"
+msgstr "Veličina fonta"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Stvori"
-#: src/commandhandler.cpp:1077
+#: src/commandhandler.cpp:1086
#, fuzzy
-msgid "Deleted: "
+msgid "Deleted:"
msgstr "Obriši"
#: src/commandhandler.h:40
@@ -302,46 +307,46 @@ msgstr "Obriši"
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:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Općenito"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr ""
-#: src/game.cpp:445
+#: src/game.cpp:444
#, fuzzy
msgid "Screenshot saved as "
msgstr "Screenshot spremljen u ~/"
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Spremanje screenshot-a nije uspjelo!"
-#: src/game.cpp:492
+#: src/game.cpp:491
#, fuzzy
msgid "The connection to the server was lost."
msgstr "Veza s poslužiteljem je bila izgubljena, program će se sada zatvoriti"
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Mreža Greška"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
#, fuzzy
msgid "Could Not Load Map"
msgstr "Ne mogu učitati karte"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Greška prilikom učitavanja %s"
@@ -361,39 +366,44 @@ msgstr "Cehovi"
msgid "Pvp rank: %d"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
#, fuzzy
msgid "Bot Checker"
msgstr "Chat Prozor"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Ime"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Napad"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Govori"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
#, fuzzy
msgid "Move"
msgstr "Pomakni Gore"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Poništi"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Kupi"
@@ -436,7 +446,9 @@ msgstr "Max"
msgid "Shop"
msgstr "Trgovina"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Prodaj"
@@ -444,14 +456,18 @@ msgstr "Prodaj"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Poništi"
@@ -485,7 +501,7 @@ msgid "The email address entries mismatch."
msgstr "Nova E-mail Adresa već postoji."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Promijeni Lozinku"
@@ -554,8 +570,8 @@ msgstr "Frizura:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Stvori"
@@ -585,135 +601,150 @@ msgstr "Podaci lika su u redu"
msgid "Please remove %d points"
msgstr "Molimo, oduzmi %d bodova"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Potvrdi Brisanje Lika"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Da li ste sigurni da želite obrisati ovog lika?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Upravljanje Računom i Likovima"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Odjavi"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
#, fuzzy
msgid "Change Email"
msgstr "Promijeni Email Adresu"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Pogrešna lozinka"
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Neuspješno brisanje znaka."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Pogrešna lozinka"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Obriši"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
#, fuzzy
msgid "Choose"
msgstr "Zatvori"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, fuzzy, c-format
msgid "Level %d"
msgstr "Nivo: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
#, fuzzy
msgid "default"
msgstr "Zadano"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr ""
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
#, fuzzy
msgid "red"
msgstr "Prijatelj"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
#, fuzzy
msgid "green"
msgstr "Zelena: "
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
#, fuzzy
msgid "blue"
msgstr "Plava: "
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr ""
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
#, fuzzy
msgid "yellow"
msgstr "nisko"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
#, fuzzy
msgid "pink"
msgstr "Hiperveza"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr ""
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr ""
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
msgid "brown"
msgstr ""
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
#, fuzzy
msgid "rainbow 1"
msgstr "Duga"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
#, fuzzy
msgid "rainbow 2"
msgstr "Duga"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
#, fuzzy
msgid "rainbow 3"
msgstr "Duga"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, fuzzy, c-format
msgid "Present: %s; %d players are present."
msgstr "%d igrača je prisutno."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Šaptaj prema %s: %s"
@@ -726,7 +757,10 @@ msgstr "Da"
msgid "No"
msgstr "Ne"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
#, fuzzy
msgid "Ignore"
msgstr "Ignorirano"
@@ -745,148 +779,152 @@ msgstr "Pomakni Ulijevo"
msgid "Net"
msgstr "Slijedeći"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
#, fuzzy
msgid "Music:"
msgstr "Tema: %s"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
#, fuzzy
msgid "Map:"
msgstr "Ime: %s"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
#, fuzzy
msgid "Minimap:"
msgstr "Prozor Minikarte"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr ""
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
#, fuzzy
msgid "Player Position:"
msgstr "Igrač pogađa Čudovište"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, fuzzy, c-format
msgid "Particle count: %d"
msgstr "Efekti Čestica"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, fuzzy, c-format
msgid "Map actors count: %d"
msgstr "Podaci lika su u redu"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
#, fuzzy
msgid "Cursor:"
msgstr "Vlastiti kursor"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
#, fuzzy
msgid "Target:"
msgstr "Pomakni Ulijevo"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
#, fuzzy
msgid "Target Id:"
msgstr "Ciljaj Igrača"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
#, fuzzy
msgid "Target Level:"
msgstr "Ciljaj Igrača"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
#, fuzzy
msgid "Target Party:"
msgstr "Ciljaj Igrača"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
#, fuzzy
msgid "Target Guild:"
msgstr "Ciljaj Igrača"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Napad %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Prozor Minikarte"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Kritični Udarac"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "U redu"
@@ -897,8 +935,8 @@ msgstr "Oprema"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Skini opremu"
@@ -907,7 +945,8 @@ msgid "Help"
msgstr "Pomoć"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Zatvori"
@@ -944,32 +983,32 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Opremi"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Upotrijebi"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
#, fuzzy
msgid "Drop..."
msgstr "Ispusti"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Razdvoji"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr ""
@@ -978,17 +1017,17 @@ msgid "Weight:"
msgstr "Težina:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Pohrani"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Preuzmi"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Ispusti"
@@ -1263,7 +1302,7 @@ msgstr "Dostavi"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
#, fuzzy
msgid "Clear"
msgstr "Zatvori"
@@ -1305,382 +1344,317 @@ msgstr "Skini opremu"
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-#, fuzzy
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Razmijeni se s %s@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Trgovanje"
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Napadni %s@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr "Šapat"
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-#, fuzzy
-msgid "@@whisper|Whisper@@"
-msgstr "@@use|Upotrijebi@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:589
#, fuzzy
-msgid "@@heal|Heal@@"
-msgstr "@@cancel|Otkaži@@"
+msgid "Be friend"
+msgstr "Prijatelj"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
#, fuzzy
-msgid "@@friend|Be friend@@"
-msgstr "@@retrieve|Preuzmi@@"
+msgid "Disregard"
+msgstr "Zanemareno"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-#, fuzzy
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Zanemari %s@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
+msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
#, fuzzy
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignoriraj %s@@"
+msgid "Unignore"
+msgstr "Ignorirano"
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
#, fuzzy
-msgid "@@erase|Erase@@"
-msgstr "@@use|Upotrijebi@@"
+msgid "Completely ignore"
+msgstr "@@ignore|Potpuno ignoriraj %s@@"
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
#, fuzzy
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Prestani Ignorirati %s@@"
+msgid "Follow"
+msgstr "nisko"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
#, fuzzy
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Potpuno ignoriraj %s@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr ""
+msgid "Imitation"
+msgstr "Promijeni Email Adresu"
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
#, fuzzy
-msgid "@@party|Invite to party@@"
+msgid "Invite to party"
msgstr "/party > Pozovite korisnike na partiju"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
#, fuzzy
-msgid "@@kick party|Kick from party@@"
+msgid "Kick from party"
msgstr "@@admin-kick|Šutni igrača@@"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
#, fuzzy
-msgid "@@guild-kick|Kick from guild@@"
+msgid "Kick from guild"
msgstr "@@admin-kick|Šutni igrača@@"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "Izmijeni"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
#, fuzzy
-msgid "@@guild|Invite to guild@@"
+msgid "Invite to guild"
msgstr "/party > Pozovite korisnike na partiju"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Šutni igrača@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Šut nije uspio!"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-#, fuzzy
-msgid "@@undress|Undress@@"
-msgstr "@@unignore|Prestani Ignorirati %s@@"
-
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:267
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-#, fuzzy
-msgid "@@sell|Sell@@"
-msgstr "@@use|Upotrijebi@@"
-
-#: src/gui/popupmenu.cpp:235
-#, fuzzy
-msgid "@@talk|Talk@@"
-msgstr "@@attack|Napadni %s@@"
-
-#: src/gui/popupmenu.cpp:251
-#, fuzzy
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Šutni igrača@@"
-
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:284
#, fuzzy
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Add to priority attack list"
msgstr "@@attack|Napadni %s@@"
-#: src/gui/popupmenu.cpp:270
+#: src/gui/popupmenu.cpp:286
#, fuzzy
-msgid "@@add attack|Add to attack list@@"
+msgid "Add to attack list"
msgstr "@@attack|Napadni %s@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:289
#, fuzzy
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Dodaj ime u chat@@"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Otkaži@@"
+msgid "Add to ignore list"
+msgstr "Pohrani"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@chat|Dudaj u chat@@"
-#: src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:450
#, fuzzy
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Pokupi %s@@"
+msgid "Pick up"
+msgstr "Pokupi"
-#: src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
#, fuzzy
-msgid "@@chat|Add to chat@@"
+msgid "Add to chat"
msgstr "@@chat|Dudaj u chat@@"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Zapamti korisničko ime"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#, fuzzy
+msgid "Remove"
+msgstr "Zapamti korisničko ime"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@use|Upotrijebi@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
#, fuzzy
msgid "Disable highlight"
msgstr "Istakni Karticu"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
#, fuzzy
msgid "Enable highlight"
msgstr "Istakni Karticu"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
#, fuzzy
msgid "Remove name"
msgstr "Zapamti korisničko ime"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
#, fuzzy
msgid "Enable away"
msgstr "Ne može se kupiti"
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
#, fuzzy
msgid "Disable away"
msgstr "Omogući/Onemogući Trgovanje"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#, fuzzy
+msgid "Leave"
+msgstr "Veliko"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
#, fuzzy
msgid "Change guild position"
msgstr "Izmijeni"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
#, fuzzy
msgid "Add to trade"
msgstr "@@chat|Dudaj u chat@@"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
#, fuzzy
msgid "Add to trade 10"
msgstr "@@chat|Dudaj u chat@@"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
#, fuzzy
msgid "Add to trade half"
msgstr "Pohrani"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
#, fuzzy
msgid "Add to trade all"
msgstr "Pohrani"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
#, fuzzy
msgid "Store 10"
msgstr "Pohrani"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
#, fuzzy
msgid "Store half"
msgstr "Pohrani"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
#, fuzzy
msgid "Store all"
msgstr "Pohrani"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
#, fuzzy
msgid "Retrieve 10"
msgstr "Preuzmi"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
#, fuzzy
msgid "Retrieve half"
msgstr "Preuzmi"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
#, fuzzy
msgid "Retrieve all"
msgstr "Preuzmi"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Dudaj u chat@@"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "Zadano"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Pomakni Gore"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Pomakni Dolje"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-#, fuzzy
-msgid "Remove"
-msgstr "Zapamti korisničko ime"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2622,136 +2596,131 @@ msgstr ""
msgid "Atk"
msgstr "Napad"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Napad"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Ignorirano"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Formiraj Ceh"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
#, fuzzy
msgid "Create Party"
msgstr "Stvori Lika"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
#, fuzzy
msgid "Invite"
msgstr "Pozovi Korisnika"
-#: src/gui/socialwindow.cpp:1018
-#, fuzzy
-msgid "Leave"
-msgstr "Veliko"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, fuzzy, c-format
msgid "Accepted party invite from %s."
msgstr "Prihvaćen poziv od %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, fuzzy, c-format
msgid "Rejected party invite from %s."
msgstr "Odbijen poziv od %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, fuzzy, c-format
msgid "Accepted guild invite from %s."
msgstr "Prihvaćen poziv od %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, fuzzy, c-format
msgid "Rejected guild invite from %s."
msgstr "Odbijen poziv od %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, fuzzy, c-format
msgid "Creating guild called %s."
msgstr "Pogreška pri ustanovljavanju ceha."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
#, fuzzy
msgid "Guild Name"
msgstr "Ceh"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
#, fuzzy
msgid "Choose your guild's name."
msgstr "Izaberite vaš server"
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
#, fuzzy
msgid "Received guild request, but one already exists."
msgstr "Primljen zahtjev za partiju, ali ona već postoji."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, fuzzy, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s vas je pozvao/la da se pridružite %s partiji."
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
#, fuzzy
msgid "Accept Guild Invite"
msgstr "Prihvati Pozivnicu za Partiju"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Primljen zahtjev za partiju, ali ona već postoji."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
#, fuzzy
msgid "You have been invited you to join a party."
msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, fuzzy, c-format
msgid "You have been invited to join the %s party."
msgstr "%s vas je pozvao/la da se pridružite %s partiji."
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, 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:1347
+#: src/gui/socialwindow.cpp:1348
#, 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:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Prihvati Pozivnicu za Partiju"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
#, fuzzy
msgid "Party Name"
msgstr "Partija"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
#, fuzzy
msgid "Choose your party's name."
msgstr "Izaberite vaš server"
@@ -3182,99 +3151,99 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
#, fuzzy
msgid "No Target"
msgstr "Pomakni Ulijevo"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
#, fuzzy
msgid "Allow Target"
msgstr "Dozvoli trgovanje"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
#, fuzzy
msgid "Need Target"
msgstr "Pomakni Ulijevo"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
#, fuzzy
msgid "General Magic"
msgstr "Općenito"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
#, fuzzy
msgid "Life Magic"
msgstr "Magija"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
#, fuzzy
msgid "War Magic"
msgstr "Magija"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
#, fuzzy
msgid "Command Editor"
msgstr "Naredba: /item"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
#, fuzzy
msgid "magic"
msgstr "Magija"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
#, fuzzy
msgid "Command:"
msgstr "Naredba: /who"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
#, fuzzy
msgid "Target Type:"
msgstr "Ciljaj Igrača"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
#, fuzzy
msgid "Magic level:"
msgstr "Najviša razina"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
#, fuzzy
msgid "School level:"
msgstr "Prikaži ime"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3298,10 +3267,6 @@ msgstr "Dogovoreno. Čekanje..."
msgid "Trade: You"
msgstr "Trgovanje: Vi"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Trgovanje"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, fuzzy, c-format
msgid "You get %s"
@@ -4179,73 +4144,73 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Neuspješno korištenje predmeta."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
#, fuzzy
msgid "Inventory is full."
msgstr "Server je pun"
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr ""
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, fuzzy, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Pokupili ste %s [@@%d|%s@@]."
msgstr[1] "Pokupili ste %s [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
#, fuzzy
msgid "Follow canceled"
msgstr "Otkazano trgovanje."
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
#, fuzzy
msgid "Imitation: "
msgstr "Promijeni Email Adresu"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
#, fuzzy
msgid "Imitation canceled"
msgstr "Otkazano trgovanje."
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
#, fuzzy
msgid "You see "
msgstr "Vi dobijete %s."
@@ -4994,17 +4959,17 @@ msgid "M.Defense"
msgstr "M.Obrana:"
#: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
+#, fuzzy, c-format
msgid "% Accuracy"
msgstr "% Preciznost:"
#: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy
+#, fuzzy, c-format
msgid "% Evade"
msgstr "% Izbjegavanje:"
#: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy
+#, fuzzy, c-format
msgid "% Critical"
msgstr "Kritični Udarac"
@@ -5623,11 +5588,6 @@ msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
msgid "Failed adding item for unknown reason."
msgstr "Neuspješno dodavanje predmeta, iz nepoznatog razloga."
-#: src/playerrelations.cpp:404
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Potpuno ignoriraj %s@@"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
@@ -5674,6 +5634,88 @@ msgid "Unknown item"
msgstr "Nepoznati predmet"
#, fuzzy
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Razmijeni se s %s@@"
+
+#, fuzzy
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Napadni %s@@"
+
+#, fuzzy
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@use|Upotrijebi@@"
+
+#, fuzzy
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@cancel|Otkaži@@"
+
+#, fuzzy
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@retrieve|Preuzmi@@"
+
+#, fuzzy
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Zanemari %s@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignoriraj %s@@"
+
+#, fuzzy
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@use|Upotrijebi@@"
+
+#, fuzzy
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Prestani Ignorirati %s@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Potpuno ignoriraj %s@@"
+
+#, fuzzy
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "/party > Pozovite korisnike na partiju"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Šutni igrača@@"
+
+#, fuzzy
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@unignore|Prestani Ignorirati %s@@"
+
+#, fuzzy
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@use|Upotrijebi@@"
+
+#, fuzzy
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@attack|Napadni %s@@"
+
+#, fuzzy
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Šutni igrača@@"
+
+#, fuzzy
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Dodaj ime u chat@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Otkaži@@"
+
+#, fuzzy
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Pokupi %s@@"
+
+#, fuzzy
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Dudaj u chat@@"
+
+#, fuzzy
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@use|Upotrijebi@@"
+
+#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "Odaberite OK"
@@ -6041,10 +6083,6 @@ msgstr "Nepoznati predmet"
#~ msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "Šut nije uspio!"
-
-#, fuzzy
#~ msgid "Talk to %s"
#~ msgstr "@@talk|Govori S %s@@"
@@ -6082,9 +6120,6 @@ msgstr "Nepoznati predmet"
#~ msgid "Player"
#~ msgstr "Igrač"
-#~ msgid "Whisper"
-#~ msgstr "Šapat"
-
#~ msgid "Is"
#~ msgstr "Je"
diff --git a/po/hu.po b/po/hu.po
index a92e8c8f3..9c8acf2a7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mana\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2009-07-07 19:52+0000\n"
"Last-Translator: Tatsukichi <artit91@gmail.com>\n"
"Language-Team: Hungarian <hu@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
#, fuzzy
msgid "Visible on map"
msgstr "Látható nevek"
@@ -32,96 +32,96 @@ msgstr ""
msgid "miss"
msgstr ""
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Beállítások"
-#: src/client.cpp:824
+#: src/client.cpp:826
#, fuzzy
msgid "Connecting to server"
msgstr "Csatlakozás a térkép szerverhez...."
-#: src/client.cpp:855
+#: src/client.cpp:857
#, fuzzy
msgid "Logging in"
msgstr "Belépés"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:980
+#: src/client.cpp:982
#, fuzzy
msgid "Requesting characters"
msgstr "Kapcsolódási kérelem a %s nevű csatornába."
-#: src/client.cpp:1011
+#: src/client.cpp:1013
#, fuzzy
msgid "Connecting to the game server"
msgstr "Csatlakozás a térkép szerverhez...."
-#: src/client.cpp:1021
+#: src/client.cpp:1023
#, fuzzy
msgid "Changing game servers"
msgstr "Szerver"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Hiba"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1099
+#: src/client.cpp:1101
#, fuzzy
msgid "Password Change"
msgstr "Jelszó:"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1119
+#: src/client.cpp:1121
#, fuzzy
msgid "Email Change"
msgstr "Változtatás"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
#, fuzzy
msgid "Email changed successfully!"
msgstr "A tag előléptetése sikeres."
-#: src/client.cpp:1140
+#: src/client.cpp:1142
#, fuzzy
msgid "Unregister Successful"
msgstr "Regisztráció megszüntetése"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, fuzzy, c-format
msgid "Invalid update host: %s"
msgstr "Helytelen frissítési kiszolgáló: "
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Hiba a frissítési könyvtár létrehozása közben!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -275,19 +275,24 @@ msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
#, fuzzy
msgid "font cache size"
msgstr "Betűméret"
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1082
#, fuzzy
-msgid "Created: "
+msgid "Cache size:"
+msgstr "Betűméret"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Létrehozás"
-#: src/commandhandler.cpp:1077
+#: src/commandhandler.cpp:1086
#, fuzzy
-msgid "Deleted: "
+msgid "Deleted:"
msgstr "Törlés"
#: src/commandhandler.h:40
@@ -297,46 +302,46 @@ msgstr ""
"Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"."
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Általános"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr ""
-#: src/game.cpp:445
+#: src/game.cpp:444
#, fuzzy
msgid "Screenshot saved as "
msgstr "Képernyőt mentettük a ~/ helyre"
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Hiba a képernyő mentése során!"
-#: src/game.cpp:492
+#: src/game.cpp:491
#, fuzzy
msgid "The connection to the server was lost."
msgstr "A kapcsolat megszakadt a szerverrel, a program most kilép."
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Hálózati hiba"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Kereskedési kérelmek elutasítása"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Kereskedési kérelmek elfogadása"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
#, fuzzy
msgid "Could Not Load Map"
msgstr "Nem lehet betölteni a térképet"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Hiba %s betöltése közben"
@@ -356,39 +361,44 @@ msgstr "Klánok"
msgid "Pvp rank: %d"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
#, fuzzy
msgid "Bot Checker"
msgstr "Chat Ablak"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Név"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Támadás"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Csevegés"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
#, fuzzy
msgid "Move"
msgstr "Mozgás felfelé"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Alaphelyzet"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Vétel"
@@ -431,7 +441,9 @@ msgstr "Max."
msgid "Shop"
msgstr "Üzlet"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Eladás"
@@ -439,14 +451,18 @@ msgstr "Eladás"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Mégse"
@@ -480,7 +496,7 @@ msgid "The email address entries mismatch."
msgstr "Az új email cím már foglalt."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Jelszó módosítása"
@@ -549,8 +565,8 @@ msgstr "Haj stílus:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Létrehozás"
@@ -580,136 +596,151 @@ msgstr "Karakter statok rendben"
msgid "Please remove %d points"
msgstr "Kérlek távolíts el %d pontot"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Karakter törlésének megerősítése"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Fiók és Karakter Menedzsment"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Regisztráció megszüntetése"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
#, fuzzy
msgid "Change Email"
msgstr "Email cím módosírása"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Hibás jelszó"
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Karakter törlése sikertelen."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Hibás jelszó"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Törlés"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
#, fuzzy
msgid "Choose"
msgstr "Bezár"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, fuzzy, c-format
msgid "Level %d"
msgstr "Szint: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
#, fuzzy
msgid "default"
msgstr "Alapértelmezett"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr ""
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
#, fuzzy
msgid "red"
msgstr "Barát"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
#, fuzzy
msgid "green"
msgstr "Zöld: "
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
#, fuzzy
msgid "blue"
msgstr "Kék: "
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr ""
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
#, fuzzy
msgid "yellow"
msgstr "alacsony"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
#, fuzzy
msgid "pink"
msgstr "Hiperlink"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr ""
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr ""
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
#, fuzzy
msgid "brown"
msgstr "Dobófegyver"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
#, fuzzy
msgid "rainbow 1"
msgstr "Szivárvány"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
#, fuzzy
msgid "rainbow 2"
msgstr "Szivárvány"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
#, fuzzy
msgid "rainbow 3"
msgstr "Szivárvány"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, fuzzy, c-format
msgid "Present: %s; %d players are present."
msgstr "%d játékos van a közeledben."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Üzenet %s számára: %s"
@@ -722,7 +753,10 @@ msgstr "Igen"
msgid "No"
msgstr "Nem"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
#, fuzzy
msgid "Ignore"
msgstr "Tiltott"
@@ -741,148 +775,152 @@ msgstr "Mozgás balra"
msgid "Net"
msgstr "Következő"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
#, fuzzy
msgid "Music:"
msgstr "Téma: %s"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
#, fuzzy
msgid "Map:"
msgstr "Név: %s"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
#, fuzzy
msgid "Minimap:"
msgstr "Minitérkép Ablak"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr ""
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
#, fuzzy
msgid "Player Position:"
msgstr "Sebzéskor"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, fuzzy, c-format
msgid "Particle count: %d"
msgstr "Effektek"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, fuzzy, c-format
msgid "Map actors count: %d"
msgstr "Karakter statok rendben"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
#, fuzzy
msgid "Cursor:"
msgstr "Egyéni kurzor"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
#, fuzzy
msgid "Target:"
msgstr "Mozgás balra"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
#, fuzzy
msgid "Target Id:"
msgstr "Játékost Kijelöl"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
#, fuzzy
msgid "Target Level:"
msgstr "Játékost Kijelöl"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
#, fuzzy
msgid "Target Party:"
msgstr "Játékost Kijelöl"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
#, fuzzy
msgid "Target Guild:"
msgstr "Játékost Kijelöl"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Támadás %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Minitérkép Ablak"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Kritikális ütéskor"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "Ok"
@@ -893,8 +931,8 @@ msgstr "Felszerelés"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Nem használ"
@@ -903,7 +941,8 @@ msgid "Help"
msgstr "Súgó"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Bezár"
@@ -940,32 +979,32 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Használ"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Bevet"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
#, fuzzy
msgid "Drop..."
msgstr "Eldob"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Felosztás"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr ""
@@ -974,17 +1013,17 @@ msgid "Weight:"
msgstr "Súly:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Raktároz"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Magához vesz"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Eldob"
@@ -1259,7 +1298,7 @@ msgstr "Küldés"
msgid "NPC"
msgstr "Gépjátékos"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
#, fuzzy
msgid "Clear"
msgstr "Szálfegyver"
@@ -1301,382 +1340,317 @@ msgstr "Nem használ"
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-#, fuzzy
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Üzlet Te és %s között@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Üzlet"
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
-msgid "@@attack|Attack@@"
-msgstr "@@attack|%s megtámadása@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr "Privát üzenet"
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-#, fuzzy
-msgid "@@whisper|Whisper@@"
-msgstr "@@use|Bevet@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:589
#, fuzzy
-msgid "@@heal|Heal@@"
-msgstr "@@cancel|mégse@@"
+msgid "Be friend"
+msgstr "Barát"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
#, fuzzy
-msgid "@@friend|Be friend@@"
-msgstr "@@retrieve|Visszavesz@@"
+msgid "Disregard"
+msgstr "Semmibevett"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-#, fuzzy
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Semmibe veszed %s-t@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
+msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
#, fuzzy
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|%s tiltása@@"
+msgid "Unignore"
+msgstr "Tiltott"
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
#, fuzzy
-msgid "@@erase|Erase@@"
-msgstr "@@use|Bevet@@"
+msgid "Completely ignore"
+msgstr "@@ignore|Teljesen letiltod %s-t@@"
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
#, fuzzy
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|%s tiltásának feloldása@@"
+msgid "Follow"
+msgstr "alacsony"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
#, fuzzy
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Teljesen letiltod %s-t@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr ""
+msgid "Imitation"
+msgstr "Email cím módosírása"
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
#, fuzzy
-msgid "@@party|Invite to party@@"
+msgid "Invite to party"
msgstr "/party > Felhasználó csapatba hívása"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
#, fuzzy
-msgid "@@kick party|Kick from party@@"
+msgid "Kick from party"
msgstr "@@admin-kick|Játékos kirúgása@@"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
#, fuzzy
-msgid "@@guild-kick|Kick from guild@@"
+msgid "Kick from guild"
msgstr "@@admin-kick|Játékos kirúgása@@"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "Változtatás"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
#, fuzzy
-msgid "@@guild|Invite to guild@@"
+msgid "Invite to guild"
msgstr "/party > Felhasználó csapatba hívása"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Játékos kirúgása@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Kirúgás sikertelen!"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-#, fuzzy
-msgid "@@undress|Undress@@"
-msgstr "@@unignore|%s tiltásának feloldása@@"
-
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:267
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-#, fuzzy
-msgid "@@sell|Sell@@"
-msgstr "@@use|Bevet@@"
-
-#: src/gui/popupmenu.cpp:235
-#, fuzzy
-msgid "@@talk|Talk@@"
-msgstr "@@attack|%s megtámadása@@"
-
-#: src/gui/popupmenu.cpp:251
-#, fuzzy
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Játékos kirúgása@@"
-
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:284
#, fuzzy
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Add to priority attack list"
msgstr "@@attack|%s megtámadása@@"
-#: src/gui/popupmenu.cpp:270
+#: src/gui/popupmenu.cpp:286
#, fuzzy
-msgid "@@add attack|Add to attack list@@"
+msgid "Add to attack list"
msgstr "@@attack|%s megtámadása@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:289
#, fuzzy
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Neve hozzáadása a csevegéshez@@"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|mégse@@"
+msgid "Add to ignore list"
+msgstr "Raktároz"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@chat|Hozzáadás a chat-hez@@"
-#: src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:450
#, fuzzy
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Vedd fel a(z) %s-t@@"
+msgid "Pick up"
+msgstr "Felvesz"
-#: src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
#, fuzzy
-msgid "@@chat|Add to chat@@"
+msgid "Add to chat"
msgstr "@@chat|Hozzáadás a chat-hez@@"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Felhasználónév megjegyzése"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#, fuzzy
+msgid "Remove"
+msgstr "Felhasználónév megjegyzése"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@use|Bevet@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
#, fuzzy
msgid "Disable highlight"
msgstr "Kijelölt fül"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
#, fuzzy
msgid "Enable highlight"
msgstr "Kijelölt fül"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
#, fuzzy
msgid "Remove name"
msgstr "Felhasználónév megjegyzése"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
#, fuzzy
msgid "Enable away"
msgstr "Nem tudod megvenni."
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
#, fuzzy
msgid "Disable away"
msgstr "Üzletelés Engedélyezése/Tiltása"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#, fuzzy
+msgid "Leave"
+msgstr "Nagy"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
#, fuzzy
msgid "Change guild position"
msgstr "Változtatás"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
#, fuzzy
msgid "Add to trade"
msgstr "@@chat|Hozzáadás a chat-hez@@"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
#, fuzzy
msgid "Add to trade 10"
msgstr "@@chat|Hozzáadás a chat-hez@@"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
#, fuzzy
msgid "Add to trade half"
msgstr "Raktároz"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
#, fuzzy
msgid "Add to trade all"
msgstr "Raktároz"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
#, fuzzy
msgid "Store 10"
msgstr "Raktároz"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
#, fuzzy
msgid "Store half"
msgstr "Raktároz"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
#, fuzzy
msgid "Store all"
msgstr "Raktároz"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
#, fuzzy
msgid "Retrieve 10"
msgstr "Magához vesz"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
#, fuzzy
msgid "Retrieve half"
msgstr "Magához vesz"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
#, fuzzy
msgid "Retrieve all"
msgstr "Magához vesz"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Hozzáadás a chat-hez@@"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "Alapértelmezett"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Mozgás felfelé"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Mozgás lefelé"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-#, fuzzy
-msgid "Remove"
-msgstr "Felhasználónév megjegyzése"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2620,136 +2594,131 @@ msgstr ""
msgid "Atk"
msgstr "Támadás"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Támadás"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Tiltott"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Klán létrehozása"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
#, fuzzy
msgid "Create Party"
msgstr "Karakter létrehozása"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
#, fuzzy
msgid "Invite"
msgstr "Felhasználó meghívása"
-#: src/gui/socialwindow.cpp:1018
-#, fuzzy
-msgid "Leave"
-msgstr "Nagy"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, fuzzy, c-format
msgid "Accepted party invite from %s."
msgstr "Csapatba hívást elfogadta %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, fuzzy, c-format
msgid "Rejected party invite from %s."
msgstr "Csapatba hívást elutasította %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, fuzzy, c-format
msgid "Accepted guild invite from %s."
msgstr "Csapatba hívást elfogadta %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, fuzzy, c-format
msgid "Rejected guild invite from %s."
msgstr "Csapatba hívást elutasította %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, fuzzy, c-format
msgid "Creating guild called %s."
msgstr "Hiba a klán létrehozása közben."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
#, fuzzy
msgid "Guild Name"
msgstr "Klán"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
#, fuzzy
msgid "Choose your guild's name."
msgstr "Válassz szervert"
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
#, fuzzy
msgid "Received guild request, but one already exists."
msgstr "Csapatba hívtak, de neked van csapatod."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, fuzzy, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s behívott %s csapatába."
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
#, fuzzy
msgid "Accept Guild Invite"
msgstr "Ajánlat elfogadása"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Csapatba hívtak, de neked van csapatod."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
#, fuzzy
msgid "You have been invited you to join a party."
msgstr "%s a csapatába hívott."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, fuzzy, c-format
msgid "You have been invited to join the %s party."
msgstr "%s behívott %s csapatába."
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s a csapatába hívott."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s behívott %s csapatába."
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Ajánlat elfogadása"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
#, fuzzy
msgid "Party Name"
msgstr "Csapat"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
#, fuzzy
msgid "Choose your party's name."
msgstr "Válassz szervert"
@@ -3180,99 +3149,99 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
#, fuzzy
msgid "No Target"
msgstr "Mozgás balra"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
#, fuzzy
msgid "Allow Target"
msgstr "Üzletelés engedélyezése"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
#, fuzzy
msgid "Need Target"
msgstr "Mozgás balra"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
#, fuzzy
msgid "General Magic"
msgstr "Általános"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
#, fuzzy
msgid "Life Magic"
msgstr "Mágia"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
#, fuzzy
msgid "War Magic"
msgstr "Mágia"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
#, fuzzy
msgid "Command Editor"
msgstr "Parancs: /item"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
#, fuzzy
msgid "magic"
msgstr "Mágia"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
#, fuzzy
msgid "Command:"
msgstr "Parancs: /who"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
#, fuzzy
msgid "Target Type:"
msgstr "Játékost Kijelöl"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
#, fuzzy
msgid "Magic level:"
msgstr "Max. szint"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
#, fuzzy
msgid "School level:"
msgstr "A név mutatása"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3296,10 +3265,6 @@ msgstr "Elfogadva. Vár..."
msgid "Trade: You"
msgstr "Üzlet: Te"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Üzlet"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, fuzzy, c-format
msgid "You get %s"
@@ -4181,74 +4146,74 @@ msgid ""
"strange behaviour."
msgstr "Állítsd át, vagy a játék érdekesen fog viselkedni."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Nem tudod felvenni a tárgyat."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
#, fuzzy
msgid "Inventory is full."
msgstr "A szerver tele van"
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
#, fuzzy
msgid "Unknown problem picking up item."
msgstr "Nem tudod felvenni a tárgyat."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, fuzzy, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Zsákmányod%s [@@%d|%s@@]."
msgstr[1] "Zsákmányod%s [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
#, fuzzy
msgid "Follow canceled"
msgstr "Az üzlet megszakadt."
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
#, fuzzy
msgid "Imitation: "
msgstr "Email cím módosírása"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
#, fuzzy
msgid "Imitation canceled"
msgstr "Az üzlet megszakadt."
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
#, fuzzy
msgid "You see "
msgstr "Kapott tárgy: %s."
@@ -5001,17 +4966,17 @@ msgid "M.Defense"
msgstr "Mágikus védelem:"
#: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
+#, fuzzy, c-format
msgid "% Accuracy"
msgstr "Találati esély (%):"
#: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy
+#, fuzzy, c-format
msgid "% Evade"
msgstr "Kitérés (%):"
#: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy
+#, fuzzy, c-format
msgid "% Critical"
msgstr "Kritikális ütéskor"
@@ -5638,11 +5603,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr "Ismeretlen okból a tárgy hozzáadása sikertelen."
-#: src/playerrelations.cpp:404
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Teljesen letiltod %s-t@@"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
@@ -5689,6 +5649,88 @@ msgid "Unknown item"
msgstr "Ismeretlen tárgy"
#, fuzzy
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Üzlet Te és %s között@@"
+
+#, fuzzy
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|%s megtámadása@@"
+
+#, fuzzy
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@use|Bevet@@"
+
+#, fuzzy
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@cancel|mégse@@"
+
+#, fuzzy
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@retrieve|Visszavesz@@"
+
+#, fuzzy
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Semmibe veszed %s-t@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|%s tiltása@@"
+
+#, fuzzy
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@use|Bevet@@"
+
+#, fuzzy
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|%s tiltásának feloldása@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Teljesen letiltod %s-t@@"
+
+#, fuzzy
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "/party > Felhasználó csapatba hívása"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Játékos kirúgása@@"
+
+#, fuzzy
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@unignore|%s tiltásának feloldása@@"
+
+#, fuzzy
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@use|Bevet@@"
+
+#, fuzzy
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@attack|%s megtámadása@@"
+
+#, fuzzy
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Játékos kirúgása@@"
+
+#, fuzzy
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Neve hozzáadása a csevegéshez@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|mégse@@"
+
+#, fuzzy
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Vedd fel a(z) %s-t@@"
+
+#, fuzzy
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Hozzáadás a chat-hez@@"
+
+#, fuzzy
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@use|Bevet@@"
+
+#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "Ok Kiválasztása"
@@ -6102,10 +6144,6 @@ msgstr "Ismeretlen tárgy"
#~ msgstr "@@party|%s meghívása a csapatodba@@"
#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "Kirúgás sikertelen!"
-
-#, fuzzy
#~ msgid "Talk to %s"
#~ msgstr "@@talk|Privát Te és %s között@@"
@@ -6146,9 +6184,6 @@ msgstr "Ismeretlen tárgy"
#~ msgid "Player"
#~ msgstr "Játékos"
-#~ msgid "Whisper"
-#~ msgstr "Privát üzenet"
-
#~ msgid "Is"
#~ msgstr "Is"
diff --git a/po/it.po b/po/it.po
index bfd104fb1..de713c844 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2011-04-15 17:33+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Italian <>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
msgid "Visible on map"
msgstr ""
@@ -29,87 +29,87 @@ msgstr "Schivato"
msgid "miss"
msgstr "Mancato"
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Impostazioni"
-#: src/client.cpp:824
+#: src/client.cpp:826
msgid "Connecting to server"
msgstr "Connessione al server"
-#: src/client.cpp:855
+#: src/client.cpp:857
msgid "Logging in"
msgstr "Accesso"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr "Accesso al gioco"
-#: src/client.cpp:980
+#: src/client.cpp:982
msgid "Requesting characters"
msgstr "Ricerca personaggi"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
-#: src/client.cpp:1021
+#: src/client.cpp:1023
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Errore"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
-#: src/client.cpp:1099
+#: src/client.cpp:1101
msgid "Password Change"
msgstr "Cambiamento password"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
-#: src/client.cpp:1119
+#: src/client.cpp:1121
msgid "Email Change"
msgstr "Cambio Email"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
-#: src/client.cpp:1140
+#: src/client.cpp:1142
msgid "Unregister Successful"
msgstr "Annullamento registrazione effettuato con successo"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr "Addio, torna quando vuoi..."
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s non esiste e non può essere creato! Uscita in corso."
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, c-format
msgid "Invalid update host: %s"
msgstr "Invalido aggiornamento host: %s"
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Errore durante la creazione della directory degli aggiornamenti"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
@@ -256,17 +256,23 @@ msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1076
-msgid "Created: "
+#: src/commandhandler.cpp:1082
+msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1077
-msgid "Deleted: "
-msgstr ""
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
+msgstr "Crea"
+
+#: src/commandhandler.cpp:1086
+#, fuzzy
+msgid "Deleted:"
+msgstr "Elimina"
#: src/commandhandler.h:40
#, c-format
@@ -275,43 +281,43 @@ msgstr ""
"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
"\" (falso), \"1\", \"0\"."
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Generale"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:445
+#: src/game.cpp:444
msgid "Screenshot saved as "
msgstr "Screenshot salvato come"
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Salvataggio della schermata fallito!"
-#: src/game.cpp:492
+#: src/game.cpp:491
msgid "The connection to the server was lost."
msgstr "La connessione al server è stata persa."
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Errore di rete"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Le richieste di scambio in arrivo saranno ignorate"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Le richieste di scambio in arrivo saranno accettate"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
msgid "Could Not Load Map"
msgstr "Impossibile caricare la mappa."
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Errore durante il caricamento di %s"
@@ -331,37 +337,42 @@ msgstr "Gilda: %s"
msgid "Pvp rank: %d"
msgstr "Rango PvP: %d"
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
msgid "Bot Checker"
msgstr "Bot Checker"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Attacco"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Parla"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
msgid "Move"
msgstr "Movimento"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr "Risultato"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Reimposta"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Compra"
@@ -404,7 +415,9 @@ msgstr "Massimo"
msgid "Shop"
msgstr "Negozio"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Vendi"
@@ -412,14 +425,18 @@ msgstr "Vendi"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Annulla"
@@ -451,7 +468,7 @@ msgid "The email address entries mismatch."
msgstr ""
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Cambia la Password"
@@ -517,8 +534,8 @@ msgstr "Taglio di capelli:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Crea"
@@ -548,124 +565,139 @@ msgstr "Statistiche personaggio OK"
msgid "Please remove %d points"
msgstr "Rimuovere %d punti"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Conferma la cancellazione del personaggio"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Sei sicuro di voler cancellare questo personaggio?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Gestione dell'account e del personaggio"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr "Cambia login"
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Cancella registrazione"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
msgid "Change Email"
msgstr "Cambia email"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Cambia la Password"
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Cancellazione del personaggio fallita."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Password:"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Elimina"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
msgid "Choose"
msgstr "Scegli"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, c-format
msgid "Level %d"
msgstr "Livello %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr "(vuoto)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
msgid "default"
msgstr "Predefinito"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr "Nero"
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
msgid "red"
msgstr "Rosso"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
msgid "green"
msgstr "Verde"
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
msgid "blue"
msgstr "Blu"
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr "Oro"
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
msgid "yellow"
msgstr "Giallo"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
msgid "pink"
msgstr "Rosa"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr "Viola"
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr "Grigio"
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
msgid "brown"
msgstr "Marrone"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
msgid "rainbow 1"
msgstr "Arcobaleno 1"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
msgid "rainbow 2"
msgstr "Arcobaleno 2"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
msgid "rainbow 3"
msgstr "Arcobaleno 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presente: %s; %d giocatori sono presenti."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Sussurra a %s: %s"
@@ -678,7 +710,10 @@ msgstr "Sì"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
msgid "Ignore"
msgstr "Ignora"
@@ -696,138 +731,142 @@ msgstr "Target:"
msgid "Net"
msgstr "Prossimo"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
msgid "Music:"
msgstr "Musica:"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
msgid "Map:"
msgstr "Mappa:"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
msgid "Minimap:"
msgstr "Mini mappa:"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Cursore: (%d, %d)"
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
msgid "Player Position:"
msgstr "Posizione giocatore:"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, c-format
msgid "Particle count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, c-format
msgid "Map actors count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Software)"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (OpenGL veloce)"
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (OpenGL vecchio)"
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
msgid "Cursor:"
msgstr "Cursore:"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
msgid "Target:"
msgstr "Target:"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
msgid "Target Id:"
msgstr "Target ID:"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
msgid "Target Level:"
msgstr "Livello Target"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
msgid "Target Party:"
msgstr "Party del Target:"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
msgid "Target Guild:"
msgstr "Gilda del Target"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Attacco %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Mini mappa:"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Colpo critico"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr "Ping: %d ms"
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr "Ping: ? ms"
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr "In: %d bytes/s"
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr "Out: %d bytes/s"
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "OK"
@@ -838,8 +877,8 @@ msgstr "Equipaggiamento"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Togli"
@@ -848,7 +887,8 @@ msgid "Help"
msgstr "Aiuto"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Chiudi"
@@ -882,31 +922,31 @@ msgid "id"
msgstr "id"
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Equipaggia"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Usa"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
msgid "Drop..."
msgstr "Lascia..."
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Dividi"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr "Attrezzatura"
@@ -915,17 +955,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Magazzino"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Recupera"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Lascia"
@@ -1186,7 +1226,7 @@ msgstr "Invia"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
msgid "Clear"
msgstr "Cancella"
@@ -1225,342 +1265,294 @@ msgstr "Rimuovi prima"
msgid "Away outfit"
msgstr "Away outfit"
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Scambio@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Commercia"
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Attacco@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr ""
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-msgid "@@whisper|Whisper@@"
-msgstr "@@whisper|Sussurro@@"
-
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
-msgid "@@heal|Heal@@"
-msgstr "@@heal|Cura@@"
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-msgid "@@friend|Be friend@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Disprezza@@"
-
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignora@@"
-
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
-msgid "@@erase|Erase@@"
-msgstr "@@erase|Rimuovi dallo schermo@@"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Annulla ignoro@@"
-
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Ignora completamente@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr "@@follow|Segui@@"
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr "@@imitation|Imita@@"
-
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
-msgid "@@party|Invite to party@@"
-msgstr "@@party|Invita nel party@@"
+#, fuzzy
+msgid "Be friend"
+msgstr "Amico"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
-msgstr "@@kick party|Escludi dal party@@"
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+#, fuzzy
+msgid "Disregard"
+msgstr "Disprezzato"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
-msgstr "@@guild-kick|Escludi dalla Gilda@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
+msgstr ""
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr "@@guild-pos|Cambia rango nella Gilda >@@"
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
+#, fuzzy
+msgid "Unignore"
+msgstr "Ignora"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
-msgid "@@guild|Invite to guild@@"
-msgstr "@@guild|Invita nella Gilda@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+#, fuzzy
+msgid "Follow"
+msgstr "Giallo"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Espelli giocatore@@"
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+msgid "Imitation"
+msgstr ""
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
-msgstr "@@nuke|Elimina completamente dallo schermo@@"
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#, fuzzy
+msgid "Invite to party"
+msgstr "@@party|Invita nel party@@"
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
-msgstr "@@move|Move@@"
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+#, fuzzy
+msgid "Kick from party"
+msgstr "@@kick party|Escludi dal party@@"
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
-msgstr "@@undress|Svesti@@"
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+#, fuzzy
+msgid "Kick from guild"
+msgstr "@@guild-kick|Escludi dalla Gilda@@"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
-msgstr "@@buy|Compra@@"
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "@@guild-pos|Cambia rango nella Gilda >@@"
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-msgid "@@sell|Sell@@"
-msgstr "@@sell|Sell@@"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
+#, fuzzy
+msgid "Invite to guild"
+msgstr "@@guild|Invita nella Gilda@@"
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
-msgstr "@@talk|Parla@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Espulsione fallita!"
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Escludi@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
+msgstr ""
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
#: src/gui/popupmenu.cpp:267
+msgid "Kick"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:284
#, fuzzy
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Add to priority attack list"
msgstr "@@attack|Attacco@@"
-#: src/gui/popupmenu.cpp:270
+#: src/gui/popupmenu.cpp:286
#, fuzzy
-msgid "@@add attack|Add to attack list@@"
+msgid "Add to attack list"
msgstr "@@attack|Attacco@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
+#: src/gui/popupmenu.cpp:289
+msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
-msgid "@@name|Add name to chat@@"
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
msgstr "@@name|Aggiungi il nome alla chat@@"
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Cancella@@"
-
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr "@@player_%u|%s >@@"
-
-#: src/gui/popupmenu.cpp:428
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Raccogli@@"
+#: src/gui/popupmenu.cpp:450
+#, fuzzy
+msgid "Pick up"
+msgstr "Raccogli"
-#: src/gui/popupmenu.cpp:429
-msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Aggiungi alla chat@@"
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
+msgstr ""
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
+#: src/gui/popupmenu.cpp:469
+msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:480
-msgid "@@edit spell|Edit spell@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
msgid "Change guild position"
msgstr ""
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "Predefinito"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Muoviti verso l'alto"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Muoviti verso il basso"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-msgid "Remove"
-msgstr ""
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2447,127 +2439,123 @@ msgstr ""
msgid "Atk"
msgstr "Attacco"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Attacco"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Ignora"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Crea una Gilda"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
msgid "Create Party"
msgstr ""
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
-msgid "Invite"
-msgstr ""
-
#: src/gui/socialwindow.cpp:1018
-msgid "Leave"
+msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Ricevuta richiesta di party, ma ne esiste già una."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s ti ha invitato ad unirti al suo party."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s ti ha invitato ad unirti al party %s."
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Accetta invito nel party"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
msgid "Choose your party's name."
msgstr ""
@@ -2990,87 +2978,87 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
msgid "No Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
msgid "Allow Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
msgid "Need Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
msgid "General Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
msgid "Life Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
msgid "War Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
msgid "Command Editor"
msgstr ""
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
msgid "magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
msgid "Command:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
msgid "Target Type:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
msgid "Magic level:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
msgid "School level:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3094,10 +3082,6 @@ msgstr "Accettato. In attesa..."
msgid "Trade: You"
msgstr "Commercia: Tu"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Commercia"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, c-format
msgid "You get %s"
@@ -3926,68 +3910,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr ""
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
msgid "You see "
msgstr ""
@@ -4678,14 +4662,17 @@ msgid "M.Defense"
msgstr ""
#: src/net/tmwa/generalhandler.cpp:259
+#, c-format
msgid "% Accuracy"
msgstr ""
#: src/net/tmwa/generalhandler.cpp:260
+#, c-format
msgid "% Evade"
msgstr ""
#: src/net/tmwa/generalhandler.cpp:261
+#, c-format
msgid "% Critical"
msgstr ""
@@ -5281,10 +5268,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr ""
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr ""
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
@@ -5330,6 +5313,75 @@ msgstr "PM %+d"
msgid "Unknown item"
msgstr "Oggetto sconosciuto"
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Scambio@@"
+
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Attacco@@"
+
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@whisper|Sussurro@@"
+
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@heal|Cura@@"
+
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Disprezza@@"
+
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignora@@"
+
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@erase|Rimuovi dallo schermo@@"
+
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Annulla ignoro@@"
+
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Ignora completamente@@"
+
+#~ msgid "@@follow|Follow@@"
+#~ msgstr "@@follow|Segui@@"
+
+#~ msgid "@@imitation|Imitation@@"
+#~ msgstr "@@imitation|Imita@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Espelli giocatore@@"
+
+#~ msgid "@@nuke|Nuke@@"
+#~ msgstr "@@nuke|Elimina completamente dallo schermo@@"
+
+#~ msgid "@@move|Move@@"
+#~ msgstr "@@move|Move@@"
+
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@undress|Svesti@@"
+
+#~ msgid "@@buy|Buy@@"
+#~ msgstr "@@buy|Compra@@"
+
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@sell|Sell@@"
+
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@talk|Parla@@"
+
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Escludi@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancella@@"
+
+#~ msgid "@@player_%u|%s >@@"
+#~ msgstr "@@player_%u|%s >@@"
+
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Raccogli@@"
+
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Aggiungi alla chat@@"
+
#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "Seleziona OK"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 3dbfa56da..ce870c6ef 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-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+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"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
msgid "Visible on map"
msgstr ""
@@ -30,87 +30,87 @@ msgstr ""
msgid "miss"
msgstr ""
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr ""
-#: src/client.cpp:824
+#: src/client.cpp:826
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:855
+#: src/client.cpp:857
msgid "Logging in"
msgstr ""
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:980
+#: src/client.cpp:982
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1011
+#: src/client.cpp:1013
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1021
+#: src/client.cpp:1023
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr ""
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1099
+#: src/client.cpp:1101
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1119
+#: src/client.cpp:1121
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1120
+#: src/client.cpp:1122
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1140
+#: src/client.cpp:1142
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -255,16 +255,20 @@ msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1076
-msgid "Created: "
+#: src/commandhandler.cpp:1082
+msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1077
-msgid "Deleted: "
+#: src/commandhandler.cpp:1085
+msgid "Created:"
+msgstr ""
+
+#: src/commandhandler.cpp:1086
+msgid "Deleted:"
msgstr ""
#: src/commandhandler.h:40
@@ -272,43 +276,43 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr ""
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr ""
-#: src/game.cpp:445
+#: src/game.cpp:444
msgid "Screenshot saved as "
msgstr ""
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr ""
-#: src/game.cpp:492
+#: src/game.cpp:491
msgid "The connection to the server was lost."
msgstr ""
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr ""
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr ""
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/game.cpp:1406
+#: src/game.cpp:1405
msgid "Could Not Load Map"
msgstr ""
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr ""
@@ -328,37 +332,42 @@ msgstr ""
msgid "Pvp rank: %d"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
msgid "Bot Checker"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
msgid "Move"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr ""
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr ""
@@ -401,7 +410,9 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr ""
@@ -409,14 +420,18 @@ msgstr ""
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr ""
@@ -448,7 +463,7 @@ msgid "The email address entries mismatch."
msgstr ""
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr ""
@@ -514,8 +529,8 @@ msgstr ""
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr ""
@@ -545,124 +560,136 @@ msgstr ""
msgid "Please remove %d points"
msgstr ""
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr ""
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr ""
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr ""
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr ""
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
msgid "Change Email"
msgstr ""
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:285
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:285
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr ""
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
msgid "Choose"
msgstr ""
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, c-format
msgid "Level %d"
msgstr ""
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
msgid "default"
msgstr ""
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr ""
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
msgid "red"
msgstr ""
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
msgid "green"
msgstr ""
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
msgid "blue"
msgstr ""
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr ""
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
msgid "yellow"
msgstr ""
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
msgid "pink"
msgstr ""
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr ""
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr ""
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
msgid "brown"
msgstr ""
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
msgid "rainbow 1"
msgstr ""
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
msgid "rainbow 2"
msgstr ""
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
msgid "rainbow 3"
msgstr ""
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr ""
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr ""
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -675,7 +702,10 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
msgid "Ignore"
msgstr ""
@@ -691,135 +721,139 @@ msgstr ""
msgid "Net"
msgstr ""
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
msgid "Music:"
msgstr ""
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
msgid "Map:"
msgstr ""
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
msgid "Minimap:"
msgstr ""
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr ""
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
msgid "Player Position:"
msgstr ""
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, c-format
msgid "Particle count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, c-format
msgid "Map actors count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
msgid "Cursor:"
msgstr ""
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
msgid "Target:"
msgstr ""
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
msgid "Target Id:"
msgstr ""
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
msgid "Target Level:"
msgstr ""
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
msgid "Target Party:"
msgstr ""
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
msgid "Target Guild:"
msgstr ""
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
msgid "Attack delay:"
msgstr ""
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
msgid "Minimal hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
msgid "Critical hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr ""
@@ -830,8 +864,8 @@ msgstr ""
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr ""
@@ -840,7 +874,8 @@ msgid "Help"
msgstr ""
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr ""
@@ -874,31 +909,31 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr ""
@@ -907,17 +942,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr ""
@@ -1178,7 +1213,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
msgid "Clear"
msgstr ""
@@ -1217,337 +1252,277 @@ msgstr ""
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-msgid "@@trade|Trade@@"
-msgstr ""
-
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-msgid "@@attack|Attack@@"
-msgstr ""
-
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-msgid "@@whisper|Whisper@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
-msgid "@@heal|Heal@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-msgid "@@friend|Be friend@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
-msgid "@@erase|Erase@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
-msgid "@@ignore|Completely ignore@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
+msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
-msgid "@@party|Invite to party@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
+msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
-msgid "@@guild|Invite to guild@@"
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
+msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-msgid "@@sell|Sell@@"
+#: src/gui/popupmenu.cpp:232
+msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
#: src/gui/popupmenu.cpp:267
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:270
-msgid "@@add attack|Add to attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
+#: src/gui/popupmenu.cpp:284
+msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
-msgid "@@name|Add name to chat@@"
+#: src/gui/popupmenu.cpp:286
+msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
+#: src/gui/popupmenu.cpp:289
+msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:428
-msgid "@@pickup|Pick up@@"
+#: src/gui/popupmenu.cpp:450
+msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:429
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
+#: src/gui/popupmenu.cpp:469
+msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:480
-msgid "@@edit spell|Edit spell@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
msgid "Change guild position"
msgstr ""
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-msgid "Remove"
-msgstr ""
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2433,125 +2408,121 @@ msgstr ""
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
msgid "Create Party"
msgstr ""
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
-msgid "Invite"
-msgstr ""
-
#: src/gui/socialwindow.cpp:1018
-msgid "Leave"
+msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
msgid "Choose your party's name."
msgstr ""
@@ -2974,87 +2945,87 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
msgid "No Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
msgid "Allow Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
msgid "Need Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
msgid "General Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
msgid "Life Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
msgid "War Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
msgid "Command Editor"
msgstr ""
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
msgid "magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
msgid "Command:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
msgid "Target Type:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
msgid "Magic level:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
msgid "School level:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3078,10 +3049,6 @@ msgstr ""
msgid "Trade: You"
msgstr ""
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr ""
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, c-format
msgid "You get %s"
@@ -3906,68 +3873,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr ""
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
msgid "You see "
msgstr ""
@@ -5246,10 +5213,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr ""
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr ""
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 7967da1bb..9d9c3076a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2009-07-15 12:21+0000\n"
"Last-Translator: Yentl <y.v.t@scarlet.be>\n"
"Language-Team: Dutch\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
#, fuzzy
msgid "Visible on map"
msgstr "Zichtbare namen"
@@ -32,96 +32,96 @@ msgstr ""
msgid "miss"
msgstr ""
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Configureren"
-#: src/client.cpp:824
+#: src/client.cpp:826
#, fuzzy
msgid "Connecting to server"
msgstr "Verbinden met de map server..."
-#: src/client.cpp:855
+#: src/client.cpp:857
#, fuzzy
msgid "Logging in"
msgstr "Inloggen"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:980
+#: src/client.cpp:982
#, fuzzy
msgid "Requesting characters"
msgstr "Kies Personage"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
#, fuzzy
msgid "Connecting to the game server"
msgstr "Verbinden met de map server..."
-#: src/client.cpp:1021
+#: src/client.cpp:1023
#, fuzzy
msgid "Changing game servers"
msgstr "Server"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Fout"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1099
+#: src/client.cpp:1101
#, fuzzy
msgid "Password Change"
msgstr "Wachtwoord:"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1119
+#: src/client.cpp:1121
#, fuzzy
msgid "Email Change"
msgstr "Veranderen"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
#, fuzzy
msgid "Email changed successfully!"
msgstr "Lid is succesvol gepromoveerd."
-#: src/client.cpp:1140
+#: src/client.cpp:1142
#, fuzzy
msgid "Unregister Successful"
msgstr "Registreren"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, fuzzy, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige updatahost: "
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -273,19 +273,24 @@ msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
#, fuzzy
msgid "font cache size"
msgstr "Lettergrootte"
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1082
#, fuzzy
-msgid "Created: "
+msgid "Cache size:"
+msgstr "Lettergrootte"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Aanmaken"
-#: src/commandhandler.cpp:1077
+#: src/commandhandler.cpp:1086
#, fuzzy
-msgid "Deleted: "
+msgid "Deleted:"
msgstr "Verwijderen"
#: src/commandhandler.h:40
@@ -294,48 +299,48 @@ 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:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Algemeen"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr ""
-#: src/game.cpp:445
+#: src/game.cpp:444
#, fuzzy
msgid "Screenshot saved as "
msgstr "Screenshot opgeslagen naar ~/"
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Opslaan van screenshot mislukt!"
-#: src/game.cpp:492
+#: src/game.cpp:491
#, fuzzy
msgid "The connection to the server was lost."
msgstr ""
"De verbinding met de server is verloren gegaan, het programma zal nu "
"afsluiten"
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Netwerkfout"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Inkomende handelsaanvragen negeren"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
#, fuzzy
msgid "Could Not Load Map"
msgstr "Kan de map niet laden"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Fout bij het laden van %s"
@@ -355,39 +360,44 @@ msgstr "Guilds"
msgid "Pvp rank: %d"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
#, fuzzy
msgid "Bot Checker"
msgstr "Gespreksvenster"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Naam"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Aanvallen"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Spreken"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
#, fuzzy
msgid "Move"
msgstr "Omhoog"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Reset"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Kopen"
@@ -430,7 +440,9 @@ msgstr "Maximum"
msgid "Shop"
msgstr "Winkel"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Verkopen"
@@ -438,14 +450,18 @@ msgstr "Verkopen"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Annuleren"
@@ -479,7 +495,7 @@ msgid "The email address entries mismatch."
msgstr "Het nieuwe emailadres bestaat al."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Wijzig wachtwoord"
@@ -548,8 +564,8 @@ msgstr "Haarstijl:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Aanmaken"
@@ -579,136 +595,151 @@ msgstr "Attributen van personage OK"
msgid "Please remove %d points"
msgstr "Verwijder alstublieft %d punten"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Bevestig het verwijderen van het personage"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Account en personage beheer"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Registreren"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
#, fuzzy
msgid "Change Email"
msgstr "Emailadres wijzigen"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Onjuist wachtwoord"
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Kon personage niet verwijderen."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Onjuist wachtwoord"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Verwijderen"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
#, fuzzy
msgid "Choose"
msgstr "Sluiten"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, fuzzy, c-format
msgid "Level %d"
msgstr "Level: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
#, fuzzy
msgid "default"
msgstr "Standaard"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr ""
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
#, fuzzy
msgid "red"
msgstr "Vriend"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
#, fuzzy
msgid "green"
msgstr "Groen: "
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
#, fuzzy
msgid "blue"
msgstr "Blauw: "
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr ""
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
#, fuzzy
msgid "yellow"
msgstr "laag"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
#, fuzzy
msgid "pink"
msgstr "Hyperlink"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr ""
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr ""
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
#, fuzzy
msgid "brown"
msgstr "Geworpen"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
#, fuzzy
msgid "rainbow 1"
msgstr "Regenboog"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
#, fuzzy
msgid "rainbow 2"
msgstr "Regenboog"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
#, fuzzy
msgid "rainbow 3"
msgstr "Regenboog"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, fuzzy, c-format
msgid "Present: %s; %d players are present."
msgstr "%d spelers zijn aanwezig."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
@@ -721,7 +752,10 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
#, fuzzy
msgid "Ignore"
msgstr "Genegeerd"
@@ -740,148 +774,152 @@ msgstr "Naar links"
msgid "Net"
msgstr "Volgende"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
#, fuzzy
msgid "Music:"
msgstr "Onderwerp: %s"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
#, fuzzy
msgid "Map:"
msgstr "Naam: %s"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
#, fuzzy
msgid "Minimap:"
msgstr "Kaartje"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr ""
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
#, fuzzy
msgid "Player Position:"
msgstr "Speler raakt Monster"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, fuzzy, c-format
msgid "Particle count: %d"
msgstr "Deeltjes effecten"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, fuzzy, c-format
msgid "Map actors count: %d"
msgstr "Attributen van personage OK"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
#, fuzzy
msgid "Cursor:"
msgstr "Aangepaste cursor"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
#, fuzzy
msgid "Target:"
msgstr "Naar links"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
#, fuzzy
msgid "Target Id:"
msgstr "Speler viseren"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
#, fuzzy
msgid "Target Level:"
msgstr "Speler viseren"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
#, fuzzy
msgid "Target Party:"
msgstr "Speler viseren"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
#, fuzzy
msgid "Target Guild:"
msgstr "Speler viseren"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Aanval %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Kaartje"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Kritieke aanval"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "OK"
@@ -892,8 +930,8 @@ msgstr "Uitrusting"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Afdoen"
@@ -902,7 +940,8 @@ msgid "Help"
msgstr "Help"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Sluiten"
@@ -939,32 +978,32 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Uitrusten"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Gebruiken"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
#, fuzzy
msgid "Drop..."
msgstr "Neerleggen"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Splitsen"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr ""
@@ -973,17 +1012,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Neerleggen"
@@ -1258,7 +1297,7 @@ msgstr "Indienen"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
#, fuzzy
msgid "Clear"
msgstr "Sluiten"
@@ -1300,371 +1339,314 @@ msgstr "Afdoen"
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-#, fuzzy
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Handelen met %s@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Handel"
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
-msgid "@@attack|Attack@@"
-msgstr "@@attack|%s aanvallen@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr "Fluister"
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-#, fuzzy
-msgid "@@whisper|Whisper@@"
-msgstr "@@use|Gebruiken@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:589
#, fuzzy
-msgid "@@heal|Heal@@"
-msgstr "@@cancel|Annuleren@@"
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-msgid "@@friend|Be friend@@"
-msgstr ""
+msgid "Be friend"
+msgstr "Vriend"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
#, fuzzy
-msgid "@@erase|Erase@@"
-msgstr "@@use|Gebruiken@@"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
-#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr ""
+msgid "Unignore"
+msgstr "Genegeerd"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
#, fuzzy
-msgid "@@ignore|Completely ignore@@"
+msgid "Completely ignore"
msgstr "Voltooid"
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+#, fuzzy
+msgid "Follow"
+msgstr "laag"
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+#, fuzzy
+msgid "Imitation"
+msgstr "Emailadres wijzigen"
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
#, fuzzy
-msgid "@@party|Invite to party@@"
+msgid "Invite to party"
msgstr "/party > Een gebruiker uitnodigen in de groep"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+#, fuzzy
+msgid "Kick from party"
+msgstr "Kick gefaald!"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+#, fuzzy
+msgid "Kick from guild"
+msgstr "Kick gefaald!"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "Veranderen"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
#, fuzzy
-msgid "@@guild|Invite to guild@@"
+msgid "Invite to guild"
msgstr "/party > Een gebruiker uitnodigen in de groep"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Kick gefaald!"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
+#: src/gui/popupmenu.cpp:267
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-#, fuzzy
-msgid "@@sell|Sell@@"
-msgstr "@@use|Gebruiken@@"
-
-#: src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:284
#, fuzzy
-msgid "@@talk|Talk@@"
+msgid "Add to priority attack list"
msgstr "@@attack|%s aanvallen@@"
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:286
#, fuzzy
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Add to attack list"
msgstr "@@attack|%s aanvallen@@"
-#: src/gui/popupmenu.cpp:270
+#: src/gui/popupmenu.cpp:289
#, fuzzy
-msgid "@@add attack|Add to attack list@@"
-msgstr "@@attack|%s aanvallen@@"
-
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
-msgid "@@name|Add name to chat@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Annuleren@@"
+msgid "Add to ignore list"
+msgstr "Opslaan"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:450
#, fuzzy
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|%s oppakken@@"
+msgid "Pick up"
+msgstr "Oprapen"
-#: src/gui/popupmenu.cpp:429
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Onthoud Naam"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#, fuzzy
+msgid "Remove"
+msgstr "Onthoud Naam"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@use|Gebruiken@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
#, fuzzy
msgid "Disable highlight"
msgstr "Tab Accentuering"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
#, fuzzy
msgid "Enable highlight"
msgstr "Tab Accentuering"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
#, fuzzy
msgid "Remove name"
msgstr "Onthoud Naam"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
#, fuzzy
msgid "Enable away"
msgstr "Kan niets kopen."
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
#, fuzzy
msgid "Disable away"
msgstr "Handelen inschakelen/uitschakelen"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#, fuzzy
+msgid "Leave"
+msgstr "Groot"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
#, fuzzy
msgid "Change guild position"
msgstr "Veranderen"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
#, fuzzy
msgid "Add to trade"
msgstr "Handel goedkeuren"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
#, fuzzy
msgid "Add to trade 10"
msgstr "Opslaan"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
#, fuzzy
msgid "Add to trade half"
msgstr "Opslaan"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
#, fuzzy
msgid "Add to trade all"
msgstr "Opslaan"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
#, fuzzy
msgid "Store 10"
msgstr "Opslaan"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
#, fuzzy
msgid "Store half"
msgstr "Opslaan"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
#, fuzzy
msgid "Store all"
msgstr "Opslaan"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
#, fuzzy
msgid "Retrieve 10"
msgstr "Afhalen"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
#, fuzzy
msgid "Retrieve half"
msgstr "Afhalen"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
#, fuzzy
msgid "Retrieve all"
msgstr "Afhalen"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "Standaard"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Omhoog"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Omlaag"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-#, fuzzy
-msgid "Remove"
-msgstr "Onthoud Naam"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2608,136 +2590,131 @@ msgstr ""
msgid "Atk"
msgstr "Aanvallen"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Aanvallen"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Genegeerd"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Guild aanmaken"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
#, fuzzy
msgid "Create Party"
msgstr "Personage Aanmaken"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
#, fuzzy
msgid "Invite"
msgstr "Gebruiker uitnodigen"
-#: src/gui/socialwindow.cpp:1018
-#, fuzzy
-msgid "Leave"
-msgstr "Groot"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, fuzzy, c-format
msgid "Accepted party invite from %s."
msgstr "Uitnodiging van %s aanvaard."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, fuzzy, c-format
msgid "Rejected party invite from %s."
msgstr "Uitnodiging van %s geweigerd."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, fuzzy, c-format
msgid "Accepted guild invite from %s."
msgstr "Uitnodiging van %s aanvaard."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, fuzzy, c-format
msgid "Rejected guild invite from %s."
msgstr "Uitnodiging van %s geweigerd."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, fuzzy, c-format
msgid "Creating guild called %s."
msgstr "Fout bij het creëren van guild."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
#, fuzzy
msgid "Guild Name"
msgstr "Guild"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
#, fuzzy
msgid "Choose your guild's name."
msgstr "Kies jouw server"
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
#, fuzzy
msgid "Received guild request, but one already exists."
msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, fuzzy, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
#, fuzzy
msgid "Accept Guild Invite"
msgstr "Groepsuitnodiging aanvaarden"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
#, fuzzy
msgid "You have been invited you to join a party."
msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, fuzzy, c-format
msgid "You have been invited to join the %s party."
msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, 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:1347
+#: src/gui/socialwindow.cpp:1348
#, 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:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Groepsuitnodiging aanvaarden"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
#, fuzzy
msgid "Party Name"
msgstr "Groep"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
#, fuzzy
msgid "Choose your party's name."
msgstr "Kies jouw server"
@@ -3168,99 +3145,99 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
#, fuzzy
msgid "No Target"
msgstr "Naar links"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
#, fuzzy
msgid "Allow Target"
msgstr "Handelen toestaan"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
#, fuzzy
msgid "Need Target"
msgstr "Naar links"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
#, fuzzy
msgid "General Magic"
msgstr "Algemeen"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
#, fuzzy
msgid "Life Magic"
msgstr "Magie"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
#, fuzzy
msgid "War Magic"
msgstr "Magie"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
#, fuzzy
msgid "Command Editor"
msgstr "Commando: /item"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
#, fuzzy
msgid "magic"
msgstr "Magie"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
#, fuzzy
msgid "Command:"
msgstr "Commando: /who"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
#, fuzzy
msgid "Target Type:"
msgstr "Speler viseren"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
#, fuzzy
msgid "Magic level:"
msgstr "Maximum level"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
#, fuzzy
msgid "School level:"
msgstr "Naam tonen"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3284,10 +3261,6 @@ msgstr "Goedgekeurd. Wachten..."
msgid "Trade: You"
msgstr "Handel: Jij"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Handel"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, fuzzy, c-format
msgid "You get %s"
@@ -4172,74 +4145,74 @@ msgid ""
"strange behaviour."
msgstr "Los deze problemen op, of het spel kan raar gedrag vertonen."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Kan het voorwerp niet oprapen."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
#, fuzzy
msgid "Inventory is full."
msgstr "Server is volzet"
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
#, fuzzy
msgid "Unknown problem picking up item."
msgstr "Kan het voorwerp niet oprapen."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, fuzzy, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Je raapte %s [@@%d|%s@@] op."
msgstr[1] "Je raapte %s [@@%d|%s@@] op."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
#, fuzzy
msgid "Follow canceled"
msgstr "Handel geannuleerd."
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
#, fuzzy
msgid "Imitation: "
msgstr "Emailadres wijzigen"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
#, fuzzy
msgid "Imitation canceled"
msgstr "Handel geannuleerd."
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
#, fuzzy
msgid "You see "
msgstr "Jij krijgt %s."
@@ -4995,17 +4968,17 @@ msgid "M.Defense"
msgstr "Magische Verdediging:"
#: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
+#, fuzzy, c-format
msgid "% Accuracy"
msgstr "% Nauwkeurigheid:"
#: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy
+#, fuzzy, c-format
msgid "% Evade"
msgstr "% Ontwijking:"
#: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy
+#, fuzzy, c-format
msgid "% Critical"
msgstr "Kritieke aanval"
@@ -5639,11 +5612,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
-#: src/playerrelations.cpp:404
-#, fuzzy
-msgid "Completely ignore"
-msgstr "Voltooid"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
@@ -5690,6 +5658,53 @@ msgid "Unknown item"
msgstr "Onbekend voorwerp"
#, fuzzy
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Handelen met %s@@"
+
+#, fuzzy
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|%s aanvallen@@"
+
+#, fuzzy
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@use|Gebruiken@@"
+
+#, fuzzy
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@cancel|Annuleren@@"
+
+#, fuzzy
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@use|Gebruiken@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "Voltooid"
+
+#, fuzzy
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "/party > Een gebruiker uitnodigen in de groep"
+
+#, fuzzy
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@use|Gebruiken@@"
+
+#, fuzzy
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@attack|%s aanvallen@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuleren@@"
+
+#, fuzzy
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|%s oppakken@@"
+
+#, fuzzy
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@use|Gebruiken@@"
+
+#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "OK selecteren"
@@ -6071,10 +6086,6 @@ msgstr "Onbekend voorwerp"
#~ msgstr "%s is niet in jouw groep!"
#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "Kick gefaald!"
-
-#, fuzzy
#~ msgid "Kick monster"
#~ msgstr "Monsters"
@@ -6108,9 +6119,6 @@ msgstr "Onbekend voorwerp"
#~ msgid "Player"
#~ msgstr "Speler"
-#~ msgid "Whisper"
-#~ msgstr "Fluister"
-
#~ msgid "Is"
#~ msgstr "is gelijk aan"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index ba7615653..72051c3e7 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: manaplus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2011-03-29 18:51+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium/Flemish) <>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
#, fuzzy
msgid "Visible on map"
msgstr "Zichtbare namen"
@@ -30,87 +30,87 @@ msgstr "ontwijkt"
msgid "miss"
msgstr "mist"
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Configureren"
-#: src/client.cpp:824
+#: src/client.cpp:826
msgid "Connecting to server"
msgstr "Verbinden met server"
-#: src/client.cpp:855
+#: src/client.cpp:857
msgid "Logging in"
msgstr "Inloggen"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
-#: src/client.cpp:980
+#: src/client.cpp:982
msgid "Requesting characters"
msgstr "Aanvragen personage"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
-#: src/client.cpp:1021
+#: src/client.cpp:1023
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Fout"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
-#: src/client.cpp:1099
+#: src/client.cpp:1101
msgid "Password Change"
msgstr "Paswoord Wijziging"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
-#: src/client.cpp:1119
+#: src/client.cpp:1121
msgid "Email Change"
msgstr "Email Wijziging"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
-#: src/client.cpp:1140
+#: src/client.cpp:1142
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, 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:1533
+#: src/client.cpp:1535
#, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige update host %s"
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, 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."
@@ -255,19 +255,24 @@ msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
#, fuzzy
msgid "font cache size"
msgstr "Lettergrootte"
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1082
#, fuzzy
-msgid "Created: "
+msgid "Cache size:"
+msgstr "Lettergrootte"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Aanmaken"
-#: src/commandhandler.cpp:1077
+#: src/commandhandler.cpp:1086
#, fuzzy
-msgid "Deleted: "
+msgid "Deleted:"
msgstr "Verwijderen"
#: src/commandhandler.h:40
@@ -276,43 +281,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:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Algemeen"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:445
+#: src/game.cpp:444
msgid "Screenshot saved as "
msgstr ""
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Opslaan van screenshot mislukt!"
-#: src/game.cpp:492
+#: src/game.cpp:491
msgid "The connection to the server was lost."
msgstr "De verbinding met de server is verbroken."
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Netwerkfout"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Inkomende handelsaanvragen negeren"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
msgid "Could Not Load Map"
msgstr "Kon Map Niet Laden"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Fout bij het laden van %s"
@@ -332,37 +337,42 @@ msgstr "Gilde: %s"
msgid "Pvp rank: %d"
msgstr "Pvp rang: %d"
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
msgid "Bot Checker"
msgstr "Bot Controleerder"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Naam"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Aanvallen"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Spreken"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
msgid "Move"
msgstr "Beweeg"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr "Resultaat"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Reset"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Kopen"
@@ -405,7 +415,9 @@ msgstr "Maximum"
msgid "Shop"
msgstr "Winkel"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Verkopen"
@@ -413,14 +425,18 @@ msgstr "Verkopen"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Annuleren"
@@ -452,7 +468,7 @@ msgid "The email address entries mismatch."
msgstr "De email adres ingaven zijn niet gelijk."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Wijzig wachtwoord"
@@ -518,8 +534,8 @@ msgstr "Haarstijl:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Aanmaken"
@@ -549,124 +565,139 @@ msgstr "Attributen van personage OK"
msgid "Please remove %d points"
msgstr "Verwijder alstublieft %d punten"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Bevestig het verwijderen van het personage"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Account en personage beheer"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr "Verwissel Login"
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Registreren"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
msgid "Change Email"
msgstr "Wijzig Email"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Wijzig wachtwoord"
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Kon personage niet verwijderen."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Wachtwoord:"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Verwijderen"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
msgid "Choose"
msgstr "Kies"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, c-format
msgid "Level %d"
msgstr "Niveau %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
msgid "default"
msgstr "standaard"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr "zwart"
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
msgid "red"
msgstr "rood"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
msgid "green"
msgstr "groen"
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
msgid "blue"
msgstr "blauw"
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr "goud"
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
msgid "yellow"
msgstr "geel"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
msgid "pink"
msgstr "roze"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr "paars"
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr "grijs"
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
msgid "brown"
msgstr "bruin"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
msgid "rainbow 1"
msgstr "regenboog 1"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
msgid "rainbow 2"
msgstr "regenboog 2"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
msgid "rainbow 3"
msgstr "regenboog 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
@@ -679,7 +710,10 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
msgid "Ignore"
msgstr "Negeer"
@@ -697,138 +731,142 @@ msgstr "NPC viseren"
msgid "Net"
msgstr "Volgende"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
msgid "Music:"
msgstr ""
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
msgid "Map:"
msgstr ""
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
msgid "Minimap:"
msgstr ""
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr ""
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
msgid "Player Position:"
msgstr ""
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, c-format
msgid "Particle count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, c-format
msgid "Map actors count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
msgid "Cursor:"
msgstr ""
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
msgid "Target:"
msgstr ""
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
msgid "Target Id:"
msgstr ""
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
msgid "Target Level:"
msgstr ""
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
msgid "Target Party:"
msgstr ""
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
msgid "Target Guild:"
msgstr ""
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Aanval %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Minimapvenster"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Kritieke aanval"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "OK"
@@ -839,8 +877,8 @@ msgstr "Uitrusting"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Afdoen"
@@ -849,7 +887,8 @@ msgid "Help"
msgstr "Help"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Sluiten"
@@ -883,31 +922,31 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Uitrusten"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Gebruiken"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Splitsen"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr "Kleren"
@@ -916,17 +955,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Neerleggen"
@@ -1187,7 +1226,7 @@ msgstr "Indienen"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
msgid "Clear"
msgstr ""
@@ -1226,340 +1265,289 @@ msgstr ""
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-msgid "@@trade|Trade@@"
-msgstr ""
-
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-msgid "@@attack|Attack@@"
-msgstr ""
-
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-msgid "@@whisper|Whisper@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
-msgid "@@heal|Heal@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-msgid "@@friend|Be friend@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Handel"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
-msgid "@@erase|Erase@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
-msgid "@@ignore|Completely ignore@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr ""
+#, fuzzy
+msgid "Be friend"
+msgstr "Vriend"
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
-msgid "@@party|Invite to party@@"
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
+#, fuzzy
+msgid "Unignore"
+msgstr "Negeer"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
-msgid "@@guild|Invite to guild@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+#, fuzzy
+msgid "Follow"
+msgstr "geel"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+#, fuzzy
+msgid "Imitation"
+msgstr "Handel geannuleerd."
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#, fuzzy
+msgid "Invite to party"
+msgstr "/party > Een gebruiker uitnodigen in de groep"
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+#, fuzzy
+msgid "Kick from guild"
+msgstr "Kick gefaald!"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-msgid "@@sell|Sell@@"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
+msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Kick gefaald!"
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
#: src/gui/popupmenu.cpp:267
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:270
-msgid "@@add attack|Add to attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
+#: src/gui/popupmenu.cpp:284
+msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
-msgid "@@name|Add name to chat@@"
+#: src/gui/popupmenu.cpp:286
+msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Annuleren@@"
-
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
+#: src/gui/popupmenu.cpp:289
+msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:428
-msgid "@@pickup|Pick up@@"
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:429
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:450
+#, fuzzy
+msgid "Pick up"
+msgstr "Oprapen"
+
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "naamloos"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:480
-msgid "@@edit spell|Edit spell@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
msgid "Change guild position"
msgstr ""
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "standaard"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Omhoog"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Omlaag"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-msgid "Remove"
-msgstr ""
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2450,127 +2438,123 @@ msgstr ""
msgid "Atk"
msgstr "Aanvallen"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Aanvallen"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Negeer"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Guild aanmaken"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
msgid "Create Party"
msgstr ""
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
-msgid "Invite"
-msgstr ""
-
#: src/gui/socialwindow.cpp:1018
-msgid "Leave"
+msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, 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:1347
+#: src/gui/socialwindow.cpp:1348
#, 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:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Groepsuitnodiging aanvaarden"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
msgid "Choose your party's name."
msgstr ""
@@ -2993,87 +2977,87 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
msgid "No Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
msgid "Allow Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
msgid "Need Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
msgid "General Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
msgid "Life Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
msgid "War Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
msgid "Command Editor"
msgstr ""
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
msgid "magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
msgid "Command:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
msgid "Target Type:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
msgid "Magic level:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
msgid "School level:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3097,10 +3081,6 @@ msgstr "Goedgekeurd. Wachten..."
msgid "Trade: You"
msgstr "Handel: Jij"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Handel"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, c-format
msgid "You get %s"
@@ -3933,70 +3913,70 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr ""
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
#, fuzzy
msgid "Follow canceled"
msgstr "Handel geannuleerd."
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
#, fuzzy
msgid "Imitation canceled"
msgstr "Handel geannuleerd."
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
msgid "You see "
msgstr ""
@@ -4687,14 +4667,17 @@ msgid "M.Defense"
msgstr ""
#: src/net/tmwa/generalhandler.cpp:259
+#, c-format
msgid "% Accuracy"
msgstr ""
#: src/net/tmwa/generalhandler.cpp:260
+#, c-format
msgid "% Evade"
msgstr ""
#: src/net/tmwa/generalhandler.cpp:261
+#, c-format
msgid "% Critical"
msgstr ""
@@ -5294,10 +5277,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr ""
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
@@ -5343,6 +5322,9 @@ msgstr "Magie %+d"
msgid "Unknown item"
msgstr "Onbekend voorwerp"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuleren@@"
+
#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "OK selecteren"
@@ -5416,9 +5398,6 @@ msgstr "Onbekend voorwerp"
#~ msgid "/createguild > Create a new guild"
#~ msgstr "/createguild > Maak een nieuwe gilde"
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Een gebruiker uitnodigen in de groep"
-
#~ msgid "/toggle > Determine whether <return> toggles the chat log"
#~ msgstr "/toggle > Bepalen of <return> de chatlog wisselt"
diff --git a/po/pl.po b/po/pl.po
index 726c3ded4..4b92e76fe 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2009-09-14 06:59+0000\n"
"Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
"Language-Team: <pl@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
#, fuzzy
msgid "Visible on map"
msgstr "Widoczne imiona"
@@ -35,96 +35,96 @@ msgstr ""
msgid "miss"
msgstr ""
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Konfiguracja"
-#: src/client.cpp:824
+#: src/client.cpp:826
#, fuzzy
msgid "Connecting to server"
msgstr "Łączenie z serwerem map..."
-#: src/client.cpp:855
+#: src/client.cpp:857
#, fuzzy
msgid "Logging in"
msgstr "Użytkownik"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:980
+#: src/client.cpp:982
#, fuzzy
msgid "Requesting characters"
msgstr "Wybierz postać"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
#, fuzzy
msgid "Connecting to the game server"
msgstr "Łączenie z serwerem map..."
-#: src/client.cpp:1021
+#: src/client.cpp:1023
#, fuzzy
msgid "Changing game servers"
msgstr "Serwer"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Błąd"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1099
+#: src/client.cpp:1101
#, fuzzy
msgid "Password Change"
msgstr "Hasło:"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1119
+#: src/client.cpp:1121
#, fuzzy
msgid "Email Change"
msgstr "Zmień"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
#, fuzzy
msgid "Email changed successfully!"
msgstr "Członek został pomyślnie wypromowany."
-#: src/client.cpp:1140
+#: src/client.cpp:1142
#, fuzzy
msgid "Unregister Successful"
msgstr "Wyrejestruj"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, fuzzy, c-format
msgid "Invalid update host: %s"
msgstr "Nieprawidłowy host aktualizacji: "
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -284,19 +284,24 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
#, fuzzy
msgid "font cache size"
msgstr "Rozmiar czcionki"
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1082
#, fuzzy
-msgid "Created: "
+msgid "Cache size:"
+msgstr "Rozmiar czcionki"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Utwórz"
-#: src/commandhandler.cpp:1077
+#: src/commandhandler.cpp:1086
#, fuzzy
-msgid "Deleted: "
+msgid "Deleted:"
msgstr "Usuń"
#: src/commandhandler.h:40
@@ -304,46 +309,46 @@ msgstr "Usuń"
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Ogólny"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr ""
-#: src/game.cpp:445
+#: src/game.cpp:444
#, fuzzy
msgid "Screenshot saved as "
msgstr "Zrzut ekranu zapisany do ~/"
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
-#: src/game.cpp:492
+#: src/game.cpp:491
#, fuzzy
msgid "The connection to the server was lost."
msgstr "Połączenie z serwerem zostało utracone, program zakończy pracę"
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Błąd sieci"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignorowanie przychodzących próśb o handel"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Akceptowanie przychodzących próśb o handel"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
#, fuzzy
msgid "Could Not Load Map"
msgstr "Nie można załadować mapy"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Błąd podczas łądowania %s"
@@ -363,39 +368,44 @@ msgstr "Gildie"
msgid "Pvp rank: %d"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
#, fuzzy
msgid "Bot Checker"
msgstr "Okno Emotek"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Nazwa"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Atak"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Rozmowa"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
#, fuzzy
msgid "Move"
msgstr "Przesuń w górę"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Resetuj"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Kup"
@@ -438,7 +448,9 @@ msgstr "Maks."
msgid "Shop"
msgstr "Sklep"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Sprzedaj"
@@ -446,14 +458,18 @@ msgstr "Sprzedaj"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Anuluj"
@@ -487,7 +503,7 @@ msgid "The email address entries mismatch."
msgstr "Nowy Adres Email już istnieje"
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Zmień hasło"
@@ -556,8 +572,8 @@ msgstr "Fryzura:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Utwórz"
@@ -587,136 +603,151 @@ msgstr "Statystyki postaci w porządku."
msgid "Please remove %d points"
msgstr "Proszę usunąć %d punktów"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Potwierdź usunięcie postaci"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Zarządzanie kontem i postaciami"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Wyrejestruj"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
#, fuzzy
msgid "Change Email"
msgstr "Zmień adres Email"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Nieprawidłowe hasło"
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Usunięcie gracza nie powiodło się."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Nieprawidłowe hasło"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Usuń"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
#, fuzzy
msgid "Choose"
msgstr "Zamknij"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, fuzzy, c-format
msgid "Level %d"
msgstr "Poziom: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
#, fuzzy
msgid "default"
msgstr "Domyślny"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr ""
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
#, fuzzy
msgid "red"
msgstr "Przyjaciel"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
#, fuzzy
msgid "green"
msgstr "Zielony: "
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
#, fuzzy
msgid "blue"
msgstr "Niebieski: "
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr ""
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
#, fuzzy
msgid "yellow"
msgstr "niskie"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
#, fuzzy
msgid "pink"
msgstr "Hiperłącze"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr ""
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr ""
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
#, fuzzy
msgid "brown"
msgstr "Rzucana"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
#, fuzzy
msgid "rainbow 1"
msgstr "Tęcza"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
#, fuzzy
msgid "rainbow 2"
msgstr "Tęcza"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
#, fuzzy
msgid "rainbow 3"
msgstr "Tęcza"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Czat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, fuzzy, c-format
msgid "Present: %s; %d players are present."
msgstr "%d graczy jest obecnych."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Szepczesz do %s: %s"
@@ -729,7 +760,10 @@ msgstr "Tak"
msgid "No"
msgstr "Nie"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
#, fuzzy
msgid "Ignore"
msgstr "Ignorowany"
@@ -748,148 +782,152 @@ msgstr "Przesuń w lewo"
msgid "Net"
msgstr "Następna"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
#, fuzzy
msgid "Music:"
msgstr "Temat: %s"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
#, fuzzy
msgid "Map:"
msgstr "Imię: %s"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
#, fuzzy
msgid "Minimap:"
msgstr "MiniMapa"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr ""
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
#, fuzzy
msgid "Player Position:"
msgstr "Gracz uderza Potwora"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, fuzzy, c-format
msgid "Particle count: %d"
msgstr "Efekty Cząsteczkowe"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, fuzzy, c-format
msgid "Map actors count: %d"
msgstr "Statystyki postaci w porządku."
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
#, fuzzy
msgid "Cursor:"
msgstr "Własny kursor"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
#, fuzzy
msgid "Target:"
msgstr "Przesuń w lewo"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
#, fuzzy
msgid "Target Id:"
msgstr "Namierz Gracza"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
#, fuzzy
msgid "Target Level:"
msgstr "Namierz Gracza"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
#, fuzzy
msgid "Target Party:"
msgstr "Namierz Gracza"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
#, fuzzy
msgid "Target Guild:"
msgstr "Namierz Gracza"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Atak %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "MiniMapa"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Uderzenie Krytyczne"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "Ok"
@@ -900,8 +938,8 @@ msgstr "Ekwipunek"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Zdejmij"
@@ -910,7 +948,8 @@ msgid "Help"
msgstr "Pomoc"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Zamknij"
@@ -946,32 +985,32 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Załóż"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Użyj"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
#, fuzzy
msgid "Drop..."
msgstr "Upuść"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Podziel"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr ""
@@ -980,17 +1019,17 @@ msgid "Weight:"
msgstr "Waga:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Przechowaj"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Pobierz"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Upuść"
@@ -1264,7 +1303,7 @@ msgstr "Zatwierdź"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
#, fuzzy
msgid "Clear"
msgstr "Kij"
@@ -1306,382 +1345,317 @@ msgstr "Zdejmij"
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-#, fuzzy
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Handel z %s@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Handel"
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Atakuj %s@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr "Szept"
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-#, fuzzy
-msgid "@@whisper|Whisper@@"
-msgstr "@@use|Użyj@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:589
#, fuzzy
-msgid "@@heal|Heal@@"
-msgstr "@@cancel|Anuluj@@"
+msgid "Be friend"
+msgstr "Przyjaciel"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
#, fuzzy
-msgid "@@friend|Be friend@@"
-msgstr "@@retrieve|Pobierz@@"
+msgid "Disregard"
+msgstr "Nielubiany"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-#, fuzzy
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Lekceważ %s@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
+msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
#, fuzzy
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignoruj %s@@"
+msgid "Unignore"
+msgstr "Ignorowany"
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
#, fuzzy
-msgid "@@erase|Erase@@"
-msgstr "@@use|Użyj@@"
+msgid "Completely ignore"
+msgstr "@@ignore|Kompletnie ignoruj %s@@"
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
#, fuzzy
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Przestań Ignorować %s@@"
+msgid "Follow"
+msgstr "niskie"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
#, fuzzy
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Kompletnie ignoruj %s@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr ""
+msgid "Imitation"
+msgstr "Zmień adres Email"
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
#, fuzzy
-msgid "@@party|Invite to party@@"
+msgid "Invite to party"
msgstr "/party > Zaproś użytkownika do grupy"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
#, fuzzy
-msgid "@@kick party|Kick from party@@"
+msgid "Kick from party"
msgstr "@@admin-kick|Wykop gracza@@"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
#, fuzzy
-msgid "@@guild-kick|Kick from guild@@"
+msgid "Kick from guild"
msgstr "@@admin-kick|Wykop gracza@@"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "Zmień"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
#, fuzzy
-msgid "@@guild|Invite to guild@@"
+msgid "Invite to guild"
msgstr "/party > Zaproś użytkownika do grupy"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Wykop gracza@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Wykopanie nie powiodło się!"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-#, fuzzy
-msgid "@@undress|Undress@@"
-msgstr "@@unignore|Przestań Ignorować %s@@"
-
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:267
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-#, fuzzy
-msgid "@@sell|Sell@@"
-msgstr "@@use|Użyj@@"
-
-#: src/gui/popupmenu.cpp:235
-#, fuzzy
-msgid "@@talk|Talk@@"
-msgstr "@@attack|Atakuj %s@@"
-
-#: src/gui/popupmenu.cpp:251
-#, fuzzy
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Wykop gracza@@"
-
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:284
#, fuzzy
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Add to priority attack list"
msgstr "@@attack|Atakuj %s@@"
-#: src/gui/popupmenu.cpp:270
+#: src/gui/popupmenu.cpp:286
#, fuzzy
-msgid "@@add attack|Add to attack list@@"
+msgid "Add to attack list"
msgstr "@@attack|Atakuj %s@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:289
#, fuzzy
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Dodaj imię do czatu@@"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Anuluj@@"
+msgid "Add to ignore list"
+msgstr "Przechowaj"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@chat|Dodaj do czatu@@"
-#: src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:450
#, fuzzy
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Podnieś %s@@"
+msgid "Pick up"
+msgstr "Podnieś"
-#: src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
#, fuzzy
-msgid "@@chat|Add to chat@@"
+msgid "Add to chat"
msgstr "@@chat|Dodaj do czatu@@"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Zapamiętaj użytkownika"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#, fuzzy
+msgid "Remove"
+msgstr "Zapamiętaj użytkownika"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@use|Użyj@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
#, fuzzy
msgid "Disable highlight"
msgstr "Podświetlenie zakładki"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
#, fuzzy
msgid "Enable highlight"
msgstr "Podświetlenie zakładki"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
#, fuzzy
msgid "Remove name"
msgstr "Zapamiętaj użytkownika"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
#, fuzzy
msgid "Enable away"
msgstr "Nie można kupić."
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
#, fuzzy
msgid "Disable away"
msgstr "Włącz/Wysłącz Handlowanie"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#, fuzzy
+msgid "Leave"
+msgstr "Duża"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
#, fuzzy
msgid "Change guild position"
msgstr "Zmień"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
#, fuzzy
msgid "Add to trade"
msgstr "@@chat|Dodaj do czatu@@"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
#, fuzzy
msgid "Add to trade 10"
msgstr "@@chat|Dodaj do czatu@@"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
#, fuzzy
msgid "Add to trade half"
msgstr "Przechowaj"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
#, fuzzy
msgid "Add to trade all"
msgstr "Przechowaj"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
#, fuzzy
msgid "Store 10"
msgstr "Przechowaj"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
#, fuzzy
msgid "Store half"
msgstr "Przechowaj"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
#, fuzzy
msgid "Store all"
msgstr "Przechowaj"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
#, fuzzy
msgid "Retrieve 10"
msgstr "Pobierz"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
#, fuzzy
msgid "Retrieve half"
msgstr "Pobierz"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
#, fuzzy
msgid "Retrieve all"
msgstr "Pobierz"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Dodaj do czatu@@"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "Domyślny"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Przesuń w górę"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Przesuń w dół"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-#, fuzzy
-msgid "Remove"
-msgstr "Zapamiętaj użytkownika"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2625,136 +2599,131 @@ msgstr ""
msgid "Atk"
msgstr "Atak"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Atak"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Ignorowany"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Utwórz Gildię"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
#, fuzzy
msgid "Create Party"
msgstr "Stwórz postać"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
#, fuzzy
msgid "Invite"
msgstr "Zaproś Użytkownika"
-#: src/gui/socialwindow.cpp:1018
-#, fuzzy
-msgid "Leave"
-msgstr "Duża"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, fuzzy, c-format
msgid "Accepted party invite from %s."
msgstr "Zaakceptowano zaproszenie od %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, fuzzy, c-format
msgid "Rejected party invite from %s."
msgstr "Odrzucono zaproszenie od %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, fuzzy, c-format
msgid "Accepted guild invite from %s."
msgstr "Zaakceptowano zaproszenie od %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, fuzzy, c-format
msgid "Rejected guild invite from %s."
msgstr "Odrzucono zaproszenie od %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, fuzzy, c-format
msgid "Creating guild called %s."
msgstr "Błąd podczas tworzenia gildii."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
#, fuzzy
msgid "Guild Name"
msgstr "Gildia"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
#, fuzzy
msgid "Choose your guild's name."
msgstr "Wybierz twój serwer"
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
#, fuzzy
msgid "Received guild request, but one already exists."
msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, fuzzy, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
#, fuzzy
msgid "Accept Guild Invite"
msgstr "Zaakceptuj zaproszenie do grupy"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
#, fuzzy
msgid "You have been invited you to join a party."
msgstr "%s zaprosił ciebie, byś dołączył do grupy."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, fuzzy, c-format
msgid "You have been invited to join the %s party."
msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s zaprosił ciebie, byś dołączył do grupy."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Zaakceptuj zaproszenie do grupy"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
#, fuzzy
msgid "Party Name"
msgstr "Grupa"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
#, fuzzy
msgid "Choose your party's name."
msgstr "Wybierz twój serwer"
@@ -3185,99 +3154,99 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
#, fuzzy
msgid "No Target"
msgstr "Przesuń w lewo"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
#, fuzzy
msgid "Allow Target"
msgstr "Zezwól na handel"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
#, fuzzy
msgid "Need Target"
msgstr "Przesuń w lewo"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
#, fuzzy
msgid "General Magic"
msgstr "Ogólny"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
#, fuzzy
msgid "Life Magic"
msgstr "Magia"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
#, fuzzy
msgid "War Magic"
msgstr "Magia"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
#, fuzzy
msgid "Command Editor"
msgstr "Komenda: /przedmiot"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
#, fuzzy
msgid "magic"
msgstr "Magia"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
#, fuzzy
msgid "Command:"
msgstr "Komenda: /who"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
#, fuzzy
msgid "Target Type:"
msgstr "Namierz Gracza"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
#, fuzzy
msgid "Magic level:"
msgstr "Maks. poziom"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
#, fuzzy
msgid "School level:"
msgstr "Pokaż imię"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3301,10 +3270,6 @@ msgstr "Zaakceptowano. Oczekiwanie..."
msgid "Trade: You"
msgstr "Handel: Ty"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Handel"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, fuzzy, c-format
msgid "You get %s"
@@ -4185,74 +4150,74 @@ msgid ""
"strange behaviour."
msgstr "Rozwiąż je, albo granie może być utrudnione."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Nie można podnieść przedmiotu."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
#, fuzzy
msgid "Inventory is full."
msgstr "Serwer jest pełny"
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
#, fuzzy
msgid "Unknown problem picking up item."
msgstr "Nie można podnieść przedmiotu."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, fuzzy, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Podniosłeś %s [@@%d|%s@@]."
msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
#, fuzzy
msgid "Follow canceled"
msgstr " anulował"
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
#, fuzzy
msgid "Imitation: "
msgstr "Zmień adres Email"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
#, fuzzy
msgid "Imitation canceled"
msgstr " anulował"
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
#, fuzzy
msgid "You see "
msgstr "Otrzymujesz %s"
@@ -5006,17 +4971,17 @@ msgid "M.Defense"
msgstr "Obrona M.:"
#: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
+#, fuzzy, c-format
msgid "% Accuracy"
msgstr "% Celność:"
#: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy
+#, fuzzy, c-format
msgid "% Evade"
msgstr "% Unik:"
#: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy
+#, fuzzy, c-format
msgid "% Critical"
msgstr "Uderzenie Krytyczne"
@@ -5643,11 +5608,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
-#: src/playerrelations.cpp:404
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Kompletnie ignoruj %s@@"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
@@ -5694,6 +5654,88 @@ msgid "Unknown item"
msgstr "Nieznany przedmiot"
#, fuzzy
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Handel z %s@@"
+
+#, fuzzy
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Atakuj %s@@"
+
+#, fuzzy
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@use|Użyj@@"
+
+#, fuzzy
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@cancel|Anuluj@@"
+
+#, fuzzy
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@retrieve|Pobierz@@"
+
+#, fuzzy
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Lekceważ %s@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignoruj %s@@"
+
+#, fuzzy
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@use|Użyj@@"
+
+#, fuzzy
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Przestań Ignorować %s@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Kompletnie ignoruj %s@@"
+
+#, fuzzy
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "/party > Zaproś użytkownika do grupy"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Wykop gracza@@"
+
+#, fuzzy
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@unignore|Przestań Ignorować %s@@"
+
+#, fuzzy
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@use|Użyj@@"
+
+#, fuzzy
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@attack|Atakuj %s@@"
+
+#, fuzzy
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Wykop gracza@@"
+
+#, fuzzy
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Dodaj imię do czatu@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Anuluj@@"
+
+#, fuzzy
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Podnieś %s@@"
+
+#, fuzzy
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Dodaj do czatu@@"
+
+#, fuzzy
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@use|Użyj@@"
+
+#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "Wybrano OK"
@@ -6102,10 +6144,6 @@ msgstr "Nieznany przedmiot"
#~ msgstr "@@party|Zaproś %s do grupy@@"
#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "Wykopanie nie powiodło się!"
-
-#, fuzzy
#~ msgid "Talk to %s"
#~ msgstr "@@talk|Rozmawiaj z %s@@"
@@ -6146,9 +6184,6 @@ msgstr "Nieznany przedmiot"
#~ msgid "Player"
#~ msgstr "Gracz"
-#~ msgid "Whisper"
-#~ msgstr "Szept"
-
#~ msgid "Is"
#~ msgstr "Jest"
diff --git a/po/pt.po b/po/pt.po
index 355b4d1cd..5077efb79 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2011-04-27 20:40+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese <>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
msgid "Visible on map"
msgstr "Visivel no mapa"
@@ -29,87 +29,87 @@ msgstr "desviou"
msgid "miss"
msgstr "errou"
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:824
+#: src/client.cpp:826
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:855
+#: src/client.cpp:857
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:980
+#: src/client.cpp:982
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1021
+#: src/client.cpp:1023
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1099
+#: src/client.cpp:1101
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1119
+#: src/client.cpp:1121
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1140
+#: src/client.cpp:1142
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, 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:1533
+#: src/client.cpp:1535
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, 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."
@@ -256,16 +256,23 @@ msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
msgid "font cache size"
msgstr "Tamanho do cache de fonte"
-#: src/commandhandler.cpp:1076
-msgid "Created: "
+#: src/commandhandler.cpp:1082
+#, fuzzy
+msgid "Cache size:"
+msgstr "Tamanho do cache de fonte"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1077
-msgid "Deleted: "
+#: src/commandhandler.cpp:1086
+#, fuzzy
+msgid "Deleted:"
msgstr "Deletado:"
#: src/commandhandler.h:40
@@ -274,43 +281,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:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Geral"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr "Depurador"
-#: src/game.cpp:445
+#: src/game.cpp:444
msgid "Screenshot saved as "
msgstr "Screenshot salva como "
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
-#: src/game.cpp:492
+#: src/game.cpp:491
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -330,37 +337,42 @@ msgstr "Guilda: %s"
msgid "Pvp rank: %d"
msgstr "Posição no PVP: %d"
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
msgid "Move"
msgstr "Mover"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Resetar"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Comprar"
@@ -403,7 +415,9 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Loja"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Vender"
@@ -411,14 +425,18 @@ msgstr "Vender"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Cancelar"
@@ -450,7 +468,7 @@ msgid "The email address entries mismatch."
msgstr "Os emails informados não são iguais."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Alterar senha"
@@ -516,8 +534,8 @@ msgstr "Estilo do Cabelo:"
msgid "Race:"
msgstr "Corrida:"
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Criar"
@@ -547,124 +565,139 @@ msgstr "Atributos do personagem OK"
msgid "Please remove %d points"
msgstr "Por favor remova %d pontos"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Confimar exclusão do personagem"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Tem certeza que deseja excluir este personagem?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Gerenciamento de Conta e Personagem"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr "Trocar Login"
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Cancelar Registro"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
msgid "Change Email"
msgstr "Alterar email"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Cabelo incorreto."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Falha ao deletar personagem."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Senha incorreta."
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Excluir"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
msgid "Choose"
msgstr "Escolher"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, c-format
msgid "Level %d"
msgstr "Nível %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr "(vazio)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
msgid "default"
msgstr "padrão"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr "preto"
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
msgid "red"
msgstr "vermelho"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
msgid "green"
msgstr "verde"
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
msgid "blue"
msgstr "azul"
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr "ouro"
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
msgid "yellow"
msgstr "amarelo"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
msgid "pink"
msgstr "rosa"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr "roxo"
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr "cinza"
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
msgid "brown"
msgstr "marrom"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
msgid "rainbow 1"
msgstr "arco-íris 1"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
msgid "rainbow 2"
msgstr "arco-íris 2"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
msgid "rainbow 3"
msgstr "arco-íris 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -677,7 +710,10 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
msgid "Ignore"
msgstr "Ignora"
@@ -695,138 +731,143 @@ msgstr "Alvo:"
msgid "Net"
msgstr "Próximo"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
msgid "Music:"
msgstr "Música:"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
msgid "Map:"
msgstr "Mapa:"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
msgid "Minimap:"
msgstr "Minimapa:"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Cursor: (%d, %d)"
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
msgid "Player Position:"
msgstr "Sua posição:"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, c-format
msgid "Particle count: %d"
msgstr "Contagem de partículas: %d"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, c-format
msgid "Map actors count: %d"
msgstr "Jogadores no mapa: %d"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (software)"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (rápido OpenGL)"
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (velho OpenGL)"
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#, fuzzy
+msgid "Textures count:"
+msgstr "Jogadores no mapa:"
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
msgid "Cursor:"
msgstr "Cursor:"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr "Jogadores no mapa:"
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
msgid "Target:"
msgstr "Alvo:"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
msgid "Target Id:"
msgstr "ID do alvo:"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
msgid "Target Level:"
msgstr "Nível do alvo:"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
msgid "Target Party:"
msgstr "Grupo do alvo:"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
msgid "Target Guild:"
msgstr "Guilda do alvo:"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Atraso de ataque"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Minimapa:"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Golpe crítico"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr "Ping: %d ms"
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr "Ping: ? ms"
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr "Entrada: %d bytes/s"
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr "Saída: %d bytes/s"
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "OK"
@@ -837,8 +878,8 @@ msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Desequipar"
@@ -847,7 +888,8 @@ msgid "Help"
msgstr "Ajuda"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Fechar"
@@ -881,31 +923,31 @@ msgid "id"
msgstr "id"
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Dividir"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr "Roupas"
@@ -914,17 +956,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Descartar"
@@ -1185,7 +1227,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
msgid "Clear"
msgstr "Limpar"
@@ -1224,337 +1266,296 @@ msgstr "Desequipar antes"
msgid "Away outfit"
msgstr "Roupas de ocupado"
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Negociar@@"
-
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Atacar@@"
-
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-msgid "@@whisper|Whisper@@"
-msgstr "@@whisper|Mensagem privada@@"
-
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
-msgid "@@heal|Heal@@"
-msgstr "@@heal|Curar@@"
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-msgid "@@friend|Be friend@@"
-msgstr "@@friend|Ser Amigo@@"
-
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Desconsiderar@@"
-
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignorar@@"
-
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
-msgid "@@erase|Erase@@"
-msgstr "@@erase|Apagar@@"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Negócios"
+
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Parar de ignorar@@"
-
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Ignorar completamente@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr "@@follow|Seguir@@"
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr "@@imitation|Imitar@@"
-
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
-msgid "@@party|Invite to party@@"
-msgstr "@@party|Convidar para o grupo@@"
-
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
-msgstr "@@kick party|Expulsar do grupo@@"
+#, fuzzy
+msgid "Be friend"
+msgstr "amigo"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
-msgstr "@@guild-kick|Expulsar da guilda@@"
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+#, fuzzy
+msgid "Disregard"
+msgstr "Desconsiderado"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr "@@guild-pos|Mudar posição da guilda >@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+#, fuzzy
+msgid "Erase"
+msgstr "Apagado"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
-msgid "@@guild|Invite to guild@@"
-msgstr "@@guild|Convidar para a guilda@@"
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
+#, fuzzy
+msgid "Unignore"
+msgstr "Ignora"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Expulsar jogador@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
+msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
-msgstr "@@nuke|Tornar invisível@@"
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+#, fuzzy
+msgid "Follow"
+msgstr "Seguindo:"
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
-msgstr "@@move|Mover@@"
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+#, fuzzy
+msgid "Imitation"
+msgstr "Imitando:"
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
-msgstr "@@undress|Remover@@"
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#, fuzzy
+msgid "Invite to party"
+msgstr "Convite de membros para o grupo"
+
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+#, fuzzy
+msgid "Kick from party"
+msgstr "@@kick party|Expulsar do grupo@@"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
-msgstr "@@buy|Comprar@@"
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+#, fuzzy
+msgid "Kick from guild"
+msgstr "Você foi expulso da Guilda."
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-msgid "@@sell|Sell@@"
-msgstr "@@sell|Vender@@"
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "@@guild-pos|Mudar posição da guilda >@@"
+
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
+#, fuzzy
+msgid "Invite to guild"
+msgstr "Convite de membros para a Guilda."
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
-msgstr "@@talk|Conversar@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Jogador VIP."
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Expulsar@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
+msgstr ""
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
#: src/gui/popupmenu.cpp:267
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:270
-msgid "@@add attack|Add to attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
+#: src/gui/popupmenu.cpp:284
+msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Nome para o chat@@"
+#: src/gui/popupmenu.cpp:286
+#, fuzzy
+msgid "Add to attack list"
+msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Cancelar@@"
+#: src/gui/popupmenu.cpp:289
+#, fuzzy
+msgid "Add to ignore list"
+msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr "@@player_%u|%s >@@"
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:428
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Pegar@@"
+#: src/gui/popupmenu.cpp:450
+#, fuzzy
+msgid "Pick up"
+msgstr "Pegar item"
-#: src/gui/popupmenu.cpp:429
-msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Adicionar para o chat@@"
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
+msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr "@@renomear mapa|Renomear@@"
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Remover nome"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr "@@remove map|Remover do mapa@@"
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+msgid "Remove"
+msgstr ""
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
-msgstr "@@load old outfits|Carregar antigos roupas@@"
+#: src/gui/popupmenu.cpp:484
+#, fuzzy
+msgid "Load old outfits"
+msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+#, fuzzy
+msgid "Load old spells"
msgstr "@@load old spells|Carregar antigos feitiços@@"
-#: src/gui/popupmenu.cpp:480
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@edit spell|Editar feitiço@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
-msgstr "@@chat close|Fechar@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
+msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr "Não remover nome"
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
msgid "Remove name"
msgstr "Remover nome"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
msgid "Enable away"
msgstr "Habilitar longe do teclado"
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
msgid "Disable away"
msgstr "Desabilitar longe do teclado"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr "@@leave party|Deixar grupo@@"
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+msgid "Leave"
+msgstr "Sair"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
msgid "Change guild position"
msgstr "Mudar a posição da guilda"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr "@@guild-pos-%d|%s@@"
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr "Renomear mapa "
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr "Nome: "
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr "Nome no chat"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-msgid "Remove"
-msgstr ""
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr "Salvar Estado"
@@ -2445,125 +2446,121 @@ msgstr "Nav"
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Criar guilda"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
msgid "Create Party"
msgstr "Criar grupo"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
msgid "Invite"
msgstr "Convidar"
-#: src/gui/socialwindow.cpp:1018
-msgid "Leave"
-msgstr "Sair"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, c-format
msgid "Rejected party invite from %s."
msgstr "Rejeitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rejeitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, c-format
msgid "Creating guild called %s."
msgstr "Criando guilda chamada %s."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr "Criando grupo chamado %s."
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
msgid "Guild Name"
msgstr "Nome da guilda"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
msgid "Choose your guild's name."
msgstr "Escolha o nome da sua guilda."
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
msgid "Received guild request, but one already exists."
msgstr "Requisição de guilda recebida, mas já existe uma."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, 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:1304
+#: src/gui/socialwindow.cpp:1305
msgid "Accept Guild Invite"
msgstr "Aceitar convite para a guilda"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Requisição de grupo recebida, mas já existe um."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
msgid "You have been invited you to join a party."
msgstr "Você foi convidado para entrar em um grupo."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, 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:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te convidou para entrar em seu grupo."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, 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:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
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:1376
+#: src/gui/socialwindow.cpp:1377
msgid "Party Name"
msgstr "Nome do grupo"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
msgid "Choose your party's name."
msgstr "Escolha o nome do seu grupo."
@@ -2986,87 +2983,87 @@ msgstr "(b)"
msgid "(O)"
msgstr "(O)"
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
msgid "No Target"
msgstr "Sem alvo"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
msgid "Allow Target"
msgstr "Permitir alvo"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
msgid "Need Target"
msgstr "Precisa de alvo"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
msgid "General Magic"
msgstr "Magia geral"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
msgid "Life Magic"
msgstr "Magia Vida"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
msgid "War Magic"
msgstr "Magia Guerra"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr "Magia Transmutação"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr "Magia Natureza"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr "Magia Astral"
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
msgid "Command Editor"
msgstr "Editor de comandos"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
msgid "magic"
msgstr "Feitiço"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr "Outro"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr "Símbolo: "
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
msgid "Command:"
msgstr "Comando:"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
msgid "Target Type:"
msgstr "Tipo de alvo:"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr "Icone:"
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
msgid "Magic level:"
msgstr "Nível mágico:"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr "Escola de Feitiço:"
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
msgid "School level:"
msgstr "Nível da escola:"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr "Salvar"
@@ -3090,10 +3087,6 @@ msgstr "Aceitou. Aguarde..."
msgid "Trade: You"
msgstr "Negócio: você"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Negócios"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, c-format
msgid "You get %s"
@@ -3923,68 +3916,68 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr "Você foi morto por "
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr "Este item está muito longe."
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
msgid "Inventory is full."
msgstr "O inventário está cheio."
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Você pegou %d [@@%d|%s@@]."
msgstr[1] "Você pegou %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr "Indisponivel "
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
msgid "You see "
msgstr "Você vê "
@@ -4677,14 +4670,17 @@ msgid "M.Defense"
msgstr "Def. Mágica"
#: src/net/tmwa/generalhandler.cpp:259
+#, c-format
msgid "% Accuracy"
msgstr "% Exatidão"
#: src/net/tmwa/generalhandler.cpp:260
+#, c-format
msgid "% Evade"
msgstr "% Evasão"
#: src/net/tmwa/generalhandler.cpp:261
+#, c-format
msgid "% Critical"
msgstr "% Críticos"
@@ -5289,10 +5285,6 @@ msgstr "Falha ao adicionar item. Você não pode trocar este item."
msgid "Failed adding item for unknown reason."
msgstr "Erro ao adicionar item devido a um motivo desconhecido."
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr "Ignorar completamente"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr "Imprimir '...'"
@@ -5337,3 +5329,108 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:166
msgid "Unknown item"
msgstr "Item desconhecido"
+
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Negociar@@"
+
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Atacar@@"
+
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@whisper|Mensagem privada@@"
+
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@heal|Curar@@"
+
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@friend|Ser Amigo@@"
+
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Desconsiderar@@"
+
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignorar@@"
+
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@erase|Apagar@@"
+
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Parar de ignorar@@"
+
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Ignorar completamente@@"
+
+#~ msgid "@@follow|Follow@@"
+#~ msgstr "@@follow|Seguir@@"
+
+#~ msgid "@@imitation|Imitation@@"
+#~ msgstr "@@imitation|Imitar@@"
+
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "@@party|Convidar para o grupo@@"
+
+#~ msgid "@@guild-kick|Kick from guild@@"
+#~ msgstr "@@guild-kick|Expulsar da guilda@@"
+
+#~ msgid "@@guild|Invite to guild@@"
+#~ msgstr "@@guild|Convidar para a guilda@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Expulsar jogador@@"
+
+#~ msgid "@@nuke|Nuke@@"
+#~ msgstr "@@nuke|Tornar invisível@@"
+
+#~ msgid "@@move|Move@@"
+#~ msgstr "@@move|Mover@@"
+
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@undress|Remover@@"
+
+#~ msgid "@@buy|Buy@@"
+#~ msgstr "@@buy|Comprar@@"
+
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@sell|Vender@@"
+
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@talk|Conversar@@"
+
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Expulsar@@"
+
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Nome para o chat@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancelar@@"
+
+#~ msgid "@@player_%u|%s >@@"
+#~ msgstr "@@player_%u|%s >@@"
+
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Pegar@@"
+
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Adicionar para o chat@@"
+
+#~ msgid "@@rename map|Rename@@"
+#~ msgstr "@@renomear mapa|Renomear@@"
+
+#~ msgid "@@remove map|Remove@@"
+#~ msgstr "@@remove map|Remover do mapa@@"
+
+#~ msgid "@@load old outfits|Load old outfits@@"
+#~ msgstr "@@load old outfits|Carregar antigos roupas@@"
+
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@edit spell|Editar feitiço@@"
+
+#~ msgid "@@chat close|Close@@"
+#~ msgstr "@@chat close|Fechar@@"
+
+#~ msgid "@@leave party|Leave@@"
+#~ msgstr "@@leave party|Deixar grupo@@"
+
+#~ msgid "@@guild-pos-%d|%s@@"
+#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 800111444..7306ad066 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2011-04-27 20:40+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazilian) <>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
msgid "Visible on map"
msgstr "Mapa visivel "
@@ -29,87 +29,87 @@ msgstr "desviou"
msgid "miss"
msgstr "errou"
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:824
+#: src/client.cpp:826
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:855
+#: src/client.cpp:857
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:980
+#: src/client.cpp:982
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1021
+#: src/client.cpp:1023
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1099
+#: src/client.cpp:1101
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1119
+#: src/client.cpp:1121
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1140
+#: src/client.cpp:1142
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, 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:1533
+#: src/client.cpp:1535
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, 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."
@@ -256,16 +256,23 @@ msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
msgid "font cache size"
msgstr "Tamanho de fonte Cache"
-#: src/commandhandler.cpp:1076
-msgid "Created: "
+#: src/commandhandler.cpp:1082
+#, fuzzy
+msgid "Cache size:"
+msgstr "Tamanho de fonte Cache"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1077
-msgid "Deleted: "
+#: src/commandhandler.cpp:1086
+#, fuzzy
+msgid "Deleted:"
msgstr "Deletado:"
#: src/commandhandler.h:40
@@ -274,43 +281,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:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Geral"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr "Depurador"
-#: src/game.cpp:445
+#: src/game.cpp:444
msgid "Screenshot saved as "
msgstr "Screenshot salva como "
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
-#: src/game.cpp:492
+#: src/game.cpp:491
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -330,37 +337,42 @@ msgstr "Guilda: %s"
msgid "Pvp rank: %d"
msgstr "Posição no PVP: %d"
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
msgid "Move"
msgstr "Mover"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Resetar"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Comprar"
@@ -403,7 +415,9 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Loja"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Vender"
@@ -411,14 +425,18 @@ msgstr "Vender"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Cancelar"
@@ -450,7 +468,7 @@ msgid "The email address entries mismatch."
msgstr "Os emails informados não são iguais."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Alterar senha"
@@ -516,8 +534,8 @@ msgstr "Estilo do Cabelo:"
msgid "Race:"
msgstr "Corrida:"
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Criar"
@@ -547,124 +565,139 @@ msgstr "Atributos do personagem OK"
msgid "Please remove %d points"
msgstr "Por favor remova %d pontos"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Confimar exclusão do personagem"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Tem certeza que deseja excluir este personagem?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Gerenciamento de Conta e Personagem"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr "Trocar Login"
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Cancelar Registro"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
msgid "Change Email"
msgstr "Alterar email"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Cabelo incorreto."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Falha ao deletar personagem."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Senha incorreta."
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Excluir"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
msgid "Choose"
msgstr "Escolher"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, c-format
msgid "Level %d"
msgstr "Nível %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr "(vazio)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
msgid "default"
msgstr "padrão"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr "preto"
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
msgid "red"
msgstr "vermelho"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
msgid "green"
msgstr "verde"
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
msgid "blue"
msgstr "azul"
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr "ouro"
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
msgid "yellow"
msgstr "amarelo"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
msgid "pink"
msgstr "rosa"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr "roxo"
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr "cinza"
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
msgid "brown"
msgstr "marrom"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
msgid "rainbow 1"
msgstr "arco-íris 1"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
msgid "rainbow 2"
msgstr "arco-íris 2"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
msgid "rainbow 3"
msgstr "arco-íris 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -677,7 +710,10 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
msgid "Ignore"
msgstr "Ignora"
@@ -695,138 +731,143 @@ msgstr "Alvo:"
msgid "Net"
msgstr "Próximo"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
msgid "Music:"
msgstr "Música:"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
msgid "Map:"
msgstr "Mapa:"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
msgid "Minimap:"
msgstr "Minimapa:"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Cursor: (%d, %d)"
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
msgid "Player Position:"
msgstr "Sua posição:"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, c-format
msgid "Particle count: %d"
msgstr "Contagem de partículas: %d"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, c-format
msgid "Map actors count: %d"
msgstr "Jogadores no mapa: %d"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (software)"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (rápido OpenGL)"
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (velho OpenGL)"
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#, fuzzy
+msgid "Textures count:"
+msgstr "Jogadores no mapa:"
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
msgid "Cursor:"
msgstr "Cursor:"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr "Jogadores no mapa:"
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
msgid "Target:"
msgstr "Alvo:"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
msgid "Target Id:"
msgstr "ID do alvo:"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
msgid "Target Level:"
msgstr "Nível do alvo:"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
msgid "Target Party:"
msgstr "Grupo do alvo:"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
msgid "Target Guild:"
msgstr "Guilda do alvo:"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Atraso de ataque"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Minimapa:"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Golpe crítico"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr "Ping: %d ms"
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr "Ping: ? ms"
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr "Entrada: %d bytes/s"
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr "Saída: %d bytes/s"
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "OK"
@@ -837,8 +878,8 @@ msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Desequipar"
@@ -847,7 +888,8 @@ msgid "Help"
msgstr "Ajuda"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Fechar"
@@ -881,31 +923,31 @@ msgid "id"
msgstr "id"
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Dividir"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr "Roupas"
@@ -914,17 +956,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Descartar"
@@ -1185,7 +1227,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
msgid "Clear"
msgstr "Limpar"
@@ -1224,337 +1266,296 @@ msgstr "Desequipar antes"
msgid "Away outfit"
msgstr "Roupas de ocupado"
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Negociar@@"
-
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Atacar@@"
-
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-msgid "@@whisper|Whisper@@"
-msgstr "@@whisper|Mensagem privada@@"
-
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
-msgid "@@heal|Heal@@"
-msgstr "@@heal|Curar@@"
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-msgid "@@friend|Be friend@@"
-msgstr "@@friend|Ser Amigo@@"
-
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Desconsiderar@@"
-
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignorar@@"
-
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
-msgid "@@erase|Erase@@"
-msgstr "@@erase|Apagar@@"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Negócios"
+
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Parar de ignorar@@"
-
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Ignorar completamente@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr "@@follow|Seguir@@"
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr "@@imitation|Imitar@@"
-
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
-msgid "@@party|Invite to party@@"
-msgstr "@@party|Convidar para o grupo@@"
-
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
-msgstr "@@kick party|Expulsar do grupo@@"
+#, fuzzy
+msgid "Be friend"
+msgstr "amigo"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
-msgstr "@@guild-kick|Expulsar da guilda@@"
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+#, fuzzy
+msgid "Disregard"
+msgstr "Desconsiderado"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr "@@guild-pos|Mudar posição da guilda >@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+#, fuzzy
+msgid "Erase"
+msgstr "Apagado"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
-msgid "@@guild|Invite to guild@@"
-msgstr "@@guild|Convidar para a guilda@@"
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
+#, fuzzy
+msgid "Unignore"
+msgstr "Ignora"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Expulsar jogador@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
+msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
-msgstr "@@nuke|Tornar invisível@@"
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+#, fuzzy
+msgid "Follow"
+msgstr "Seguindo:"
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
-msgstr "@@move|Mover@@"
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+#, fuzzy
+msgid "Imitation"
+msgstr "Imitando:"
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
-msgstr "@@undress|Remover@@"
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#, fuzzy
+msgid "Invite to party"
+msgstr "Convite de membros para o grupo"
+
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+#, fuzzy
+msgid "Kick from party"
+msgstr "@@kick party|Expulsar do grupo@@"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
-msgstr "@@buy|Comprar@@"
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+#, fuzzy
+msgid "Kick from guild"
+msgstr "Você foi expulso da Guilda."
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-msgid "@@sell|Sell@@"
-msgstr "@@sell|Vender@@"
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "@@guild-pos|Mudar posição da guilda >@@"
+
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
+#, fuzzy
+msgid "Invite to guild"
+msgstr "Convite de membros para a Guilda."
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
-msgstr "@@talk|Conversar@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Jogador VIP."
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Expulsar@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
+msgstr ""
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
#: src/gui/popupmenu.cpp:267
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:270
-msgid "@@add attack|Add to attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
+#: src/gui/popupmenu.cpp:284
+msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Nome para o chat@@"
+#: src/gui/popupmenu.cpp:286
+#, fuzzy
+msgid "Add to attack list"
+msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Cancelar@@"
+#: src/gui/popupmenu.cpp:289
+#, fuzzy
+msgid "Add to ignore list"
+msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr "@@player_%u|%s >@@"
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:428
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Pegar@@"
+#: src/gui/popupmenu.cpp:450
+#, fuzzy
+msgid "Pick up"
+msgstr "Pegar item"
-#: src/gui/popupmenu.cpp:429
-msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Adicionar para o chat@@"
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
+msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr "@@renomear mapa|Renomear@@"
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Remover o nome"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr "@@remove map|Remover do mapa@@"
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+msgid "Remove"
+msgstr ""
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
-msgstr "@@load old outfits|Carregar antigos roupas@@"
+#: src/gui/popupmenu.cpp:484
+#, fuzzy
+msgid "Load old outfits"
+msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+#, fuzzy
+msgid "Load old spells"
msgstr "@@load old spells|Carregar antigos feitiços@@"
-#: src/gui/popupmenu.cpp:480
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@edit spell|Editar feitiço@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
-msgstr "@@chat close|Fechar@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
+msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr "Não remover o nome"
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
msgid "Remove name"
msgstr "Remover o nome"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
msgid "Enable away"
msgstr "Habilitar longe do teclado"
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
msgid "Disable away"
msgstr "Desabilitar longe do teclado"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr "@@leave party|Deixar grupo@@"
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+msgid "Leave"
+msgstr "Sair"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
msgid "Change guild position"
msgstr "Mudar a posição da guilda"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr "@@guild-pos-%d|%s@@"
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr "Renomear mapa "
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr "Nome: "
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr "Nome no chat"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-msgid "Remove"
-msgstr ""
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr "Salvar Estado"
@@ -2445,125 +2446,121 @@ msgstr "Nav"
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Criar guilda"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
msgid "Create Party"
msgstr "Criar grupo"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
msgid "Invite"
msgstr "Convidar"
-#: src/gui/socialwindow.cpp:1018
-msgid "Leave"
-msgstr "Sair"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, c-format
msgid "Rejected party invite from %s."
msgstr "Rejeitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rejeitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, c-format
msgid "Creating guild called %s."
msgstr "Criando guilda chamada %s."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr "Criando grupo chamado %s."
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
msgid "Guild Name"
msgstr "Nome da guilda"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
msgid "Choose your guild's name."
msgstr "Escolha o nome da sua guilda."
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
msgid "Received guild request, but one already exists."
msgstr "Requisição de guilda recebida, mas já existe uma."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, 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:1304
+#: src/gui/socialwindow.cpp:1305
msgid "Accept Guild Invite"
msgstr "Aceitar convite para a guilda"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Requisição de grupo recebida, mas já existe um."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
msgid "You have been invited you to join a party."
msgstr "Você foi convidado para entrar em um grupo."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, 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:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te convidou para entrar em seu grupo."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, 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:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
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:1376
+#: src/gui/socialwindow.cpp:1377
msgid "Party Name"
msgstr "Nome do grupo"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
msgid "Choose your party's name."
msgstr "Escolha o nome do seu grupo."
@@ -2986,87 +2983,87 @@ msgstr "(b)"
msgid "(O)"
msgstr "(O)"
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
msgid "No Target"
msgstr "Sem alvo"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
msgid "Allow Target"
msgstr "Permitir alvo"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
msgid "Need Target"
msgstr "Precisa de alvo"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
msgid "General Magic"
msgstr "Magia geral"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
msgid "Life Magic"
msgstr "Magia Vida"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
msgid "War Magic"
msgstr "Magia Guerra"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr "Magia Transmutação"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr "Magia Natureza"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr "Magia Astral"
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
msgid "Command Editor"
msgstr "Editor de comandos"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
msgid "magic"
msgstr "Feitiço"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr "Outro"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr "Símbolo: "
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
msgid "Command:"
msgstr "Comando:"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
msgid "Target Type:"
msgstr "Tipo de alvo:"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr "Icone:"
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
msgid "Magic level:"
msgstr "Nível mágico:"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr "Escola de Feitiço:"
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
msgid "School level:"
msgstr "Nível da escola:"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr "Salvar"
@@ -3090,10 +3087,6 @@ msgstr "Aceitou. Aguarde..."
msgid "Trade: You"
msgstr "Negócio: você"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Negócios"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, c-format
msgid "You get %s"
@@ -3923,68 +3916,68 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr "Você foi morto por "
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr "Este item está muito longe."
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
msgid "Inventory is full."
msgstr "O inventário está cheio."
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Você pegou %d [@@%d|%s@@]."
msgstr[1] "Você pegou %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr "Indisponivel "
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
msgid "Follow canceled"
msgstr "Seguindo cancelado"
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
msgid "You see "
msgstr "Você vê "
@@ -4677,14 +4670,17 @@ msgid "M.Defense"
msgstr "Def. Mágica"
#: src/net/tmwa/generalhandler.cpp:259
+#, c-format
msgid "% Accuracy"
msgstr "% Exatidão"
#: src/net/tmwa/generalhandler.cpp:260
+#, c-format
msgid "% Evade"
msgstr "% Evasão"
#: src/net/tmwa/generalhandler.cpp:261
+#, c-format
msgid "% Critical"
msgstr "% Críticos"
@@ -5289,10 +5285,6 @@ msgstr "Falha ao adicionar item. Você não pode trocar este item."
msgid "Failed adding item for unknown reason."
msgstr "Erro ao adicionar item devido a um motivo desconhecido."
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr "Ignorar completamente"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr "Imprimir '...'"
@@ -5337,3 +5329,108 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:166
msgid "Unknown item"
msgstr "Item desconhecido"
+
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Negociar@@"
+
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Atacar@@"
+
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@whisper|Mensagem privada@@"
+
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@heal|Curar@@"
+
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@friend|Ser Amigo@@"
+
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Desconsiderar@@"
+
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignorar@@"
+
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@erase|Apagar@@"
+
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Parar de ignorar@@"
+
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Ignorar completamente@@"
+
+#~ msgid "@@follow|Follow@@"
+#~ msgstr "@@follow|Seguir@@"
+
+#~ msgid "@@imitation|Imitation@@"
+#~ msgstr "@@imitation|Imitar@@"
+
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "@@party|Convidar para o grupo@@"
+
+#~ msgid "@@guild-kick|Kick from guild@@"
+#~ msgstr "@@guild-kick|Expulsar da guilda@@"
+
+#~ msgid "@@guild|Invite to guild@@"
+#~ msgstr "@@guild|Convidar para a guilda@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Expulsar jogador@@"
+
+#~ msgid "@@nuke|Nuke@@"
+#~ msgstr "@@nuke|Tornar invisível@@"
+
+#~ msgid "@@move|Move@@"
+#~ msgstr "@@move|Mover@@"
+
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@undress|Remover@@"
+
+#~ msgid "@@buy|Buy@@"
+#~ msgstr "@@buy|Comprar@@"
+
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@sell|Vender@@"
+
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@talk|Conversar@@"
+
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Expulsar@@"
+
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Nome para o chat@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancelar@@"
+
+#~ msgid "@@player_%u|%s >@@"
+#~ msgstr "@@player_%u|%s >@@"
+
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Pegar@@"
+
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Adicionar para o chat@@"
+
+#~ msgid "@@rename map|Rename@@"
+#~ msgstr "@@renomear mapa|Renomear@@"
+
+#~ msgid "@@remove map|Remove@@"
+#~ msgstr "@@remove map|Remover do mapa@@"
+
+#~ msgid "@@load old outfits|Load old outfits@@"
+#~ msgstr "@@load old outfits|Carregar antigos roupas@@"
+
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@edit spell|Editar feitiço@@"
+
+#~ msgid "@@chat close|Close@@"
+#~ msgstr "@@chat close|Fechar@@"
+
+#~ msgid "@@leave party|Leave@@"
+#~ msgstr "@@leave party|Deixar grupo@@"
+
+#~ msgid "@@guild-pos-%d|%s@@"
+#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/ru.po b/po/ru.po
index c67818315..168f84a3f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2011-04-27 21:03+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Russian <>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
msgid "Visible on map"
msgstr "Видимые на карте"
@@ -30,87 +30,87 @@ msgstr "уворот"
msgid "miss"
msgstr "промах"
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Настройка"
-#: src/client.cpp:824
+#: src/client.cpp:826
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
-#: src/client.cpp:855
+#: src/client.cpp:857
msgid "Logging in"
msgstr "Авторизация"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr "Входим в игровой мир"
-#: src/client.cpp:980
+#: src/client.cpp:982
msgid "Requesting characters"
msgstr "Получение списка персонажей"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
-#: src/client.cpp:1021
+#: src/client.cpp:1023
msgid "Changing game servers"
msgstr "Смена игрового сервера"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Ошибка"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
-#: src/client.cpp:1099
+#: src/client.cpp:1101
msgid "Password Change"
msgstr "Изменить Пароль"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
-#: src/client.cpp:1119
+#: src/client.cpp:1121
msgid "Email Change"
msgstr "Сменить Email"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#: src/client.cpp:1140
+#: src/client.cpp:1142
msgid "Unregister Successful"
msgstr "Регистрация удалена"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, c-format
msgid "Invalid update host: %s"
msgstr "Некорректный сервер обновлений: %s"
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -262,16 +262,23 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
msgid "font cache size"
msgstr "размер кеша шрифта"
-#: src/commandhandler.cpp:1076
-msgid "Created: "
+#: src/commandhandler.cpp:1082
+#, fuzzy
+msgid "Cache size:"
+msgstr "размер кеша шрифта"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Создано: "
-#: src/commandhandler.cpp:1077
-msgid "Deleted: "
+#: src/commandhandler.cpp:1086
+#, fuzzy
+msgid "Deleted:"
msgstr "Удалено: "
#: src/commandhandler.h:40
@@ -281,43 +288,43 @@ msgstr ""
"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
"\"0\"."
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Общие"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr "Отладка"
-#: src/game.cpp:445
+#: src/game.cpp:444
msgid "Screenshot saved as "
msgstr "Снимок экрана сохранен как "
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Ошибка при сохранении снимка экрана!"
-#: src/game.cpp:492
+#: src/game.cpp:491
msgid "The connection to the server was lost."
msgstr "Соединение с сервером потеряно."
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Ошибка сети"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Игнорировать предложения о торговле"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
msgid "Could Not Load Map"
msgstr "Не удалось загрузить карту"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Ошибка во время загрузки %s"
@@ -337,37 +344,42 @@ msgstr "Гильдия: %s"
msgid "Pvp rank: %d"
msgstr "PvP ранг: %d"
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
msgid "Bot Checker"
msgstr "Окно детектора ботов"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Имя"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Атака"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Разговор"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
msgid "Move"
msgstr "Движение"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr "Результат"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Сбросить"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Купить"
@@ -410,7 +422,9 @@ msgstr "Макс"
msgid "Shop"
msgstr "Магазин"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Продать"
@@ -418,14 +432,18 @@ msgstr "Продать"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Отмена"
@@ -457,7 +475,7 @@ msgid "The email address entries mismatch."
msgstr "Адрес E-mail не совпадает"
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Изменить пароль"
@@ -523,8 +541,8 @@ msgstr "Стрижка:"
msgid "Race:"
msgstr "Расса:"
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Создать"
@@ -554,124 +572,139 @@ msgstr "Данные персонажа в порядке"
msgid "Please remove %d points"
msgstr "Снимите очки (%d)"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Подтвердите удаление героя"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Вы уверены, что хотите удалить этого персонажа?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Управление учётной записью"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr "Сменить героя"
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Удалить регистрацию"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
msgid "Change Email"
msgstr "Сменить адрес E-mail"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Некорректный тип волос."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Невозможно удалить персонажа."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Неверный пароль"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Удалить"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
msgid "Choose"
msgstr "Выбрать"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, c-format
msgid "Level %d"
msgstr "Уровень: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr "(пусто)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
msgid "default"
msgstr "По умолчанию"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr "черный"
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
msgid "red"
msgstr "красный"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
msgid "green"
msgstr "зеленый"
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
msgid "blue"
msgstr "синий"
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr "золотой"
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
msgid "yellow"
msgstr "желтый"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
msgid "pink"
msgstr "розовый"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr "фиолетовый"
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr "серый"
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
msgid "brown"
msgstr "коричневый"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
msgid "rainbow 1"
msgstr "радуга 1"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
msgid "rainbow 2"
msgstr "радуга 2"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
msgid "rainbow 3"
msgstr "радуга 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Чат"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Присутствуют: %s; Всего %d игроков."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
@@ -684,7 +717,10 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
msgid "Ignore"
msgstr "Игнорировать"
@@ -702,138 +738,143 @@ msgstr "Цель:"
msgid "Net"
msgstr "Следующий"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
msgid "Music:"
msgstr "Музыка:"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
msgid "Map:"
msgstr "Карта:"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
msgid "Minimap:"
msgstr "МиниКарта:"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Курсор: (%d, %d)"
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
msgid "Player Position:"
msgstr "Позиция игрока:"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, c-format
msgid "Particle count: %d"
msgstr "Количество частиц: %d"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, c-format
msgid "Map actors count: %d"
msgstr "Кол-во объектов: %d"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Программно)"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (быстрый OpenGL)"
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (старый OpenGL)"
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#, fuzzy
+msgid "Textures count:"
+msgstr "Кол-во. объектов:"
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
msgid "Cursor:"
msgstr "Курсор:"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr "Кол-во. объектов:"
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
msgid "Target:"
msgstr "Цель:"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
msgid "Target Id:"
msgstr "Id цели:"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
msgid "Target Level:"
msgstr "Уровень цели:"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
msgid "Target Party:"
msgstr "Группа цели:"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
msgid "Target Guild:"
msgstr "Гильдия цели:"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Задержка атаки"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "МиниКарта:"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Критический удар"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr "Пинг: %d мсек."
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr "Пинг: ? мсек."
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr "Вх.: %d байт/сек."
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr "Исх.: %d байт/сек."
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "ОК"
@@ -844,8 +885,8 @@ msgstr "Снаряжение"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Снять"
@@ -854,7 +895,8 @@ msgid "Help"
msgstr "Помощь"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Закрыть"
@@ -888,31 +930,31 @@ msgid "id"
msgstr "ид"
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Надеть"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Использовать"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
msgid "Drop..."
msgstr "Бросить"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Разделить"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr "Наряды"
@@ -921,17 +963,17 @@ msgid "Weight:"
msgstr "Вес:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Сохранить"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Получить"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Бросить"
@@ -1192,7 +1234,7 @@ msgstr "Применить"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
msgid "Clear"
msgstr "Очистить"
@@ -1231,337 +1273,298 @@ msgstr "Сначала снять"
msgid "Away outfit"
msgstr "наряд отсутствия"
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Торговать@@"
-
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Атаковать@@"
-
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-msgid "@@whisper|Whisper@@"
-msgstr "@@whisper|Шептать@@"
-
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
-msgid "@@heal|Heal@@"
-msgstr "@@heal|Лечить@@"
-
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
-msgid "@@friend|Be friend@@"
-msgstr "@@friend|Подружиться@@"
-
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Пренебреч@@"
-
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
-msgid "@@ignore|Ignore@@"
-msgstr "@@unignore|Игнорировать@@"
-
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
-msgid "@@erase|Erase@@"
-msgstr "@@erase|Стереть@@"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
-#: src/gui/popupmenu.cpp:589
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Не игнорировать@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Торговать"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Полностью игнорировать@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr ""
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr "@@follow|Следовать@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr "@@imitation|Имитация@@"
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:589
+#, fuzzy
+msgid "Be friend"
+msgstr "друг"
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
-msgid "@@party|Invite to party@@"
-msgstr "@@party|Пригласить в группу@@"
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
+#, fuzzy
+msgid "Disregard"
+msgstr "Пренебрегаемый"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
-msgid "@@kick party|Kick from party@@"
-msgstr "@@kick party|Вышвырнуть из группы@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+#, fuzzy
+msgid "Erase"
+msgstr "Стерт"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
-msgid "@@guild-kick|Kick from guild@@"
-msgstr "@@guild-kick|Выкинуть из гильдии@@"
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
+#, fuzzy
+msgid "Unignore"
+msgstr "Игнорировать"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr "@@guild-pos|Сменить статус в гильдии >@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
+msgstr "@@ignore|Полностью игнорировать@@"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
-msgid "@@guild|Invite to guild@@"
-msgstr "@@guild|Пригласить в гильдию@@"
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
+#, fuzzy
+msgid "Follow"
+msgstr "Следование: "
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Вышвырнуть игрока@@"
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
+#, fuzzy
+msgid "Imitation"
+msgstr "Имитация: "
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
-msgstr "@@nuke|Уничтожить@@"
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#, fuzzy
+msgid "Invite to party"
+msgstr "Пригласить пользователя в группу"
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
-msgstr "@@move|Двигаться@@"
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
+#, fuzzy
+msgid "Kick from party"
+msgstr "@@kick party|Вышвырнуть из группы@@"
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-msgid "@@undress|Undress@@"
-msgstr "@@undress|Раздеть@@"
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+#, fuzzy
+msgid "Kick from guild"
+msgstr "Вы были кикнуты из гильдии."
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
-msgstr "@@buy|Купить@@"
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "@@guild-pos|Сменить статус в гильдии >@@"
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-msgid "@@sell|Sell@@"
-msgstr "@@sell|Продать@@"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
+#, fuzzy
+msgid "Invite to guild"
+msgstr "Приглашение игрока в Гильдию"
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
-msgstr "@@talk|Говорить@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Игрок MVP."
-#: src/gui/popupmenu.cpp:251
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Вышвырнуть игрока@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
+msgstr ""
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
-msgstr "@@remove attack|Удалить из списка атак@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
+msgstr ""
#: src/gui/popupmenu.cpp:267
-msgid "@@add attack priority|Add to priority attack list@@"
-msgstr "@@add attack priority|Добавить в список приортетных атак@@"
+msgid "Kick"
+msgstr ""
-#: src/gui/popupmenu.cpp:270
-msgid "@@add attack|Add to attack list@@"
-msgstr "@@add attack|Добавить к списку атак@@"
+#: src/gui/popupmenu.cpp:278
+#, fuzzy
+msgid "Remove from attack list"
+msgstr "@@remove attack|Удалить из списка атак@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr "@@add attack ignore|Добавить в список игнорирования@@"
+#: src/gui/popupmenu.cpp:284
+#, fuzzy
+msgid "Add to priority attack list"
+msgstr "@@add attack priority|Добавить в список приортетных атак@@"
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Добавить имя в чат@@"
+#: src/gui/popupmenu.cpp:286
+#, fuzzy
+msgid "Add to attack list"
+msgstr "@@add attack|Добавить к списку атак@@"
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Отмена@@"
+#: src/gui/popupmenu.cpp:289
+#, fuzzy
+msgid "Add to ignore list"
+msgstr "Добавить к торговле все"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr "@@player_%u|%s >@@"
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "Добавить в чат"
-#: src/gui/popupmenu.cpp:428
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Поднять@@"
+#: src/gui/popupmenu.cpp:450
+#, fuzzy
+msgid "Pick up"
+msgstr "Поднятие предметов"
-#: src/gui/popupmenu.cpp:429
-msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Добавить в чат@@"
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+msgid "Add to chat"
+msgstr "Добавить в чат"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr "Элмент карты"
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr "@@rename map|Переименовать@@"
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Скрывать имя"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr "@@remove map|Удалить@@"
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+msgid "Remove"
+msgstr "Удалить"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
-msgstr "@@load old outfits|Загрузить старые наряды@@"
+#: src/gui/popupmenu.cpp:484
+#, fuzzy
+msgid "Load old outfits"
+msgstr "Загрузить старые горячие клавиши предметов"
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr "Заклинания"
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+#, fuzzy
+msgid "Load old spells"
msgstr "@@load old spells|Загрузить старые заклинания@@"
-#: src/gui/popupmenu.cpp:480
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@edit spell|Изменить заклинание@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
-msgstr "@@chat close|Закрыть@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
+msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
msgid "Disable highlight"
msgstr "Отключить уведомление"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
msgid "Enable highlight"
msgstr "Включить уведомление"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr "Не скрывать имя"
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
msgid "Remove name"
msgstr "Скрывать имя"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
msgid "Enable away"
msgstr "Рарешить режим отошел"
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
msgid "Disable away"
msgstr "Запретить режим отошел"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr "@@leave party|Покинуть@@"
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+msgid "Leave"
+msgstr "Покинуть"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
msgid "Change guild position"
msgstr "Сменить позицию в гильдии"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr "@@guild-pos-%d|%s@@"
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr "Переименовать знак на карте"
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr "Имя: "
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
msgid "Add to trade"
msgstr "Добавить к торговли"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
msgid "Add to trade 10"
msgstr "Добавить к торговле 10"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
msgid "Add to trade half"
msgstr "Добавить к торговле половину"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
msgid "Add to trade all"
msgstr "Добавить к торговле все"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
msgid "Store 10"
msgstr "Сохранить 10"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
msgid "Store half"
msgstr "Сохранить половину"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
msgid "Store all"
msgstr "Сохранить все"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
msgid "Retrieve 10"
msgstr "Получить 10"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
msgid "Retrieve half"
msgstr "Получить половину"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
msgid "Retrieve all"
msgstr "Получить все"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-msgid "Add to chat"
-msgstr "Добавить в чат"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr "Загрузить старые горячие клавиши предметов"
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr "Загрузить старые данные"
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr "Спрятать"
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr "Показать"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr "сбросить настройки"
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
msgid "(default)"
msgstr "(поумолчанию)"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
msgid "Move up"
msgstr "Передвинуть выше"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
msgid "Move down"
msgstr "Передвинуть ниже"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-msgid "Remove"
-msgstr "Удалить"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr "Сохранить состояние"
@@ -2454,125 +2457,121 @@ msgstr "Нав"
msgid "Atk"
msgstr "Атк"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr "Приоритетные монстры"
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
msgid "Attack mobs"
msgstr "Атакуемые монстры"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
msgid "Ignore mobs"
msgstr "Игнорируемые монстры"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Создать Гильдию"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
msgid "Create Party"
msgstr "Создать группу"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr "Общество"
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
msgid "Invite"
msgstr "Пригласить"
-#: src/gui/socialwindow.cpp:1018
-msgid "Leave"
-msgstr "Покинуть"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, c-format
msgid "Accepted party invite from %s."
msgstr "Принято приглашение в группу от %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, c-format
msgid "Rejected party invite from %s."
msgstr "Отклонено приглашение в группу от %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Принято приглашение в гильдию от %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Отклонено приглашение в гильдию от %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, c-format
msgid "Creating guild called %s."
msgstr "Создание гильдии с именем %s."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr "Создание группы с именем %s."
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
msgid "Guild Name"
msgstr "Имя гильдии"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
msgid "Choose your guild's name."
msgstr "Выберите имя для гильдии."
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
msgid "Received guild request, but one already exists."
msgstr "Получено приглашение в гильдию, но оно не первое."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s приглашает присоединиться к гильдии %s."
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
msgid "Accept Guild Invite"
msgstr "Принять приглашение в гильдию"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Получено приглашение в группу, но оно не порвое."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
msgid "You have been invited you to join a party."
msgstr "Вас приглашают в группу."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Вас приглашают присоединиться к группе %s."
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s приглашает вас к себе в группу."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s приглашает присоединиться к %s группе."
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Принять приглашение в группу"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr "Не удалось создать группу. Вы уже состоите в другой."
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
msgid "Party Name"
msgstr "Имя группы"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
msgid "Choose your party's name."
msgstr "Выберите имя будущей группы."
@@ -2995,87 +2994,87 @@ msgstr "(b)"
msgid "(O)"
msgstr "(O)"
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
msgid "No Target"
msgstr "Без цели"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
msgid "Allow Target"
msgstr "Разрешить цель"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
msgid "Need Target"
msgstr "Необходима цель"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
msgid "General Magic"
msgstr "Общая Магия"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
msgid "Life Magic"
msgstr "Магия Жизни"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
msgid "War Magic"
msgstr "Боевая Магия"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr "Магия Трансформации"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr "Магия Природы"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr "Астральная магия"
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
msgid "Command Editor"
msgstr "Редактор комманд"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
msgid "magic"
msgstr "Магия"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr "Другое"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr "Символ:"
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
msgid "Command:"
msgstr "Команда:"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr "Мана:"
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
msgid "Target Type:"
msgstr "Тип цели:"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr "Картинка:"
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
msgid "Magic level:"
msgstr "Уровень Магии:"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr "Школа Магии:"
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
msgid "School level:"
msgstr "Уровень школы:"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr "Сохранить"
@@ -3099,10 +3098,6 @@ msgstr "Подтверждено. Ждем-с..."
msgid "Trade: You"
msgstr "Торговля: Вы"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Торговать"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, c-format
msgid "You get %s"
@@ -3934,41 +3929,41 @@ msgstr ""
"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
"вести."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr "Вы были убиты "
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый"
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr "Предмет слишком далеко"
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr "Слишком много предметов."
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -3976,27 +3971,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
msgstr[1] "Вы подняли %d [@@%d|%s@@]."
msgstr[2] "Вы подняли %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr "Отошел"
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr "Следование: "
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
msgid "Follow canceled"
msgstr "Следование отменено"
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
msgid "Imitation: "
msgstr "Имитация: "
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
msgid "Imitation canceled"
msgstr "Имитация отменена"
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
msgid "You see "
msgstr "Вы видите "
@@ -5296,10 +5291,6 @@ msgstr "Ошибка добавления предмета. Вы не может
msgid "Failed adding item for unknown reason."
msgstr "Не удалось добавить предмет по неизвестной причине."
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr "@@ignore|Полностью игнорировать@@"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr "Печатать '...'"
@@ -5344,3 +5335,111 @@ msgstr "Мана %+d"
#: src/resources/itemdb.cpp:166
msgid "Unknown item"
msgstr "Неизвестный предмет"
+
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Торговать@@"
+
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Атаковать@@"
+
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@whisper|Шептать@@"
+
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@heal|Лечить@@"
+
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@friend|Подружиться@@"
+
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Пренебреч@@"
+
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@unignore|Игнорировать@@"
+
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@erase|Стереть@@"
+
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Не игнорировать@@"
+
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Полностью игнорировать@@"
+
+#~ msgid "@@follow|Follow@@"
+#~ msgstr "@@follow|Следовать@@"
+
+#~ msgid "@@imitation|Imitation@@"
+#~ msgstr "@@imitation|Имитация@@"
+
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "@@party|Пригласить в группу@@"
+
+#~ msgid "@@guild-kick|Kick from guild@@"
+#~ msgstr "@@guild-kick|Выкинуть из гильдии@@"
+
+#~ msgid "@@guild|Invite to guild@@"
+#~ msgstr "@@guild|Пригласить в гильдию@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Вышвырнуть игрока@@"
+
+#~ msgid "@@nuke|Nuke@@"
+#~ msgstr "@@nuke|Уничтожить@@"
+
+#~ msgid "@@move|Move@@"
+#~ msgstr "@@move|Двигаться@@"
+
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@undress|Раздеть@@"
+
+#~ msgid "@@buy|Buy@@"
+#~ msgstr "@@buy|Купить@@"
+
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@sell|Продать@@"
+
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@talk|Говорить@@"
+
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Вышвырнуть игрока@@"
+
+#~ msgid "@@add attack ignore|Add to ignore list@@"
+#~ msgstr "@@add attack ignore|Добавить в список игнорирования@@"
+
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Добавить имя в чат@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Отмена@@"
+
+#~ msgid "@@player_%u|%s >@@"
+#~ msgstr "@@player_%u|%s >@@"
+
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Поднять@@"
+
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Добавить в чат@@"
+
+#~ msgid "@@rename map|Rename@@"
+#~ msgstr "@@rename map|Переименовать@@"
+
+#~ msgid "@@remove map|Remove@@"
+#~ msgstr "@@remove map|Удалить@@"
+
+#~ msgid "@@load old outfits|Load old outfits@@"
+#~ msgstr "@@load old outfits|Загрузить старые наряды@@"
+
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@edit spell|Изменить заклинание@@"
+
+#~ msgid "@@chat close|Close@@"
+#~ msgstr "@@chat close|Закрыть@@"
+
+#~ msgid "@@leave party|Leave@@"
+#~ msgstr "@@leave party|Покинуть@@"
+
+#~ msgid "@@guild-pos-%d|%s@@"
+#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/sv.po b/po/sv.po
index 90b787413..d0e6d17c4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mana\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-03 03:42+0300\n"
+"POT-Creation-Date: 2011-05-09 01:25+0300\n"
"PO-Revision-Date: 2009-07-17 05:36+0000\n"
"Last-Translator: Kess Vargavind <Unknown>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/actorspritemanager.cpp:1012
+#: src/actorspritemanager.cpp:1022
#, fuzzy
msgid "Visible on map"
msgstr "Synliga namn"
@@ -32,96 +32,96 @@ msgstr ""
msgid "miss"
msgstr ""
-#: src/client.cpp:750 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Inställningar"
-#: src/client.cpp:824
+#: src/client.cpp:826
#, fuzzy
msgid "Connecting to server"
msgstr "Ansluter till kartservern..."
-#: src/client.cpp:855
+#: src/client.cpp:857
#, fuzzy
msgid "Logging in"
msgstr "Användarnamn"
-#: src/client.cpp:888
+#: src/client.cpp:890
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:980
+#: src/client.cpp:982
#, fuzzy
msgid "Requesting characters"
msgstr "Välj karaktär"
-#: src/client.cpp:1011
+#: src/client.cpp:1013
#, fuzzy
msgid "Connecting to the game server"
msgstr "Ansluter till kartservern..."
-#: src/client.cpp:1021
+#: src/client.cpp:1023
#, fuzzy
msgid "Changing game servers"
msgstr "Server"
-#: src/client.cpp:1056 src/client.cpp:1063 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Fel"
-#: src/client.cpp:1072
+#: src/client.cpp:1074
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1099
+#: src/client.cpp:1101
#, fuzzy
msgid "Password Change"
msgstr "Lösenord:"
-#: src/client.cpp:1100
+#: src/client.cpp:1102
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1119
+#: src/client.cpp:1121
#, fuzzy
msgid "Email Change"
msgstr "Ändra"
-#: src/client.cpp:1120
+#: src/client.cpp:1122
#, fuzzy
msgid "Email changed successfully!"
msgstr "Medlem befordrad."
-#: src/client.cpp:1140
+#: src/client.cpp:1142
#, fuzzy
msgid "Unregister Successful"
msgstr "Avregistrera"
-#: src/client.cpp:1141
+#: src/client.cpp:1143
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1533
+#: src/client.cpp:1535
#, fuzzy, c-format
msgid "Invalid update host: %s"
msgstr "Ogiltig uppdateringsvärd: "
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
msgid "Error creating updates directory!"
msgstr "Kunde inte skapa katalog för uppdateringar!"
-#: src/client.cpp:1594
+#: src/client.cpp:1596
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -276,19 +276,24 @@ msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1070
#, fuzzy
msgid "font cache size"
msgstr "Typsnittsgrad"
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1082
#, fuzzy
-msgid "Created: "
+msgid "Cache size:"
+msgstr "Typsnittsgrad"
+
+#: src/commandhandler.cpp:1085
+#, fuzzy
+msgid "Created:"
msgstr "Skapa"
-#: src/commandhandler.cpp:1077
+#: src/commandhandler.cpp:1086
#, fuzzy
-msgid "Deleted: "
+msgid "Deleted:"
msgstr "Ta bort"
#: src/commandhandler.h:40
@@ -296,47 +301,47 @@ msgstr "Ta bort"
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Alternativ till /%s är ”yes”, ”no”, ”true”, ”false”, ”1”, ”0”."
-#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Allmänt"
-#: src/game.cpp:233 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr ""
-#: src/game.cpp:445
+#: src/game.cpp:444
#, fuzzy
msgid "Screenshot saved as "
msgstr "Skärmbild sparades till ~/"
-#: src/game.cpp:453
+#: src/game.cpp:452
msgid "Saving screenshot failed!"
msgstr "Kunde inte spara skärmbild!"
-#: src/game.cpp:492
+#: src/game.cpp:491
#, fuzzy
msgid "The connection to the server was lost."
msgstr ""
"Förbindelsen till servern förlorades, programmet kommer nu att avslutas."
-#: src/game.cpp:506
+#: src/game.cpp:505
msgid "Network Error"
msgstr "Nätverksfel"
-#: src/game.cpp:1024
+#: src/game.cpp:1023
msgid "Ignoring incoming trade requests"
msgstr "Ignorerar handelserbjudanden"
-#: src/game.cpp:1031
+#: src/game.cpp:1030
msgid "Accepting incoming trade requests"
msgstr "Accepterar handelserbjudanden"
-#: src/game.cpp:1406
+#: src/game.cpp:1405
#, fuzzy
msgid "Could Not Load Map"
msgstr "Kunde inte ladda karta"
-#: src/game.cpp:1407
+#: src/game.cpp:1406
#, c-format
msgid "Error while loading %s"
msgstr "Kunde inte ladda %s"
@@ -356,39 +361,44 @@ msgstr "Gillen"
msgid "Pvp rank: %d"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
#, fuzzy
msgid "Bot Checker"
msgstr "Chattfönster"
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
msgid "Name"
msgstr "Namn"
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Attackera"
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Prata"
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
#, fuzzy
msgid "Move"
msgstr "Gå uppåt"
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
msgid "Reset"
msgstr "Återställ"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:641
msgid "Buy"
msgstr "Köp"
@@ -431,7 +441,9 @@ msgstr "Max"
msgid "Shop"
msgstr "Affär"
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
#: src/gui/sell.cpp:90
msgid "Sell"
msgstr "Sälj"
@@ -439,14 +451,18 @@ msgstr "Sälj"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
-#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1742
-#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
-#: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
-#: src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
+#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Avbryt"
@@ -480,7 +496,7 @@ msgid "The email address entries mismatch."
msgstr "Den nya epostadressen används redan."
#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
msgid "Change Password"
msgstr "Ändra lösenord"
@@ -549,8 +565,8 @@ msgstr "Frisyr:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
-#: src/gui/socialwindow.cpp:1016
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
msgid "Create"
msgstr "Skapa"
@@ -580,136 +596,151 @@ msgstr "Karaktärens värden okej"
msgid "Please remove %d points"
msgstr "Var vänlig ta bort %d poäng"
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
msgid "Confirm Character Delete"
msgstr "Bekräfta borttagning av karaktär"
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
msgid "Are you sure you want to delete this character?"
msgstr "Är du säker på att du vill ta bort den här karaktären?"
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
msgid "Account and Character Management"
msgstr "Hantering av konto och karaktärer"
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
#: src/gui/unregisterdialog.cpp:56
msgid "Unregister"
msgstr "Avregistrera"
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
#, fuzzy
msgid "Change Email"
msgstr "Ändra epostadress"
-#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:252
+#, fuzzy
+msgid "Incorrect password"
+msgstr "Fel lösenord"
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password for deleting character"
+msgstr "Kunde inte ta bort karaktär."
+
+#: src/gui/charselectdialog.cpp:285
+#, fuzzy
+msgid "Enter password:"
+msgstr "Fel lösenord"
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
msgstr "Ta bort"
-#: src/gui/charselectdialog.cpp:437
+#: src/gui/charselectdialog.cpp:465
#, fuzzy
msgid "Choose"
msgstr "Stäng"
-#: src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:468
#, fuzzy, c-format
msgid "Level %d"
msgstr "Nivå: %d"
-#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
#, fuzzy
msgid "default"
msgstr "Förval"
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
msgid "black"
msgstr ""
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
#, fuzzy
msgid "red"
msgstr "Vän"
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
#, fuzzy
msgid "green"
msgstr "Grön: "
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
#, fuzzy
msgid "blue"
msgstr "Blå: "
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
msgid "gold"
msgstr ""
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
#, fuzzy
msgid "yellow"
msgstr "låg"
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
#, fuzzy
msgid "pink"
msgstr "Länk"
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
msgid "purple"
msgstr ""
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
msgid "grey"
msgstr ""
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
#, fuzzy
msgid "brown"
msgstr "Kastvapen"
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
#, fuzzy
msgid "rainbow 1"
msgstr "Regnbåge"
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
#, fuzzy
msgid "rainbow 2"
msgstr "Regnbåge"
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
#, fuzzy
msgid "rainbow 3"
msgstr "Regnbåge"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
msgid "???"
msgstr "???"
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
msgid "Chat"
msgstr "Chatt"
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:586
#, fuzzy, c-format
msgid "Present: %s; %d players are present."
msgstr "%d spelare är närvarande."
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:969
#, c-format
msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
@@ -722,7 +753,10 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:601
#, fuzzy
msgid "Ignore"
msgstr "Ignorerad"
@@ -741,148 +775,152 @@ msgstr "Gå åt vänster"
msgid "Net"
msgstr "Nästa"
-#: src/gui/debugwindow.cpp:132 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:236
#, fuzzy
msgid "Music:"
msgstr "Ämne: %s"
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:205
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
+#: src/gui/debugwindow.cpp:238
#, fuzzy
msgid "Map:"
msgstr "Namn: %s"
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:203
-#: src/gui/debugwindow.cpp:225
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
+#: src/gui/debugwindow.cpp:237
#, fuzzy
msgid "Minimap:"
msgstr "Minikarta"
-#: src/gui/debugwindow.cpp:135
+#: src/gui/debugwindow.cpp:136
#, c-format
msgid "Cursor: (%d, %d)"
msgstr ""
-#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:187
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
+#: src/gui/debugwindow.cpp:193
#, fuzzy
msgid "Player Position:"
msgstr "Spelare slår monster"
-#: src/gui/debugwindow.cpp:138 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
#, fuzzy, c-format
msgid "Particle count: %d"
msgstr "Partikeleffekter"
-#: src/gui/debugwindow.cpp:140
+#: src/gui/debugwindow.cpp:141
#, fuzzy, c-format
msgid "Map actors count: %d"
msgstr "Karaktärens värden okej"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:153
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:155
+#: src/gui/debugwindow.cpp:156
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:162
+#: src/gui/debugwindow.cpp:163
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:199 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
#, fuzzy
msgid "Cursor:"
msgstr "Särskild muspekare"
-#: src/gui/debugwindow.cpp:216 src/gui/debugwindow.cpp:229
+#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:243 src/gui/debugwindow.cpp:274
-#: src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
+#: src/gui/debugwindow.cpp:330
#, fuzzy
msgid "Target:"
msgstr "Gå åt vänster"
-#: src/gui/debugwindow.cpp:244 src/gui/debugwindow.cpp:279
-#: src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
+#: src/gui/debugwindow.cpp:331
#, fuzzy
msgid "Target Id:"
msgstr "Välj spelare"
-#: src/gui/debugwindow.cpp:245 src/gui/debugwindow.cpp:283
-#: src/gui/debugwindow.cpp:288 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
+#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
#, fuzzy
msgid "Target Level:"
msgstr "Välj spelare"
-#: src/gui/debugwindow.cpp:246 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:333
#, fuzzy
msgid "Target Party:"
msgstr "Välj spelare"
-#: src/gui/debugwindow.cpp:247 src/gui/debugwindow.cpp:294
-#: src/gui/debugwindow.cpp:322
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:334
#, fuzzy
msgid "Target Guild:"
msgstr "Välj spelare"
-#: src/gui/debugwindow.cpp:248 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
+#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
#, fuzzy
msgid "Attack delay:"
msgstr "Attack %+d"
-#: src/gui/debugwindow.cpp:249 src/gui/debugwindow.cpp:298
-#: src/gui/debugwindow.cpp:324
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:336
#, fuzzy
msgid "Minimal hit:"
msgstr "Minikarta"
-#: src/gui/debugwindow.cpp:250 src/gui/debugwindow.cpp:300
-#: src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:337
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:251 src/gui/debugwindow.cpp:302
-#: src/gui/debugwindow.cpp:326
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
+#: src/gui/debugwindow.cpp:338
#, fuzzy
msgid "Critical hit:"
msgstr "Kritisk träff"
-#: src/gui/debugwindow.cpp:360
+#: src/gui/debugwindow.cpp:372
#, c-format
msgid "Ping: %d ms"
msgstr ""
-#: src/gui/debugwindow.cpp:365
+#: src/gui/debugwindow.cpp:377
msgid "Ping: ? ms"
msgstr ""
-#: src/gui/debugwindow.cpp:368
+#: src/gui/debugwindow.cpp:380
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:370
+#: src/gui/debugwindow.cpp:382
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
msgid "OK"
msgstr "Okej"
@@ -893,8 +931,8 @@ msgstr "Utrustning"
#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1619
msgid "Unequip"
msgstr "Avrusta"
@@ -903,7 +941,8 @@ msgid "Help"
msgstr "Hjälp"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Stäng"
@@ -940,32 +979,32 @@ msgid "id"
msgstr ""
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
msgid "Equip"
msgstr "Utrusta"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
-#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
-#: src/gui/popupmenu.cpp:1586
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
+#: src/gui/popupmenu.cpp:1624
msgid "Use"
msgstr "Använd"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
-#: src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
+#: src/gui/popupmenu.cpp:1627
#, fuzzy
msgid "Drop..."
msgstr "Släpp"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
-#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
+#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
msgid "Split"
msgstr "Dela"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:482
msgid "Outfits"
msgstr ""
@@ -974,17 +1013,17 @@ msgid "Weight:"
msgstr "Vikt:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
+#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
msgid "Store"
msgstr "Lagra"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
msgid "Retrieve"
msgstr "Hämta"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Släpp"
@@ -1259,7 +1298,7 @@ msgstr "Vidare"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
#, fuzzy
msgid "Clear"
msgstr "Spjut"
@@ -1303,382 +1342,317 @@ msgstr "Avrusta"
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
-#, fuzzy
-msgid "@@trade|Trade@@"
-msgstr "@@trade|Handla med %s@@"
+#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
+#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Byteshandla"
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:555
-#, fuzzy
-msgid "@@attack|Attack@@"
-msgstr "@@attack|Attackera %s@@"
+#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+msgid "Whisper"
+msgstr "Viskning"
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
-#, fuzzy
-msgid "@@whisper|Whisper@@"
-msgstr "@@use|Använd@@"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+msgid "Heal"
+msgstr ""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:589
#, fuzzy
-msgid "@@heal|Heal@@"
-msgstr "@@cancel|Avbryt@@"
+msgid "Be friend"
+msgstr "Vän"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:623
#, fuzzy
-msgid "@@friend|Be friend@@"
-msgstr "@@retrieve|Hämta@@"
+msgid "Disregard"
+msgstr "Förbisedd"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
-#: src/gui/popupmenu.cpp:590
-#, fuzzy
-msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Strunta i %s@@"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+msgid "Erase"
+msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
-#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621
#, fuzzy
-msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignorera %s@@"
+msgid "Unignore"
+msgstr "Ignorerad"
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
-#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/playerrelations.cpp:404
#, fuzzy
-msgid "@@erase|Erase@@"
-msgstr "@@use|Använd@@"
+msgid "Completely ignore"
+msgstr "@@ignore|Ignorera %s fullständigt@@"
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:633
#, fuzzy
-msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Sluta ignorera %s@@"
+msgid "Follow"
+msgstr "låg"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:634
#, fuzzy
-msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Ignorera %s fullständigt@@"
-
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
-#: src/gui/popupmenu.cpp:599
-msgid "@@follow|Follow@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
-#: src/gui/popupmenu.cpp:600
-msgid "@@imitation|Imitation@@"
-msgstr ""
+msgid "Imitation"
+msgstr "Ändra epostadress"
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
#, fuzzy
-msgid "@@party|Invite to party@@"
+msgid "Invite to party"
msgstr "/party > Bjud in en spelare till din grupp"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:659
#, fuzzy
-msgid "@@kick party|Kick from party@@"
+msgid "Kick from party"
msgstr "@@admin-kick|Sparka spelare@@"
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
#, fuzzy
-msgid "@@guild-kick|Kick from guild@@"
+msgid "Kick from guild"
msgstr "@@admin-kick|Sparka spelare@@"
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:640
-msgid "@@guild-pos|Change pos in guild >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:675
+#, fuzzy
+msgid "Change pos in guild"
+msgstr "Ändra"
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:681
#, fuzzy
-msgid "@@guild|Invite to guild@@"
+msgid "Invite to guild"
msgstr "/party > Bjud in en spelare till din grupp"
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Sparka spelare@@"
+#: src/gui/popupmenu.cpp:232
+#, fuzzy
+msgid "Kick player"
+msgstr "Kunde inte sparka ut!"
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
+#: src/gui/popupmenu.cpp:234
+msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:601
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
-#, fuzzy
-msgid "@@undress|Undress@@"
-msgstr "@@unignore|Sluta ignorera %s@@"
-
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:267
+msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
-#, fuzzy
-msgid "@@sell|Sell@@"
-msgstr "@@use|Använd@@"
-
-#: src/gui/popupmenu.cpp:235
-#, fuzzy
-msgid "@@talk|Talk@@"
-msgstr "@@attack|Attackera %s@@"
-
-#: src/gui/popupmenu.cpp:251
-#, fuzzy
-msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Sparka spelare@@"
-
-#: src/gui/popupmenu.cpp:262
-msgid "@@remove attack|Remove from attack list@@"
+#: src/gui/popupmenu.cpp:278
+msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:284
#, fuzzy
-msgid "@@add attack priority|Add to priority attack list@@"
+msgid "Add to priority attack list"
msgstr "@@attack|Attackera %s@@"
-#: src/gui/popupmenu.cpp:270
+#: src/gui/popupmenu.cpp:286
#, fuzzy
-msgid "@@add attack|Add to attack list@@"
+msgid "Add to attack list"
msgstr "@@attack|Attackera %s@@"
-#: src/gui/popupmenu.cpp:272
-msgid "@@add attack ignore|Add to ignore list@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:289
#, fuzzy
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Använd namn i chatt@@"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
-#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
-#: src/gui/popupmenu.cpp:674
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Avbryt@@"
+msgid "Add to ignore list"
+msgstr "Lagra"
-#: src/gui/popupmenu.cpp:304
-#, c-format
-msgid "@@player_%u|%s >@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@chat|Nämn i chattfönstret@@"
-#: src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:450
#, fuzzy
-msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Plocka upp %s@@"
+msgid "Pick up"
+msgstr "Plocka upp"
-#: src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
#, fuzzy
-msgid "@@chat|Add to chat@@"
+msgid "Add to chat"
msgstr "@@chat|Nämn i chattfönstret@@"
-#: src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:468
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:448
-msgid "@@rename map|Rename@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:469
+#, fuzzy
+msgid "Rename"
+msgstr "Kom ihåg användarnamnet"
-#: src/gui/popupmenu.cpp:449
-msgid "@@remove map|Remove@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#, fuzzy
+msgid "Remove"
+msgstr "Kom ihåg användarnamnet"
-#: src/gui/popupmenu.cpp:462
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:484
+msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:479
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:502
+msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:480
-#, fuzzy
-msgid "@@edit spell|Edit spell@@"
-msgstr "@@use|Använd@@"
-
-#: src/gui/popupmenu.cpp:498
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:503
+msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:529
#, fuzzy
msgid "Disable highlight"
msgstr "Flikmarkering"
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:534
#, fuzzy
msgid "Enable highlight"
msgstr "Flikmarkering"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:539
msgid "Dont remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:544
#, fuzzy
msgid "Remove name"
msgstr "Kom ihåg användarnamnet"
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:549
#, fuzzy
msgid "Enable away"
msgstr "Kan inte köpa."
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:554
#, fuzzy
msgid "Disable away"
msgstr "Tillåt/neka handel"
-#: src/gui/popupmenu.cpp:537
-msgid "@@leave party|Leave@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#, fuzzy
+msgid "Leave"
+msgstr "Stor"
-#: src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:694
#, fuzzy
msgid "Change guild position"
msgstr "Ändra"
-#: src/gui/popupmenu.cpp:671
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1069
+#: src/gui/popupmenu.cpp:1105
msgid "Rename map sign "
msgstr ""
-#: src/gui/popupmenu.cpp:1070
+#: src/gui/popupmenu.cpp:1106
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1422
+#: src/gui/popupmenu.cpp:1460
#, fuzzy
msgid "Add to trade"
msgstr "@@chat|Nämn i chattfönstret@@"
-#: src/gui/popupmenu.cpp:1428
+#: src/gui/popupmenu.cpp:1466
#, fuzzy
msgid "Add to trade 10"
msgstr "@@chat|Nämn i chattfönstret@@"
-#: src/gui/popupmenu.cpp:1431
+#: src/gui/popupmenu.cpp:1469
#, fuzzy
msgid "Add to trade half"
msgstr "Lagra"
-#: src/gui/popupmenu.cpp:1433
+#: src/gui/popupmenu.cpp:1471
#, fuzzy
msgid "Add to trade all"
msgstr "Lagra"
-#: src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1483
#, fuzzy
msgid "Store 10"
msgstr "Lagra"
-#: src/gui/popupmenu.cpp:1448
+#: src/gui/popupmenu.cpp:1486
#, fuzzy
msgid "Store half"
msgstr "Lagra"
-#: src/gui/popupmenu.cpp:1450
+#: src/gui/popupmenu.cpp:1488
#, fuzzy
msgid "Store all"
msgstr "Lagra"
-#: src/gui/popupmenu.cpp:1484
+#: src/gui/popupmenu.cpp:1522
#, fuzzy
msgid "Retrieve 10"
msgstr "Hämta"
-#: src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1525
#, fuzzy
msgid "Retrieve half"
msgstr "Hämta"
-#: src/gui/popupmenu.cpp:1489
+#: src/gui/popupmenu.cpp:1527
#, fuzzy
msgid "Retrieve all"
msgstr "Hämta"
-#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
-#: src/gui/popupmenu.cpp:1598
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|Nämn i chattfönstret@@"
-
-#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1640
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1712
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
+#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
#, fuzzy
msgid "(default)"
msgstr "Förval"
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
#, fuzzy
msgid "Move up"
msgstr "Gå uppåt"
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
#, fuzzy
msgid "Move down"
msgstr "Gå nedåt"
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1735
-#, fuzzy
-msgid "Remove"
-msgstr "Kom ihåg användarnamnet"
-
#: src/gui/quitdialog.cpp:54
msgid "Save state"
msgstr ""
@@ -2622,136 +2596,131 @@ msgstr ""
msgid "Atk"
msgstr "Attackera"
-#: src/gui/socialwindow.cpp:823
+#: src/gui/socialwindow.cpp:824
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:855
+#: src/gui/socialwindow.cpp:856
#, fuzzy
msgid "Attack mobs"
msgstr "Attackera"
-#: src/gui/socialwindow.cpp:890
+#: src/gui/socialwindow.cpp:891
#, fuzzy
msgid "Ignore mobs"
msgstr "Ignorerad"
-#: src/gui/socialwindow.cpp:953
+#: src/gui/socialwindow.cpp:954
msgid "Create Guild"
msgstr "Skapa gille"
-#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
#, fuzzy
msgid "Create Party"
msgstr "Skapa karaktär"
-#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1017
+#: src/gui/socialwindow.cpp:1018
#, fuzzy
msgid "Invite"
msgstr "Bjud in spelare"
-#: src/gui/socialwindow.cpp:1018
-#, fuzzy
-msgid "Leave"
-msgstr "Stor"
-
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1160
#, fuzzy, c-format
msgid "Accepted party invite from %s."
msgstr "Accepterade injudan från %s."
-#: src/gui/socialwindow.cpp:1169
+#: src/gui/socialwindow.cpp:1170
#, fuzzy, c-format
msgid "Rejected party invite from %s."
msgstr "Avslog inbjudan från %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1187
#, fuzzy, c-format
msgid "Accepted guild invite from %s."
msgstr "Accepterade injudan från %s."
-#: src/gui/socialwindow.cpp:1196
+#: src/gui/socialwindow.cpp:1197
#, fuzzy, c-format
msgid "Rejected guild invite from %s."
msgstr "Avslog inbjudan från %s."
-#: src/gui/socialwindow.cpp:1240
+#: src/gui/socialwindow.cpp:1241
#, fuzzy, c-format
msgid "Creating guild called %s."
msgstr "Kunde inte skapa gille."
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1264
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
#, fuzzy
msgid "Guild Name"
msgstr "Gille"
-#: src/gui/socialwindow.cpp:1278
+#: src/gui/socialwindow.cpp:1279
#, fuzzy
msgid "Choose your guild's name."
msgstr "Välj din server"
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1293
#, fuzzy
msgid "Received guild request, but one already exists."
msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
-#: src/gui/socialwindow.cpp:1298
+#: src/gui/socialwindow.cpp:1299
#, fuzzy, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s har bjudit in dig till %ss grupp."
-#: src/gui/socialwindow.cpp:1304
+#: src/gui/socialwindow.cpp:1305
#, fuzzy
msgid "Accept Guild Invite"
msgstr "Acceptera gruppinbjudan"
-#: src/gui/socialwindow.cpp:1319
+#: src/gui/socialwindow.cpp:1320
msgid "Received party request, but one already exists."
msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
-#: src/gui/socialwindow.cpp:1330
+#: src/gui/socialwindow.cpp:1331
#, fuzzy
msgid "You have been invited you to join a party."
msgstr "%s har bjudit in dig till sin grupp."
-#: src/gui/socialwindow.cpp:1334
+#: src/gui/socialwindow.cpp:1335
#, fuzzy, c-format
msgid "You have been invited to join the %s party."
msgstr "%s har bjudit in dig till %ss grupp."
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1343
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s har bjudit in dig till sin grupp."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1348
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s har bjudit in dig till %ss grupp."
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1357
msgid "Accept Party Invite"
msgstr "Acceptera gruppinbjudan"
-#: src/gui/socialwindow.cpp:1371
+#: src/gui/socialwindow.cpp:1372
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1376
+#: src/gui/socialwindow.cpp:1377
#, fuzzy
msgid "Party Name"
msgstr "Grupp"
-#: src/gui/socialwindow.cpp:1377
+#: src/gui/socialwindow.cpp:1378
#, fuzzy
msgid "Choose your party's name."
msgstr "Välj din server"
@@ -3182,99 +3151,99 @@ msgstr ""
msgid "(O)"
msgstr ""
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
#, fuzzy
msgid "No Target"
msgstr "Gå åt vänster"
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
#, fuzzy
msgid "Allow Target"
msgstr "Tillåt byteshandel"
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
#, fuzzy
msgid "Need Target"
msgstr "Gå åt vänster"
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
#, fuzzy
msgid "General Magic"
msgstr "Allmänt"
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
#, fuzzy
msgid "Life Magic"
msgstr "Magi"
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
#, fuzzy
msgid "War Magic"
msgstr "Magi"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
#, fuzzy
msgid "Command Editor"
msgstr "Kommando: /item"
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
#, fuzzy
msgid "magic"
msgstr "Magi"
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
#, fuzzy
msgid "Command:"
msgstr "Kommando: /who"
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:202
+#: src/gui/textcommandeditor.cpp:203
#, fuzzy
msgid "Target Type:"
msgstr "Välj spelare"
-#: src/gui/textcommandeditor.cpp:208
+#: src/gui/textcommandeditor.cpp:209
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:214
+#: src/gui/textcommandeditor.cpp:215
#, fuzzy
msgid "Magic level:"
msgstr "Maxnivå"
-#: src/gui/textcommandeditor.cpp:220
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:226
+#: src/gui/textcommandeditor.cpp:227
#, fuzzy
msgid "School level:"
msgstr "Visa namn"
-#: src/gui/textcommandeditor.cpp:231
+#: src/gui/textcommandeditor.cpp:232
msgid "Save"
msgstr ""
@@ -3298,10 +3267,6 @@ msgstr "Godkänt. Väntar…"
msgid "Trade: You"
msgstr "Byteshandel: du"
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Byteshandla"
-
#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
#, fuzzy, c-format
msgid "You get %s"
@@ -4185,74 +4150,74 @@ msgid ""
"strange behaviour."
msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
-#: src/localplayer.cpp:345
+#: src/localplayer.cpp:344
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1365
+#: src/localplayer.cpp:1364
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Kunde inte plocka upp."
-#: src/localplayer.cpp:1367
+#: src/localplayer.cpp:1366
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1369
+#: src/localplayer.cpp:1368
msgid "Item is too far away"
msgstr ""
-#: src/localplayer.cpp:1371
+#: src/localplayer.cpp:1370
#, fuzzy
msgid "Inventory is full."
msgstr "Servern är full"
-#: src/localplayer.cpp:1373
+#: src/localplayer.cpp:1372
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1376
+#: src/localplayer.cpp:1375
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1378
#, fuzzy
msgid "Unknown problem picking up item."
msgstr "Kunde inte plocka upp."
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1404
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1402
#, fuzzy, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Du plockade upp %s [@@%d|%s@@]."
msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
-#: src/localplayer.cpp:3134
+#: src/localplayer.cpp:3131
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3437
+#: src/localplayer.cpp:3435
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3439 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
#, fuzzy
msgid "Follow canceled"
msgstr " avbruten"
-#: src/localplayer.cpp:3446
+#: src/localplayer.cpp:3444
#, fuzzy
msgid "Imitation: "
msgstr "Ändra epostadress"
-#: src/localplayer.cpp:3448 src/localplayer.cpp:3456
+#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
#, fuzzy
msgid "Imitation canceled"
msgstr " avbruten"
-#: src/localplayer.cpp:3808
+#: src/localplayer.cpp:3806
#, fuzzy
msgid "You see "
msgstr "Du får %s."
@@ -5008,17 +4973,17 @@ msgid "M.Defense"
msgstr "M. försvar:"
#: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
+#, fuzzy, c-format
msgid "% Accuracy"
msgstr "% Träffsäkerhet:"
#: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy
+#, fuzzy, c-format
msgid "% Evade"
msgstr "% Kringgå:"
#: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy
+#, fuzzy, c-format
msgid "% Critical"
msgstr "Kritisk träff"
@@ -5648,11 +5613,6 @@ msgstr ""
msgid "Failed adding item for unknown reason."
msgstr "Kunde inte lägga till föremål av okänd anledning."
-#: src/playerrelations.cpp:404
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Ignorera %s fullständigt@@"
-
#: src/playerrelations.cpp:418
msgid "Print '...'"
msgstr ""
@@ -5699,6 +5659,88 @@ msgid "Unknown item"
msgstr "Okänt föremål"
#, fuzzy
+#~ msgid "@@trade|Trade@@"
+#~ msgstr "@@trade|Handla med %s@@"
+
+#, fuzzy
+#~ msgid "@@attack|Attack@@"
+#~ msgstr "@@attack|Attackera %s@@"
+
+#, fuzzy
+#~ msgid "@@whisper|Whisper@@"
+#~ msgstr "@@use|Använd@@"
+
+#, fuzzy
+#~ msgid "@@heal|Heal@@"
+#~ msgstr "@@cancel|Avbryt@@"
+
+#, fuzzy
+#~ msgid "@@friend|Be friend@@"
+#~ msgstr "@@retrieve|Hämta@@"
+
+#, fuzzy
+#~ msgid "@@disregard|Disregard@@"
+#~ msgstr "@@disregard|Strunta i %s@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Ignore@@"
+#~ msgstr "@@ignore|Ignorera %s@@"
+
+#, fuzzy
+#~ msgid "@@erase|Erase@@"
+#~ msgstr "@@use|Använd@@"
+
+#, fuzzy
+#~ msgid "@@unignore|Unignore@@"
+#~ msgstr "@@unignore|Sluta ignorera %s@@"
+
+#, fuzzy
+#~ msgid "@@ignore|Completely ignore@@"
+#~ msgstr "@@ignore|Ignorera %s fullständigt@@"
+
+#, fuzzy
+#~ msgid "@@party|Invite to party@@"
+#~ msgstr "/party > Bjud in en spelare till din grupp"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Sparka spelare@@"
+
+#, fuzzy
+#~ msgid "@@undress|Undress@@"
+#~ msgstr "@@unignore|Sluta ignorera %s@@"
+
+#, fuzzy
+#~ msgid "@@sell|Sell@@"
+#~ msgstr "@@use|Använd@@"
+
+#, fuzzy
+#~ msgid "@@talk|Talk@@"
+#~ msgstr "@@attack|Attackera %s@@"
+
+#, fuzzy
+#~ msgid "@@admin-kick|Kick@@"
+#~ msgstr "@@admin-kick|Sparka spelare@@"
+
+#, fuzzy
+#~ msgid "@@name|Add name to chat@@"
+#~ msgstr "@@name|Använd namn i chatt@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Avbryt@@"
+
+#, fuzzy
+#~ msgid "@@pickup|Pick up@@"
+#~ msgstr "@@pickup|Plocka upp %s@@"
+
+#, fuzzy
+#~ msgid "@@chat|Add to chat@@"
+#~ msgstr "@@chat|Nämn i chattfönstret@@"
+
+#, fuzzy
+#~ msgid "@@edit spell|Edit spell@@"
+#~ msgstr "@@use|Använd@@"
+
+#, fuzzy
#~ msgid "Selected mobs"
#~ msgstr "Välj okej"
@@ -6108,10 +6150,6 @@ msgstr "Okänt föremål"
#~ msgstr "@@party|Bjud in %s till din grupp@@"
#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "Kunde inte sparka ut!"
-
-#, fuzzy
#~ msgid "Talk to %s"
#~ msgstr "@@talk|Prata med %s@@"
@@ -6152,9 +6190,6 @@ msgstr "Okänt föremål"
#~ msgid "Player"
#~ msgstr "Spelare"
-#~ msgid "Whisper"
-#~ msgstr "Viskning"
-
#~ msgid "Is"
#~ msgstr "Är"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 01:47:50 +0000