Merge branch 'master' into strippedstripped1.1.10.30

1 files changed, 75 insertions, 59 deletions

diff --git a/po/manaplus.pot b/po/manaplus.pot
index f141b3248..a7a34c90e 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-15 00:08+0300\n"
+"POT-Creation-Date: 2011-10-28 03:52+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"
@@ -138,171 +138,171 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:205
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:304
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: src/commandhandler.cpp:318
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:331
+#: src/commandhandler.cpp:338
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:358
+#: src/commandhandler.cpp:365
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:371 src/commandhandler.cpp:483
-#: src/commandhandler.cpp:524 src/commandhandler.cpp:559
+#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
+#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:430
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:430
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:428
+#: src/commandhandler.cpp:441
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:434
+#: src/commandhandler.cpp:447
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:475
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:480
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:485
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:491
+#: src/commandhandler.cpp:504
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:518
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:526
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:556
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:558
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:564
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:579
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:592
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:879 src/commandhandler.cpp:925
+#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:889
+#: src/commandhandler.cpp:902
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:898
+#: src/commandhandler.cpp:911
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:906
+#: src/commandhandler.cpp:919
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:914
+#: src/commandhandler.cpp:927
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:922
+#: src/commandhandler.cpp:935
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1001
+#: src/commandhandler.cpp:1014
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1013
+#: src/commandhandler.cpp:1026
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1017
+#: src/commandhandler.cpp:1030
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1019
+#: src/commandhandler.cpp:1032
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073
+#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075
+#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -335,19 +335,19 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1323
+#: src/game.cpp:1322
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1333
+#: src/game.cpp:1332
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1733
+#: src/game.cpp:1732
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1734
+#: src/game.cpp:1733
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -731,12 +731,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:610
+#: src/gui/chatwindow.cpp:613
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:997
+#: src/gui/chatwindow.cpp:1000
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -4294,7 +4294,7 @@ msgstr ""
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3873
+#: src/localplayer.cpp:3876
 msgid "You see "
 msgstr ""
 
@@ -4495,6 +4495,22 @@ msgstr ""
 msgid "MVP player: "
 msgstr ""
 
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
+msgstr ""
+
 #: src/net/ea/gamehandler.cpp:87
 #, c-format
 msgid "Online users: %d"
@@ -5062,53 +5078,53 @@ msgstr ""
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:134
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
+#: src/net/ea/tradehandler.cpp:138
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:135
+#: src/net/ea/tradehandler.cpp:142
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:141
+#: src/net/ea/tradehandler.cpp:148
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:151
+#: src/net/ea/tradehandler.cpp:158
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:164
+#: src/net/ea/tradehandler.cpp:171
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:229
+#: src/net/ea/tradehandler.cpp:236
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:234
+#: src/net/ea/tradehandler.cpp:241
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:239
+#: src/net/ea/tradehandler.cpp:246
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:243
+#: src/net/ea/tradehandler.cpp:250
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
@@ -5531,11 +5547,11 @@ msgstr ""
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:355
+#: src/net/tmwa/network.cpp:356
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:425
+#: src/net/tmwa/network.cpp:426
 msgid "Connection to server terminated. "
 msgstr ""