summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/cs.po879
-rw-r--r--po/de.po877
-rw-r--r--po/es.po891
-rw-r--r--po/fi.po879
-rw-r--r--po/fr.po883
-rw-r--r--po/id.po878
-rw-r--r--po/it.po104
-rw-r--r--po/ja.po877
-rw-r--r--po/manaplus.pot875
-rw-r--r--po/nl_BE.po879
-rw-r--r--po/pt.po881
-rw-r--r--po/pt_BR.po881
-rw-r--r--po/ru.po879
-rw-r--r--po/zh_CN.po879
14 files changed, 6481 insertions, 5061 deletions
diff --git a/po/cs.po b/po/cs.po
index 9fbfa2a0c..9288981c2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-28 00:55+0000\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
"cs/)\n"
@@ -43,47 +43,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Nastavení"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Výkon"
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr ""
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "Přihlašuji se"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Požaduji postavy"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Zaměňuji herní servery"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,63 +93,63 @@ msgstr "Zaměňuji herní servery"
msgid "Error"
msgstr "Chyba"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Požaduji registrační detaily"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Změna hesla"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "Změna emailu"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Neplatný host updatů: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "Chyba při vytváření adresáře s updaty!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Neznámý příkaz."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "Nelze zaslat prázdné šeptání!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,101 +158,105 @@ msgstr ""
"Nelze vytvořit záložku se šeptáním pro \"%s\"! Buďto záložka existuje nebo "
"jsi to ty."
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr ""
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Chybí jméno party."
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Chybí jméno guildy."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Prosím zadej jméno."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "Enter přepíná chat."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "Zpráva zavírá chat."
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "Enter nyní přepíná chat."
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Zpráva nyní ukončuje chat."
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "přítel"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "přehlížený"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "neutrální"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "Hráč je již %s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "Hráč byl úspěšně zařazen jako %s!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "Hráč nemůže být zařazen jako %s!"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "Hráč nebyl ignorován!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "Hráč již není ignorován!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Hráč nemůže být odignorován!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "Hráč již byl vymazán!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "Hráč byl úspěšně vymazán!"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "Hráč nemůže být vymazán!"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr "Doba běhu klienta: %s"
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -260,7 +264,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -268,7 +272,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -276,7 +280,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -284,7 +288,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -292,27 +296,27 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr "velikost chache fontů"
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr "Velikost cache:"
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "Vytvořeno:"
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "Odstraněno:"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr ""
@@ -341,23 +345,23 @@ msgstr "Ukládání snímku obrazovky selhalo!"
msgid "The connection to the server was lost."
msgstr "Spojení se serverem bylo ztraceno."
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Chyba sítě"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Ignorovat příchozí žádosti o obchodování"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Akceptovat příchozí žádosti o obchodování"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "Nelze načíst mapu"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Chyba při načítání %s"
@@ -391,19 +395,19 @@ msgid "Name"
msgstr "Jméno"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Útok"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Mluvit"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr ""
@@ -416,8 +420,8 @@ msgid "Reset"
msgstr "Vynulovat"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Nákup"
@@ -435,7 +439,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr ""
@@ -443,7 +447,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr ""
@@ -456,7 +460,7 @@ msgstr "Ukončit"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Vše"
@@ -465,8 +469,8 @@ msgstr "Vše"
msgid "Shop"
msgstr "Obchod"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -475,15 +479,15 @@ msgstr "Prodej"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -654,7 +658,7 @@ msgid "Enter password:"
msgstr "Zadej heslo:"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Smazat"
@@ -730,10 +734,10 @@ msgstr "duhová 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -741,12 +745,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Přítomno: %s; %d hráčů je přítomno."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Šeptání pro %s: %s"
@@ -760,10 +764,12 @@ msgid "No"
msgstr "Ne"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "Ignorovat"
@@ -909,7 +915,7 @@ msgstr "Víte že ... ?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Zavřít"
@@ -936,8 +942,8 @@ msgstr "Vybavení"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Odstranit z vybavení"
@@ -979,31 +985,31 @@ msgid "Filter:"
msgstr "Filtr:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Vybavit"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Použít"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Upustit..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Rozdělit"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Výstroje"
@@ -1012,17 +1018,17 @@ msgid "Weight:"
msgstr "Hmotnost:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Uložit"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Vzít"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Upustit"
@@ -1264,7 +1270,7 @@ msgstr "Odeslat"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Vyprázdnit"
@@ -1302,331 +1308,347 @@ msgstr "Nejdřív odstrojit"
msgid "Away outfit"
msgstr "Výstroj pro \"Away\""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Obchod"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Šeptat"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Vyléčit"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Být přátelé"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Přehlížet"
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr "Vymazat"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr "Odignorovat"
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "Kompletně ignorovat"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Následovat"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr "imitovat"
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr "Pozvat do party"
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr "Vykopnout z party"
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr "Vykopnout z gildy"
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr "Změnit pozici v gildě"
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr "Pozvat do gildy"
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "Vykopnout hráče"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "Zobrazit věci"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr "Svléct"
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr "Přidat komentář"
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr "Koupit (?)"
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr "Prodat (?)"
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr "Vykopnout"
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr "Vložit do seznamu ignorovaných"
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr "Vložit jméno do chatu"
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Sebrat"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Vložit do chatu"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "Označit na mapě"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Přejmenovat"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "Odebrat"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr "Načíst staré výstroje"
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Kouzla"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr "Načíst stará kouzla"
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr "Upravit kouzlo"
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "vypnout zvýrazǒvání"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Zapnout zvýrazňování"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr "Neodebírat jméno"
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "Odebrat jméno"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr "Zapnout \"away\""
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr "Vypnout \"away\""
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Odejít"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Přejmenovat značku an mapě"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Jméno: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr "Hráčův komentář"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr "Komentář: "
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr "Přidat do transakce"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr "Přidat 10 do transakce"
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr "Přidat polovinu do transakce"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr "Přidat vše do transakce"
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "Uschovat 10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Uschovat polovinu"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Uschovat všechny"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr "Upustit vše"
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "Vzít 10"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Vzít polovinu"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Vzít všechny"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr "Načíst staré zkratky věcí"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr "Načíst staré zkratky upuštění"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "Skrýt"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "Zobrazit"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr "Resetovat žlutý pruh"
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Zkopírovat do chatu"
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "Posunout nahoru"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr "Posunout dolů"
@@ -2145,22 +2167,22 @@ msgid "Enable bot checker"
msgstr "Zapnout ověřovač botů"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "Zapnout ochranu proti vadným serverům"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "Zapnout debug záznam"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr "Mód nízké síťvé náročnosti"
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr "Skrýt zobrazení štítu"
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Zobrazit pozadí"
@@ -2288,91 +2310,151 @@ msgstr "Vymazán"
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Povolit obchodování"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Povolit šeptání"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Starý"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr "Vztahy"
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Když ignoruji:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Mrňavý (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Malý (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Střední (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Velký (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Větší (14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Obrovský (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Téma"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "Téma GUI"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Hlavní font"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Tučný font"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "Font částic"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "Pomocný font"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr "Bezpečný font"
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr "Japonský font"
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Velikost písma"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Téma změněno"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Restartujte klient pro aplikováni změn."
@@ -2802,247 +2884,267 @@ msgstr "Zvolte jméno vaší party."
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr "(D) výchozí pohyby"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr "(I) invertované pohyby"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr "(c) pohyby s trochou šílených pohybů"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr "(C) pohyby s šílenými pohyby"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr "(d) dvojité normální + šílené"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) pohyb"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr "(a) vlastní šílené pohyby"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr "(?) šílené pohyby"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr "(0) výchozí pohyb k cíli"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr "(1) pohyb k cíli do vzdálenosti 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr "(2) pohyb k cíli do vzdálenosti 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr "(3) pohyb k cíli do vzdálenosti 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr "(5) pohyb k cíli do vzdálenosti 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr "(7) pohyb k cíli do vzdálenosti 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr "(A) pohyb k cíli na útočný dosah"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?) pohyb k cíli"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr "(D) výchozí následování"
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr "(R) relativní následování"
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr "(M) zrcadlené následování"
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr "(?) neznámé následování"
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr "(D) výchozí útok"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr "(s) přepínat útok bez štítu"
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr "(S) přepínat útok se štítem"
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) útok"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) jdi a útoč"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr "(A) jdi, útoč, sbírej"
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr "(d) bez automatického útoku"
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr "(S) malý sběr 1x1 pole"
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr "(D) výchozí sběr 2x1 pole"
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) sběr před 2x3 pole"
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr "(3) sběr 3x3 pole"
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr "(g) jdi a seber do vzdálenosti 4"
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr "(G) jdi a seber do vzdálenosti 8"
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr "(A) jdi a seber do max. vzdálenosti"
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?) sběr"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr "(N) Normální zobrazení mapy"
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr "(D) debug zobrazení mapy"
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr "(u) ultra zobrazení mapy"
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr "(U) ultra zobrazení mapy 2"
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr "(e) zobrazen prázdné mapy"
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr "(b) zobrazení černobílé mapy"
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr "(?) zobrazení pamy"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr "(f) použij #flar pro magický útok"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr "(c) použij #chiza pro magický útok"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr "(I) použij #ingrav pro magický útok"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr "(F) použij #frillyar pro magický útok"
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) použij #upmarmu pro magický útok"
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr "(?) magický útok attack"
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr "(D) výchozí imitace"
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr "(O) imitace výstroje"
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr "(?) imitace"
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr "(O) u počítače"
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) pryč (away)"
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) away"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr "(G) mód herní kamery"
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr "(F) mód volné kamery"
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr "Modifikátory hry jsou vypnuty"
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr "Modifikátory hry jsou zapnuty"
@@ -3096,8 +3198,8 @@ msgstr ""
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3114,19 +3216,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3142,7 +3247,7 @@ msgstr "(1)"
msgid "(2)"
msgstr " (2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3155,7 +3260,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3175,49 +3280,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3942,7 +4047,7 @@ msgstr ""
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr ""
@@ -4069,7 +4174,7 @@ msgstr "Smajlíky"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "Zkratka smajlíku %d"
@@ -4198,51 +4303,55 @@ msgstr "Použít magický útok"
msgid "Switch magic attack"
msgstr "Přepnout magický útok"
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
msgid "Change move type"
msgstr "Změnit typ pohybu"
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
msgstr "Změnit typ útočné zbraně"
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
msgstr "Změnit typ útoku"
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
msgstr "Změnit mód následování"
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr "Změnit mód imitace"
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr ""
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "Zapnout/Vypnout audio"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr "Zapnout/Vypnout Away mód"
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr "Emulovat pravý klik z klávesnice"
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr "přemnout mód kamery"
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr "Klávesa modifikátoru"
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4251,41 +4360,41 @@ msgstr ""
"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
"chovat podivně."
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr "Zabil vás "
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr "Snažili jste se sebrat neexistující předmět."
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "Předmět je příliš těžký."
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "Předmět je příliš daleko."
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr "Inventář je plný."
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr "Hromada je příliš velká."
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr "Předmět patří někomu jinému."
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr "Neznámý problém při pokusu sebrat předmět."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4293,27 +4402,27 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr "Následování zrušeno."
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr "Imitace zrušena."
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "Vidíte "
@@ -5105,53 +5214,53 @@ msgstr ""
msgid "%s wants to trade with you, do you accept?"
msgstr ""
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr ""
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr ""
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr ""
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr ""
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr ""
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr ""
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr ""
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr ""
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr ""
@@ -5587,19 +5696,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr ""
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 961f67b55..8275017be 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-28 00:55+0000\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
"de/)\n"
@@ -45,47 +45,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Einstellungen"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr ""
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "Verbinde zum Server"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "Anmelden"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Spielfiguren werden angefragt"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "Verbinde zum Charakterserver"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Charakterserver wechseln"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,64 +95,64 @@ msgstr "Charakterserver wechseln"
msgid "Error"
msgstr "Fehler"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Passwort ändern"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "E-Mail ändern"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "erfolgreich abgemeldet."
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, 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:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Ungültiger Updateserver: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
"Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Unbekannter Befehl."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "Kann keine leeren Nachrichten versenden!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -161,156 +161,160 @@ msgstr ""
"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
"oder du bist es selbst."
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "Anfrage den Kanal %s betreten zu dürfen."
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Name der Party fehlt."
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Name der Gilde fehlt."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Bitte gib einen Namen an."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "Nachricht schließt den Chat."
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "Enter aktiviert jetzt den Chat."
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Nachricht schließt jetzt den Chat."
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "Freund"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "unbeachtet"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "neutral"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "Spieler ist bereits %s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "Spieler erfolgreich %s!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "Spieler konnte nicht %s werden!"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "Spieler wurde nicht ignoriert!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "Spieler wird nicht länger ignoriert!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "Spieler ist bereits gelöscht!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "Spieler erfolgreich gelöscht!"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "Spieler konnte nicht gelöscht werden!"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr ""
@@ -340,23 +344,23 @@ msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
msgid "The connection to the server was lost."
msgstr "Die Verbindung zum Server wurde getrennt."
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Netzwerkfehler"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Ignoriere eingehende Handelsanfragen"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Akzeptiere eingehende Handelsanfragen"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "Karte konnte nicht geladen werden."
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Fehler beim Laden von %s"
@@ -390,19 +394,19 @@ msgid "Name"
msgstr "Name"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Angriff"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Sprechen"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "Bewegen"
@@ -415,8 +419,8 @@ msgid "Reset"
msgstr "Zurücksetzten"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Kaufen"
@@ -434,7 +438,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -442,7 +446,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -455,7 +459,7 @@ msgstr "Beenden"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Max"
@@ -464,8 +468,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Laden"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -474,15 +478,15 @@ msgstr "Verkaufen"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -653,7 +657,7 @@ msgid "Enter password:"
msgstr ""
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Löschen"
@@ -729,10 +733,10 @@ msgstr "Regenbogen 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -740,12 +744,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Anwesend: %s ;%d Spieler sind anwesend."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Flüsternd zu %s: %s"
@@ -759,10 +763,12 @@ msgid "No"
msgstr "Nein"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "ignorieren"
@@ -908,7 +914,7 @@ msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Schließen"
@@ -935,8 +941,8 @@ msgstr "Ausrüstung"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Ablegen"
@@ -978,31 +984,31 @@ msgid "Filter:"
msgstr "Filter:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Ausrüsten"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Benutzen"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Wegwerfen"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Aufteilen"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Ausrüstung"
@@ -1011,17 +1017,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Aufbewahren"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Abholen"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Wegwerfen"
@@ -1261,7 +1267,7 @@ msgstr "Absenden"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Frei"
@@ -1299,331 +1305,347 @@ msgstr "Zuerst ausziehen"
msgid "Away outfit"
msgstr "Abwesend-Outfit"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Handeln"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Flüstern"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Heilen"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Befreunden"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "@@ignore|Ignoriere %s komplett@@"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Folgen"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr "Kommentar hinzufügen"
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Aufheben"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Zu Chat hinzufügen"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Umbenennen"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "Entfernen"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Zaubersprüche"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "Hervorhebung abschalten"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Hervorhebung einschalten"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Verlassen"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "Position der Gilde ändern"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Kartenzeichen umbenennen"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Name:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "10 aufbewahren"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Die Hälfte aufbewahren"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Alles aufbewahren"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "10 abholen"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Die Hälfte abholen"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Alles abholen"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr ""
@@ -2143,22 +2165,22 @@ msgid "Enable bot checker"
msgstr "Botprüfer einschalten"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
+msgid "Enable buggy servers protection (do not disable)"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "Debug-Protokoll benutzen"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Zeige Hintergrund"
@@ -2286,91 +2308,151 @@ msgstr "Gelöscht"
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Handeln erlauben"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Flüstern erlauben"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Alt"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr ""
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Wenn ignorierend:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Winzig"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Klein"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Mittel"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Groß"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Sehr groß"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Riesig"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Theme"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "GUI Theme"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Hauptschriftart"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Dicke Schrift"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "Schrift von Spieleraktionen"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr ""
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr ""
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr ""
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Schriftgröße"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Theme geändert"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
@@ -2805,247 +2887,267 @@ msgstr "Name deiner Party wählen."
msgid "Specials"
msgstr "Special"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr ""
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr ""
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr ""
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr ""
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr ""
@@ -3099,8 +3201,8 @@ msgstr ""
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr ""
@@ -3117,19 +3219,22 @@ msgid "(C)"
msgstr ""
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr ""
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr ""
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr ""
@@ -3145,7 +3250,7 @@ msgstr ""
msgid "(2)"
msgstr ""
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr ""
@@ -3158,7 +3263,7 @@ msgid "(7)"
msgstr ""
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr ""
@@ -3178,49 +3283,49 @@ msgstr ""
msgid "(s)"
msgstr ""
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr ""
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr ""
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr ""
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr ""
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr ""
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr ""
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr ""
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr ""
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr ""
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr ""
@@ -3951,7 +4056,7 @@ msgstr ""
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "Kurztaste %d"
@@ -4078,7 +4183,7 @@ msgstr "Grinsen"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "Gefühlstaste %d"
@@ -4207,119 +4312,123 @@ msgstr ""
msgid "Switch magic attack"
msgstr ""
-#: src/keyboardconfig.cpp:328
-msgid "Change move type"
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
msgstr ""
#: src/keyboardconfig.cpp:330
-msgid "Change Attack Weapon Type"
+msgid "Change move type"
msgstr ""
#: src/keyboardconfig.cpp:332
-msgid "Change Attack Type"
+msgid "Change Attack Weapon Type"
msgstr ""
#: src/keyboardconfig.cpp:334
-msgid "Change Follow mode"
+msgid "Change Attack Type"
msgstr ""
#: src/keyboardconfig.cpp:336
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr ""
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr ""
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr ""
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr ""
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr ""
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr ""
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr ""
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "Abwesend"
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "Folgen:"
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "Du siehst"
@@ -5110,53 +5219,53 @@ msgstr ""
msgid "%s wants to trade with you, do you accept?"
msgstr "%s möchte mit dir handeln, stimmst du zu?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr ""
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr ""
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr ""
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr ""
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr ""
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr ""
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr ""
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "Handel abgebrochen."
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "Handel abgeschlossen."
@@ -5595,19 +5704,19 @@ msgstr "Verbindung mit Server abgebrochen. "
msgid "%s is not in your party!"
msgstr "%s ist nicht in Deiner Party!"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr "Drucke '..'"
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr "Blinkender Name"
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr "Schwebende '...' Blase"
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "Schwebende Blase"
diff --git a/po/es.po b/po/es.po
index 03ba04764..a19942550 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-29 03:29+0000\n"
-"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
"manaplus/team/es/)\n"
"Language: es\n"
@@ -45,47 +45,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configuración"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Rendimiento"
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "Conectando al servidor"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "Accediendo a la cuenta"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Cargando personajes"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,63 +95,63 @@ msgstr "Cambiando servidores del juego"
msgid "Error"
msgstr "Error"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Cambio de contraseña"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "Cambio de Email"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "Registro cancelado"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, 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:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Servidor de actualización inválido: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Comando desconocido."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "¡No puedes enviar susurros vacíos!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,156 +160,160 @@ msgstr ""
"¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
"existe, o eres tú."
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando la entrada del canal %s."
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Falta el nombre del grupo."
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Falta el nombre del Clan."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Por favor, especifique un nombre."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "Volver a alternar el chat."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "Mensaje cierra la charla."
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "Volver ahora a cambiar de chat."
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Mensaje ahora cierra el chat."
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "desatendido"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "neutral"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "¡Jugador ya es %s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "¡Jugador %s exitosamente!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "¡Jugador no pudo ser %s!"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "El jugador no estaba ignorado!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "¡El jugador ya no es ignorado!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "¡Al jugador no se le puede dejar de ignorar!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr "en la lista negra"
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "¡Jugador ya borrado!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "¡Jugador borrado con éxito!"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "¡Jugador no pudo ser borrado!"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr "Tiempo de actividad del cliente: %s"
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d día"
msgstr[1] "%d días"
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr "tamaño de caché de fuente"
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr "Tám. caché:"
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "Creado:"
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "Borrado:"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr "Imágenes de recurso:"
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr "Imágenes de recurso huérfano:"
@@ -339,23 +343,23 @@ msgstr "¡El guardado de la captura de pantalla ha fallado!"
msgid "The connection to the server was lost."
msgstr "Se ha perdido la conexión con el servidor."
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Error de Red"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Ignorando las peticiones de intercambio"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Aceptando las peticiones de intercambio"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "No se pudo cargar el mapa"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Error mientras cargaba %s"
@@ -389,19 +393,19 @@ msgid "Name"
msgstr "Nombre"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Hablar"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "Mover"
@@ -414,8 +418,8 @@ msgid "Reset"
msgstr "Restablecer"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Comprar"
@@ -433,7 +437,7 @@ msgstr "Cantidad:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -441,7 +445,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -454,7 +458,7 @@ msgstr "Salir"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Máximo"
@@ -463,8 +467,8 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Tienda"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -473,15 +477,15 @@ msgstr "Vender"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -652,7 +656,7 @@ msgid "Enter password:"
msgstr "Ingrese contraseña:"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Borrar"
@@ -728,10 +732,10 @@ msgstr "arco iris 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -739,12 +743,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jugadores estan presentes."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Susurrando a %s: %s"
@@ -758,10 +762,12 @@ msgid "No"
msgstr "No"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "Ignorar"
@@ -907,7 +913,7 @@ msgstr "¿Sabías que...?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Cerrar"
@@ -934,8 +940,8 @@ msgstr "Equipamiento"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Quitárselo"
@@ -977,31 +983,31 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Tirar..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Dividir"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Conjuntos"
@@ -1010,17 +1016,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Almacenar"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Recuperar"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Tirar"
@@ -1096,7 +1102,7 @@ msgstr "Exp: %d/%d Queda: %d"
#: src/gui/killstats.cpp:228
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr "1%% = %d exp, prom. pandilla para 1%%: %s"
+msgstr "1%% = %d exp, prom. criatura para 1%%: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
#: src/gui/killstats.cpp:237
@@ -1108,7 +1114,7 @@ msgstr "Muertes: %s, exp. total: %s"
#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr "Prom. Exp: %s, Prom. de pandilla para siguiente nivel: %s"
+msgstr "Exp prom.: %s, Prom. de criatura para siguiente nivel: %s"
#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
#: src/gui/killstats.cpp:240
@@ -1260,7 +1266,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Limpiar"
@@ -1298,331 +1304,347 @@ msgstr "Quitárselo antes"
msgid "Away outfit"
msgstr "Conjunto para modo AFK"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Intercambio"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Susurrar"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Sanar"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Ser amigo"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Desatender"
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr "Lista negra"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr "Borrar"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr "Des-ignorar"
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr "Imitación"
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr "Invitar a grupo"
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr "Sacar del grupo"
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr "Sacar del clan"
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr "Cambiar posición en el clan"
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr "Invitar al clan"
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "Sacar jugador"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr "Eliminar"
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "Mostrar artículos"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr "Desvestir"
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr "Agregar comentario"
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr "Sacar"
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr "Remover de la lista de ataque"
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr "Añadir a la lista de ataque prioritaria"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr "Agregar a la lista de ataque"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr "Agregar a la lista de ignorados"
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr "Agregar nombre al chat"
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Recoger"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Añadir al chat"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "Mapa Objeto"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Renombrar"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "Quitar"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr "Deformar"
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr "Cargar conjuntos antiguos"
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Hechizos"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr "Cargar hechizos antiguos"
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr "Editar hechizo"
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "Deshabilitar resaltado"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Habilitar resaltado"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr "No remover nombre"
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "Remover nombre"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr "Habilitar ausencia"
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr "Deshabilitar ausencia"
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Dejar"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "Cambiar posición del Clan"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Renombrar señal del mapa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Nombre:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr "Comentario del jugador "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr "Comentario: "
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr "Agredar al intercambio"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr "Agregar 10 al intercambio"
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr "Agregar la mitad al intercambio"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr "Agregar todo al intercambio"
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "Almacenar 10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Almacenar la mitad"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Almacenar todo"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr "Tirar todo"
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "Recuperar 10"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Recuperar la mitad"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Recuperar todo"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr "Cargar atajos antiguos de artículos"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr "Cargar atajos antiguos de soltar (drop)"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr "Restablecer barra amarilla"
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copiar al chat"
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(predeterminado)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "Subir"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr "Bajar"
@@ -2142,22 +2164,22 @@ msgid "Enable bot checker"
msgstr "Habilitar el control de robot"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "Habilitar la proteción contra servidores defectuosos"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "Habilitar registro de depuración"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr "Modo de bajo tráfico"
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr "Ocultar los objetos escudos"
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Mostrar fondo"
@@ -2285,91 +2307,151 @@ msgstr "Borrado"
msgid "Blacklisted"
msgstr "En la lista negra"
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Permitir intercambios"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Permitir mensajes privados"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Viejo"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr "Relaciones"
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Cuando se ignora a alguien:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Diminuto (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Pequeño (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Medio (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Extenso (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Grande (14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Enorme (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "Tema de interfáz gráfica"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Fuente principal"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Fuente negrita"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "Fuente de partícula"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "Fuente de la ayuda"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr "Fuente segura"
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr "Fuente japonesa"
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Tamaño de fuente"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Tema cambiado"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Reincie el juego para que los cambios tengan efecto."
@@ -2679,15 +2761,15 @@ msgstr "Ataque"
#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
-msgstr "Pandillas prioritarias"
+msgstr "Criaturas prioritarias"
#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
-msgstr "Ataques de las pandillas"
+msgstr "Criaturas atacadas"
#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
-msgstr "Ignorar pandillas"
+msgstr "Criaturas ignoradas"
#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
@@ -2799,247 +2881,267 @@ msgstr "Escoja el nombre del grupo."
msgid "Specials"
msgstr "Especiales"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr "(D) moverse predeterminado"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr "(I) moverse invertido"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr "(c) moverse con algunos movimientos locos"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr "(C) moverse con movimientos locos"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr "(d) doble normal + loco"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) maniobra"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr "(a) maniobra alocada personalizada"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr "(?) maniobra loca"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr "(0) moverse por defecto hacia el objetivo"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr "(1) moverse al objetivo en distancia 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr "(2) moverse al objetivo en distancia 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr "(3) moverse al objetivo en distancia 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr "(5) moverse al objetivo en distancia 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr "(7) moverse al objetivo en distancia 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr "(A) desplazarse al objetivo en el rango de ataque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr "(a) rango de ataque de arquero"
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?) mover al objetivo"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr "(D) seguimiento predeterminado"
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr "(R) seguimiento relativo"
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr "(M) seguimiento tipo espejo"
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr "(P) seguimiento como mascota"
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr "(?) seguimiento desconoicido"
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr "(D) ataque predeterminado"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr "(s) intercambiar ataque sin escudo"
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr "(S) intercambiar ataque con escudo"
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) atacar"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) ir y atacar"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr "(A) ir, atacar, recoger"
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr "(d) sin atacar automáticamente"
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr "(S) recoger a 1x1 celdas (pequeño)"
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr "(D) recoger a 2x1 celdas (predeterminado)"
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) recoger interesadamente a 2x3 celda"
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr "(3) recoger a 3x3 celdas"
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr "(g) ir y recoger en distancia 4"
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr "(G) ir y recoger en distancia 8"
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr "(A) ir y recoger a máxima distancia"
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?) recoger"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr "(N) vista normal del mapa"
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr "(D) vista depurar del mapa"
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr "(u) ultra vista del mapa"
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr "(U) ultra vista del mapa 2"
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr "(e) vista vacía del mapa"
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr "(b) vista del mapa en blanco y negro"
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr "(?) vista del mapa"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr "(f) usar #flar para ataque mágico"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr "(c) usar #chiza para ataque mágico"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr "(I) usar #ingrav para ataque mágico"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr "(F) usar #frillyar para ataque mágico"
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) usar #upmarmu para ataque mágico"
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr "(?) ataque mágico"
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr "(D) imitación predeterminada"
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr "(O) imitación de conjuntos"
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr "(?) imitación"
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr "(O) en el teclado"
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) lejos del teclado"
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) afuera"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr "(G) modo de cámara de juego"
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr "(F) modo de cámara libre"
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr "(D) Definir el modo operativo de la cámara"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr "Modificadores del juego están deshabilitados"
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr "Modificadores del juego están habilitados"
@@ -3093,8 +3195,8 @@ msgstr "Puntos de corrección: %d"
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3111,19 +3213,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3139,7 +3244,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3152,7 +3257,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3172,49 +3277,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3945,7 +4050,7 @@ msgstr "Tecla de acceso directo de objeto"
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "Atajo para el objeto %d"
@@ -4072,7 +4177,7 @@ msgstr "Emoticono"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "Atajo para Emoticono %d"
@@ -4201,51 +4306,55 @@ msgstr "Usar ataque mágico"
msgid "Switch magic attack"
msgstr "Intercambiar ataque mágico"
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
msgid "Change move type"
msgstr "Cambiar tipo de maniobra"
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
msgstr "Cambiar tipo de arma de ataque"
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
msgstr "Cambiar tipo de ataque"
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
msgstr "Cambiar modo de perseguir"
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr "Cambiar modo de Imitación"
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr "Habilitar / Deshabilitar las teclas de modification del juego"
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "Encender / Apagar audio"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr "Habilitar / Deshabilitar modo AFK"
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr "Emular clic derecho desde el teclado"
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr "Interruptor de tipo de cámara"
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr "Tecla modificadora"
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4254,68 +4363,68 @@ msgstr ""
"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
"puede presentar un comportamiento raro."
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr "Fuiste eliminado por "
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr "Intentaste recoger un objeto inexistante."
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "El artículo es muy pesado."
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "El artículo está muy lejos."
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr "El inventario está lleno."
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr "El agrupamiento es demasiado grande."
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr "El artículo pertenece a alguien más."
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr "Problema desconocido al intentar recoger el artículo."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, 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:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "Fuera del Teclado"
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "Seguir: "
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr "Imitacion: "
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr "Imitación cancelada"
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "Ves "
@@ -5120,54 +5229,54 @@ msgstr "Veneno no tuvo ningún efecto..."
msgid "%s wants to trade with you, do you accept?"
msgstr "%s quiere comerciar contigo, aceptas?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr ""
"No es posible realizar el Intercambio. El otro personaje está muy alejado."
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr "El intercambio no es posible. El personaje no existe."
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr "Intercambio cancelado por una razón desconocida."
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr "Intercambio: Tú y %s"
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr "Intercambio con %s cancelado."
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr "Intercambio no soportado."
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Error al añadir objeto. El otro jugador no tiene más espacio."
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr "Fallo al agregar artículo. No puedes intercambiar este artículo."
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr "Fallo al anadir objeto por una razón desconocida."
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "Intercambio Cancelado."
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "Intercambio Realizado."
@@ -5607,19 +5716,19 @@ msgstr "Conexión al servidor terminada."
msgid "%s is not in your party!"
msgstr "%s no está en tu grupo!"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr "Imprimir '...'"
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr "Parpadear nombre"
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr "Burbuja '...' flotante"
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "Burbuja Flotante"
diff --git a/po/fi.po b/po/fi.po
index b7071d382..8483f673a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-28 00:55+0000\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fi\n"
@@ -41,47 +41,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Asetukset"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Kuva"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr ""
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "Kirjaudun sisään"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -91,63 +91,63 @@ msgstr "Vaihdan pelipalvelinta"
msgid "Error"
msgstr "Virhe"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Salasanan vaihto"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "Sähköpostin vaihto"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/client.cpp:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Epäkelpo päivitysosoite: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Tuntematon komento."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "Et voi lähettää tyhjiä kuiskauksia!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -156,156 +156,160 @@ msgstr ""
"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
"käytit omaa nimeäsi."
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "Pyyntö liittyä kanavalle %s lähetetty."
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Ryhmän nimi puuttuu."
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Killan nimi puuttuu."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Anna nimi."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "Viesti sulkee keskustelun."
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Nyt viesti sulkee keskustelun."
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "ystävä"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "vaimennettu"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "neutraali"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "Pelaaja on jo %s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "Pelaaja on nyt %s."
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "Pelaajaa ei ollut jätetty huomiotta!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "Pelaaja huomioidaan taas."
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "Pelaaja on jo pyyhitty!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "Pelaaja pyyhitty."
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr "Ohjelma ollut käynnissä: %s"
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d viikon"
msgstr[1] "%d viikkoa"
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d päivän"
msgstr[1] "%d päivää"
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d tunnin"
msgstr[1] "%d tuntia"
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuutin"
msgstr[1] "%d minuuttia"
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d sekunnin"
msgstr[1] "%d sekuntia"
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr "kirjasinvälimuistin koko"
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr "Välimuistin koko:"
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "Luotu:"
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "Poistettu:"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr "Resurssikuvat:"
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr "Orvot resurssikuvat:"
@@ -336,23 +340,23 @@ msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
msgid "The connection to the server was lost."
msgstr "Yhteys palvelimeen katkesi."
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Verkkovirhe"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Et huomioi kaupankäyntipyyntöjä"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Hyväksyt kaupankäyntipyynnöt"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "Kartan lataaminen epäonnistui"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -386,19 +390,19 @@ msgid "Name"
msgstr "Nimi"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Hyökkää"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Keskustele"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "Liiku"
@@ -411,8 +415,8 @@ msgid "Reset"
msgstr "Nollaa"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Osta"
@@ -430,7 +434,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -438,7 +442,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -451,7 +455,7 @@ msgstr "Sulje"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Max"
@@ -460,8 +464,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Kauppa"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -470,15 +474,15 @@ msgstr "Myy"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -649,7 +653,7 @@ msgid "Enter password:"
msgstr "Salasana:"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Poista"
@@ -725,10 +729,10 @@ msgstr "sateenkaari 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -736,12 +740,12 @@ msgstr "???"
msgid "Chat"
msgstr "Keskustelu"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Läsnä: %s; %d pelaajaa paikalla."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Kuiskaat pelaajalle %s: %s"
@@ -755,10 +759,12 @@ msgid "No"
msgstr "Ei"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "Ohita"
@@ -904,7 +910,7 @@ msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Sulje"
@@ -931,8 +937,8 @@ msgstr "Varusteet"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Poista varuste käytöstä"
@@ -974,31 +980,31 @@ msgid "Filter:"
msgstr "Suodin:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Ota käyttöön"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Käytä"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Pudota..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Jaa"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Asukokonaisuudet"
@@ -1007,17 +1013,17 @@ msgid "Weight:"
msgstr "Paino:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Varastoi"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Ota"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Pudota"
@@ -1257,7 +1263,7 @@ msgstr "Lähetä"
msgid "NPC"
msgstr "Ei-pelaajahahmo (NPC)"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Tyhjennä"
@@ -1295,331 +1301,347 @@ msgstr "Riisu ensin"
msgid "Away outfit"
msgstr "Poissaoloasu"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Tee kaupat"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Kuiskaa"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Paranna"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Ystävysty"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Vaimenna"
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr "Pyyhi"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr "Huomioi jälleen"
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "Jätä täysin huomiotta"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Seuraa"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr "Matki"
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr "Kutsu ryhmään"
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr "Potki ryhmästä"
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr "Potki killasta"
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr "Muuta kilta-asemaa"
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr "Kutsu kiltaan"
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "Potki pelaaja"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr "Pommita"
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "Näytä tavarat"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr "Riisu"
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr "Potki"
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr "Poista hyökkäyslistasta"
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr "Lisää prioriteettihyökkäyslistalle"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr "Lisää hyökkäyslistaan"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr "Lisää ohitettavien listaan"
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr "Lisää nimi keskusteluun"
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Nosta"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Lisää keskusteluun"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "Karttaolio"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "Poista"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr "Lataa vanhat asut"
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Loitsut"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr "Lataa vanhat loitsut"
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr "Muokkaa loitsua"
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "Estä korostus"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Salli korostus"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "Poista nimi"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr "Ota poissaolo käyttöön"
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr "Poista poissaolo käytöstä"
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Eroa"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "Muuta asemaa killassa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Muuta merkin nimeä "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Nimi: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr "Lisää kauppaan"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr "Lisää 10 kauppaan"
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr "Lisää puolet kauppaan"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr "Lisää kaikki kauppaan"
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "Varastoi 10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Varastoi puolet"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Varastoi kaikki"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "Ota 10"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Ota puolet"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Ota kaikki"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr "Lataa vanhat tavarapikavalinnat"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr "Lataa vanhat pudotuspikavalinnat"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "Piilota"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "Näytä"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(oletus)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "Siirrä ylös"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr "Siirrä alas"
@@ -2139,22 +2161,22 @@ msgid "Enable bot checker"
msgstr "Ota bottitutka käyttöön"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "Ota käyttöön debug-loki"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr "Matalan liikenteen tila"
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr "Piilota kilpihahmo"
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Näytä tausta"
@@ -2282,91 +2304,151 @@ msgstr "Pyyhitty"
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Salli kaupakäynti"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Salli kuiskaukset"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Vanha"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr ""
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Kun jätät huomiotta:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Pikkiriikkinen (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Pieni (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Keskikokoinen (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Kookas (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Suuri (14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Jättimäinen (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Teema"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "Käyttöliittymän teema"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Pääkirjasin"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Lihavoitu kirjasin"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "Hiukkaskirjasin"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "Ohjekirjasin"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr ""
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr ""
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Kirjasimen koko"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Ulkoasua muutettu"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
@@ -2794,247 +2876,267 @@ msgstr "Anna ryhmällesi nimi."
msgid "Specials"
msgstr "Erikoisuudet"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr "(D) oletusliikkeet"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr "(I) käännetyt liikkeet"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr "(c) liikkuu osin villiliikkein"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr "(C) liikkuu villiliikkein"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr "(d) tuplaa tavallinen + villi"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) liiku"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr "(a) oma villiliike"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr "(?) villiliike"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr "(0) oletussiirtymä kohteen luo"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr "(1) siirry kohteen luo etäisyydellä 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr "(2) siirry kohteen luo etäisyydellä 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr "(3) siirry kohteen luo etäisyydellä 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr "(5) siirry kohteen luo etäisyydellä 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr "(7) siirry kohteen luo etäisyydellä 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?) siirry kohteen luo"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr "(D) oletusseuraaminen"
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr "(R) suhteellinen seuraaminen"
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr "(M) peilikuvaseuraaminen"
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr "(P) lemmikkiseuraaminen"
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr "(?) tuntematon seuraaminen"
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr "(D) oletushyökkäys"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr "(s) vaihda hyökkäystä, ei kilpeä"
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr "(S) vaihda hyökkäystä, kilpi mukana"
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) hyökkäys"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) mene ja hyökkää"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr "(A) mene, hyökkää, nosta"
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr "(d) ei automaattista hyökkäystä"
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr "(S) pieni nosto 1x1 ruutua"
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr "(D) oletusnosto 2x1 ruutua"
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) nosto edestä 2x3 ruutua"
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr "(3) nosto 3x3 ruutua"
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr "(g) mene ja nosta etäisyydellä 4"
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr "(G) mene ja nosta etäisyydellä 8"
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr "(A) mene ja nosta maksimietäisyydellä"
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?) nosta"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr "(N) normaali karttanäkymä"
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr "(D) debug-karttanäkymä"
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr "(u) ultra-karttanäkymä"
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr "(U) ultra-karttanäkymä 2"
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr "(e) tyhjä karttanäkymä"
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr "(b) mustavalkoinen karttanäkymä"
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr "(?) karttanäkymä"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr "(f) #flar taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr "(c) #chiza taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr "(I) #ingrav taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr "(F) #frillyar taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) #upmarmu taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr "(?) taikahyökkäys"
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr "(D) oletusmatkinta"
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr "(O) asun matkinta"
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr "(?) matkinta"
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr "(O) paikalla"
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) poissa"
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) poissaolo"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr "(G) pelin kameratila"
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr "(F) vapaa kamera"
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr "(D) suunnittelukamera"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr "Pelimuokkaimet poissa käytöstä"
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr "Pelimuokkaimet käytössä"
@@ -3088,8 +3190,8 @@ msgstr "Korjauspisteitä: %d"
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3106,19 +3208,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3134,7 +3239,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3147,7 +3252,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3167,49 +3272,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3939,7 +4044,7 @@ msgstr "Tavaroiden pikavalintanäppäin"
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "Tavarapikavalinta %d"
@@ -4066,7 +4171,7 @@ msgstr "Hymiö"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "Eleen pikavalinta %d"
@@ -4195,51 +4300,55 @@ msgstr "Käytä magiahyökkäystä"
msgid "Switch magic attack"
msgstr "Vaihda magiahyökkäystä"
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
msgid "Change move type"
msgstr "Vaihda liikkumistyyppiä"
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
msgstr "Vaihda hyökkäysaseen tyyppiä"
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
msgstr "Vaihda hyökkäystyyppiä"
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
msgstr "Vaihda seuraustyyliä"
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr "Vaihda matkintatyyliä"
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr "Ota käyttöön / poista pelimuokkaimet"
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "Äänet päälle / pois"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr "Aseta / peru poissaolo"
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr "Kontekstivalikkoon \"klikkaus\" näppäimistöltä"
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr "Vaihda kameran toimintaa"
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr ""
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4248,68 +4357,68 @@ msgstr ""
"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
"ole hyvä ja poista päällekkäisyydet. "
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr "Sinut otti hengiltä "
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr "Yritit nostaa olemattoman tavaran."
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "Tavara on liian painava."
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "Tavara on liian kaukana."
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr "Sinulla on liikaa tavaraa ennestään."
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr "Kasa on liian suuri."
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr "Tavara kuuluu jollekulle muulle."
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr "Tuntematon ongelma esti tavaran nostamisen."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "Poissa"
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "Seuraa: "
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr "Seuraaminen keskeytetty"
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr "Matki: "
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr "Matkiminen keskeytetty"
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "Näet "
@@ -5108,54 +5217,54 @@ msgstr "Myrkyllä ei ollut vaikutusta..."
msgid "%s wants to trade with you, do you accept?"
msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr "Kaupanteko ei ole mahdollista. kauppa kumppani on liian kaukana."
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr "Kaupanteko ei ole mahdollista. Hahmoa ei ole."
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr "Kaupanteko keskeytyi tuntemattomasta syystä."
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr "Kauppa: sinä ja %s"
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr "Kaupanteko pelaajan %s kanssa peruttu."
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr "Käsittelemätön kaupan peruutus -paketti."
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
"Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille."
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr "Tavaran lisääminen epäonnistui. Et voi kaupitella sitä."
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr "Tavaran lisääminen epäonnistui tuntemattomasta syystä."
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "Kaupat peruttu."
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "Kaupat tuli."
@@ -5595,19 +5704,19 @@ msgstr "Yhteys palvelimeen katkaistu. "
msgid "%s is not in your party!"
msgstr "%s ei ole ryhmässäsi!"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr "Tulosta '...'"
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr "Vilkuta nimeä"
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr "Leijuva '...' -puhekupla"
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "Leijuva puhekupla"
diff --git a/po/fr.po b/po/fr.po
index 84e80cbba..dc2a98c72 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-28 22:46+0000\n"
-"Last-Translator: reid <reidyaro@gmail.com>\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
"fr/)\n"
"Language: fr\n"
@@ -45,47 +45,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configuration"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vidéo"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr "Thèmes"
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "Connexion au serveur"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "Connexion"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Vous entrez dans un nouveau monde"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,64 +95,64 @@ msgstr "Changement de serveur de jeu"
msgid "Error"
msgstr "Erreur"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Changement de mot de passe"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "Changer d'e-mail"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "Désinscription réussie"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "A bientôt, revenez quand vous voudrez..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, 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:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Site de mise à jour invalide : %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
"Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Commande inconnue."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "Vous ne pouvez pas envoyer de messages vides."
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -161,157 +161,161 @@ msgstr ""
"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
"\". Soit elle existe déjà, soit il s'agit de vous même."
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "Demande de rejoindre le canal %s."
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Le nom du groupe est manquant."
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Le nom de la guilde est manquant."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Veuillez indiquer un nom."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "Le message ferme la conversation."
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr ""
"La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Le message ferme maintenant la conversation."
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "ami"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "écarté"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "neutre"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "Joueur déjà %s !"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "Joueur %s avec succès!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "Le joueur n'a pas pu %s !"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "Le joueur n'était pas ignoré !"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "Le joueur n'est plus ignoré !"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr "sous liste noir"
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "Joueur déjà effacé !"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "Joueur éliminé avec succès !"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "le joueur n'a pas pu être effacé !"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr "Heure de lancement du client : %s"
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semaine"
msgstr[1] "%d semaines"
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d jour"
msgstr[1] "%d jours"
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d heure"
msgstr[1] "%d heures"
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minute"
msgstr[1] "%d minutes"
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d secondes"
msgstr[1] "%d secondes"
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr "Taille du cache de polices"
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr "Dimension du cache :"
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "Créé : "
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "Effacé :"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr "Images des ressources :"
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr "Images des ressources non affectées :"
@@ -342,23 +346,23 @@ 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:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Erreur Réseau"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Ignorer les requêtes d'échanges entrantes"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "La carte n'a pu être chargée"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Erreur durant le chargement %s"
@@ -392,19 +396,19 @@ msgid "Name"
msgstr "Nom"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Attaquer"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Parler"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "Déplacement"
@@ -417,8 +421,8 @@ msgid "Reset"
msgstr "Réinitialiser"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Acheter"
@@ -436,7 +440,7 @@ msgstr "Montant"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -444,7 +448,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -457,7 +461,7 @@ msgstr "Quitter"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Max."
@@ -466,8 +470,8 @@ msgstr "Max."
msgid "Shop"
msgstr "Boutique"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -476,15 +480,15 @@ msgstr "Vendre"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -655,7 +659,7 @@ msgid "Enter password:"
msgstr "Entrer le mot de passe :"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Supprimer"
@@ -731,10 +735,10 @@ msgstr "arc en ciel 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -742,12 +746,12 @@ msgstr "???"
msgid "Chat"
msgstr "Conversation"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Présents : %s ; %d joueurs sont présents."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Message envoyé à %s : %s"
@@ -761,10 +765,12 @@ msgid "No"
msgstr "Non"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "Ignorer"
@@ -910,7 +916,7 @@ msgstr "Le saviez-vous ?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fermer"
@@ -937,8 +943,8 @@ msgstr "Équipement"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Retirer"
@@ -980,31 +986,31 @@ msgid "Filter:"
msgstr "Filtre :"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Équiper"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Utiliser"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Jeter..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Partager"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Tenues"
@@ -1013,17 +1019,17 @@ msgid "Weight:"
msgstr "Poids :"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Entreposer"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Récupérer"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Jeter"
@@ -1263,7 +1269,7 @@ msgstr "Soumettre"
msgid "NPC"
msgstr "PNJ"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Effacer"
@@ -1301,331 +1307,347 @@ msgstr "Retirer d'abord l'équipement"
msgid "Away outfit"
msgstr "Équipement en absence"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Échange"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Message"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Soigner"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Être ami"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Éviter"
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr "Liste noir"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr "Éliminer"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr "Ne plus ignorer"
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "Ignorer complètement"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Suivre"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr "Imiter"
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr "Inviter dans le groupe"
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr "Sortir du groupe"
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr "Sortir de la guilde"
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr "Changer la position dans la guilde"
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr "Inviter dans la guilde"
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "Sortir le joueur"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr "Annihiler"
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "Montrer les objets"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr "Déshabiller"
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr "Ajouter commentaire"
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr "Acheter (?)"
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr "Vendre (?)"
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr "Virer"
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr "Enlever de la liste d'attaque"
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr "Ajouter à la liste de priorités d'attaque"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr "Ajouter à la liste d'attaque"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr "Ajouter à la liste d'ignorés"
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr "Ajouter le nom dans la boite de dialogue"
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Ramasser"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Ajouter à la conversation"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "Objet de carte"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Renommer"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "Enlever"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr "Télétransportation"
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr "Charger les anciennes tenues"
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Sortilèges"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr "Charger les anciens sorts"
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr "Éditer le sortilège"
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "Désactiver la surbrillance"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Activer la surbrillance"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr "Ne pas enlever les noms"
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "Enlève le nom"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr "Active la fonction Absence"
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr "Désactive la fonction Absence"
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Quitter"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "Changer la position de la Guilde"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Renommer le panneau de carte"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Nom : "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr "Le joueur commente "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr "Commentaire : "
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr "Ajouter à la transaction"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr "Ajouter 10 dans l'échange"
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr "Ajouter la moitié dans l'échange"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr "Ajouter tout dans l'échange"
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "Entreposer 10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Entreposer la moitié"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Entreposer tout"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr "Jeter tout"
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "Reprendre 10"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Reprendre la moitié"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Reprendre tout"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr "Charger les anciens raccourcis d'objets"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr "Charger les anciens raccourcis de jets d'objets"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "Cacher"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "Montrer"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr "Remise aux valeurs de défaut de la barre jaune"
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copier dans la conversation"
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(défaut)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "Aller vers le haut"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr "Aller vers le bas"
@@ -2144,22 +2166,22 @@ msgid "Enable bot checker"
msgstr "Activer le testeur de robots"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "Activer la protection contre les serveurs instables"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "Activer l'enregistrement des informations"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr "Mode traffic faible"
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr "Cacher le bouclier"
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Montrer le fond"
@@ -2289,91 +2311,151 @@ msgstr "Effacé"
msgid "Blacklisted"
msgstr "Sous liste noir"
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Autoriser les échanges"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Autoriser les messages privés"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Ancien"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr "Relations"
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Quand ignoré :"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Minuscule (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Petite (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Moyenne (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Grande (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Grand (14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Immense (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Thème"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "Thème de l'interface"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Police principale"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Police grasse"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "Taille des effets de particules"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "Police de l'aide"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr "Police sécurisée"
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr "police japonaise"
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Taille de police"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Thème changé"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Redémarrez le jeu pour que les changements soient appliqués."
@@ -2812,247 +2894,267 @@ msgstr "Choisissez le nom du groupe."
msgid "Specials"
msgstr "Cpt. spéciales"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr "(D) Mouvements par défaut"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr "(I) Mouvements inversés"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr "(c) Mouvements un peu fous"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr "(C) Mouvement complètement fous"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr "(d) double normal et fou"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) Mouvements"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr "(a) Mouvements fous personnalisés"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr "(?) Mouvements fous"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr "(0) Aller à la cible distante par défaut"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr "(1) Aller à la cible en distante de 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr "(3) Aller à la cible en distante de 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr "(5) Aller à la cible en distante de 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr "(7) Aller à la cible en distante de 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr "(A) Aller à la cible dans le champ d'attaque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr "(a) Portée des attaques des Archéens"
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?) Aller à la cible"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr "(D) Suivre : défaut"
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr "(R) Suivre: mouvement relatif"
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr "(M) Suivre effet miroir"
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr "(P) Suivre comme un toutou"
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr "(?) Suivre : mode inconnu"
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr "(D) Attaque : défaut"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr "(s) Attaquer sans protection"
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr "(S) Attaquer avec protection"
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) Attaque"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) Se déplacer et attaquer"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr "(A) Se déplacer, attaquer et ramasser"
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr "(d) Sans attaque automatique"
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr "(S) Ramassage sur 1x1 case"
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr "(D) Ramassage par défaut sur 2x1 cases"
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) Ramassage avant sur 2x3 cases"
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr "(3) Ramassage sur 3x3 cases"
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr "(A) Aller et ramasser jusqu'à la distance max"
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?) Ramassage"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr "(N) Vue normale du jeu"
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr "(D) Vue du jeu mode déverminage"
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr "(u) Vue du jeu mode Ultra 1"
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr "(u) Vue du jeu mode Ultra 2"
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr "(e) Vue de la carte vide"
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr "(b) Vue de la carte en N&B"
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr "(?) Carte"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr "(f) Utiliser #flar comme sort d'attaque"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr "(c) Utiliser #chiza comme sort d'attaque"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr "(I) Utiliser #ingrav comme sort d'attaque"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr "(F) Utiliser #frillyar comme sort d'attaque"
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr "(?) Sorts d'attaque"
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr "(D) Imitation par défaut"
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr "(O) Imiter les équipements"
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr "(?) Imitation"
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr "(O) Présent sur le jeu"
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) Absent"
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) Absent"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr "(G) Mode camera du jeu"
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr "(F) Mode camera libre"
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr "(D) Définir le mode camera"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr "Modificateurs de mode de jeu désactivés"
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr "Modificateurs de mode de jeu activés"
@@ -3106,8 +3208,8 @@ msgstr "Points de correction : %d"
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3124,19 +3226,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3152,7 +3257,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3165,7 +3270,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3185,49 +3290,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3774,7 +3879,7 @@ msgstr "Émoticône"
#: src/gui/windowmenu.cpp:73
msgid "STA"
-msgstr "Car"
+msgstr "STA"
#: src/gui/windowmenu.cpp:73
msgid "Status"
@@ -3962,7 +4067,7 @@ msgstr "Touche de raccourcis items"
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "Raccourci Objet %d"
@@ -4089,7 +4194,7 @@ msgstr "Smileys"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "Raccourci d'émoticône %d"
@@ -4218,51 +4323,55 @@ msgstr "Utiliser l'attaque magique"
msgid "Switch magic attack"
msgstr "Changer d'attaque magique"
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
msgid "Change move type"
msgstr "Changer de type de mouvement"
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
msgstr "Changer de type d'arme d'attaque"
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
msgstr "Changer de type d'attaque"
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
msgstr "Changer de type de suivi"
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr "Changer de type d'imitation"
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr "Désactiver / Activer les touches de modifications du jeu"
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "Son On / Off"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr "Activer / Désactiver le mode en absence"
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr "Emuler le clic droit à partir du clavier"
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr "Changer le mode caméra"
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr "Modifier la touche"
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4271,68 +4380,68 @@ msgstr ""
"Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
"touches ou attendez vous à un possible comportement étrange du jeu."
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr "Vous avez été tué par "
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr "Vous avez essayé de prendre un item qui n'existe pas."
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "L'objet est trop lourd."
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "L'objet est trop éloigné"
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr "L'inventaire est plein"
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr "La pile est trop grande"
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr "L'objet appartient a quelqu'un d'autre"
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr "Problème inconnu pour ramasser l'objet."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, 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:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "Inactif"
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "Suivre : "
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr "Suivi annulé"
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr "Imitation: "
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr "Imitation annulée"
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "Vous voyez "
@@ -5154,57 +5263,57 @@ msgstr "Le poison fut sans effet..."
msgid "%s wants to trade with you, do you accept?"
msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr "Échange impossible. Ce personnage n'existe pas."
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr "Échange annulé pour une raison inconnue."
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr "Échange : Vous et %s"
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr "Échange avec %s annulé."
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr "Échange non pris en compte."
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
"Impossible de rajouter un objet. Votre partenaire pour cet échange est "
"surchargé."
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
"Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
"de place libre."
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr "Impossible d'ajouter l'objet. Celui-ci ne peut pas être échangeable."
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr "Impossible de rajouter un objet pour une raison inconnue."
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "Échange annulé."
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "Échange finalisé."
@@ -5648,19 +5757,19 @@ msgstr "Connexion au serveur terminée."
msgid "%s is not in your party!"
msgstr "%s n'est pas membre de votre groupe !"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr "Affiche '...'"
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr "Fais clignoter le nom"
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr "Bulle flottante '...'"
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "Bulle flottante"
diff --git a/po/id.po b/po/id.po
index b5991397c..2af9b5ebf 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
"PO-Revision-Date: 2011-10-28 00:55+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Pengaturan"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr ""
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "Terhubung dengan server"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "Masuk"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Memasuki arena permainan"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Pemilihan karakter"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "terhubung dengan server"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Pergantian server"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,63 +93,63 @@ msgstr "Pergantian server"
msgid "Error"
msgstr "Kesalahan"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Ubah sandi"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "Perubahan email"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
-#: src/client.cpp:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Gagal mengupdate host: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Perintah tidak dikenal."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "Tidak dapat mengirimkan pesan tanpa nama"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,151 +158,155 @@ msgstr ""
"Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
"atau nama anda sendiri"
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "Meminta untuk masuk ke channel %s."
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Nama kelompok tidak dapat di temukan"
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Nama organisasi tidak ditemukan."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Tetapkan sebuah nama"
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "Kembalikan pengalihan obrolan"
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "Tutup pesan obrolan"
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "Kembalikan sekarang pengalihan obrolan"
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Pesan menutup obrolan"
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "Teman"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "Diabaikan"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "netral"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "Pemain telah %s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "Pemain telah berhasil %s!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "Pemain tidak bisa %s!"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "Pemain tidak diabaikan!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "Pemain tidak lagi diabaikan!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Pemain tidak dapat diabaikan"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "Pemain telah terhapus"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "Pemain telah berhasil dihapus"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "Pemain tidak dapat dihapus"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr "Ukuran jenis huruf cache"
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr "Ukuran Cache:"
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "Buat"
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "Hapus"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr "Sumber gambar"
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr ""
@@ -332,23 +336,23 @@ msgstr "Gagal menyimpan screenshot!"
msgid "The connection to the server was lost."
msgstr "Koneksi ke server terputus"
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Kesalahan jaringan"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Abaikan permohonan transaksi"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Terima permohonan transaksi"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "Tidak dapat menampilkan peta"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Error ketika menunggu %s"
@@ -382,19 +386,19 @@ msgid "Name"
msgstr "Nama"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Pukul"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Berbicara"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "Jalan"
@@ -407,8 +411,8 @@ msgid "Reset"
msgstr "Reset"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Beli"
@@ -426,7 +430,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -434,7 +438,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -447,7 +451,7 @@ msgstr "Keluar"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Max"
@@ -456,8 +460,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Toko"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -466,15 +470,15 @@ msgstr "Jual"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -645,7 +649,7 @@ msgid "Enter password:"
msgstr "Masukkan sandi"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Hapus"
@@ -721,10 +725,10 @@ msgstr "pelangi 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -732,12 +736,12 @@ msgstr "???"
msgid "Chat"
msgstr "Obrolan"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Kehadiran: %s; %d pemain yang hadir."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Berbisik ke %s: %s"
@@ -751,10 +755,12 @@ msgid "No"
msgstr "Tidak"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "Abaikan"
@@ -900,7 +906,7 @@ msgstr "Apakah kamu tahu?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Tutup"
@@ -927,8 +933,8 @@ msgstr "Perlengkapan"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Lepaskan"
@@ -970,31 +976,31 @@ msgid "Filter:"
msgstr "Penyaring:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Pakai"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Gunakan"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Buang..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Pecah"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Setelan"
@@ -1003,17 +1009,17 @@ msgid "Weight:"
msgstr "Berat"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Simpan"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Kembalikan"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Buang"
@@ -1251,7 +1257,7 @@ msgstr "Masukan"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Hapus"
@@ -1289,331 +1295,347 @@ msgstr "Copot lebih dahulu"
msgid "Away outfit"
msgstr "Setelan saat bepergian"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Tukar"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Berbisik"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Menyembuhkan"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Jadikan teman"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr "Hapus"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr "Batalkan pengabaian"
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Mengikuti"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr "Tirukan"
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr "Undang ke kelompok"
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr "Keluarkan dari kelompok"
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr "Keluarkan dari organisasi"
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr "Ubah posisi di organisasi"
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr "Undang ke organisasi"
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "keluarkan pemain"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "Perlihatkan item"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr "Tanggalkan pakaian"
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr "Penambahan komentar"
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr "Beli(?)"
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr "Jual(?)"
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr "keluarkan"
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr "Hapus dari daftar menyerang"
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr "Tambahkan prioritas daftar menyerang"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr "Tambahkan ke daftar menyerang"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr "Tambahkan ke daftar Abaikan"
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr "Tambahkan nama ke Obrolan"
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Ambil"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Ambil ke obrolan"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "Daftar barang"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Ganti nama"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "Hapus"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr "Memuat setelan lama"
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Mantra"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr "Memuat mantra lama"
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr "Edit mantra"
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "Nonaktifkan sorotan"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Aktifkan sorotan"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "hapus nama"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "Ubah posisi Organisasi"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Ubah nama tanda peta"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Nama:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr "Komentar pemain"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr "komentar"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr "Tambahkan semua ke Penukaran"
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "Masukkan 10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Masukkan setengah"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Masukkan semua"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr "Buang semuanya"
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "Ambil 10"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Ambil setengah"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Ambil semua"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr "Muat jalan pintas iItem lama"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr "Muat jalan pintas Buang yang lama"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "Tampilkan"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr "Atur ulang bar kuning"
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Pindahkan ke chat"
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(kembalikan)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "Bergerak keatas"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr "Bergerak kebawah"
@@ -2131,22 +2153,22 @@ msgid "Enable bot checker"
msgstr "Perbolehkan pengecekan bot"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
+msgid "Enable buggy servers protection (do not disable)"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Perlihatkan latar belakang"
@@ -2274,91 +2296,151 @@ msgstr "Dihapus"
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Perbolehkan penukaran"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Perbolehkan berbisik"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Lama"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr ""
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Ketika menolak:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Sangat kecil (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Kecil (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Sedang (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Besar (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Sangat besar (14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Sangat besar sekali (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "Tema Gui"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Jenis huruf utama"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Jenis huruf tebal"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr ""
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr ""
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr "Jenis huruf/Karakter yang diperbolehkan"
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr ""
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Ukuran huruf"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Tema diganti"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Restart client anda untuk memberikan efek."
@@ -2785,247 +2867,269 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr "(D) jalan normal"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr "(d) normal ganda + mode gila"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) jalan"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr "(2) jalan ke target di jarak 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?)bergerak ke target"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr "(D) pukulan normal"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr "(s) ganti pukulan tanpa pelindung"
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr "(S) pukulan dengan pelindung"
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?)serangan"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) jalan dan serang"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr "(A) jalan, serang, ambil"
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr "(d) tanpa penyerangan otomatis"
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?)mengambil"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr "(N) penampilan peta normal"
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr "(e) penampilan peta kosong"
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr "(b)penampilan peta hitam & putih"
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr "(f) gunakan #flar untuk serangan magic"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr "(c) gunakan #chiza untuk serangan magic"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr "(l) gunakan #ingrav untuk serangan magic"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr "(F) gunakan #frillyar untuk serangan magic"
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) gunakan #upmarmu untuk serangan magic"
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr "(?) serangan magic"
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+#, fuzzy
+msgid "(d) dont attack players"
+msgstr "Tambahkan ke daftar menyerang"
+
+#: src/gui/statuspopup.cpp:505
+#, fuzzy
+msgid "(?) pvp attack"
+msgstr "(?)serangan"
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr "(O) pada keyboard"
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) pergi"
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) pergi"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr "Perombakan game tidak diperbolehkan"
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr "Perombakan game diperbolehkan"
@@ -3079,8 +3183,8 @@ msgstr ""
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3097,19 +3201,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3125,7 +3232,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3138,7 +3245,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3158,49 +3265,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3925,7 +4032,7 @@ msgstr ""
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr ""
@@ -4052,7 +4159,7 @@ msgstr ""
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr ""
@@ -4181,118 +4288,123 @@ msgstr ""
msgid "Switch magic attack"
msgstr ""
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:329
+#, fuzzy
+msgid "Switch pvp attack"
+msgstr "Ganti Karakter"
+
+#: src/keyboardconfig.cpp:330
msgid "Change move type"
msgstr ""
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
msgstr ""
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
msgstr ""
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
msgstr ""
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr ""
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr ""
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr ""
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr ""
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr ""
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr ""
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr "Kunci pengubah"
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr "Mencoba mengambil item yang tidak lagi ada"
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "item terlalu berat"
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "barang terlalu jauh"
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr "Perbekalan sudah penuh"
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr "Barang milik orang lain."
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "Ikuti:"
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr "Batal mengikuti"
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr "Tirukan:"
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr "Batal menirukan"
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr ""
@@ -5078,53 +5190,53 @@ msgstr ""
msgid "%s wants to trade with you, do you accept?"
msgstr ""
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr ""
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr ""
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr ""
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr ""
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr ""
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr "Gagal menambahkan barang. Kamu tidak dapat menukar barang ini."
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr ""
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr ""
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr ""
@@ -5560,19 +5672,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr ""
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 3ba14752a..2b97341c1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,8 +12,8 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-28 00:55+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"PO-Revision-Date: 2011-11-03 15:03+0000\n"
+"Last-Translator: WildX <guglielmo__@hotmail.it>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -65,7 +65,7 @@ msgstr "Connessione al server"
#: src/client.cpp:965
msgid "Logging in"
-msgstr "Accesso"
+msgstr "Accesso all'account"
#: src/client.cpp:998
msgid "Entering game world"
@@ -73,7 +73,7 @@ msgstr "Accesso al gioco"
#: src/client.cpp:1098
msgid "Requesting characters"
-msgstr "Ricerca personaggi"
+msgstr "Caricamento personaggi"
#: src/client.cpp:1129
msgid "Connecting to the game server"
@@ -99,7 +99,7 @@ msgstr "Richiesta dettagli di registrazione"
#: src/client.cpp:1224
msgid "Password Change"
-msgstr "Cambiamento password"
+msgstr "Cambia password"
#: src/client.cpp:1225
msgid "Password changed successfully!"
@@ -107,7 +107,7 @@ msgstr "Password modificata con successo!"
#: src/client.cpp:1244
msgid "Email Change"
-msgstr "Cambio Email"
+msgstr "Cambia Email"
#: src/client.cpp:1245
msgid "Email changed successfully!"
@@ -178,7 +178,7 @@ msgstr "Prego specificare un nome."
#: src/commandhandler.cpp:430
msgid "Return toggles chat."
-msgstr "Invio attiva/disattiva la conversazione."
+msgstr "Attiva/disattiva la chat."
#: src/commandhandler.cpp:430
msgid "Message closes chat."
@@ -186,11 +186,11 @@ msgstr "I messaggi chiudono la conversazione."
#: src/commandhandler.cpp:441
msgid "Return now toggles chat."
-msgstr "\"Invio\" adesso attiva/disattiva la conversazione."
+msgstr "Attiva/disattiva la chat adesso."
#: src/commandhandler.cpp:447
msgid "Message now closes chat."
-msgstr "I messaggi adesso chiudono la conversazione."
+msgstr "I messaggi adesso chiudono la chat."
#: src/commandhandler.cpp:475
msgid "friend"
@@ -202,22 +202,22 @@ msgstr "Disprezzato"
#: src/commandhandler.cpp:485
msgid "neutral"
-msgstr "Neutro"
+msgstr "Neutrale"
#: src/commandhandler.cpp:504
#, c-format
msgid "Player already %s!"
-msgstr "Giocatore già %s!"
+msgstr "Il giocatore è già %s!"
#: src/commandhandler.cpp:518
#, c-format
msgid "Player successfully %s!"
-msgstr "Giocatore %s con successo!"
+msgstr "Il giocatore è stato %s con successo!"
#: src/commandhandler.cpp:526
#, c-format
msgid "Player could not be %s!"
-msgstr "Player non può essere %s!"
+msgstr "Il giocatore non può essere %s!"
#: src/commandhandler.cpp:549
msgid "Player wasn't ignored!"
@@ -332,11 +332,11 @@ msgstr "Screenshot salvato come"
#: src/game.cpp:521
msgid "Saving screenshot failed!"
-msgstr "Salvataggio della schermata fallito!"
+msgstr "Salvataggio immagine fallito!"
#: src/game.cpp:560
msgid "The connection to the server was lost."
-msgstr "La connessione al server è stata persa."
+msgstr "La connessione al server è caduta."
#: src/game.cpp:572
msgid "Network Error"
@@ -513,7 +513,7 @@ msgstr "Il nuovo indirizzo email deve essere lungo meno di %d caratteri."
#: src/gui/changeemaildialog.cpp:146
msgid "The email address entries mismatch."
-msgstr ""
+msgstr "Gli indirizzi email immessi non coincidono."
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
#: src/gui/charselectdialog.cpp:139
@@ -545,7 +545,7 @@ msgstr "La nuova password deve essere più corta di %d caratteri."
#: src/gui/changepassworddialog.cpp:134
msgid "The new password entries mismatch."
-msgstr ""
+msgstr "Le password immesse non coincidono."
#: src/gui/charcreatedialog.cpp:58
msgid "Create Character"
@@ -838,7 +838,7 @@ msgstr ""
#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
-msgstr ""
+msgstr "Conto particelle: %d"
#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
#: src/gui/debugwindow.cpp:345
@@ -1526,7 +1526,7 @@ msgstr "Cambia posizione nella gilda"
#. TRANSLATORS: number of chars in string should be near original
#: src/gui/popupmenu.cpp:1243
msgid "Rename map sign "
-msgstr ""
+msgstr "Rinomina mappa"
#. TRANSLATORS: number of chars in string should be near original
#: src/gui/popupmenu.cpp:1245
@@ -1787,7 +1787,7 @@ msgstr "Rimuovi colori dei messaggi ricevuti in chat"
#: src/gui/setup_chat.cpp:60
msgid "Show chat colors list"
-msgstr ""
+msgstr "Mostra colori per la chat"
#: src/gui/setup_chat.cpp:64
msgid "Commands"
@@ -1803,11 +1803,11 @@ msgstr ""
#: src/gui/setup_chat.cpp:72
msgid "Limit max chars in chat line"
-msgstr ""
+msgstr "Limita un massimo di caratteri per messaggio"
#: src/gui/setup_chat.cpp:75
msgid "Limit max lines in chat"
-msgstr ""
+msgstr "Limita un massimo di messaggi per la chat"
#: src/gui/setup_chat.cpp:79
msgid "Logs"
@@ -1815,11 +1815,11 @@ msgstr ""
#: src/gui/setup_chat.cpp:81
msgid "Enable chat Log"
-msgstr ""
+msgstr "Abilita I logs della chat"
#: src/gui/setup_chat.cpp:84
msgid "Show chat history"
-msgstr ""
+msgstr "Mostra la storia della chat"
#: src/gui/setup_chat.cpp:88
msgid "Messages"
@@ -1827,7 +1827,7 @@ msgstr ""
#: src/gui/setup_chat.cpp:90
msgid "Hide shop messages"
-msgstr ""
+msgstr "Nascondi i messaggi del negozio"
#: src/gui/setup_chat.cpp:94
msgid "Tabs"
@@ -1843,19 +1843,19 @@ msgstr "Salva i messaggi delle magie nella debug tab"
#: src/gui/setup_chat.cpp:102
msgid "Show server messages in debug tab"
-msgstr ""
+msgstr "Mostra i messaggi del server nella chat di debug"
#: src/gui/setup_chat.cpp:105
msgid "Enable trade tab"
-msgstr ""
+msgstr "Abilita la chat di commercio"
#: src/gui/setup_chat.cpp:108
msgid "Enable battle tab"
-msgstr ""
+msgstr "Abilita la chat di battaglia"
#: src/gui/setup_chat.cpp:111
msgid "Show battle events"
-msgstr ""
+msgstr "Mostra gli eventi della battaglia"
#: src/gui/setup_chat.cpp:114
msgid "Resize chat tabs if need"
@@ -1887,7 +1887,7 @@ msgstr "Come appaiono i colori"
#: src/gui/setup_colors.cpp:75
msgid "Type:"
-msgstr ""
+msgstr "Type:"
#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
msgid "Static"
@@ -1910,7 +1910,7 @@ msgstr "Gamma"
#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
msgid "Delay:"
-msgstr ""
+msgstr "Ritardo: "
#: src/gui/setup_colors.cpp:112
msgid "Red:"
@@ -1926,7 +1926,7 @@ msgstr "blu"
#: src/gui/setup_colors.cpp:314
msgid "Alpha:"
-msgstr ""
+msgstr "Alfa:"
#: src/gui/setup.cpp:71
msgid "Apply"
@@ -1970,7 +1970,7 @@ msgstr "Imposta"
#: src/gui/setup_keyboard.cpp:93
msgid "Unassign"
-msgstr ""
+msgstr "Annullare l'assegnazione"
#: src/gui/setup_keyboard.cpp:97
msgid "Default"
@@ -1982,7 +1982,7 @@ msgstr "Sono stati rilevati conflitti nei tasti."
#: src/gui/setup_other.cpp:39
msgid "Misc"
-msgstr ""
+msgstr "Varie"
#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
msgid "Monsters"
@@ -1990,19 +1990,19 @@ msgstr "Mostri"
#: src/gui/setup_other.cpp:47
msgid "Show damage inflicted to monsters"
-msgstr ""
+msgstr "Mostra danno afflitto ai nemici"
#: src/gui/setup_other.cpp:50
msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "Target automatico solo sui nemici raggiungibili"
#: src/gui/setup_other.cpp:53
msgid "Highlight monster attack range"
-msgstr ""
+msgstr "Evidenzia distanza massima di attacco del nemico"
#: src/gui/setup_other.cpp:57
msgid "Show monster hp bar"
-msgstr ""
+msgstr "Mostra la barra hp dei nemici, punti vita"
#: src/gui/setup_other.cpp:60
msgid "Cycle monster targets"
@@ -2014,15 +2014,15 @@ msgstr ""
#: src/gui/setup_other.cpp:69
msgid "Highlight map portals"
-msgstr ""
+msgstr "Evidenzia i cambiamenti di mappa"
#: src/gui/setup_other.cpp:72
msgid "Highlight floor items"
-msgstr ""
+msgstr "Evidenzia oggetti sul terreno"
#: src/gui/setup_other.cpp:75
msgid "Highlight player attack range"
-msgstr ""
+msgstr "Evidenzia distanza massima d'attacco"
#: src/gui/setup_other.cpp:78
msgid "Show extended minimaps"
@@ -2054,11 +2054,11 @@ msgstr ""
#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
-msgstr ""
+msgstr "Correggi posizione automaticamente"
#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
-msgstr ""
+msgstr "Attacca in movimento"
#: src/gui/setup_other.cpp:105
msgid "Sync player move"
@@ -2066,7 +2066,7 @@ msgstr ""
#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
-msgstr ""
+msgstr "Movimento matto \"A\""
#: src/gui/setup_other.cpp:112
msgid "Player"
@@ -2074,11 +2074,11 @@ msgstr ""
#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
-msgstr ""
+msgstr "Mostra la mia barra hp"
#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
-msgstr ""
+msgstr "Abilita statistiche veloci"
#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
@@ -2110,11 +2110,11 @@ msgstr ""
#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
-msgstr ""
+msgstr "Accetta richieste di vendita/acquisto"
#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
-msgstr ""
+msgstr "Abilita la modalità negozio"
#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
@@ -2138,15 +2138,15 @@ msgstr ""
#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
-msgstr ""
+msgstr "Abilita il bot checker"
#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
-msgstr ""
+msgstr "Abilita protezione dai bug del server"
#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
-msgstr ""
+msgstr "Abilita i log di debug"
#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
@@ -3688,7 +3688,7 @@ msgstr ""
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
-msgstr ""
+msgstr "Modifica"
#: src/gui/widgets/whispertab.cpp:107
msgid "/ignore > Ignore the other player"
diff --git a/po/ja.po b/po/ja.po
index 2e5373ec6..49989d3c4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-28 00:55+0000\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
"ja/)\n"
@@ -44,47 +44,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "設定"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "ビデオ"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr ""
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "サーバー通信中…"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "ログイン中…"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "ゲームの世界に入る中"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "服:%d"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "ゲームサーバー通信中…"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "サーバーを入り替え中…"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -94,63 +94,63 @@ msgstr "サーバーを入り替え中…"
msgid "Error"
msgstr "エラー"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "登録細目を要請中"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "パスワード変更"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "パスワード変更成功!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "メール変更"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "メール変更成功!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "登録解除成功"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "さよなら、いつでも戻ってね..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s は存在しないので作成することが不可能!終了中…"
-#: src/client.cpp:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "無効なアップデートホスト: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "更新フォルダの作成エラー"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "エラー: %s は存在しないので作成することが不可能!終了中…"
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "不明なコマンド"
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "空のメッセージを送信することはできません!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -159,151 +159,155 @@ msgstr ""
"%sと言うメッセージタブの作成ができません!それはもう既に存在しているか、自分"
"です。"
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "%sというチャンネルへの参加を要求しています。"
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "パーティ名がない。"
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "ギルド名がない。"
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "名前を教えてください。"
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "リターンはチャットを留めておきます。"
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "メッセージはチャットを閉じます。"
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "リターンはこれからチャットを留めておきます。"
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "メッセージはこれからチャットを閉じます。"
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "友達"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "無視"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "中性"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "プレイヤーはもう%s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "プレイヤーは%s成功!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "選手は%sを居られなかった "
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "プレイヤーは無視されなかった!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "プレイヤーはもう無視していない!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Playerはunignoredことができなかった!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "プレイヤーはもう消している!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "プレーアが首尾よくに消去!"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr "クライアントの稼働時間:%s"
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr ""
@@ -334,23 +338,23 @@ msgstr "スクリーンショットを保存することに失敗しました!
msgid "The connection to the server was lost."
msgstr ""
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "ネットワークエラー"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "他人からのトレードリクエストを無視します。"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "他人からのトレードリクエストを受け入れます。"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "マップをロードできませんでした"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "%sをロードしている間にエラーが起きました。"
@@ -384,19 +388,19 @@ msgid "Name"
msgstr "名前"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "攻撃"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "話す"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "動く"
@@ -409,8 +413,8 @@ msgid "Reset"
msgstr "リセット"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "買う"
@@ -428,7 +432,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -436,7 +440,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -449,7 +453,7 @@ msgstr "終了"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "最大"
@@ -458,8 +462,8 @@ msgstr "最大"
msgid "Shop"
msgstr "店"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -468,15 +472,15 @@ msgstr "売る"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -647,7 +651,7 @@ msgid "Enter password:"
msgstr ""
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "削除"
@@ -723,10 +727,10 @@ msgstr "虹 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -734,12 +738,12 @@ msgstr "???"
msgid "Chat"
msgstr "チャット"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "%sに送信中: %s"
@@ -753,10 +757,12 @@ msgid "No"
msgstr "いいえ"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "無視"
@@ -902,7 +908,7 @@ msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "閉じる"
@@ -929,8 +935,8 @@ msgstr "装備"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "外す"
@@ -972,31 +978,31 @@ msgid "Filter:"
msgstr "フィルタ:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "装備する"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "使う"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "落とす..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "分割する"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "服"
@@ -1005,17 +1011,17 @@ msgid "Weight:"
msgstr "重量"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "保存"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "取り戻す"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "落とす"
@@ -1253,7 +1259,7 @@ msgstr "決定"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "クリア"
@@ -1291,331 +1297,347 @@ msgstr "外す第一"
msgid "Away outfit"
msgstr "装備一式不在で"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "交換"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "完全無視"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "チャットに追加"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "マップアイテム"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "取り去る"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "呪文"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "強調表示を無効"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "強調表示を有効"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "でる"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "ギルドポジションを変更"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr " 名前: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr "に貿易を足す"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "10保存"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "半分保存"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "全部保存"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "10取る"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "半分取る"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "全部取る"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr " 隠す"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "見せる"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(デフォルト)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr ""
@@ -2135,22 +2157,22 @@ msgid "Enable bot checker"
msgstr ""
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
+msgid "Enable buggy servers protection (do not disable)"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "デバッグループを有効にする"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "背景を表示する"
@@ -2278,91 +2300,151 @@ msgstr "消した"
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "交換を承認する"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "プライベートメッセージを受け取ることを承認する"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "古い"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr ""
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "無視の際には:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "小さい (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "小(11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "媒体(12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "大(13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "ビッグ(14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "巨大(15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "テーマ"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "GUIテーマ"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "メインフォント"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "太字フォント"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "粒子のフォント"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "ヘルプフォント"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr ""
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr ""
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "フォントサイズ"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "テーマは変えました"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "設定変更のため、アプリケーションを再起動してください。"
@@ -2789,247 +2871,267 @@ msgstr "パーティ名を選んでください"
msgid "Specials"
msgstr "スペシアール"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) 動く"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr ""
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) 襲う"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr ""
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?) 拾い上げる"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr "(?) "
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) "
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) 不在で"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr ""
@@ -3083,8 +3185,8 @@ msgstr "修正点: %d"
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3101,19 +3203,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3129,7 +3234,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3142,7 +3247,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3162,49 +3267,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3936,7 +4041,7 @@ msgstr ""
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "アイテムショートカット: %d"
@@ -4063,7 +4168,7 @@ msgstr "スマイリー"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "スマイリーショートカット: %d"
@@ -4192,118 +4297,122 @@ msgstr "魔法攻撃を使用"
msgid "Switch magic attack"
msgstr ""
-#: src/keyboardconfig.cpp:328
-msgid "Change move type"
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
msgstr ""
#: src/keyboardconfig.cpp:330
-msgid "Change Attack Weapon Type"
+msgid "Change move type"
msgstr ""
#: src/keyboardconfig.cpp:332
-msgid "Change Attack Type"
+msgid "Change Attack Weapon Type"
msgstr ""
#: src/keyboardconfig.cpp:334
-msgid "Change Follow mode"
+msgid "Change Attack Type"
msgstr ""
#: src/keyboardconfig.cpp:336
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr ""
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr ""
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "アウディオ オン/オフ"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr ""
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr ""
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr ""
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr ""
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "去って"
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "従う: "
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr "擬い: "
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "あなた"
@@ -5097,53 +5206,53 @@ msgstr "毒は不効果"
msgid "%s wants to trade with you, do you accept?"
msgstr "%sはあなたと取引したいみたいが、応じる?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr "取引は不可能。取引の相手は遠すぎる。"
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr "取引は不可能。本キャラが存在していない。"
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr "不明な理由で取引が中止された。"
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr "あなたと%sとの取引"
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr "%sとの取引が中止された。"
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr "できなかった取引キャンセルパケット"
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr "アイテム追加失敗。相手はアイテムを持ちすぎている状態である。"
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr "アイテム追加失敗。相手の空いているスロットはない。"
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr ""
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr "不明な理由でアイテム追加失敗"
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "取引中止"
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "取引完了"
@@ -5579,19 +5688,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr "%sはパーティにはいない!"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr "'...'を表示する"
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr "名前を瞬き"
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr "フローティング'...'バブル"
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "フローティングバブル"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index a7a34c90e..6610a9d22 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-10-28 03:52+0300\n"
+"POT-Creation-Date: 2011-11-04 02:32+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"
@@ -40,47 +40,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr ""
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr ""
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr ""
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr ""
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -90,219 +90,223 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr ""
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr ""
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr ""
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr ""
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr ""
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr ""
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr ""
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr ""
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr ""
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr ""
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr ""
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr ""
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr ""
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr ""
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr ""
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr ""
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr ""
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr ""
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr ""
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr ""
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr ""
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr ""
@@ -331,23 +335,23 @@ msgstr ""
msgid "The connection to the server was lost."
msgstr ""
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr ""
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr ""
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr ""
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr ""
@@ -381,19 +385,19 @@ msgid "Name"
msgstr ""
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr ""
@@ -406,8 +410,8 @@ msgid "Reset"
msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr ""
@@ -425,7 +429,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr ""
@@ -433,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr ""
@@ -446,7 +450,7 @@ msgstr ""
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr ""
@@ -455,8 +459,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -465,15 +469,15 @@ msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -644,7 +648,7 @@ msgid "Enter password:"
msgstr ""
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr ""
@@ -720,10 +724,10 @@ msgstr ""
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr ""
@@ -731,12 +735,12 @@ msgstr ""
msgid "Chat"
msgstr ""
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -750,10 +754,12 @@ msgid "No"
msgstr ""
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr ""
@@ -899,7 +905,7 @@ msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr ""
@@ -926,8 +932,8 @@ msgstr ""
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr ""
@@ -969,31 +975,31 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr ""
@@ -1002,17 +1008,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr ""
@@ -1252,7 +1258,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr ""
@@ -1290,331 +1296,347 @@ msgstr ""
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr ""
@@ -2132,22 +2154,22 @@ msgid "Enable bot checker"
msgstr ""
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
+msgid "Enable buggy servers protection (do not disable)"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr ""
@@ -2275,91 +2297,151 @@ msgstr ""
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr ""
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr ""
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr ""
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr ""
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr ""
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr ""
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr ""
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr ""
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr ""
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr ""
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr ""
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr ""
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr ""
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr ""
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr ""
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr ""
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr ""
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr ""
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr ""
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -2786,247 +2868,267 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr ""
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr ""
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr ""
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr ""
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr ""
@@ -3080,8 +3182,8 @@ msgstr ""
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr ""
@@ -3098,19 +3200,22 @@ msgid "(C)"
msgstr ""
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr ""
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr ""
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr ""
@@ -3126,7 +3231,7 @@ msgstr ""
msgid "(2)"
msgstr ""
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr ""
@@ -3139,7 +3244,7 @@ msgid "(7)"
msgstr ""
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr ""
@@ -3159,49 +3264,49 @@ msgstr ""
msgid "(s)"
msgstr ""
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr ""
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr ""
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr ""
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr ""
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr ""
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr ""
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr ""
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr ""
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr ""
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr ""
@@ -3926,7 +4031,7 @@ msgstr ""
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr ""
@@ -4053,7 +4158,7 @@ msgstr ""
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr ""
@@ -4182,119 +4287,123 @@ msgstr ""
msgid "Switch magic attack"
msgstr ""
-#: src/keyboardconfig.cpp:328
-msgid "Change move type"
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
msgstr ""
#: src/keyboardconfig.cpp:330
-msgid "Change Attack Weapon Type"
+msgid "Change move type"
msgstr ""
#: src/keyboardconfig.cpp:332
-msgid "Change Attack Type"
+msgid "Change Attack Weapon Type"
msgstr ""
#: src/keyboardconfig.cpp:334
-msgid "Change Follow mode"
+msgid "Change Attack Type"
msgstr ""
#: src/keyboardconfig.cpp:336
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr ""
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr ""
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr ""
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr ""
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr ""
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr ""
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr ""
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr ""
@@ -5078,53 +5187,53 @@ msgstr ""
msgid "%s wants to trade with you, do you accept?"
msgstr ""
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr ""
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr ""
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr ""
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr ""
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr ""
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr ""
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr ""
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr ""
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr ""
@@ -5560,19 +5669,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr ""
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 09fb798ab..909ea6e53 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-28 00:55+0000\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
"manaplus/team/nl_BE/)\n"
@@ -42,47 +42,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configureren"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr ""
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "Verbinden met server"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "Inloggen"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Aanvragen personage"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -92,63 +92,63 @@ msgstr "Wijzigen spelservers"
msgid "Error"
msgstr "Fout"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Paswoord Wijziging"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "Email Wijziging"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, 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:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige update host %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Onbekend commando."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "Kan geen lege berichten sturen!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -157,156 +157,160 @@ msgstr ""
"Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
"bestaat, of het is jezelf."
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Groepsnaam ontbreekt."
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Guild-naam ontbreekt."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Gelieve een naam te specifiëren"
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "Ga terug naar chat"
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "Bericht sluit chat."
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "Ga nu terug naar chat."
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Bericht sluit nu chat."
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "vriend"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "genegeerd"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "neutraal"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "Speler reeds %s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "Speler succesvol %s!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "Speler kan niet %s zijn!"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "Speler is niet genegeerd!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "Speler niet langer genegeerd!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Speler kan niet worden genegeerd!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "Speler reeds verwijderd!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "Speler succesvol verwijderd!"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "Speler kan niet worden verwijderd!"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr "Client uptime: %s"
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d week"
msgstr[1] "%d weken"
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dag"
msgstr[1] "%d dagen"
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d uur"
msgstr[1] "%d uren"
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuut"
msgstr[1] "%d minuten"
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d seconde"
msgstr[1] "%d seconden"
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "Aangemaakt:"
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "Verwijdered:"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr ""
@@ -336,23 +340,23 @@ msgstr "Opslaan van screenshot mislukt!"
msgid "The connection to the server was lost."
msgstr "De verbinding met de server is verbroken."
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Netwerkfout"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Inkomende handelsaanvragen negeren"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "Kon Map Niet Laden"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Fout bij het laden van %s"
@@ -386,19 +390,19 @@ msgid "Name"
msgstr "Naam"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Aanvallen"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Spreken"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "Beweeg"
@@ -411,8 +415,8 @@ msgid "Reset"
msgstr "Reset"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Kopen"
@@ -430,7 +434,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -438,7 +442,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -451,7 +455,7 @@ msgstr "Afsluiten"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Maximum"
@@ -460,8 +464,8 @@ msgstr "Maximum"
msgid "Shop"
msgstr "Winkel"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -470,15 +474,15 @@ msgstr "Verkopen"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -649,7 +653,7 @@ msgid "Enter password:"
msgstr "Geef wachtwoord:"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Verwijderen"
@@ -725,10 +729,10 @@ msgstr "regenboog 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -736,12 +740,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Aanwezig: %s; %d speler zijn aanwezig."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
@@ -755,10 +759,12 @@ msgid "No"
msgstr "Nee"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "Negeer"
@@ -904,7 +910,7 @@ msgstr "Weet u?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Sluiten"
@@ -931,8 +937,8 @@ msgstr "Uitrusting"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Afdoen"
@@ -974,31 +980,31 @@ msgid "Filter:"
msgstr "Filter:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Uitrusten"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Gebruiken"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Neerleggen..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Splitsen"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Kleren"
@@ -1007,17 +1013,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Neerleggen"
@@ -1257,7 +1263,7 @@ msgstr "Indienen"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Wissen"
@@ -1295,331 +1301,347 @@ msgstr "Verwijder uitrusting eerst"
msgid "Away outfit"
msgstr "Kleren om weg te gaan"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Handel"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Fluister"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Genees"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Word vriend"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Geen rekening mee houden"
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr "Wis"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "Volledig genegeerd"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Volg"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr "Imiteer"
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "Schop speler"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "Toon Voorwerpen"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr "ontkleed"
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr "Koop (?)"
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr "Verkoop (?)"
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr "Schop"
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Raap op"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Aan chat toevoegen"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "Plaats voorwerp op de kaart"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Hernoem"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "Verwijder"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr "Inladen oude kleren"
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Spreuken"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr "Laad oude spreuken"
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr "Wijzig spreuk"
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "Markering afzetten"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Markering aanzetten"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "Verwijder naam"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr "away aanzetten"
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr "away afzetten"
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Verlaat"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "Wijzig uw guild positie"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Kaart bordje hernoemen "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Naam: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "Plaats 10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Plaats de helft"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Plaats alles"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr "Laat alles vallen"
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "Haal 10 op"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Haal de helft op"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Haal alles op"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr "Laden van oude voorwerpsnelkoppelingen"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr "Laden van oude neerleggingsnelkoppeling"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "Verberg"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "Toon"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Kopieer naar chat"
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(standaard)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "Beweeg naar boven"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr "Beweeg naar beneden"
@@ -2139,22 +2161,22 @@ msgid "Enable bot checker"
msgstr "Bot controle aanzetten"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "Beveiliging tegen fouten van server aanzetten"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "Zet debug log aan"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Toon achtergrond"
@@ -2282,91 +2304,151 @@ msgstr "Gewist"
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Handelen toestaan"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Fluisteren toestaan"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Oud"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr "Relaties"
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Tijdens negeren:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Heel klein (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Klein (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Middelmatig (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Groot (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Heel groot (14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Extreem groot (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Thema"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr ""
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Standaard Lettertype"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Vet lettertype"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr ""
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "Help lettertype"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr ""
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr ""
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Lettergrootte"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Thema is gewijzigd"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Herstart de client om de wijzigingen in werking te doen treden."
@@ -2799,247 +2881,267 @@ msgstr "Kies uw groepsnaam."
msgid "Specials"
msgstr "Specialen"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr "(D) standaard bewegingen"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr "(I) geïnverteerde bewegingen"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr "(c) bewegingen met enkele vreemde bewegingen"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr "(C) bewegingen met vreemde bewegingen"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr "(d) dubbel normaal + raar"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) beweeg"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr "(a) manuele vreemde beweging"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr "(?) vreemde beweging"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr "(0) standaard bewegingen tot aan doel"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr "(1) bewegen tot aan doel in bereik 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr "(2) bewegen tot aan doel in bereik 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr "(3) bewegen tot aan doel in bereik 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr "(5) bewegen tot aan doel in bereik 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr "(7) bewegen tot aan doel in bereik 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr "(A) beweeg tot aan doel in aanvalsbereik"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?) beweeg tot aan doel"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr "(D) standaard volgen"
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr "(R) relatief volgen"
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr "(M) gespiegeld volgen"
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr "(P) huisdier volgen"
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr "(?) onbekend volgen"
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr "(D) standaard aanval"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr "(s) wissel aanval zonder schild"
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr "(S) wissel aanval met schild"
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) aanval"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) ga en val aan"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr "(A) ga, val aan, raap op"
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr "(d) zonder auto aanval"
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr "(S) klein raap op 1x1 velden"
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr "(D) standaard raap op 2x1 velden"
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) vooruit raap op 2x3 velden"
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr "(3) raap op 3x3 velden"
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr "(g) go en raap op met bereik 4"
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr "(G) ga en raap op met bereik 8"
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr "(A) ga en raap op zonder bereiklimiet"
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?) raap op"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr "(N) normale map tonen"
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr "(D) debug map tonen"
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr "(u) ultra map tonen"
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr "(U) ultra map tonen 2"
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr "(e) lege map tonen"
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr "(b) zwart & witte map tonen"
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr "(?) map tonen"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr "(f) gebruik #flar voor magie aanval"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr "(c) gebruik #chiza voor magie aanval"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr "(I) gebruik #ingrav voor magie aanval"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr "(F) gebruik #frillyar voor magie aanval"
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) gebruik #upmarmu voor magie aanval"
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr "(?) magie aanval"
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr "(D) standaard imitatie"
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr "(O) kleren imitatie"
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr "(?) imitatie"
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr "(O) op toetsenbord"
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) weg"
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) weg"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr "(G) spel camera modus"
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr "(F) vrije camera modus"
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr "(D) design camera modus"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr ""
@@ -3093,8 +3195,8 @@ msgstr ""
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3111,19 +3213,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3139,7 +3244,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3152,7 +3257,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3172,49 +3277,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3950,7 +4055,7 @@ msgstr "Voorwerpsnelkoppelingstoets"
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "Snelkoppeling naar voorwerp %d"
@@ -4077,7 +4182,7 @@ msgstr "Smilie"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "Emoticon snelkoppeling %d"
@@ -4206,119 +4311,123 @@ msgstr "Gebruik magie aanval"
msgid "Switch magic attack"
msgstr ""
-#: src/keyboardconfig.cpp:328
-msgid "Change move type"
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
msgstr ""
#: src/keyboardconfig.cpp:330
-msgid "Change Attack Weapon Type"
+msgid "Change move type"
msgstr ""
#: src/keyboardconfig.cpp:332
-msgid "Change Attack Type"
+msgid "Change Attack Weapon Type"
msgstr ""
#: src/keyboardconfig.cpp:334
-msgid "Change Follow mode"
+msgid "Change Attack Type"
msgstr ""
#: src/keyboardconfig.cpp:336
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr ""
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr ""
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "Aan / Uit audio"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr ""
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr ""
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr ""
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr ""
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr "U bent gedoodt door "
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "Voorwerp is te zwaar."
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "Voorwerp is te ver weg."
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr "Voorwerp behoort bij iemand anders."
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr "Onbekend probleem bij het oprapen van voorwerp."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "U raapte op %d [@@%d|%s@@]."
msgstr[1] "U raapte op %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "Weg"
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "Volg: "
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr "Volgen onderbroken"
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr "Imitatie: "
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr "Imitatie onderbroken"
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr ""
@@ -5123,54 +5232,54 @@ msgstr "Gif had geen effect..."
msgid "%s wants to trade with you, do you accept?"
msgstr "%s wil met jou handelen, aanvaard je dit?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr "Handelen is niet mogelijk. Partner is te ver weg."
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr "Handelen is niet mogelijk. Personage bestaat niet."
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr "Handel onderbroken vanwege een onbekende reden."
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr "Handelen: Jij en %s"
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr "Handel met %s geannuleerd."
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr ""
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr ""
"Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "Handel geannuleerd."
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "Handel voltooid."
@@ -5607,19 +5716,19 @@ msgstr "Verbinding met server beëindigd. "
msgid "%s is not in your party!"
msgstr "%s is niet in jouw groep!"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr "Say '...'"
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr "Blink naam"
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr "Zwevende '...' bel"
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "Zwevende bel"
diff --git a/po/pt.po b/po/pt.po
index 6a197f72c..4bb12a7be 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-29 02:01+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
"pt/)\n"
"Language: pt\n"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,63 +93,63 @@ msgstr "Mudando servidores do jogo"
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, 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:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,156 +158,160 @@ msgstr ""
"Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
"já existe ou é você mesmo."
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr "Na Lista Negra"
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr "Tamanho do cache de fonte"
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr "Tamanho de Cache:"
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr "Recursos de imagens:"
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr "Recursos de imagens orfãos:"
@@ -337,23 +341,23 @@ msgstr "Falha ao salvar screenshot!"
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -387,19 +391,19 @@ msgid "Name"
msgstr "Nome"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "Mover"
@@ -412,8 +416,8 @@ msgid "Reset"
msgstr "Resetar"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Comprar"
@@ -431,7 +435,7 @@ msgstr "Quantidade:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -439,7 +443,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -452,7 +456,7 @@ msgstr "Sair"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Máximo"
@@ -461,8 +465,8 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Loja"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -471,15 +475,15 @@ msgstr "Vender"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -650,7 +654,7 @@ msgid "Enter password:"
msgstr "Entre com a senha"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Excluir"
@@ -726,10 +730,10 @@ msgstr "arco-íris 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -737,12 +741,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -756,10 +760,12 @@ msgid "No"
msgstr "Não"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "Ignora"
@@ -905,7 +911,7 @@ msgstr "Você sabia?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fechar"
@@ -932,8 +938,8 @@ msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Desequipar"
@@ -975,31 +981,31 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Dividir"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Roupas"
@@ -1008,17 +1014,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Descartar"
@@ -1258,7 +1264,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Limpar"
@@ -1296,331 +1302,347 @@ msgstr "Desequipar antes"
msgid "Away outfit"
msgstr "Roupas de ocupado"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Negócios"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Sussuro"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Curar:"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Ser Amigo"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Ser inimigo"
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr "Lista Negra"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr "Chutar do grupo"
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr "Chutar da Guilda"
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr "Mudar posição da Guilda"
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr "Convidar para Guilda"
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "Chutar Jogador"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr "Deixar pelado"
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "Mostar itens:"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr "Deixar sem Roupas"
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr "Adicionar comentário"
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr "Chutar"
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr "Remover da Lista de Ataques"
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr "Adicionar a prioridade na lista de ataques"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr "Adicionar nome ao chat"
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "A Remover"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr "Urdidura"
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr "Carregar Antigas Roupas"
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr "Carregar Antigos Feitiços"
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr "Editar Feitiços"
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr "Não remova o nome"
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "Remover nome"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr "Habilitar longe do teclado"
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr "Desabilitar longe do teclado"
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Sair"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "Mudar a posição da guilda"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr "Resetar barra amarela"
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copiar para o chat"
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "Mover a cima"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr "Mover a baixo"
@@ -2139,22 +2161,22 @@ msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "Habilitar proteção contra servidores com bugs"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "Habilitar Depurador"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr "Ocultar sprite de escudo"
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Mostrar imagem de fundo"
@@ -2282,91 +2304,151 @@ msgstr "Apagado"
msgid "Blacklisted"
msgstr "Na Lista Negra "
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Permitir negociações"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Permitir mensagens particulares"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Antigo"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr "Relações"
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Quando ignorar:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Minúsculo (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Pequeno (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Médio (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Largo (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Grande (14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Enorme (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Fonte"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Fonte negrito"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "Fonte de particulas"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "Fonte de ajuda"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr "Fonte Segura"
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr "Font Jasponesa"
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Tamanho da fonte"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Tema alterado"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -2797,247 +2879,267 @@ msgstr "Escolha o nome do seu grupo."
msgid "Specials"
msgstr "Especiais"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr "(D) movimentos padrão"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr "(l) inserir movimentos"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr "(c) Alguns movimentos loucos"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr "(C) Movimentos loucos"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr "(d) dobro normal + louco"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) mover"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr "(a) movimentos loucos customizados"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr "(?) movimentos loucos"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr "(0) Mover ao alvo padrão"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr "(1) Mover ao alvo com distância 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr "(2) mover ao alvo em distância 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr "(3) Mover ao alvo com distância 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr "(5) Mover ao alvo com distância 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr "(7) Mover ao alvo com distância 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr "(A) Mover ao alvo com a distância de ataque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr "(a) Alcance de arqueiros"
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?) Mover ao alvo"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr "(D) Seguir em modo padrão"
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr "(R) Seguir em modo relativo"
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr "(M) Seguir em modo espelhado"
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr "(P) Seguir em modo animal de extimação"
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr "(?) Seguir em modo desconhecido"
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr "(D) Ataque padrão"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr "(s) Trocar ataque sem escudo"
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr "(S) Trocar ataque com escudo"
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) Ataque"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) Ir e atacar"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr "(A) Ir, atacar, pegar"
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr "(d) sem auto ataque"
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr "(S) Pequeno pegar 1x1 celulas"
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr "(D) Pegar padrão 2x1 células"
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) Pegar em frente 2x3 células"
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr "(3) Pegar 3x3 células"
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr "(g) Ir e pegar em distância 4"
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr "(G) Ir e pegar em distância 8"
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr "(A) Ir e pegar em distância mâxima"
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?) Pegar item"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr "(N) Visualizardor de mapa normal"
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr "(D) Visualizador de mapa depurador"
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr "(u) Visualizador de mapa ultra"
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr "(U) Visualizador de mapa ultra 2"
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr "(e) Visualizador de mapa vazio"
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr "(b) Visualizador de mapa preto e branco"
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr "(?) Visualizador de mapa"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr "(f) Usar #flar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr "(c) Usar #chiza para feitiço de ataque"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr "(I) Usar #ingrav para feitiço de ataque"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr "(F) Usar #frillyar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) Usar #upmarmu para feitiço de ataque"
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr "(?) Feitiço de ataque"
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr "(D) Mímica padrão"
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr "(O) Mímica de roupas"
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr "(?) Mímica"
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr "(O) No teclado"
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) Ausente"
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) Ausente"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr "(G) Modo de jogo câmera"
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr "(F) Modo de jogo câmera livre"
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr "(D) Modo de jogo câmera design"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr "Modificadores de jogo desativados"
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr "Modificadores de jogo ativados"
@@ -3091,8 +3193,8 @@ msgstr "Pontos de correção: %d"
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3109,19 +3211,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3137,7 +3242,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3150,7 +3255,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3170,49 +3275,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3940,7 +4045,7 @@ msgstr "Atalhos de item"
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "Atalho para item %d"
@@ -4067,7 +4172,7 @@ msgstr "Emoticon"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "Atalho para emoticon %d"
@@ -4196,51 +4301,55 @@ msgstr "Usar feitiço de ataque"
msgid "Switch magic attack"
msgstr "Trocar feitiço de ataque"
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
msgid "Change move type"
msgstr "Mudar tipo de movimento"
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
msgstr "Mudar tipo de ataque de arma"
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
msgstr "Mudar tipo de ataque"
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
msgstr "Mudar modo de seguir"
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr "Mudar modo de imitação"
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr "Habilitar / Desabilitar Chaves de modificação"
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "Ligar / Desligar áudio"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr "Habilitar / Desabilitar modo indisponivel "
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr "Emular botão direito do teclado"
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr "Alterar modo de camera"
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr "Modificar chave"
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4249,68 +4358,68 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr "Você foi morto por "
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "Item está muito longe"
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr "O inventário está cheio."
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, 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:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "Indisponivel "
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "Você vê "
@@ -5118,53 +5227,53 @@ msgstr "Veneno não surtiu efeito..."
msgid "%s wants to trade with you, do you accept?"
msgstr "%s quer negociar com você, você aceita?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr "Negociação impossível. O parceiro de negócios está muito longe."
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr "Negociação impossível. O personagem não existe."
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr "Negociação cancelada devido a uma razão desconhecida."
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr "Negociação: Você e %s"
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr "Negociação com %s cancelada."
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr "Troca injusta pacote cancelado."
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr "Falha ao adicionar item. Você não pode trocar este item."
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr "Erro ao adicionar item devido a um motivo desconhecido."
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "Negociação cancelada."
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "Negociação realizada."
@@ -5602,19 +5711,19 @@ msgstr "Conexão com o servidor interrompida. "
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr "Imprimir '...'"
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr "Piscar nome"
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr "Bolha '...' flutuante"
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "Bolha Flutuante"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e4f04c9b3..33f6db6cd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-29 01:59+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
"manaplus/team/pt_BR/)\n"
"Language: pt_BR\n"
@@ -45,47 +45,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "por peso"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "por quantidade"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "por tipo"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Habilitar rolagem preguisoça "
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Rolagem preguiçosa"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,63 +95,63 @@ msgstr "Mudando servidores do jogo"
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, 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:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,156 +160,160 @@ msgstr ""
"Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
"já existe ou é você mesmo."
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr "Na Lista Negra"
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr "Tamanho de fonte Cache"
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr "Tamanho de cache:"
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr "Recursos de imagem:"
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr "Recurso de imagem orfão:"
@@ -339,23 +343,23 @@ msgstr "Falha ao salvar screenshot!"
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -389,19 +393,19 @@ msgid "Name"
msgstr "Nome"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "Mover"
@@ -414,8 +418,8 @@ msgid "Reset"
msgstr "Resetar"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Comprar"
@@ -433,7 +437,7 @@ msgstr "Quantidade:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -441,7 +445,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -454,7 +458,7 @@ msgstr "Sair"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Máximo"
@@ -463,8 +467,8 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Loja"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -473,15 +477,15 @@ msgstr "Vender"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -652,7 +656,7 @@ msgid "Enter password:"
msgstr "Entre com a senha:"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Excluir"
@@ -728,10 +732,10 @@ msgstr "arco-íris 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -739,12 +743,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -758,10 +762,12 @@ msgid "No"
msgstr "Não"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "Ignora"
@@ -907,7 +913,7 @@ msgstr "Você Sabia?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fechar"
@@ -934,8 +940,8 @@ msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Desequipar"
@@ -977,31 +983,31 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Dividir"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Roupas"
@@ -1010,17 +1016,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Descartar"
@@ -1260,7 +1266,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Limpar"
@@ -1298,331 +1304,347 @@ msgstr "Desequipar antes"
msgid "Away outfit"
msgstr "Roupas de ocupado"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Negócios"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Mensagem Privada:"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Cura"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Ser amigo"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Ser inimigo"
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr "Lista Negra"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr "Expulsar do grupo"
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr "Expulsar da guilda"
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr "Mudar pos na Guilda"
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr "Convidar pra Guilda"
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "Chutar Jogador"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr "Nu"
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "Mostrar itens:"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr "Despir"
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr "Add comentário"
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr "vender (?)"
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr "Chutar"
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr "Remover da lista de ataque"
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr "Adicionar na prioridade da lista de ataques"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr "Adicionar nome ao chat"
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "Remover"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr "Urdidura"
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr "Carregar velhas roupas"
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr "Carregar velhos feitiços"
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr "Editar feitiços"
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr "Não retire o nome"
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "Remover o nome"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr "Habilitar modo indisponível"
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr "Desabilitar modo indisponível"
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Sair"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "Mudar a posição da guilda"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr "Zerar barra amarela"
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copiar para chat"
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "Mover para cima"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr "Mover para baixo"
@@ -2141,22 +2163,22 @@ msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "Habilitar proteção contra servidores com bugs"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "Habilitar Depurador"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr "Ocultar sprite de escudo"
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Mostrar imagem de fundo"
@@ -2284,91 +2306,151 @@ msgstr "Apagado"
msgid "Blacklisted"
msgstr "Na Lista Negra "
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Permitir negociações"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Permitir mensagens particulares"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Antigo"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr "Relações"
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Quando ignorar:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Minúsculo (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Pequeno (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Médio (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Largo (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Grande (14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Enorme (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Fonte"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Fonte negrito"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "Fonte de particulas"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "Fonte de ajuda"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr "Fonte segura"
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr "Font Japonesa"
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Tamanho da fonte"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Tema alterado"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -2799,247 +2881,267 @@ msgstr "Escolha o nome do seu grupo."
msgid "Specials"
msgstr "Especiais"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr "(D) movimentos padrão"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr "(l) inserir movimentos"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr "(c) Alguns movimentos loucos"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr "(C) Movimentos loucos"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr "(d) dobro normal + louco"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) mover"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr "(a) movimentos loucos customizados"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr "(?) Movimentos loucos"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr "(0) Mover ao alvo padrão"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr "(1) Mover ao alvo com distância 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr "(2) mover ao alvo em distância 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr "(3) Mover ao alvo com distância 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr "(5) Mover ao alvo com distância 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr "(7) Mover ao alvo com distância 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr "(A) Mover ao alvo com a distância de ataque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr "(a) Alcance ataque de arqueiro"
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?) Mover ao alvo"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr "(D) Seguir em modo padrão"
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr "(R) Seguir em modo relativo"
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr "(M) Seguir em modo espelhado"
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr "(P) Seguir em modo animal de extimação"
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr "(?) Seguir em modo desconhecido"
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr "(D) Ataque padrão"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr "(s) Trocar ataque sem escudo"
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr "(S) Trocar ataque com escudo"
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) Ataque"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) Ir e atacar"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr "(A) Ir, atacar, pegar"
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr "(d) sem auto ataque"
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr "(S) Pequeno pegar 1x1 celulas"
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr "(D) Pegar padrão 2x1 células"
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) Pegar em frente 2x3 células"
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr "(3) Pegar 3x3 células"
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr "(g) Ir e pegar em distância 4"
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr "(G) Ir e pegar em distância 8"
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr "(A) Ir e pegar em distância mâxima"
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?) Pegar item"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr "(N) Visualizardor de mapa normal"
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr "(D) Visualizador de mapa depurador"
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr "(u) Visualizador de mapa ultra"
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr "(U) Visualizador de mapa ultra 2"
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr "(e) Visualizador de mapa vazio"
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr "(b) Visualizador de mapa preto e branco"
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr "(?) Visualizador de mapa"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr "(f) Usar #flar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr "(c) Usar #chiza para feitiço de ataque"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr "(I) Usar #ingrav para feitiço de ataque"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr "(F) Usar #frillyar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) Usar #upmarmu para feitiço de ataque"
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr "(?) Feitiço de ataque"
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr "(D) Mímica padrão"
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr "(O) Mímica de roupas"
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr "(?) Mímica"
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr "(O) No teclado"
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) Ausente"
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) Ausente"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr "(G) Modo de jogo câmera"
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr "(F) Modo de jogo câmera livre"
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr "(D) Modo de jogo câmera design"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr "Modificadores de jogo desativados"
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr "Modificadores de jogo desativados"
@@ -3093,8 +3195,8 @@ msgstr "Pontos de correção: %d"
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3111,19 +3213,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3139,7 +3244,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3152,7 +3257,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3172,49 +3277,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3942,7 +4047,7 @@ msgstr "Atalhos de item"
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "Atalho para item %d"
@@ -4069,7 +4174,7 @@ msgstr "Emoticon"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "Atalho para emoticon %d"
@@ -4198,51 +4303,55 @@ msgstr "Usar feitiço de ataque"
msgid "Switch magic attack"
msgstr "Trocar feitiço de ataque"
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
msgid "Change move type"
msgstr "Mudar tipo de movimento"
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
msgstr "Mudar tipo de ataque de arma"
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
msgstr "Mudar tipo de ataque"
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
msgstr "Mudar modo de seguir"
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr "Mudar modo de imitação"
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr "Habilitar / Desabilitar Chaves de modificação"
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "Ligar / Desligar áudio"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr "Habilitar / Desabilitar modo indisponivel "
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr "Emular botão direito do teclado"
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr "Alterar modo de camera"
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr "Chave de modificação"
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4251,68 +4360,68 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr "Você foi morto por "
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "Item está muito longe"
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr "O inventário está cheio."
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, 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:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "Indisponivel "
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr "Seguindo cancelado"
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "Você vê "
@@ -5120,53 +5229,53 @@ msgstr "Veneno não surtiu efeito..."
msgid "%s wants to trade with you, do you accept?"
msgstr "%s quer negociar com você, você aceita?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr "Negociação impossível. O parceiro de negócios está muito longe."
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr "Negociação impossível. O personagem não existe."
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr "Negociação cancelada devido a uma razão desconhecida."
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr "Negociação: Você e %s"
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr "Negociação com %s cancelada."
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr "Troca injusta pacote cancelado."
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr "Falha ao adicionar item. Você não pode trocar este item."
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr "Erro ao adicionar item devido a um motivo desconhecido."
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "Negociação cancelada."
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "Negociação realizada."
@@ -5604,19 +5713,19 @@ msgstr "Conexão com o servidor interrompida. "
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr "Imprimir '...'"
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr "Piscar nome"
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr "Bolha '...' flutuante"
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "Bolha Flutuante"
diff --git a/po/ru.po b/po/ru.po
index de5ce3b6a..6f52d89b5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-28 00:58+0000\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:41+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
"ru/)\n"
@@ -45,47 +45,47 @@ msgstr "О"
msgid "I"
msgstr "Б"
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Настройка"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Производительность"
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Видео"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr "Темы"
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "Авторизация"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "Входим в игровой мир"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "Получение списка персонажей"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "Смена игрового сервера"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,63 +95,63 @@ msgstr "Смена игрового сервера"
msgid "Error"
msgstr "Ошибка"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "Изменить Пароль"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "Сменить Email"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "Регистрация удалена"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
-#: src/client.cpp:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "Некорректный сервер обновлений: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "Неизвестная команда."
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "Нельзя отправлять пустые сообщения!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,101 +160,105 @@ msgstr ""
"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
"уже создана, или этот игрок Вы сами."
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "Запрос на присоединение к каналу %s."
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Не указано название группы"
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "Не задано имя гильдии."
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "Пожалуйста, укажите имя"
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr "Enter переключает Вас на окно чата."
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "Сообщение закрывает чат."
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "Теперь Return переключает чат."
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "Теперь сообщение закрывает чат."
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "друг"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "пренебрегаемый"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "нейтральный"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "Игрок уже %s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "Игрок удачно %s!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "Игрок не может быть %s!"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "Игрок не был игнорируемым!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "Игрок больше не игнорируется!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "Игрок не может быть удален из списка игнорирования!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr "добавлен в черный список"
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr "враг"
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "Игрок и так уже удален!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "Игрок удален!"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "Игрок не может быть удален!"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr "Время работы клиента: %s"
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -262,7 +266,7 @@ msgstr[0] "%d неделя"
msgstr[1] "%d недели"
msgstr[2] "%d недель"
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -270,7 +274,7 @@ msgstr[0] "%d день"
msgstr[1] "%d дня"
msgstr[2] "%d дней"
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -278,7 +282,7 @@ msgstr[0] "%d час"
msgstr[1] "%d часа"
msgstr[2] "%d часов"
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -286,7 +290,7 @@ msgstr[0] "%d минута"
msgstr[1] "%d минуты"
msgstr[2] "%d минут"
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -294,27 +298,27 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr "размер кеша шрифта"
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr "Размер кеша:"
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "Создано:"
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "Удалено:"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr "Изображений:"
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr "Удаленных изображений:"
@@ -345,23 +349,23 @@ msgstr "Ошибка при сохранении снимка экрана!"
msgid "The connection to the server was lost."
msgstr "Соединение с сервером потеряно."
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "Ошибка сети"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "Игнорировать предложения о торговле"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "Не удалось загрузить карту"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "Ошибка во время загрузки %s"
@@ -395,19 +399,19 @@ msgid "Name"
msgstr "Имя"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "Атака"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Разговор"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "Движение"
@@ -420,8 +424,8 @@ msgid "Reset"
msgstr "Сбросить"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "Купить"
@@ -439,7 +443,7 @@ msgstr "Количество:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -447,7 +451,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -460,7 +464,7 @@ msgstr "Выход"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "Макс"
@@ -469,8 +473,8 @@ msgstr "Макс"
msgid "Shop"
msgstr "Магазин"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -479,15 +483,15 @@ msgstr "Продать"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -658,7 +662,7 @@ msgid "Enter password:"
msgstr "Введите пароль:"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Удалить"
@@ -734,10 +738,10 @@ msgstr "радуга 3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -745,12 +749,12 @@ msgstr "???"
msgid "Chat"
msgstr "Чат"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Присутствуют: %s; Всего %d игроков."
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
@@ -764,10 +768,12 @@ msgid "No"
msgstr "Нет"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "Игнорировать"
@@ -913,7 +919,7 @@ msgstr "Вы знаете?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Закрыть"
@@ -940,8 +946,8 @@ msgstr "Снаряжение"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "Снять"
@@ -983,31 +989,31 @@ msgid "Filter:"
msgstr "Фильтр:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "Надеть"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "Использовать"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "Бросить"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "Разделить"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "Наряды"
@@ -1016,17 +1022,17 @@ msgid "Weight:"
msgstr "Вес:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "Сохранить"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "Получить"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Бросить"
@@ -1268,7 +1274,7 @@ msgstr "Применить"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "Очистить"
@@ -1306,331 +1312,347 @@ msgstr "Сначала снять"
msgid "Away outfit"
msgstr "наряд отсутствия"
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Торговать"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "Приват"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "Лечить"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "Подружиться"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Пренебречь"
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr "Черный список"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr "Сделать врагом"
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr "Стереть"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr "Не игнорировать"
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "@@ignore|Полностью игнорировать@@"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "Следовать"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr "Имитировать"
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr "Пригласить в группу"
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr "Выкинуть из группы"
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr "Выкинуть из гильдии"
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr "Сменить позицию в гильдии"
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr "Пригласить в гильдию"
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "Кикнуть игрока"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr "Уничтожить"
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "Показать предметы"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr "Раздеть"
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr "Добавить коментарий"
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr "Купить (?)"
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr "Продать (?)"
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr "Кикнуть"
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr "Удалить из списка атаки"
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr "Добавить в приоритетный список"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr "Добавить в список атаки"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr "Добавить в список игнорирования"
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr "Добавить имя в чат"
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "Поднять"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "Добавить в чат"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "Элмент карты"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "Переименовать"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr "Удалить"
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr "Прыгнуть"
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr "Загрузить старые наряды"
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Заклинания"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr "Загрузить старые заклинания"
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr "Изменить заклинание"
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "Отключить уведомление"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "Включить уведомление"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr "Не скрывать имя"
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "Скрывать имя"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr "Рарешить режим отошел"
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr "Запретить режим отошел"
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Покинуть"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "Сменить позицию в гильдии"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "Переименовать знак на карте"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "Имя: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr "Комментарий "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr "Комментарий: "
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr "Добавить к сделке"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr "Добавить к сделке 10"
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr "Добавить к сделке половину"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr "Добавить к торговле все"
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "Сохранить 10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "Сохранить половину"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "Сохранить все"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr "Бросить все"
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "Получить 10"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "Получить половину"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "Получить все"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr "Загрузить старые горячие клавиши предметов"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr "Загрузить старые данные"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "Спрятать"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "Показать"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr "сбросить настройки"
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Скопировать в чат"
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(по умолчанию)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "Передвинуть выше"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr "Передвинуть ниже"
@@ -2149,22 +2171,22 @@ msgid "Enable bot checker"
msgstr "Включить детектор ботов"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "Включить защиту от сбойных серверов"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr "Включить защиту от бажных серверов (не выключать!)"
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "Включить отлад. лог"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr "Режим кеширования игроков"
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr "Спрятать картинку счита"
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "Показать фон"
@@ -2297,91 +2319,151 @@ msgstr "Стерт"
msgid "Blacklisted"
msgstr "В черном списке"
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr "Враг"
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "Разрешить торговлю"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "Разрешить шептание"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "Старые"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr "Связи"
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "Когда игнорируется:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "Маленький (10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "Маленький (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "Средний (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "Большой (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "Боьшой (14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "Огромный (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr "Китайский"
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr "Чешский"
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr "Английский"
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr "Финский"
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr "Французский"
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr "Немецкий"
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr "Индонезийский"
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr "Японский"
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr "Голландский (Бельгийский / Фламандский)"
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr "Португальский"
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr "Португальский (Бразильский)"
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr "Русский"
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr "Испанский (Кастильский)"
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "Тема"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "Тема интерфейса"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr "Язык"
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "Основной шрифт"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "Жирный шрифт"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "Шрифт частиц"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "Шрифт помощи"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr "Безопасный шрифт"
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr "Японский шрифт"
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "Размер шрифта"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "Тема изменена"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Перезегрузите игру дабы изменения вступили в силу."
@@ -2814,247 +2896,267 @@ msgstr "Выберите имя будущей группы."
msgid "Specials"
msgstr "Особые"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr "(D) движения по умолчанию"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr "(I) обратное движение"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr "(c) обычное движение иногда с сумашедшими движениями"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr "(C) движение с сумашедшими движениями"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr "(d) нормальные и сумашедшие движения"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr "(?) неизвестное движение"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr "(a) пользовательские сумашедшие движения"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr "(?) неизвестные сумасшедшие движения"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr "(0) обычное движение к цели"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr "(1) движение к цели на расстояние 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr "(2) движение к цели на расстояние 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr "(3) движение к цели на расстояние 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr "(5) движение к цели на расстояние 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr "(7) движение к цели на расстояние 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr "(A) движение к цели на расстояние атаки"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr "(a) атака лучника"
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?) неизвестное движение к цели"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr "(D) следование по умолчанию"
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr "(R) относительное следование"
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr "(M) зеркальное следование"
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr "(P) следование как животное"
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr "(?) неизвестное следование"
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr "(D) обычная атака"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr "(s) переключение атаки без щита"
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr "(S) переключение атаки со щитом"
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) неизвестная атака"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) идти и атаковать"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr "(A) идти, атаковать, собирать"
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr "(d) без автоатаки"
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr "(S) поднятие в области 1x1"
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr "(D) поднятие из области 2x1"
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) поднятие из области спереди 2x3"
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr "(3) поднятие из области 3x3"
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr "(g) движение и поднятие на расстоянии 4"
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr "(g) движение и поднятие на расстоянии 8"
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr "(A) движение и поднятие на максимальном расстоянии"
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?) неизвестный режим поднятия"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr "(N) обычный режим карты"
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr "(D) отладочный режим карты"
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr "(u) специальный режим карты"
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr "(U) специальный режим карты 2"
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr "(e) режим пустой карты"
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr "(b) черно-белый режим карты"
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr "(?) неизвестный режим карты"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr "(f) использовать #flar для атаки"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr "(c) использовать #chiza для атаки"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr "(I) использовать #ingrav для атаки"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr "(F) использовать #frillyar для атаки"
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) использовать #upmarmu для атаки"
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr "(?) неизвестная магическая атака"
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr "(a) атаковать всех игроков"
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr "(f) атаковать всех кроме друзей"
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr "(b) атаковать врагов"
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr "(d) не атаковать игроков"
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr "(?) pvp атака"
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr "(D) имитация по умолчанию"
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr "(O) имитация нарядов"
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr "(?) неизвестная имитация"
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr "(O) возле компьютера"
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr "(A) отошел"
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr "(?) неизвестный режим отошел"
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr "(G) игровая камера"
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr "(F) свободная камера"
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr "(D) камера в режиме разработки"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr "Игровые модификаторы выключены"
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr "Игровые модификаторы включены"
@@ -3108,8 +3210,8 @@ msgstr "Очков навыков: %d"
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3126,19 +3228,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3154,7 +3259,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3167,7 +3272,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3187,49 +3292,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3959,7 +4064,7 @@ msgstr "Горячие клавиши предметов"
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "Комбинация клавиш быстрого предмета %d"
@@ -4086,7 +4191,7 @@ msgstr "Смайлы"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "Комбинация клавиш для смайла %d"
@@ -4215,51 +4320,55 @@ msgstr "Использование магической атаки"
msgid "Switch magic attack"
msgstr "Переключение маг. атаки"
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
+msgstr "Переключение pvp атаки"
+
+#: src/keyboardconfig.cpp:330
msgid "Change move type"
msgstr "Изменение типа движения"
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
msgstr "Измение типа атаки оружием"
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
msgstr "Изменение типа атаки"
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
msgstr "Изменение режима следования"
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr "Изменение режима имитации"
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr "Включение / Выключение специальных модификаторов"
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "Вкл. / Выкл. звука"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr "Включение / Выключение режима отошел"
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr "Эмуляция правого клика с клавиатуры"
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr "Изменение режима камеры"
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr "Кнопка-модификатор"
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4268,41 +4377,41 @@ msgstr ""
"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
"вести."
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr "Вы были убиты "
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый."
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "Предмет слишком далеко"
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr "Слишком много предметов."
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4310,27 +4419,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
msgstr[1] "Вы подняли %d [@@%d|%s@@]."
msgstr[2] "Вы подняли %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "Отошел"
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "Следование: "
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr "Следование отменено"
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr "Имитация: "
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr "Имитация отменена"
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "Вы видите "
@@ -5130,53 +5239,53 @@ msgstr "Яд не подействовал..."
msgid "%s wants to trade with you, do you accept?"
msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr "Торговля невозможна. Партнер по торговле слишком далеко."
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr "Торговля невозможна. Такой персонаж не существует."
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr "Торговля отменена по неизвестной причине."
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr "Торговля: Вы и %s"
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr "Торговля с %s отменена."
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr "Неизвестный сигнал завершения торговли."
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Не удалось добавить предмет. Партнер по торговле перегружен."
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Не удалось добавить предмет. У партнера по торговле кончилось место."
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr "Ошибка добавления предмета. Вы не можете торговать этим предметом."
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr "Не удалось добавить предмет по неизвестной причине."
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "Торговля отменена."
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "Торговля завершена."
@@ -5618,19 +5727,19 @@ msgstr "Подключение к серверу прервано."
msgid "%s is not in your party!"
msgstr "%s не в группе!"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr "Печатать '...'"
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr "Мигать именем"
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr "Плавающий '...' пузырек"
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "Плавающий пузырек"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 171477632..911b057cc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-10-28 00:55+0000\n"
+"POT-Creation-Date: 2011-11-04 02:32+0300\n"
+"PO-Revision-Date: 2011-11-03 23:34+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
"team/zh_CN/)\n"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "魔法攻击"
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "性能"
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:868 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "视频"
-#: src/client.cpp:852
+#: src/client.cpp:873
msgid "Themes"
msgstr "主题"
-#: src/client.cpp:934
+#: src/client.cpp:955
msgid "Connecting to server"
msgstr "魔法防御"
-#: src/client.cpp:965
+#: src/client.cpp:986
msgid "Logging in"
msgstr "尝试捡起不存在的物品。"
-#: src/client.cpp:998
+#: src/client.cpp:1019
msgid "Entering game world"
msgstr "捡起物品发生不存在的物品。"
-#: src/client.cpp:1098
+#: src/client.cpp:1119
msgid "Requesting characters"
msgstr "请求角色"
-#: src/client.cpp:1129
+#: src/client.cpp:1150
msgid "Connecting to the game server"
msgstr "连接到游戏服务器"
-#: src/client.cpp:1139
+#: src/client.cpp:1160
msgid "Changing game servers"
msgstr "更改游戏服务器"
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,214 +93,218 @@ msgstr "更改游戏服务器"
msgid "Error"
msgstr "错误"
-#: src/client.cpp:1198
+#: src/client.cpp:1219
msgid "Requesting registration details"
msgstr "请求注册的详细信息"
-#: src/client.cpp:1224
+#: src/client.cpp:1245
msgid "Password Change"
msgstr "密码更改"
-#: src/client.cpp:1225
+#: src/client.cpp:1246
msgid "Password changed successfully!"
msgstr "更改密码成功!"
-#: src/client.cpp:1244
+#: src/client.cpp:1265
msgid "Email Change"
msgstr "更改电子邮件"
-#: src/client.cpp:1245
+#: src/client.cpp:1266
msgid "Email changed successfully!"
msgstr "更改电子邮件成功!"
-#: src/client.cpp:1265
+#: src/client.cpp:1286
msgid "Unregister Successful"
msgstr "注销成功"
-#: src/client.cpp:1266
+#: src/client.cpp:1287
msgid "Farewell, come back any time..."
msgstr "再见,随时欢迎回来... ..."
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
+#: src/client.cpp:1956 src/client.cpp:1963
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s 不存在,并且无法创建!退出。"
-#: src/client.cpp:1641
+#: src/client.cpp:1662
#, c-format
msgid "Invalid update host: %s"
msgstr "无效的更新主机: %s"
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1696 src/client.cpp:1702
msgid "Error creating updates directory!"
msgstr "创建更新目录错误!"
-#: src/client.cpp:1702
+#: src/client.cpp:1723
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "错误:%s 不存在并且无法创建!退出。"
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
msgid "Unknown command."
msgstr "未知命令。"
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
msgid "Cannot send empty whispers!"
msgstr "无法发送空白密语!"
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr "无法同 \"%s\" 建立一个私人谈话标签页!或者已经存在,或者那就是自己。"
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
#, c-format
msgid "Requesting to join channel %s."
msgstr "请求加入频道%s。"
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "帮会名称缺失。"
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
msgid "Guild name is missing."
msgstr "公会名称是缺少的。"
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
msgid "Please specify a name."
msgstr "请指定一个名称。"
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
msgid "Message closes chat."
msgstr "讯息关闭聊天。"
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
msgid "Return now toggles chat."
msgstr "<回车>键现在切换聊天。"
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
msgid "Message now closes chat."
msgstr "讯息现在关闭聊天。"
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
msgid "friend"
msgstr "朋友"
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
msgid "disregarded"
msgstr "无视"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
msgid "neutral"
msgstr "中性"
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
#, c-format
msgid "Player already %s!"
msgstr "玩家已经%s!"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player successfully %s!"
msgstr "玩家成功%s!"
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
#, c-format
msgid "Player could not be %s!"
msgstr "玩家不能为 %s"
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
msgid "Player wasn't ignored!"
msgstr "是不能忽视的!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
msgid "Player no longer ignored!"
msgstr "玩家不再被忽略!"
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
msgid "Player could not be unignored!"
msgstr "玩家不能被忽略!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
msgid "Player already erased!"
msgstr "玩家已经被删除!"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
msgid "Player successfully erased!"
msgstr "玩家成功删除!"
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
msgid "Player could not be erased!"
msgstr "玩家无法删除!"
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
msgid "font cache size"
msgstr "字体缓存大小"
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
msgid "Created:"
msgstr "创建于:"
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
msgid "Deleted:"
msgstr "删除:"
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
msgid "Resource orphaned images:"
msgstr ""
@@ -329,23 +333,23 @@ msgstr "保存屏幕快照失败!"
msgid "The connection to the server was lost."
msgstr "服务器的连接丢失。"
-#: src/game.cpp:572
+#: src/game.cpp:577
msgid "Network Error"
msgstr "网络错误"
-#: src/game.cpp:1322
+#: src/game.cpp:1335
msgid "Ignoring incoming trade requests"
msgstr "忽略新进的交易请求"
-#: src/game.cpp:1332
+#: src/game.cpp:1345
msgid "Accepting incoming trade requests"
msgstr "接受传入的交易请求"
-#: src/game.cpp:1732
+#: src/game.cpp:1745
msgid "Could Not Load Map"
msgstr "不能加载地图"
-#: src/game.cpp:1733
+#: src/game.cpp:1746
#, c-format
msgid "Error while loading %s"
msgstr "加载%s时出现错误"
@@ -379,19 +383,19 @@ msgid "Name"
msgstr "姓名"
#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
msgid "Attack"
msgstr "攻击"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "说话"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
msgid "Move"
msgstr "移动"
@@ -404,8 +408,8 @@ msgid "Reset"
msgstr "重置"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
msgid "Buy"
msgstr "购买"
@@ -423,7 +427,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
msgid "+"
msgstr "+"
@@ -431,7 +435,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
msgid "-"
msgstr "-"
@@ -444,7 +448,7 @@ msgstr "退出"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
msgid "Max"
msgstr "最大"
@@ -453,8 +457,8 @@ msgstr "最大"
msgid "Shop"
msgstr "商店"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
#: src/gui/selldialog.cpp:93
msgid "Sell"
@@ -463,15 +467,15 @@ msgstr "出售"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -642,7 +646,7 @@ msgid "Enter password:"
msgstr "输入密码:"
#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "删除"
@@ -718,10 +722,10 @@ msgstr "彩虹3"
#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
+#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -729,12 +733,12 @@ msgstr "???"
msgid "Chat"
msgstr "聊天"
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
#, c-format
msgid "Whispering to %s: %s"
msgstr "对%s密语到:%s"
@@ -748,10 +752,12 @@ msgid "No"
msgstr "否"
#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
msgid "Ignore"
msgstr "忽略"
@@ -897,7 +903,7 @@ msgstr "你知道吗?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "关闭"
@@ -924,8 +930,8 @@ msgstr "装备"
#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
msgid "Unequip"
msgstr "卸下装备"
@@ -967,31 +973,31 @@ msgid "Filter:"
msgstr "过滤器:"
#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
msgid "Equip"
msgstr "装备"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
msgid "Drop..."
msgstr "掉落... ..."
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
msgid "Split"
msgstr "分离"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
msgid "Outfits"
msgstr "套装"
@@ -1000,17 +1006,17 @@ msgid "Weight:"
msgstr "重量:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
msgid "Store"
msgstr "存储"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
msgid "Retrieve"
msgstr "取回"
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "丢弃"
@@ -1248,7 +1254,7 @@ msgstr "提交"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
msgid "Clear"
msgstr "清除"
@@ -1286,331 +1292,347 @@ msgstr ""
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "交易"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
msgid "Whisper"
msgstr "密语"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
msgid "Heal"
msgstr "愈合"
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
msgid "Be friend"
msgstr "是朋友"
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:439
msgid "Completely ignore"
msgstr "完全忽略"
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
msgid "Follow"
msgstr "按照"
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
msgid "Kick from party"
msgstr "踢从党"
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
msgid "Kick from guild"
msgstr "踢从公会"
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
msgid "Kick player"
msgstr "踢球员"
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
msgid "Show Items"
msgstr "显示项目"
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
msgid "Add comment"
msgstr "发表评论"
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
msgid "Buy (?)"
msgstr "购买(?)"
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
msgid "Sell (?)"
msgstr "出售(?)"
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
msgid "Add to priority attack list"
msgstr "优先攻击列表"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
msgid "Add to attack list"
msgstr "加入攻击清单"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
msgid "Pick up"
msgstr "拾取"
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
msgid "Add to chat"
msgstr "加入聊天"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
msgid "Map Item"
msgstr "地图项"
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
msgid "Rename"
msgstr "重命名"
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "法术"
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
msgid "Disable highlight"
msgstr "禁用"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
msgid "Enable highlight"
msgstr "启用突出"
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
msgid "Remove name"
msgstr "移除姓名"
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
msgid "Enable away"
msgstr "启用远"
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "留下"
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
msgid "Change guild position"
msgstr "更改公会的立场"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
msgid "Rename map sign "
msgstr "重命名的地图标志"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
msgid "Name: "
msgstr "名称:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
msgid "Player comment "
msgstr "玩家评论"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
msgid "Comment: "
msgstr "评论:"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
msgid "Store 10"
msgstr "商店10"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
msgid "Store half"
msgstr "商店的一半"
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
msgid "Store all"
msgstr "商店所有"
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
msgid "Drop all"
msgstr "所有"
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
msgid "Retrieve 10"
msgstr "拿出10"
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
msgid "Retrieve half"
msgstr "拿出一半"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
msgid "Retrieve all"
msgstr "检索所有"
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
msgid "Hide"
msgstr "隐藏"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
msgid "Show"
msgstr "显示"
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
+#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
+#: src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(默认)"
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
msgid "Move up"
msgstr "x"
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
msgid "Move down"
msgstr ""
@@ -2128,22 +2150,22 @@ msgid "Enable bot checker"
msgstr "启用挂机检查"
#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "启用BUG保护"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
msgstr "启用调试日志"
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
msgstr "低流量模式"
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
msgid "Show background"
msgstr "显示背景"
@@ -2271,91 +2293,151 @@ msgstr "已删除"
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
msgstr "允许交易"
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
msgstr "允许密语"
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
msgid "Old"
msgstr "旧"
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
msgid "Relations"
msgstr "关系"
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
msgstr "当忽略时:"
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Tiny (10)"
msgstr "小(10)"
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Small (11)"
msgstr "小 (11)"
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Medium (12)"
msgstr "中 (12)"
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Large (13)"
msgstr "大 (13)"
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Big (14)"
msgstr "大(14)"
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
msgid "Huge (15)"
msgstr "巨大的 (15)"
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
msgid "Theme"
msgstr "主题"
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:192
msgid "Gui theme"
msgstr "桂主题"
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:194
msgid "Main Font"
msgstr "主要字体"
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
msgid "Bold font"
msgstr "加粗字体"
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
msgid "Particle font"
msgstr "粒子字体"
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
msgid "Help font"
msgstr "帮助字体"
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
msgid "Secure font"
msgstr "安全字体"
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
msgid "Japanese font"
msgstr "日文字体"
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
msgid "Font size"
msgstr "字体大小"
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
msgid "Theme Changed"
msgstr "主题更改"
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "重启您的游戏客户端以使变更生效。"
@@ -2782,247 +2864,267 @@ msgstr "选择n的名称。"
msgid "Specials"
msgstr "特价商品"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
msgid "(a) archer attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
msgid "(?) move to target"
msgstr "(?)移动到目标"
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
msgid "(?) attack"
msgstr "(?) 攻击"
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
msgid "(G) go and attack"
msgstr "(G) 去攻击"
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
msgid "(?) pick up"
msgstr "(?)拿起"
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
msgid "Game modifiers are enabled"
msgstr ""
@@ -3076,8 +3178,8 @@ msgstr ""
#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
msgid "(D)"
msgstr "(D)"
@@ -3094,19 +3196,22 @@ msgid "(C)"
msgstr "(C)"
#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:802
msgid "(d)"
msgstr "(d)"
#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
+#: src/gui/statuswindow.cpp:904
msgid "(?)"
msgstr "(?)"
#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:793
msgid "(a)"
msgstr "(a)"
@@ -3122,7 +3227,7 @@ msgstr "(1)"
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
msgid "(3)"
msgstr "(3)"
@@ -3135,7 +3240,7 @@ msgid "(7)"
msgstr "(7)"
#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
msgid "(A)"
msgstr "(A)"
@@ -3155,49 +3260,49 @@ msgstr "(P)"
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:882
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:885
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:826
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:843
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:849
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:855
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
msgid "(O)"
msgstr "(O)"
@@ -3922,7 +4027,7 @@ msgstr "项目的快捷键"
#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
#, c-format
msgid "Item Shortcut %d"
msgstr "物品快捷 %d"
@@ -4049,7 +4154,7 @@ msgstr "笑脸"
#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
#, c-format
msgid "Emote Shortcut %d"
msgstr "表情快捷键为 %d"
@@ -4178,118 +4283,122 @@ msgstr "使用魔法攻击"
msgid "Switch magic attack"
msgstr "切换魔法攻击"
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
msgid "Change move type"
msgstr "更改移动类型"
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
msgstr "更改攻击型武器"
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
msgstr "更改攻击类型"
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
msgstr "更改跟随模式"
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
msgstr "更改仿模式"
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
msgstr ""
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
msgstr "开/关 音频"
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
msgstr "启用/禁用离开模式"
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
msgstr "从键盘模拟右键单击"
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
msgstr "切换模式"
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
msgid "Modifier key"
msgstr "修改按键"
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:384
msgid "You were killed by "
msgstr "你被打死"
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1438
msgid "Item is too heavy."
msgstr "项目是太重了。"
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1440
msgid "Item is too far away."
msgstr "物品太远了。"
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1442
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1444
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1447
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1450
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1474
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "你拾起%d[@@%d|%s @@]。"
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3200
msgid "Away"
msgstr "距离"
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3535
msgid "Follow: "
msgstr "跟随:"
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3544
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3902
msgid "You see "
msgstr "你看"
@@ -5081,53 +5190,53 @@ msgstr "毒药无效..."
msgid "%s wants to trade with you, do you accept?"
msgstr "%s想和您进行交易,是否接受?"
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
msgstr "交易不可能进行。与交易伙伴太过太过遥远"
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
msgid "Trading isn't possible. Character doesn't exist."
msgstr "交易不可能进行。角色不存在。"
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
msgid "Trade cancelled due to an unknown reason."
msgstr "交易取消因不明原因。"
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
#, c-format
msgid "Trade: You and %s"
msgstr "交易:您和%s"
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
#, c-format
msgid "Trade with %s cancelled."
msgstr "与%s的交易被取消。"
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
msgid "Unhandled trade cancel packet."
msgstr "未处理的交易取消分组。"
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
msgstr "添加项目失败。交易伙伴已经负重太多。"
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr "添加物品失败。您不能交易这项物品."
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
msgstr "添加项目失败,原因未知。"
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
msgstr "交易取消。"
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
msgstr "交易完成。"
@@ -5563,19 +5672,19 @@ msgstr "连接到服务器终止。"
msgid "%s is not in your party!"
msgstr "%s不在你的帮会中!"
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:453
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:473
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:517
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:520
msgid "Floating bubble"
msgstr "流动的泡沫"