summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-01 01:01:55 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-01 01:20:31 +0300
commitf6261c7070142f32ea45f24151270dd7993d73ff (patch)
treeae447bd1361ee8a52e161bd5e92cbe1b5e4ee2fa /po
parentfc5ba333f8832f3d8e054e7c74df1e3cd353645f (diff)
downloadmv-f6261c7070142f32ea45f24151270dd7993d73ff.tar.gz
mv-f6261c7070142f32ea45f24151270dd7993d73ff.tar.bz2
mv-f6261c7070142f32ea45f24151270dd7993d73ff.tar.xz
mv-f6261c7070142f32ea45f24151270dd7993d73ff.zip
Update and rebuild translations.
Diffstat (limited to 'po')
-rw-r--r--po/ar.po310
-rw-r--r--po/bg.po310
-rw-r--r--po/ca.po310
-rw-r--r--po/cs.po310
-rw-r--r--po/da.po310
-rw-r--r--po/de.po325
-rw-r--r--po/el.po310
-rw-r--r--po/en_GB.po310
-rw-r--r--po/eo.po310
-rw-r--r--po/es.po310
-rw-r--r--po/et.po310
-rw-r--r--po/fa.po310
-rw-r--r--po/fi.po310
-rw-r--r--po/fr.po406
-rw-r--r--po/he.po310
-rw-r--r--po/hr.po310
-rw-r--r--po/hu.po310
-rw-r--r--po/id.po310
-rw-r--r--po/it.po310
-rw-r--r--po/ja.po310
-rw-r--r--po/ka.po310
-rw-r--r--po/manaplus.pot308
-rw-r--r--po/nb.po310
-rw-r--r--po/nl.po310
-rw-r--r--po/nl_BE.po310
-rw-r--r--po/pl.po316
-rw-r--r--po/pt.po310
-rw-r--r--po/pt_BR.po310
-rw-r--r--po/ru.po310
-rw-r--r--po/sk.po310
-rw-r--r--po/sq.po310
-rw-r--r--po/sv.po310
-rw-r--r--po/sv_SE.po310
-rw-r--r--po/te.po310
-rw-r--r--po/th.po310
-rw-r--r--po/tr.po310
-rw-r--r--po/vls.po310
-rw-r--r--po/zh_CN.po310
-rw-r--r--po/zh_HK.po310
-rw-r--r--po/zh_TW.po310
40 files changed, 6378 insertions, 6137 deletions
diff --git a/po/ar.po b/po/ar.po
index ec737c6a0..443ca3868 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -422,7 +422,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -436,7 +436,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "شراء"
@@ -485,7 +485,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "بيع"
@@ -498,12 +498,12 @@ msgstr "بيع"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -795,9 +795,9 @@ msgstr "نعم"
msgid "No"
msgstr "لا"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -1013,8 +1013,8 @@ msgid "Equipment"
msgstr "العتاد"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "تجريد من العتاد"
@@ -1056,26 +1056,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "استعمال العتاد"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "استخدام"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "قسم"
@@ -1089,17 +1089,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "إسقاط"
@@ -1161,49 +1161,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1225,29 +1227,29 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1430,7 +1432,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1450,7 +1452,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1463,7 +1465,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1471,8 +1473,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1484,8 +1486,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1541,179 +1543,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2575,26 +2577,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2610,7 +2612,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2689,7 +2691,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3944,151 +3946,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6036,7 +6042,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 22c008efc..6467e6842 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -478,12 +478,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index d5c2b7f68..08790a843 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -478,12 +478,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr "si"
msgid "No"
msgstr "no"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index a281627b1..9dca9419b 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: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/language/"
"cs/)\n"
@@ -46,12 +46,12 @@ msgid "miss"
msgstr "minul"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -412,7 +412,7 @@ msgstr "Mluvit"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -426,7 +426,7 @@ msgstr "Vynulovat"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Nákup"
@@ -475,7 +475,7 @@ msgid "Shop"
msgstr "Obchod"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Prodej"
@@ -488,12 +488,12 @@ msgstr "Prodej"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -785,9 +785,9 @@ msgstr "Ano"
msgid "No"
msgstr "Ne"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Ignorovat"
@@ -1003,8 +1003,8 @@ msgid "Equipment"
msgstr "Vybavení"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Odstranit z vybavení"
@@ -1046,26 +1046,26 @@ msgid "Filter:"
msgstr "Filtr:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Vybavit"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Použít"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Upustit..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Rozdělit"
@@ -1079,17 +1079,17 @@ msgid "Weight:"
msgstr "Hmotnost:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Uložit"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Vzít"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Upustit"
@@ -1151,49 +1151,51 @@ msgstr "Resetovat statistiky"
msgid "Reset timer"
msgstr "Reset časomíry"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Úroveň: %d při %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d/%d Zbývá: %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, prům. mobů na 1%%: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Zabitých: %s, celkem exp %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Zabitých/Min: %s, Exp/Min: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1209,29 +1211,29 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Exp za poslední zabití:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Čas do zrození Jack O:"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr "Čas do další úrovně: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "Jack O se rodí"
@@ -1414,7 +1416,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Přidat komentář"
@@ -1434,7 +1436,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Vložit do seznamu ignorovaných"
@@ -1447,7 +1449,7 @@ msgid "Players"
msgstr "Hráči"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Vykopnout z party"
@@ -1455,8 +1457,8 @@ msgstr "Vykopnout z party"
msgid "Pick up"
msgstr "Sebrat"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Vložit do chatu"
@@ -1468,8 +1470,8 @@ msgstr "Označit na mapě"
msgid "Rename"
msgstr "Přejmenovat"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Odebrat"
@@ -1525,179 +1527,179 @@ msgstr "Odejít"
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Pozvat do party"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
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:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Jméno: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Hráčův komentář"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "Komentář: "
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Přidat do transakce"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "Přidat 10 do transakce"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "Přidat polovinu do transakce"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Přidat vše do transakce"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Uschovat 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Uschovat polovinu"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Uschovat všechny"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Upustit vše"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Vzít 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Vzít polovinu"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Vzít všechny"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Skrýt"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Zobrazit"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "Resetovat žlutý pruh"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Zkopírovat do chatu"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Posunout nahoru"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Posunout dolů"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Svléct"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Být přátelé"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Přehlížet"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Vymazat"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Odignorovat"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Kompletně ignorovat"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Následovat"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "imitovat"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Koupit (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Prodat (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Zobrazit věci"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2559,26 +2561,26 @@ msgstr "Takhle to bude vypadat"
msgid "Type:"
msgstr "Typ:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statický"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulzní"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Duhový"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spektrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Prodleva:"
@@ -2594,7 +2596,7 @@ msgstr "Zelená:"
msgid "Blue:"
msgstr "Modrá:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Průhlednost:"
@@ -2675,7 +2677,7 @@ msgstr ""
msgid "Misc"
msgstr "Ostatní"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monstra"
@@ -3932,151 +3934,155 @@ msgstr "##1 aktualizaci později"
msgid "Completed"
msgstr "Hotovo"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Jména přátel"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Jména přehlížených"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Jména ignorovaných"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Jména vymazaných"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Jména ostatních hráčů"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Vlastní jméno"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "Jména GM"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "Jména NPC"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Pruh HP monster"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Pruh HP monster (druhá barva)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Členové party"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Členové gildy"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Částicové efekty"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Oznámení o sběru"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Oznámení o zkušenostech"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "Hráčův HP pruh"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "Hráčův HP pruh (druhá barva)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Hráč zasáhne monstrum"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Monstrum zasáhne hráče"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Hráč zasáhne místního hráče"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Kritický zásah"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Místní hráč zasáhne monstrum"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Kritický zásah místního hráče"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Místní hráč minul"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Minutí"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "Zvýraznění portálů"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "Zvýraznění výchozí kolize"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "Zvýraznění vzdušné kolize"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "Zvýraznění vodní kolize"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "Zvýraznění schůdnosti"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Útočný dosah místního hráče"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Hranice útočného dosahu místního hráče"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Útočný dosah monstra"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "Domovské místo"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "Hranice domácího místa"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "Bod cesty"
@@ -6027,7 +6033,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/da.po b/po/da.po
index 5fc2f694c..abbd46808 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Danish (http://www.transifex.net/projects/p/manaplus/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -44,12 +44,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -403,7 +403,7 @@ msgstr "Snak"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -417,7 +417,7 @@ msgstr "Nulstil"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Køb"
@@ -466,7 +466,7 @@ msgid "Shop"
msgstr "butik"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Sælg"
@@ -479,12 +479,12 @@ msgstr "Sælg"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -776,9 +776,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -994,8 +994,8 @@ msgid "Equipment"
msgstr "Udstyr"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Tag af"
@@ -1037,26 +1037,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Tag på"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Brug"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Opdel"
@@ -1070,17 +1070,17 @@ msgid "Weight:"
msgstr "Vægt:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Gem på lager"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Hent fra lager"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Smid"
@@ -1142,49 +1142,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1198,29 +1200,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1403,7 +1405,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1423,7 +1425,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1436,7 +1438,7 @@ msgid "Players"
msgstr "Brugere"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1444,8 +1446,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1457,8 +1459,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1514,179 +1516,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2548,26 +2550,26 @@ msgstr "Sådan ser farven ud."
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Fastlåst"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulserende"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Regnbuefarvet"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spektrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2583,7 +2585,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2662,7 +2664,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monstre"
@@ -3917,151 +3919,155 @@ msgstr ""
msgid "Completed"
msgstr "Udført"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Skabning"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Andre spilleres navne"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Eget navn"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM-navne"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPC'er"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Partikeleffekter"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Opsamlingsnotits"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "XP-notits"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Kritisk sår"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Rammer forbi"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6005,7 +6011,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "unavngivet"
diff --git a/po/de.po b/po/de.po
index c57a4e880..7afdc6c51 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,6 +9,7 @@
# <der.loisl@gmx.de>, 2011.
# <jack@krass.com>, 2011.
# Marco Jäger <>, 2012.
+# Marco Jäger <linuxcobra@gmx.de>, 2012.
# <Necromong@inbox.ru>, 2011.
# Philipp <philipp.krueger1@googlemail.com>, 2012.
# Rosemarie Tauber <horos@online.de>, 2012.
@@ -16,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.net/projects/p/manaplus/language/"
"de/)\n"
@@ -52,12 +53,12 @@ msgid "miss"
msgstr "verfehlt"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "I"
@@ -137,7 +138,7 @@ msgstr "Erfolgreich abgemeldet."
#: src/client.cpp:1417
msgid "Farewell, come back any time..."
-msgstr "Leb wohl und komme jeder Zeit wieder..."
+msgstr "Leb wohl und komm jeder Zeit wieder..."
#: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
#: src/client.cpp:2143 src/client.cpp:2150
@@ -174,7 +175,7 @@ msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr ""
-"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
+"Kann keinen Tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
"oder du bist es selbst."
#: src/commandhandler.cpp:375
@@ -415,7 +416,7 @@ msgstr "Sprechen"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Bewegen"
@@ -429,7 +430,7 @@ msgstr "Zurücksetzten"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Kaufen"
@@ -478,7 +479,7 @@ msgid "Shop"
msgstr "Laden"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Verkaufen"
@@ -491,12 +492,12 @@ msgstr "Verkaufen"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -788,9 +789,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Ignorieren"
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr "Ausrüstung"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Ablegen"
@@ -1049,26 +1050,26 @@ msgid "Filter:"
msgstr "Filter:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Ausrüsten"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Benutzen"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Wegwerfen"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Aufteilen"
@@ -1082,17 +1083,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Aufbewahren"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Abholen"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Wegwerfen"
@@ -1154,18 +1155,18 @@ msgstr "Statistik zurücksetzen"
msgid "Reset timer"
msgstr "Timer zurücksetzen"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Level: %d bei %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d/%d Übrig: %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
@@ -1173,32 +1174,34 @@ msgstr ""
"Durchschnittliche Monsteranzahl für 1%%: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Getötet: %s, Summe Erfahrungspunkte: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr "Durchschnitt. Exp: %s"
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Durchschn. Monsteranzahl zum nächsten Level %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Kills/Min: %s, Exp/Min: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1212,29 +1215,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Zeit bis zum nächsten Level pro %d Min: %s"
msgstr[1] "Zeit bis zum nächsten Level pro %d Min: %s"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Letze exp:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Zeit bis zum nächsten JackO:"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr "Zeit bis zum nächsten Level: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "JackO erscheint"
@@ -1417,7 +1420,7 @@ msgid "Nuke"
msgstr "Atombombe"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Kommentar hinzufügen"
@@ -1437,7 +1440,7 @@ msgstr "Hinzufügen zur bevorzugten Angriffsliste"
msgid "Add to attack list"
msgstr "Hinzufügen zur normalen Angriffsliste"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Hinzufügen zur Ignorierenliste"
@@ -1450,7 +1453,7 @@ msgid "Players"
msgstr "Spieler"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Aus Gruppe werfen"
@@ -1458,8 +1461,8 @@ msgstr "Aus Gruppe werfen"
msgid "Pick up"
msgstr "Aufheben"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Zu Chat hinzufügen"
@@ -1471,8 +1474,8 @@ msgstr "Karteneinstellung"
msgid "Rename"
msgstr "Umbenennen"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Entfernen"
@@ -1528,179 +1531,179 @@ msgstr "Verlassen"
msgid "Copy to clipboard"
msgstr "Kopiere in die Zwischenablage"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Lade zu Gruppe ein"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "Position der Gilde ändern"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Kartenzeichen umbenennen"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Name:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Spieler Kommentar"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "Kommentar:"
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "10 zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "Die Hälfte zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Alles zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "10 aufbewahren"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Die Hälfte aufbewahren"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Alles aufbewahren"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Alles fallenlassen"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "10 abholen"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Die Hälfte abholen"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Alles abholen"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr "Fächer des Wegwerffensters leeren"
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Verstecken"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Zeigen"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "Setze gelben Balken zurück"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Kopiere zu Chat"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(normal)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Nach oben"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Nach unten"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Ausziehen"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Befreunden"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Missachten"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr "Schwarze Liste"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr "Als Feind setzen"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Löschen"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Nicht mehr Ignorieren"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignoriere komplett"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Folgen"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Imitation"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Kaufen(?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Verkaufen(?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Zeige Items"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr "Von der Aufhebeliste entfernen"
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr "Zur Aufhebeliste hinzufügen"
@@ -2562,26 +2565,26 @@ msgstr "So sieht die Farbe aus"
msgid "Type:"
msgstr "Typ:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statisch"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulsierend"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Regenbogen"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spektrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Verzögerung:"
@@ -2597,7 +2600,7 @@ msgstr "Grün:"
msgid "Blue:"
msgstr "Blau:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Alpha:"
@@ -2678,7 +2681,7 @@ msgstr "Drehe den Joystick und drücke keine Tasten"
msgid "Misc"
msgstr "Sonstiges"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monster"
@@ -2987,7 +2990,7 @@ msgstr "Aktivierung der rechteckigen Textur-Erweiterung (OpenGL)"
#: src/gui/setup_perfomance.cpp:102
msgid "Use new texture internal format (OpenGL)"
-msgstr ""
+msgstr "Verwenden neue Textur internes Format (OpenGL)"
#: src/gui/setup_players.cpp:53
msgid "Show gender"
@@ -3039,7 +3042,7 @@ msgstr "Gruppiere Freunde im \"wer ist online\"-Fenster"
#: src/gui/setup_players.cpp:89
msgid "Hide erased players nicks"
-msgstr ""
+msgstr "Ausblenden gelöschter Spielernamen"
#: src/gui/setup_relations.cpp:63
msgid "Relation"
@@ -3257,7 +3260,7 @@ msgstr "Alt FPS Limit:"
#: src/gui/setup_video.cpp:244
msgid "Detect best mode"
-msgstr ""
+msgstr "besten Modus ermitteln"
#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
@@ -3601,7 +3604,7 @@ msgstr "Ignoriere Monster"
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
#: src/gui/socialwindow.cpp:988
msgid "Pik"
-msgstr ""
+msgstr "Pik"
#: src/gui/socialwindow.cpp:1012
msgid "Pickup items"
@@ -3946,151 +3949,155 @@ msgstr "##1 Du versuchst es später erneut."
msgid "Completed"
msgstr "Fertig"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Aktionen"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Namen der Freunde"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Außer Acht gelassene Namen"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Ignorierte Namen"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Gelöschte Namen"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Namen anderer Spieler"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Eigener Name"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "Namen von GM"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Monster HP Leiste"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Monster HP Leiste (zweite Farbe)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Mitglieder der Party"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Mitglieder der Gilde"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Partikeleffekte"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "aufgehobene Gegenstände"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Anzeige der Erfahrungspunkte"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "HP-Leiste des Spielers"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "HP-Leiste des Spielers (zweite Farbe)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Spieler trifft Monster"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Monster trifft Spieler"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Ein Spieler hat dich getroffen"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Kritischer Treffer"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Spieler trifft Monster"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Spieler trifft Monster stark"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Spieler trifft nicht"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Verfehlt"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "Portal hervorheben"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "Hervorhebung von normalen Kollisionen"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "Hervorhebung von Flug-Kollisionen"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "Wasser Hervorhebung"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "Betretbarer Boden"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Lokale Spieler-Attackenreichweite"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Rand der Attackenreichweite des Lokalen Spielers"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Monster Angriffsreichweite"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "Stammplatz"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "Stammplatz Grenze"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "Wegpunkt"
@@ -5684,7 +5691,7 @@ msgstr "Du bist tot."
#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
msgid "Not logged in."
-msgstr "nicht angemeldet"
+msgstr "Nicht angemeldet."
#: src/net/manaserv/charhandler.cpp:148
msgid "No empty slot."
@@ -6072,7 +6079,7 @@ msgstr "Schwebende '...' Blase"
msgid "Floating bubble"
msgstr "Schwebende Blase"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "unbenannt"
diff --git a/po/el.po b/po/el.po
index d9b45b27f..f76241223 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Greek (http://www.transifex.net/projects/p/manaplus/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr "αστοχία"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr "Συζήτηση"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Κίνηση"
@@ -416,7 +416,7 @@ msgstr "Επαναφορά"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Αγορά"
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr "Κατάστημα"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Πουλήστε"
@@ -478,12 +478,12 @@ msgstr "Πουλήστε"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr "Ναι"
msgid "No"
msgstr "Δεν"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Παράβλεψη"
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr "Εξοπλισμός"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr "Φίλτρο:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Equip"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Χρήση"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Πέτα ..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Διαίρεση"
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr "Βάρος:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Κατάστημα"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Ανάκτηση"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Πέτα"
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr "Επαναφορά χρονόμετρου"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Προσθήκη στη συζήτηση"
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Μετονομασία υπογράψει χάρτη "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Όνομα:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Κατάστημα 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Αποθήκευσε τα μισά"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Αποθηκεύστε όλα τα"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Ανέκτησε τα μισά"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Ανέκτησε όλα"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 638a0e10b..a4d6b0ee4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -44,12 +44,12 @@ msgid "miss"
msgstr "miss"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -403,7 +403,7 @@ msgstr "Talk"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -417,7 +417,7 @@ msgstr "Reset"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Buy"
@@ -466,7 +466,7 @@ msgid "Shop"
msgstr "Shop"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Sell"
@@ -479,12 +479,12 @@ msgstr "Sell"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -776,9 +776,9 @@ msgstr "Yes"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -994,8 +994,8 @@ msgid "Equipment"
msgstr "Equipment"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Unequip"
@@ -1037,26 +1037,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Equip"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Use"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Split"
@@ -1070,17 +1070,17 @@ msgid "Weight:"
msgstr "Weight:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Store"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Retrieve"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Drop"
@@ -1142,49 +1142,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1198,29 +1200,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1403,7 +1405,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1423,7 +1425,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1436,7 +1438,7 @@ msgid "Players"
msgstr "Players"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1444,8 +1446,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1457,8 +1459,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1514,179 +1516,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2548,26 +2550,26 @@ msgstr "This is what the colour looks like"
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Static"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulse"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Rainbow"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spectrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2583,7 +2585,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2662,7 +2664,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monsters"
@@ -3917,151 +3919,155 @@ msgstr ""
msgid "Completed"
msgstr "Completed"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Being"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Other Players' Names"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Own Name"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM Names"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Particle Effects"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Pickup Notification"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Exp Notification"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Critical Hit"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Misses"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6005,7 +6011,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "unnamed"
diff --git a/po/eo.po b/po/eo.po
index a0f9143d2..ab8af93f5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -478,12 +478,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "sennoma"
diff --git a/po/es.po b/po/es.po
index 6bfcf0b94..b038c2188 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
"manaplus/language/es/)\n"
@@ -49,12 +49,12 @@ msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "I"
@@ -411,7 +411,7 @@ msgstr "Hablar"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Mover"
@@ -425,7 +425,7 @@ msgstr "Restablecer"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Comprar"
@@ -474,7 +474,7 @@ msgid "Shop"
msgstr "Tienda"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vender"
@@ -487,12 +487,12 @@ msgstr "Vender"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -784,9 +784,9 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Ignorar"
@@ -1003,8 +1003,8 @@ msgid "Equipment"
msgstr "Equipamiento"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Quitárselo"
@@ -1046,26 +1046,26 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Tirar..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Dividir"
@@ -1079,17 +1079,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Almacenar"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Recuperar"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Tirar"
@@ -1151,49 +1151,51 @@ msgstr "Restablecer estadísticas"
msgid "Reset timer"
msgstr "Restablecer cronometrador"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nivel: %d de %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d/%d Queda: %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, prom. criatura para 1%%: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Muertes: %s, exp. total: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr "Avg Exp: %s"
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "No. of avg mob to next level: %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Matanza/Mín: %s, Exp/Mín: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1207,29 +1209,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Exp de último eliminado:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Tiempo antes de que jacko aparezca:"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Tiempo para el siguiente nivel: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "¿%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "jacko apareciendo"
@@ -1412,7 +1414,7 @@ msgid "Nuke"
msgstr "Eliminar"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Agregar comentario"
@@ -1432,7 +1434,7 @@ msgstr "Añadir a la lista de ataque prioritaria"
msgid "Add to attack list"
msgstr "Agregar a la lista de ataque"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Agregar a la lista de ignorados"
@@ -1445,7 +1447,7 @@ msgid "Players"
msgstr "Jugadores"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Sacar del grupo"
@@ -1453,8 +1455,8 @@ msgstr "Sacar del grupo"
msgid "Pick up"
msgstr "Recoger"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Añadir al chat"
@@ -1466,8 +1468,8 @@ msgstr "Mapa Objeto"
msgid "Rename"
msgstr "Renombrar"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Quitar"
@@ -1523,179 +1525,179 @@ msgstr "Dejar"
msgid "Copy to clipboard"
msgstr "Copiar al portapapeles"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Invitar a grupo"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "Cambiar posición del Clan"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Renombrar señal del mapa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Nombre: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Comentario del jugador "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "Comentario: "
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Agregar al intercambio"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "Agregar 10 al intercambio"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "Agregar la mitad al intercambio"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Agregar todo al intercambio"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Almacenar 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Almacenar la mitad"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Almacenar todo"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Tirar todo"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Recuperar 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Recuperar la mitad"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Recuperar todo"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr "Limpiar ventana de lanzamiento"
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "Restablecer barra amarilla"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Copiar al chat"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(predeterminado)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Subir"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Bajar"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Desvestir"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Ser amigo"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Desatender"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr "Lista negra"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr "Fijar como enemigo"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Borrar"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Des-ignorar"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Imitación"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Mostrar artículos"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr "Remover de lista de recogido"
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr "Agregar a lista de recogido"
@@ -2559,26 +2561,26 @@ msgstr "Así es como se verá el color"
msgid "Type:"
msgstr "Tipo:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Estático"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulso"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Arco iris"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Espectro"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Atraso:"
@@ -2594,7 +2596,7 @@ msgstr "Verde:"
msgid "Blue:"
msgstr "Azul:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Alfa:"
@@ -2675,7 +2677,7 @@ msgstr "Girar la palanca y no presionar los botones"
msgid "Misc"
msgstr "Misceláneo"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monstruos"
@@ -3935,151 +3937,155 @@ msgstr "##1 lo intentes de nuevo más tarde."
msgid "Completed"
msgstr "Completado"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Ser"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Nombres de Amigos"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Nombres de Desatendidos"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Nombres de Ignorados"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Nombres de Borrados"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Nombres de otros jugadores"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Propio Nombre"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "Nombres De Los GMs"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Barra de energía del monstruo"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Barra de energía del monstruo (segundo color)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Miembros del grupo"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Miembros del Clan"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Efectos Particulares"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Aviso al cojer un objeto"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Aviso de experiencia"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "Barra de energía del jugador"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "Barra de energía del jugador (segundo color)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Jugador Golpea al Monstruo"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Monstruo Golpea al Jugador"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Otros Jugadores le pegan al Jugador Local"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Golpe Crítico"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Jugador Local Golpea al Monstruo"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Golpe Critico del jugador"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Cuando fallas un ataque"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Muchos fallos al atacar"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "Resaltar portal"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "Resaltar colisiones"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "Resaltado de colisión en el Aire"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "resaltado de colisión en el Agua"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "Mostrar las partes accesibles"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Alcance de ataque de Jugador local"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Borde de alcance de ataque de Jugador local"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Alcance de ataque de Monstruos"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "Lugar de Inicio"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "Limites de Lugar de Inicio"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "Mostrar camino"
@@ -6056,7 +6062,7 @@ msgstr "Burbuja '...' flotante"
msgid "Floating bubble"
msgstr "Burbuja Flotante"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "anónimo"
diff --git a/po/et.po b/po/et.po
index 525fc243d..db4dbff4d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -478,12 +478,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr "Jah"
msgid "No"
msgstr "Ei"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/fa.po b/po/fa.po
index beba809c6..12193c2c4 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -411,7 +411,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -460,7 +460,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -473,12 +473,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -770,9 +770,9 @@ msgstr "بلی"
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -988,8 +988,8 @@ msgid "Equipment"
msgstr "تجهیزات"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1031,26 +1031,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1064,17 +1064,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1136,49 +1136,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1190,29 +1192,29 @@ msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1395,7 +1397,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1415,7 +1417,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1428,7 +1430,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1436,8 +1438,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1449,8 +1451,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1506,179 +1508,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2540,26 +2542,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2575,7 +2577,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2654,7 +2656,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3909,151 +3911,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -5996,7 +6002,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 8183d7cf0..acbd962c6 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: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fi\n"
@@ -44,12 +44,12 @@ msgid "miss"
msgstr "huti"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "P"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "-"
@@ -407,7 +407,7 @@ msgstr "Keskustele"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Liiku"
@@ -421,7 +421,7 @@ msgstr "Nollaa"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Osta"
@@ -470,7 +470,7 @@ msgid "Shop"
msgstr "Kauppa"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Myy"
@@ -483,12 +483,12 @@ msgstr "Myy"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -780,9 +780,9 @@ msgstr "Kyllä"
msgid "No"
msgstr "Ei"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Ohita"
@@ -998,8 +998,8 @@ msgid "Equipment"
msgstr "Varusteet"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Poista varuste käytöstä"
@@ -1041,26 +1041,26 @@ msgid "Filter:"
msgstr "Suodin:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Ota käyttöön"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Käytä"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Pudota..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Jaa"
@@ -1074,17 +1074,17 @@ msgid "Weight:"
msgstr "Paino:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Varastoi"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Ota"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Pudota"
@@ -1146,49 +1146,51 @@ msgstr "Nollaa tiedot"
msgid "Reset timer"
msgstr "Nollaa ajastin"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Taso: %d @ %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Kokemus: %d/%d, jäljellä: %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d kp, keskim. vastustajaa 1%%:iin: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Tappoja: %s, kp kaikkiaan: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Tappoa/min: %s, kp/min: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1202,29 +1204,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Aika ensi tasolle %d min perusteella: %s"
msgstr[1] "Aika ensi tasolle %d min perusteella: %s"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Viime tapon kp:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Aika jackon resetiin:"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Aika seur. tasolle: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "jacko elää!"
@@ -1407,7 +1409,7 @@ msgid "Nuke"
msgstr "Pommita"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Lisää kommentti"
@@ -1427,7 +1429,7 @@ msgstr "Lisää prioriteettihyökkäyslistalle"
msgid "Add to attack list"
msgstr "Lisää hyökkäyslistaan"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Lisää ohitettavien listaan"
@@ -1440,7 +1442,7 @@ msgid "Players"
msgstr "Pelaajat"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Potki ryhmästä"
@@ -1448,8 +1450,8 @@ msgstr "Potki ryhmästä"
msgid "Pick up"
msgstr "Poimi"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Lisää keskusteluun"
@@ -1461,8 +1463,8 @@ msgstr "Karttaolio"
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Poista"
@@ -1518,179 +1520,179 @@ msgstr "Eroa"
msgid "Copy to clipboard"
msgstr "Kopioi leikepöydälle"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Kutsu ryhmään"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "Muuta asemaa killassa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Muuta merkin nimeä "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Nimi: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Pelaajakommentti "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "Kommentti: "
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Lisää kauppaan"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "Lisää 10 kauppaan"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "Lisää puolet kauppaan"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Lisää kaikki kauppaan"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Varastoi 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Varastoi puolet"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Varastoi kaikki"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Pudota kaikki"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Ota 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Ota puolet"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Ota kaikki"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Piilota"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Näytä"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Kopioi keskusteluun"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(oletus)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Siirrä ylös"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Siirrä alas"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Riisu"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Ystävysty"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Vaimenna"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr "Musta lista"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr "Aseta viholliseksi"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Pyyhi"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Huomioi jälleen"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Jätä täysin huomiotta"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Seuraa"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Matki"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Osta (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Myy (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Näytä tavarat"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2552,26 +2554,26 @@ msgstr "Väri näyttää tältä"
msgid "Type:"
msgstr "Tyyppi:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Staattinen"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Sykkivä"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Sateenkaari"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spektri"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Viive:"
@@ -2587,7 +2589,7 @@ msgstr "Vihreä:"
msgid "Blue:"
msgstr "Sininen:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Alfa:"
@@ -2668,7 +2670,7 @@ msgstr ""
msgid "Misc"
msgstr "Sekal."
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Hirviöt"
@@ -3924,151 +3926,155 @@ msgstr "##1 yrität myöhemmin uudelleen"
msgid "Completed"
msgstr "Valmis"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Olo"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Ystävien nimet"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Vaimennettujen nimet"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Huomiotta jätettyjen nimet"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Pyyhittyjen nimet"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Muiden pelaajien nimet"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Oma nimi"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM-nimet"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCt"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Hirviön VP-palkki"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Hirviön VP-palkki (toinen väri)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Ryhmän jäsenet"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Killan jäsenet"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Hiukkastehosteet"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Poimintailmoitus"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Kokemusilmoitus"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "Pelaajan VP-palkki"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "Pelaajan VP-palkki (toinen väri)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Pelaaja lyö hirviötä"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Hirviö lyö pelaajaa"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Toinen pelaaja lyö paikallista pelaajaa"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Täysosuma"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Paikallinen pelaaja lyö hirviötä"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Paikallinen pelaaja saa täysosuman"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Paikallisen pelaajan huti"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Hudit"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "Siirtymän korostus"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "Oletustörmäyskorostus"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "Ilmatörmäyksen korostus"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "Vesitörmäyksen korostus"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "Kuljettavan korostus"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Paikallispelaajan hyökkäyskantama"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Paikallispelaajan hyökkäyskantaman raja"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Hirviön hyökkäyskantama"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "Kotipaikka"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "Kotipaikan raja"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "Väyläpiste"
@@ -6035,7 +6041,7 @@ msgstr "Leijuva '...' -puhekupla"
msgid "Floating bubble"
msgstr "Leijuva puhekupla"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "nimetön"
diff --git a/po/fr.po b/po/fr.po
index c6caf5e7e..87c2b0429 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <aligetmw@hotmail.fr>, 2012.
# Andrei Karas <akaras@inbox.ru>, 2011.
# <andycootlapin@hotmail.fr>, 2012.
# <antoinebcn@hotmail.com>, 2011.
@@ -14,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/"
"fr/)\n"
@@ -50,12 +51,12 @@ msgid "miss"
msgstr "raté"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "I"
@@ -345,7 +346,7 @@ msgstr "Général"
#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
msgid "Debug"
-msgstr "Déboguage"
+msgstr "Débogage"
#: src/game.cpp:517
msgid "Screenshot saved as "
@@ -415,7 +416,7 @@ msgstr "Parler"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Déplacement"
@@ -429,7 +430,7 @@ msgstr "Réinitialiser"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Acheter"
@@ -478,7 +479,7 @@ msgid "Shop"
msgstr "Boutique"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vendre"
@@ -491,12 +492,12 @@ msgstr "Vendre"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -651,7 +652,7 @@ msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
#: src/gui/charselectdialog.cpp:140
msgid "Account and Character Management"
-msgstr "Gestion du compte et du personnage"
+msgstr "Gestion du compte et des personnages"
#: src/gui/charselectdialog.cpp:154
msgid "Switch Login"
@@ -788,9 +789,9 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Ignorer"
@@ -999,15 +1000,15 @@ msgstr "Description :"
#: src/gui/editserverdialog.cpp:177
msgid "Please at least type both the address and the port of the server."
-msgstr "S'il vous plait, entrez l'adresse et le port du serveur."
+msgstr "Entrez au moins l'adresse et le port du serveur."
#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
msgid "Equipment"
msgstr "Équipement"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Retirer"
@@ -1049,26 +1050,26 @@ msgid "Filter:"
msgstr "Filtre :"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Équiper"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Utiliser"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Jeter..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Partager"
@@ -1082,17 +1083,17 @@ msgid "Weight:"
msgstr "Poids :"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Entreposer"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Récupérer"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Jeter"
@@ -1154,49 +1155,51 @@ msgstr "RaZ stats"
msgid "Reset timer"
msgstr "RaZ temps"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Niveau : %d à %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp : %d/%d Reste : %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d Moyenne des monstres tués 1%% : %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Nbre Tués : %s, total exp : %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr "Exp. moy.: %s"
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Nb. de mobs moy. pour proc. niv.: %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Tués/Min : %s, Exp/Min : %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1210,29 +1213,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Temps pour le prochain niveau %d min : %s"
msgstr[1] "Temps pour le prochain niveau %d min : %s"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Exp du dernier tué :"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Temps avant l'arrivée de Jack0 :"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Temps pour le prochain niveau : %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "Arrivée de Jack0"
@@ -1415,7 +1418,7 @@ msgid "Nuke"
msgstr "Annihiler"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Ajouter commentaire"
@@ -1435,7 +1438,7 @@ msgstr "Ajouter à la liste de priorités d'attaque"
msgid "Add to attack list"
msgstr "Ajouter à la liste d'attaque"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Ajouter à la liste d'ignorés"
@@ -1448,7 +1451,7 @@ msgid "Players"
msgstr "Joueurs"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Sortir du groupe"
@@ -1456,8 +1459,8 @@ msgstr "Sortir du groupe"
msgid "Pick up"
msgstr "Ramasser"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Ajouter à la conversation"
@@ -1469,8 +1472,8 @@ msgstr "Objet de carte"
msgid "Rename"
msgstr "Renommer"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Enlever"
@@ -1526,179 +1529,179 @@ msgstr "Quitter"
msgid "Copy to clipboard"
msgstr "Copier vers le presse-papier"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Inviter dans le groupe"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "Changer de position dans la guilde"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Renommer le panneau de carte"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Nom : "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Le joueur commente "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "Commentaire : "
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Ajouter à la transaction"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "Ajouter 10 dans l'échange"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "Ajouter la moitié dans l'échange"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Ajouter tout dans l'échange"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Entreposer 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Entreposer la moitié"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Entreposer tout"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Jeter tout"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Reprendre 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Reprendre la moitié"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Reprendre tout"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr "Vider la fenêtre de dépot"
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Cacher"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Montrer"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "Remise aux valeurs de défaut de la barre jaune"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Copier dans la conversation"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(défaut)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Aller vers le haut"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Aller vers le bas"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Déshabiller"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Être ami"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Éviter"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr "Liste noire"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr "Définir comme ennemi"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Éliminer"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Ne plus ignorer"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignorer complètement"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Suivre"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Imiter"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Acheter (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Vendre (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Montrer les objets"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr "Retirer de la liste de ramassage"
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr "Ajouter à la liste de ramassage"
@@ -1800,7 +1803,7 @@ msgstr "requiert la v%s"
#: src/gui/setupactiondata.h:48
msgid "Target and attack keys"
-msgstr "touches de visée et d'attaque"
+msgstr "Touches de visée et d'attaque"
#: src/gui/setupactiondata.h:58
msgid "Target & Attack"
@@ -1880,7 +1883,7 @@ msgstr "Sélectionner OK"
#: src/gui/setupactiondata.h:172
msgid "Shortcuts modifiers keys"
-msgstr "touches des modificateurs de raccourcis"
+msgstr "Touches des modificateurs de raccourcis"
#: src/gui/setupactiondata.h:177
msgid "Item Shortcuts Key"
@@ -1888,7 +1891,7 @@ msgstr "Touche de raccourcis objets"
#: src/gui/setupactiondata.h:182
msgid "Shortcuts keys"
-msgstr "Touches de raccourci"
+msgstr "Touches de raccourcis"
#: src/gui/setupactiondata.h:187 src/gui/setupactiondata.h:192
#: src/gui/setupactiondata.h:197 src/gui/setupactiondata.h:202
@@ -1966,7 +1969,7 @@ msgstr "Fenêtre du magasin"
#: src/gui/setupactiondata.h:371
msgid "Quick drop Window"
-msgstr "Fenêtre pour jeter les objets"
+msgstr "Fenêtre jet rapide d'objets"
#: src/gui/setupactiondata.h:376
msgid "Kill Stats Window"
@@ -1998,15 +2001,15 @@ msgstr "Onglet de dialogue suivant"
#: src/gui/setupactiondata.h:420
msgid "Emote modifiers keys"
-msgstr "touches des modificateurs d'emote"
+msgstr "Touches des modificateurs d'émoticône"
#: src/gui/setupactiondata.h:425
msgid "Emote modifier key"
-msgstr "touche de modificateur d'emote"
+msgstr "Touche du modificateur d'émoticône"
#: src/gui/setupactiondata.h:430
msgid "Emote shortcuts"
-msgstr "Raccourcis d'emote"
+msgstr "Raccourcis des émoticônes"
#: src/gui/setupactiondata.h:435 src/gui/setupactiondata.h:440
#: src/gui/setupactiondata.h:445 src/gui/setupactiondata.h:450
@@ -2082,7 +2085,7 @@ msgstr "Raccourcis des tenues"
#: src/gui/setupactiondata.h:939 src/gui/setupactiondata.h:944
#, c-format
msgid "Outfit Shortcut %d"
-msgstr "Raccourci de tenues %d"
+msgstr "Raccourci de tenue %d"
#: src/gui/setupactiondata.h:958
msgid "Toggle Chat"
@@ -2158,11 +2161,11 @@ msgstr "Jeter rapidement N objets"
#: src/gui/setupactiondata.h:1057
msgid "Switch Quick Drop Counter"
-msgstr "Changer de compteur de jet rapide d'objets"
+msgstr "Changer le compteur de jet rapide d'objets"
#: src/gui/setupactiondata.h:1062
msgid "Quick heal target or self"
-msgstr "Soins rapides de la cible ou de soi"
+msgstr "Soins rapides de la cible ou de soi-même"
#: src/gui/setupactiondata.h:1067
msgid "Use #itenplz spell"
@@ -2246,7 +2249,7 @@ msgstr "Aller à droite"
#: src/gui/setupactiondata.h:1176
msgid "Move to navigation point shortcuts"
-msgstr "Raccourcis de \"aller au point de navigation point\""
+msgstr "Raccourcis de \"Aller au point de navigation\""
#: src/gui/setupactiondata.h:1181 src/gui/setupactiondata.h:1186
#: src/gui/setupactiondata.h:1191 src/gui/setupactiondata.h:1196
@@ -2274,7 +2277,7 @@ msgstr "Raccourcis de \"aller au point de navigation point\""
#: src/gui/setupactiondata.h:1411 src/gui/setupactiondata.h:1416
#, c-format
msgid "Move to point Shortcut %d"
-msgstr "Raccourci de \"aller au point de navigation point\" %d"
+msgstr "Raccourci de \"Aller au point de navigation\" %d"
#: src/gui/setupactiondata.h:1430
msgid "Move & selection"
@@ -2286,7 +2289,7 @@ msgstr "Aller au point de repos"
#: src/gui/setupactiondata.h:1460
msgid "Move End"
-msgstr "Arret du déplacement"
+msgstr "Arrêt du déplacement"
#: src/gui/setupactiondata.h:1465
msgid "Page up"
@@ -2306,7 +2309,7 @@ msgstr "Sélectionner2"
#: src/gui/setupactiondata.h:1500
msgid "Backspace"
-msgstr "Backspace"
+msgstr "Retour arrière"
#: src/gui/setupactiondata.h:1505
msgid "Insert"
@@ -2334,7 +2337,7 @@ msgstr "Fenêtres"
#: src/gui/setupactiondata.h:1545
msgid "Emotes"
-msgstr "Emoticones"
+msgstr "Emoticônes"
#: src/gui/setupactiondata.h:1549
msgid "Gui"
@@ -2382,15 +2385,15 @@ msgstr "Fréquence audio"
#: src/gui/setup_audio.cpp:86
msgid "mono"
-msgstr "Mono"
+msgstr "mono"
#: src/gui/setup_audio.cpp:87
msgid "stereo"
-msgstr "Stéréo."
+msgstr "stéréo"
#: src/gui/setup_audio.cpp:88
msgid "surround"
-msgstr "Surround"
+msgstr "surround"
#: src/gui/setup_audio.cpp:89
msgid "surround+center+lfe"
@@ -2518,7 +2521,7 @@ msgstr "Messages de magie dans l'onglet de débogage"
#: src/gui/setup_chat.cpp:107
msgid "Show server messages in debug tab"
-msgstr "Afficher les messages du serveur dans l'onglet de déboguage"
+msgstr "Afficher les messages du serveur dans l'onglet de débogage"
#: src/gui/setup_chat.cpp:110
msgid "Enable trade tab"
@@ -2560,26 +2563,26 @@ msgstr "Voilà à quoi ressemble cette couleur"
msgid "Type:"
msgstr "Type : "
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statique"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Impulsion"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Arc-en-ciel"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spectre"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Délai : "
@@ -2595,7 +2598,7 @@ msgstr "Vert : "
msgid "Blue:"
msgstr "Bleu : "
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Opacité : "
@@ -2621,7 +2624,7 @@ msgstr "Désassigner"
#: src/gui/setup_input.cpp:132
msgid "Reset all keys"
-msgstr "Réinitialiser toutes les touches"
+msgstr "Réinitialiser toutes les touches"
#: src/gui/setup_input.cpp:135
msgid "Default"
@@ -2676,7 +2679,7 @@ msgstr "Tournez le manche et n'appuyez pas sur les boutons"
msgid "Misc"
msgstr "Divers"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monstres"
@@ -2762,7 +2765,7 @@ msgstr "Synchroniser les mouvements du joueur"
#: src/gui/setup_other.cpp:110
msgid "Crazy move A program"
-msgstr "Programme A de mouvement de fou"
+msgstr "Programme de mouvement de fou A"
#: src/gui/setup_other.cpp:114
msgid "Player"
@@ -2899,7 +2902,7 @@ msgstr "Active la protection pour serveurs defaillant (ne pas désactiver)"
#: src/gui/setup_other.cpp:221
msgid "Enable debug log"
-msgstr "Activer l'enregistrement des informations de déboguage"
+msgstr "Activer l'enregistrement des informations de débogage"
#: src/gui/setup_other.cpp:224
msgid "Low traffic mode"
@@ -2915,7 +2918,7 @@ msgstr "Utiliser FBO pour les captures d'écran (seulement pour OpenGL)"
#: src/gui/setup_other.cpp:235
msgid "Network delay between sub servers"
-msgstr ""
+msgstr "Retard du réseau entre les sous-serveurs"
#: src/gui/setup_other.cpp:238
msgid "Show background"
@@ -2931,7 +2934,7 @@ msgstr "Ajustement automatique des performances"
#: src/gui/setup_perfomance.cpp:60
msgid "Hw acceleration"
-msgstr "Accélération matériel"
+msgstr "Accélération matérielle"
#: src/gui/setup_perfomance.cpp:63
msgid "Enable opacity cache (Software, can use many memory)"
@@ -2985,7 +2988,7 @@ msgstr "Activer l'extension de texture rectangulaire (OpenGL)"
#: src/gui/setup_perfomance.cpp:102
msgid "Use new texture internal format (OpenGL)"
-msgstr ""
+msgstr "Utiliser le nouveau format de texture interne (OpenGL)"
#: src/gui/setup_players.cpp:53
msgid "Show gender"
@@ -3037,7 +3040,7 @@ msgstr "Regrouper les amis dans la fenêtre de qui est en ligne"
#: src/gui/setup_players.cpp:89
msgid "Hide erased players nicks"
-msgstr ""
+msgstr "Cacher les noms des joueurs supprimés"
#: src/gui/setup_relations.cpp:63
msgid "Relation"
@@ -3251,11 +3254,11 @@ msgstr "Limite FPS :"
#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
msgid "Alt FPS limit: "
-msgstr "Alterner les limites FPS"
+msgstr "Limite FPS alternative"
#: src/gui/setup_video.cpp:244
msgid "Detect best mode"
-msgstr ""
+msgstr "Détecter le meilleur mode"
#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
@@ -3363,7 +3366,7 @@ msgstr "Bulles avec noms"
#: src/gui/setup_visual.cpp:67
msgid "Overhead text"
-msgstr "Texte aérien"
+msgstr "bulles de texte"
#: src/gui/setup_visual.cpp:71 src/gui/setup_visual.cpp:103
msgid "off"
@@ -3399,7 +3402,7 @@ msgstr "Détail des particules"
#: src/gui/setup_visual.cpp:90
msgid "best quality"
-msgstr "qualité max."
+msgstr "meilleure qualité"
#: src/gui/setup_visual.cpp:91
msgid "normal"
@@ -3407,7 +3410,7 @@ msgstr "normal"
#: src/gui/setup_visual.cpp:92
msgid "best perfomance"
-msgstr "performance max."
+msgstr "meilleure performance"
#: src/gui/setup_visual.cpp:93
msgid "Particle physics"
@@ -3526,7 +3529,7 @@ msgstr "Demande pour quitter la guilde %s effectuée."
#: src/gui/socialwindow.cpp:216
msgid "Member Invite to Guild"
-msgstr "Inviter le membre de la guilde"
+msgstr "Inviter le membre dans la guilde"
#: src/gui/socialwindow.cpp:217
#, c-format
@@ -3599,7 +3602,7 @@ msgstr "Ignorer les monstres"
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
#: src/gui/socialwindow.cpp:988
msgid "Pik"
-msgstr ""
+msgstr "Pik"
#: src/gui/socialwindow.cpp:1012
msgid "Pickup items"
@@ -3764,7 +3767,7 @@ msgstr "Métier : %d"
#: src/gui/statuswindow.cpp:211
msgid "Job:"
-msgstr "Compétences :"
+msgstr "Compétence :"
#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
#, c-format
@@ -3787,7 +3790,7 @@ msgstr "Pas de cible"
#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
-msgstr "Autoriser le ciblage"
+msgstr "permet une cible"
#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
@@ -3947,151 +3950,155 @@ msgstr "##1 Essayez à nouveau plus tard"
msgid "Completed"
msgstr "Terminé"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Créature"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Noms des amis"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Noms des écartés"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Noms des ignorés"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Noms supprimés"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Nom des autres joueurs"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Mon nom"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "Nom des MJ"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "PNJs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Barre de vie des monstres"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Barre de vie du monstre (Couleur secondaire)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Membres du groupe"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Membres de la guilde"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Effets de particules"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Information de récupération"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Information d'expérience"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "Barre de vie du Joueur"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "Barre de vie du joueur (Couleur secondaire)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Coups des joueurs sur les montres"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Le monstre touche le joueur"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Un autre joueur vous attaque"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Coup critique"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Votre personnage touche le monstre"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Coup critique"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Votre personnage manque son coup"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Coups manqués"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
-msgstr "Surbrillance des portails d'entrée et de sortie"
+msgstr "Surbrillance des portails d'entrée - sortie"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "Surbrillance des zones de collision : Défaut"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "Surbrillance des zones de collision : Air"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "Surbrillance des zones de collision : Eau"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "Surbrillance des parties praticables"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
-msgstr "Portée de de vos attaques"
+msgstr "Portée de vos attaques"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
-msgstr "Délimitation de la portée de vos attaques"
+msgstr "Limite de la portée de vos attaques"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Portée d'attaque des monstres"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "Emplacement de référence"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "Limites de votre position"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "Étape"
@@ -4258,11 +4265,11 @@ msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
#: src/gui/widgets/whispertab.cpp:107
msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Ignore l'autre joueur"
+msgstr "/ignore > Ignore le joueur"
#: src/gui/widgets/whispertab.cpp:108
msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Cesser d'ignorer l'autre joueur"
+msgstr "/unignore > Cesse d'ignorer le joueur"
#: src/gui/widgets/whispertab.cpp:109
msgid "/close > Close the whisper tab"
@@ -4274,7 +4281,7 @@ msgstr "Commande : /close"
#: src/gui/widgets/whispertab.cpp:120
msgid "This command closes the current whisper tab."
-msgstr "Cette commande ferme l'onglet courant de conversation privée."
+msgstr "Cette commande ferme l'onglet de conversation privée courant."
#: src/gui/widgets/whispertab.cpp:124
msgid "Command: /ignore"
@@ -4283,8 +4290,8 @@ msgstr "Commande : /ignore"
#: src/gui/widgets/whispertab.cpp:125
msgid "This command ignores the other player regardless of current relations."
msgstr ""
-"Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou "
-"non."
+"Cette commande permet d'ignorer un joueur indépendamment des relations "
+"actuelles."
#: src/gui/widgets/whispertab.cpp:130
msgid "Command: /unignore <player>"
@@ -4819,8 +4826,7 @@ msgstr " -p --port : Port de connexion au serveur"
#: src/main.cpp:72
msgid " --update-host : Use this update host"
-msgstr ""
-" --update-host : Utilise cette URL pour les fichiers de mises à jour"
+msgstr " --update-host : Utiliser ce serveur de mises à jour"
#: src/main.cpp:73
msgid " -D --default : Choose default character server and character"
@@ -6091,7 +6097,7 @@ msgstr "Bulle flottante '...'"
msgid "Floating bubble"
msgstr "Bulle flottante"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "anonyme"
diff --git a/po/he.po b/po/he.po
index 9508ab6ed..2c4b8c20c 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr "דבר"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr "אפס"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "קנה"
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr "חנות"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "מכר"
@@ -478,12 +478,12 @@ msgstr "מכר"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr "כן"
msgid "No"
msgstr "לא"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr "לבוש"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "הורד"
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "השתמש"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "השתמש"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "פצל"
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr "משקל:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "אחסן"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "החזר"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "השלך"
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr "שחקנים"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr "כך הצבע נראה"
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "סטטי"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "פעימה"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "קשת בענן"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "מינסרה"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "מפלצות"
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr "הסתיים"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "נהיה"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "שמות המשתמשים האחרים"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "השם שלך"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "שמות המנהלים"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "דמויות"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "אפקטים חלקיים"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "הודעה על לקיחה"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "הודעה על נק' נסיון"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "מכה קריטית"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "פספוס"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "ללא שם"
diff --git a/po/hr.po b/po/hr.po
index 07cd63e29..4ad51f56f 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -407,7 +407,7 @@ msgstr "Govori"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -421,7 +421,7 @@ msgstr "Poništi"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Kupi"
@@ -470,7 +470,7 @@ msgid "Shop"
msgstr "Trgovina"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Prodaj"
@@ -483,12 +483,12 @@ msgstr "Prodaj"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -780,9 +780,9 @@ msgstr "Da"
msgid "No"
msgstr "Ne"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -998,8 +998,8 @@ msgid "Equipment"
msgstr "Oprema"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Skini opremu"
@@ -1041,26 +1041,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Opremi"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Upotrijebi"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Razdvoji"
@@ -1074,17 +1074,17 @@ msgid "Weight:"
msgstr "Težina:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Pohrani"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Preuzmi"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Ispusti"
@@ -1146,49 +1146,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1204,29 +1206,29 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1409,7 +1411,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1429,7 +1431,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1442,7 +1444,7 @@ msgid "Players"
msgstr "Igrači"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1450,8 +1452,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1463,8 +1465,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1520,179 +1522,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2554,26 +2556,26 @@ msgstr "Ovako izgleda boja"
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statično"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulsiranje"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Duga"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spektar"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2589,7 +2591,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2668,7 +2670,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Čudovišta"
@@ -3923,151 +3925,155 @@ msgstr ""
msgid "Completed"
msgstr "Dovršeno"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Biće"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Imena Drugih Igrača"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Vlastito Ime"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM Imena"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Efekti Čestica"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Obavijest Sakupljanja"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Exp Obavijest"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Kritični Udarac"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Promašaji"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6012,7 +6018,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "neimenovano"
diff --git a/po/hu.po b/po/hu.po
index a0239e359..d399978bc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr "Csevegés"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr "Alaphelyzet"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Vétel"
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr "Üzlet"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Eladás"
@@ -478,12 +478,12 @@ msgstr "Eladás"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr "Igen"
msgid "No"
msgstr "Nem"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr "Felszerelés"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Nem használ"
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Használ"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Bevet"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Felosztás"
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr "Súly:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Raktároz"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Magához vesz"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Eldob"
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr "Játékosok"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr "Így fog kinézni a felirat."
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statikus"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulzáló"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Szivárvány"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Színkép"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Szörny neve"
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr "Kész"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Nevek"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Ismeretlen játékos neve"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Saját név"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM név"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "Gépjátékos neve"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Effektek"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Tárgy felvételekor"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Tapasztalat szerzésekor"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Kritikális ütéskor"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Ha nincs találat."
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "Névtelen"
diff --git a/po/id.po b/po/id.po
index 2b42d0b7a..b4c0f1c43 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/"
"language/id/)\n"
@@ -46,12 +46,12 @@ msgid "miss"
msgstr "Luput"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "l"
@@ -403,7 +403,7 @@ msgstr "Berbicara"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Jalan"
@@ -417,7 +417,7 @@ msgstr "Reset"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Beli"
@@ -466,7 +466,7 @@ msgid "Shop"
msgstr "Toko"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Jual"
@@ -479,12 +479,12 @@ msgstr "Jual"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -776,9 +776,9 @@ msgstr "Ya"
msgid "No"
msgstr "Tidak"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Abaikan"
@@ -994,8 +994,8 @@ msgid "Equipment"
msgstr "Perlengkapan"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Lepaskan"
@@ -1037,26 +1037,26 @@ msgid "Filter:"
msgstr "Penyaring:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Pakai"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Gunakan"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Buang..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Pecah"
@@ -1070,17 +1070,17 @@ msgid "Weight:"
msgstr "Berat"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Simpan"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Kembalikan"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Buang"
@@ -1142,49 +1142,51 @@ msgstr "Atur ulang stats"
msgid "Reset timer"
msgstr "Atur ulang penghitung waktu"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Level: %d pada %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d Tersisa:%d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "%%= %d exp, rata-rata mob untuk 1%%: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Membunuh: %s, exp total: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Membunuh/menit: %s, Exp/menit: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1196,29 +1198,29 @@ msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Exp terakhir"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "waktu sebelum Jacko kembali"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr "waktu untuk ke level selanjutnya: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "Jacko bertelur"
@@ -1401,7 +1403,7 @@ msgid "Nuke"
msgstr "Sembunyikan"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Penambahan komentar"
@@ -1421,7 +1423,7 @@ msgstr "Tambahkan prioritas daftar menyerang"
msgid "Add to attack list"
msgstr "Tambahkan ke daftar menyerang"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Tambahkan ke daftar Abaikan"
@@ -1434,7 +1436,7 @@ msgid "Players"
msgstr "Pemain"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Keluarkan dari kelompok"
@@ -1442,8 +1444,8 @@ msgstr "Keluarkan dari kelompok"
msgid "Pick up"
msgstr "Ambil"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Ambil ke obrolan"
@@ -1455,8 +1457,8 @@ msgstr "Daftar barang"
msgid "Rename"
msgstr "Ganti nama"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Hapus"
@@ -1512,179 +1514,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Undang ke kelompok"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "Ubah posisi Organisasi"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Ubah nama tanda peta"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Nama:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Komentar pemain"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "komentar"
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Tambahkan semua ke Penukaran"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Masukkan 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Masukkan setengah"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Masukkan semua"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Buang semuanya"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Ambil 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Ambil setengah"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Ambil semua"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Tampilkan"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "Atur ulang bar kuning"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Pindahkan ke chat"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(kembalikan)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Bergerak keatas"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Bergerak kebawah"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Tanggalkan pakaian"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Jadikan teman"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Hapus"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Batalkan pengabaian"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Mengikuti"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Tirukan"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Beli(?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Jual(?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Perlihatkan item"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2546,26 +2548,26 @@ msgstr "Warnanya terlihat seperti ini"
msgid "Type:"
msgstr "Tipe"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statis"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Getar"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Pelangi"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spektrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Tunda:"
@@ -2581,7 +2583,7 @@ msgstr "Hijau:"
msgid "Blue:"
msgstr "Biru:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Alpha:"
@@ -2660,7 +2662,7 @@ msgstr ""
msgid "Misc"
msgstr "macam-macam"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3914,151 +3916,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6001,7 +6007,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 0002a7a78..9b4b8ee7b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -46,12 +46,12 @@ msgid "miss"
msgstr "Mancato"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -405,7 +405,7 @@ msgstr "Parla"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Movimento"
@@ -419,7 +419,7 @@ msgstr "Reimposta"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Compra"
@@ -468,7 +468,7 @@ msgid "Shop"
msgstr "Negozio"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vendi"
@@ -481,12 +481,12 @@ msgstr "Vendi"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -778,9 +778,9 @@ msgstr "Sì"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Ignora"
@@ -996,8 +996,8 @@ msgid "Equipment"
msgstr "Equipaggiamento"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Togli"
@@ -1039,26 +1039,26 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Equipaggia"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Usa"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Lascia..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Dividi"
@@ -1072,17 +1072,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Magazzino"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Recupera"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Lascia"
@@ -1144,49 +1144,51 @@ msgstr "Reset statistiche"
msgid "Reset timer"
msgstr "Reset timer"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1200,29 +1202,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1405,7 +1407,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1425,7 +1427,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1438,7 +1440,7 @@ msgid "Players"
msgstr "Giocatori"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1446,8 +1448,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Aggiungi alla chat"
@@ -1459,8 +1461,8 @@ msgstr "Oggetto mappa"
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1516,179 +1518,179 @@ msgstr "Lascia"
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "Cambia posizione nella gilda"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Rinomina mappa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Nome:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Aggiungi allo scambio"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Salva 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Salva metà"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Salva tutto"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Ritira 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Ritira metà"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Ritira tutto"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Nascondi"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Mostra"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignora completamente."
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2550,26 +2552,26 @@ msgstr "Come appaiono i colori"
msgid "Type:"
msgstr "Type:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statico"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulsazione"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Arcobaleno"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Gamma"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Ritardo: "
@@ -2585,7 +2587,7 @@ msgstr "verde"
msgid "Blue:"
msgstr "blu"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Alfa:"
@@ -2664,7 +2666,7 @@ msgstr ""
msgid "Misc"
msgstr "Varie"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Mostri"
@@ -3919,151 +3921,155 @@ msgstr "##1 riprova più tardi"
msgid "Completed"
msgstr "Completato"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Essere"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Nomi amici"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Nomi disprezzati"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Nomi ignorati"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Nomi cancellati"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Nomi degli altri giocatori"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Proprio nome"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "Nomi dei GM"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Barra HP dei nemici"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Barra HP dei nemici (secondo colore)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Membri del gruppo"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Membri della gilda"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Effetti particelle"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Notifica oggetti raccolti"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Notifica Esperienza"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "Barra HP del giocatore"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "Barra HP del giocatore (secondo colore)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Il giocatore colpisce il nemico"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Il nemico colpisce il giocatore"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Altro giocatore colpisce giocatore vicino"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Colpo critico"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Il giocatore colpisce il nemico"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Il giocatore infligge un colpo critico"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Il giocatore manca il nemico"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Perde"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "Evidenzia portali"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Raggio d'attacco del giocatore"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Raggio d'attacco del nemico"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Raggio d'attacco del nemico"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6007,7 +6013,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "senza nome"
diff --git a/po/ja.po b/po/ja.po
index 9861b905b..6ef1f090d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/"
"language/ja/)\n"
@@ -48,12 +48,12 @@ msgid "miss"
msgstr "ミス"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "I"
@@ -405,7 +405,7 @@ msgstr "話す"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "動く"
@@ -419,7 +419,7 @@ msgstr "リセット"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "買う"
@@ -468,7 +468,7 @@ msgid "Shop"
msgstr "店"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "売る"
@@ -481,12 +481,12 @@ msgstr "売る"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -778,9 +778,9 @@ msgstr "はい"
msgid "No"
msgstr "いいえ"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "無視"
@@ -996,8 +996,8 @@ msgid "Equipment"
msgstr "装着品"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "取外す"
@@ -1039,26 +1039,26 @@ msgid "Filter:"
msgstr "フィルタ:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "装着"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "落とす..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "分割"
@@ -1072,17 +1072,17 @@ msgid "Weight:"
msgstr "重量:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "保管"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "取出す"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "落とす"
@@ -1144,49 +1144,51 @@ msgstr "統計をリセット"
msgid "Reset timer"
msgstr "タイマーをリセット"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "レベル: %d と %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d/%d 残り: %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, 平均の敵 1%%: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "キル: %s, 合計exp: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "キル/分: %s, Exp/分: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1198,29 +1200,29 @@ msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "次のレベルアップ %d 分ごと: %s"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "最後のExp:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "次のJackOの出現まで:"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " 次のレベル達成までの時間: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "JackOが出現中"
@@ -1403,7 +1405,7 @@ msgid "Nuke"
msgstr "消す"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "コメントをする"
@@ -1423,7 +1425,7 @@ msgstr "攻撃優先リストへ追加する"
msgid "Add to attack list"
msgstr "攻撃リストへ追加する"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "攻撃無視リストへ追加する"
@@ -1436,7 +1438,7 @@ msgid "Players"
msgstr "プレイヤー"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "パーティから一時的に追い出す"
@@ -1444,8 +1446,8 @@ msgstr "パーティから一時的に追い出す"
msgid "Pick up"
msgstr "拾う"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "チャットに追加"
@@ -1457,8 +1459,8 @@ msgstr "マップアイテム"
msgid "Rename"
msgstr "名前を変更する"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "削除"
@@ -1514,179 +1516,179 @@ msgstr "退会"
msgid "Copy to clipboard"
msgstr "クリップボードにコピー"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "パーティへ招待"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "ギルドポジションを変更"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr " マップサインの名前を変更"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "名前: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "プレイヤーコメント "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "コメント: "
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "トレードウィンドウに追加"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "トレードウィンドウに10追加する"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "トレードウィンドウに半分追加する"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "トレードウィンドウに全て追加する"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "10 保存"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "半分保存"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "全部保存"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "全て落とす"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "10 取出す"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "半分取出す"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "全部取出す"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr " 非表示"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "表示"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "黄色バーをリセットする"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "チャットへコピーする"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(デフォルト)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "上へ移動"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "下へ移動"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "脱ぐ"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "友達になる"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "無視する"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr "ブラックリスト"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr "敵に設定する"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "消す"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "完全無視解除"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "完全無視"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "フォロー"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "真似"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "買う (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "売る (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "アイテムを表示する"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2548,26 +2550,26 @@ msgstr "色の例"
msgid "Type:"
msgstr "タイプ:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "穏やか"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "点滅"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "カラフル"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "スペクトル"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "遅延:"
@@ -2583,7 +2585,7 @@ msgstr "緑:"
msgid "Blue:"
msgstr "青:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "アルファ:"
@@ -2664,7 +2666,7 @@ msgstr "ボタンは押さないでスティックを回転する"
msgid "Misc"
msgstr "その他"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "モンスター"
@@ -3923,151 +3925,155 @@ msgstr "##1 しばらくたってからもう一度試してください"
msgid "Completed"
msgstr "完了"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "プレイヤー"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "友達の名前"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "無視している名前"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "完全無視している名前"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "削除した名前"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "他のプレイヤー名"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "自分の名前"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM名"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPC"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "モンスターのHPバー"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "モンスターのHPバー(二番目の色)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "パーティメンバー"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "ギルドメンバー"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "特有の効果"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "収集通知"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Exp通知"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "プレイヤーのHPバー"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "プレイヤーのHPバー(二番目の色)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "プレイヤーがモンスターをヒットした時"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "モンスターがプレイヤーをヒットした時"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "他のプレイヤーがローカルプレイヤーを攻撃した時"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "クリティカルヒット"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "ローカルプレイヤーがモンスターを攻撃した時"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "ローカルプレイヤー クリティカルヒットした時"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "ローカルプレイヤー ミス"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "ミス"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "ポータルハイライト"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "デフォルトコリジョンハイライト"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "空コリジョンハイライト"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "水コリジョンハイライト"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "歩道ハイライト"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "ローカルプレイヤーの攻撃範囲"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "ローカルプレイヤーの攻撃範囲の枠線"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "モンスター攻撃範囲"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "ホーム位置"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "ホームボーダー"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "ロードポイント"
@@ -6024,7 +6030,7 @@ msgstr "フローティング'...'吹出し"
msgid "Floating bubble"
msgstr "吹出し"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "名前なし"
diff --git a/po/ka.po b/po/ka.po
index 141ea6e7a..d369f6dda 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -411,7 +411,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -460,7 +460,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -473,12 +473,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -770,9 +770,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -988,8 +988,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1031,26 +1031,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1064,17 +1064,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1136,49 +1136,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1190,29 +1192,29 @@ msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1395,7 +1397,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1415,7 +1417,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1428,7 +1430,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1436,8 +1438,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1449,8 +1451,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1506,179 +1508,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2540,26 +2542,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2575,7 +2577,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2654,7 +2656,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3909,151 +3911,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -5996,7 +6002,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 244fc2c58..f73063376 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: 2012-05-25 19:50+0300\n"
+"POT-Creation-Date: 2012-06-01 00:51+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"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -478,12 +478,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3915,151 +3917,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6001,7 +6007,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 3a7ba3792..2e5263da9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr "Tilbakestill"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Kjøp"
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr "Butikk"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Selg"
@@ -478,12 +478,12 @@ msgstr "Selg"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nei"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr "Utstyr"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Bruk"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Del opp"
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr "Vekt:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr "Spillere"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr "Slik ser fargen ut"
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statisk"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Puls"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Regnbue"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spektrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monstre"
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Andre Spilleres Navn"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Eget Navn"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM Navn"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCer"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Partikkeleffekter"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 75fab626f..ee3745475 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (http://www.transifex.net/projects/p/manaplus/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr "Spreken"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr "Reset"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Kopen"
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr "Winkel"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Verkopen"
@@ -478,12 +478,12 @@ msgstr "Verkopen"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr "Uitrusting"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Afdoen"
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Uitrusten"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Gebruiken"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Splitsen"
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Neerleggen"
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr "Spelers"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr "Dit is hoe de kleur eruit ziet"
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statisch"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Puls"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Regenboog"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spectrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monsters"
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr "Voltooid"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Wezen"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Namen van andere Spelers"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Eigen Naam"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM Namen"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Deeltjes effecten"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Notificatie bij opnemen"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Ervaring Notificatie"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Kritieke aanval"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Missers"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "naamloos"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index cfdade7a5..ee453f13f 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: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/"
"language/nl_BE/)\n"
@@ -45,12 +45,12 @@ msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "I"
@@ -407,7 +407,7 @@ msgstr "Spreken"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Beweeg"
@@ -421,7 +421,7 @@ msgstr "Reset"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Kopen"
@@ -470,7 +470,7 @@ msgid "Shop"
msgstr "Winkel"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Verkopen"
@@ -483,12 +483,12 @@ msgstr "Verkopen"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -780,9 +780,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Negeer"
@@ -998,8 +998,8 @@ msgid "Equipment"
msgstr "Uitrusting"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Afdoen"
@@ -1041,26 +1041,26 @@ msgid "Filter:"
msgstr "Filter:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Uitrusten"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Gebruiken"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Neerleggen..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Splitsen"
@@ -1074,17 +1074,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Neerleggen"
@@ -1146,49 +1146,51 @@ msgstr "Herzet statistieken"
msgid "Reset timer"
msgstr "Herzet timer"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1202,29 +1204,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Tijd tot volgend niveau: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1407,7 +1409,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1427,7 +1429,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1440,7 +1442,7 @@ msgid "Players"
msgstr "Spelers"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1448,8 +1450,8 @@ msgstr ""
msgid "Pick up"
msgstr "Raap op"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Aan chat toevoegen"
@@ -1461,8 +1463,8 @@ msgstr "Plaats voorwerp op de kaart"
msgid "Rename"
msgstr "Hernoem"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Verwijder"
@@ -1518,179 +1520,179 @@ msgstr "Verlaat"
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "Wijzig uw guild positie"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Kaart bordje hernoemen "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Naam: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Plaats 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Plaats de helft"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Plaats alles"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Laat alles vallen"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Haal 10 op"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Haal de helft op"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Haal alles op"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Verberg"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Toon"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Kopieer naar chat"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(standaard)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Beweeg naar boven"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Beweeg naar beneden"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "ontkleed"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Word vriend"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Geen rekening mee houden"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Wis"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Volledig genegeerd"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Volg"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Imiteer"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Koop (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Verkoop (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Toon Voorwerpen"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2552,26 +2554,26 @@ msgstr "Dit is hoe de kleur eruit ziet"
msgid "Type:"
msgstr "Type:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statisch"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Puls"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Regenboog"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spectrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Vertraging:"
@@ -2587,7 +2589,7 @@ msgstr "Groen:"
msgid "Blue:"
msgstr "Blauw:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Alfa:"
@@ -2666,7 +2668,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monsters"
@@ -3928,151 +3930,155 @@ msgstr "##1 probeer later opnieuw."
msgid "Completed"
msgstr "Voltooid"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Wezen"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Namen van vrienden"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Namen van geen belang"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Genegeerde Namen"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Verwijderde Namen"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Namen van andere Spelers"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Eigen Naam"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM Namen"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Groep Leden"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Guild Leden"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Deeltjes effecten"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Notificatie bij opnemen"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Ervaring Notificatie"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Kritieke aanval"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Missers"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Aanvalsbereik van speler"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Aanvalsbereikrand van speler"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Aanvalsbereik van monster"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6046,7 +6052,7 @@ msgstr "Zwevende '...' bel"
msgid "Floating bubble"
msgstr "Zwevende bel"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "naamloos"
diff --git a/po/pl.po b/po/pl.po
index 5e18d4f62..2b58c61ca 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/language/"
"pl/)\n"
@@ -46,12 +46,12 @@ msgid "miss"
msgstr "Pudło!"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "I"
@@ -411,7 +411,7 @@ msgstr "Rozmowa"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Podejdź"
@@ -425,7 +425,7 @@ msgstr "Resetuj"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Kup"
@@ -474,7 +474,7 @@ msgid "Shop"
msgstr "Sklep"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Sprzedaj"
@@ -487,12 +487,12 @@ msgstr "Sprzedaj"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -784,9 +784,9 @@ msgstr "Tak"
msgid "No"
msgstr "Nie"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Ignoruj"
@@ -1002,8 +1002,8 @@ msgid "Equipment"
msgstr "Ekwipunek"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Zdejmij"
@@ -1045,26 +1045,26 @@ msgid "Filter:"
msgstr "Filtr:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Załóż"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Użyj"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Upuść..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Podziel"
@@ -1078,17 +1078,17 @@ msgid "Weight:"
msgstr "Waga:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Przechowaj"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Pobierz"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Upuść"
@@ -1150,49 +1150,51 @@ msgstr "Zresetuj statystyki"
msgid "Reset timer"
msgstr "Zresetuj zegar"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Poziom: %d w %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d Zostało: %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, avg mob na 1%%: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Moby: %s, całk. exp: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr "Śr. Exp: %s"
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Przeciętna il mobów do nast.: %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mob/Min: %s, Exp/Min: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1208,29 +1210,29 @@ msgstr[0] "Czas do nast. poziomu z %d min: %s"
msgstr[1] "Czas do nast. poziomu z %d min: %s"
msgstr[2] "Czas do nast. poziomu z %d min: %s"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Ostatni exp:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Następny spawn Jack-O:"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Czas do nast. poziomu: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "Jack-O spawnuje się"
@@ -1413,7 +1415,7 @@ msgid "Nuke"
msgstr "Wysadź w powietrze"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Dodaj komentarz"
@@ -1433,7 +1435,7 @@ msgstr "Dodaj do listy priorytetów"
msgid "Add to attack list"
msgstr "Dodaj do listy atakowanych"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Dodaj do listy ignorowanych"
@@ -1446,7 +1448,7 @@ msgid "Players"
msgstr "Gracze"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Wyrzuć z grupy"
@@ -1454,8 +1456,8 @@ msgstr "Wyrzuć z grupy"
msgid "Pick up"
msgstr "Podnieś"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Dodaj do czatu"
@@ -1467,8 +1469,8 @@ msgstr "Portal"
msgid "Rename"
msgstr "Zmień nazwę"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Usuń"
@@ -1524,179 +1526,179 @@ msgstr "Opuść"
msgid "Copy to clipboard"
msgstr "Skopiuj do schowka"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Zaproś do grupy"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "Zmień pozycję gildii"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Zmień nazwę drogowskazu"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Nick:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Komentarz gracza "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "Komentarz: "
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Dodaj do handlu"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "Dodaj 10 do handlu"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "Dodaj połowę do handlu"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Dodaj wszystko do handlu"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Przechowaj 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Przechowaj połowę"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Przechowaj wszystko"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Upuść wszystko"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Odbierz 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Odbierz połowę"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Odbierz wszystko"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr "Wyczyść okno upuszczeń."
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Ukryj"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Pokaż"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "Zresetuj żółty pasek"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Skopiuj do czatu"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(domyślne)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "W górę"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "W dół"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Rozbierz"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Dodaj do znajomych"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Lekceważ"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr "Czarna lista"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr "Ustaw jako wroga"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Usuń"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Odignoruj"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Całkowicie ignoruj"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Podążaj"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Imituj"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Kup (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Sprzedaj (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Pokaż przedmioty"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr "Usuń z listy podnoszonych"
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr "Dodaj do listy podnoszonych"
@@ -2558,26 +2560,26 @@ msgstr "Kolor będzie wyglądał w ten sposób"
msgid "Type:"
msgstr "Typ:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statyczny"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulsujący"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Tęcza"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Widmo"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Opóźnienie:"
@@ -2593,7 +2595,7 @@ msgstr "Zielony:"
msgid "Blue:"
msgstr "Niebieski:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Alfa:"
@@ -2674,7 +2676,7 @@ msgstr "Obracaj drążkiem i nie naciskaj przycisków"
msgid "Misc"
msgstr "Różne"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Potwory"
@@ -2980,7 +2982,7 @@ msgstr "Włącz roszerzenie prostokątnych tekstur (OpenGL)"
#: src/gui/setup_perfomance.cpp:102
msgid "Use new texture internal format (OpenGL)"
-msgstr ""
+msgstr "Użuj nowy wewnętrzny format tekstur (OpenGL)"
#: src/gui/setup_players.cpp:53
msgid "Show gender"
@@ -3032,7 +3034,7 @@ msgstr "Grupuj przyjaciół w oknie obecnych online"
#: src/gui/setup_players.cpp:89
msgid "Hide erased players nicks"
-msgstr ""
+msgstr "Ukryj nicki usuniętych graczy"
#: src/gui/setup_relations.cpp:63
msgid "Relation"
@@ -3250,7 +3252,7 @@ msgstr "Alternatywny limit FPS:"
#: src/gui/setup_video.cpp:244
msgid "Detect best mode"
-msgstr ""
+msgstr "Wykryj najlepszy tryb"
#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
@@ -3935,151 +3937,155 @@ msgstr "##1 Spróbuj ponownie później."
msgid "Completed"
msgstr "Zakończono"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Byty"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Imiona przyjaciół"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Imiona lekceważonych"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Imiona ignorowanych"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Imiona usuniętych"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Imiona Innych Graczy"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Własne Imię"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "Imiona GM"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPC"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Pasek życia potwora"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Pasek życia potwora (drugi kolor)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Członkowie grupy"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Członkowie drużyny"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Efekty cząsteczkowe"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Powiadomienie o podniesieniu"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Powiadomienie o Exp"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "Pasek życia gracza"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "Pasek życia gracza (drugi kolor)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Inny gracz uderza potwora"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Potwór uderza gracza"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Inny gracz uderza Ciebie"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Uderzenie Krytyczne"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Uderzasz potwora"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Zadajesz cios krytyczny"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Pudłujesz"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Pudła"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "Podświetlenie portalu"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "Podświetlenie nieprzechadzalnych terenów"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "Podświetlenie przeszkód powietrznych"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "Podświetlenie przeszkód wodnych"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "Podświetlenie miejsc, po których da się chodzić"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Zasięg Twojego ataku"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Obwódka zasięgu Twojego ataku"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Zakres ataku potwora"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "Lokalizacja domowa"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "Obwódka lokalizacji domowej"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "Drogowskaz"
@@ -6050,7 +6056,7 @@ msgstr "Bąbelek \"...\" nad głową"
msgid "Floating bubble"
msgstr "Bąbelek nad głową"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "nienazwany"
diff --git a/po/pt.po b/po/pt.po
index 0995568d0..b226201c1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/"
"language/pt/)\n"
@@ -46,12 +46,12 @@ msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "l"
@@ -408,7 +408,7 @@ msgstr "Falar"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Mover"
@@ -422,7 +422,7 @@ msgstr "Resetar"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Comprar"
@@ -471,7 +471,7 @@ msgid "Shop"
msgstr "Loja"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vender"
@@ -484,12 +484,12 @@ msgstr "Vender"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -781,9 +781,9 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Ignora"
@@ -999,8 +999,8 @@ msgid "Equipment"
msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Desequipar"
@@ -1042,26 +1042,26 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Dividir"
@@ -1075,17 +1075,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Descartar"
@@ -1147,49 +1147,51 @@ msgstr "Resetar Status"
msgid "Reset timer"
msgstr "Resetar tempo"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nível: %d em %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d faltando: %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, avg mob para 1%%: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Mortes: %s, total exp: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mortes/Min: %s Exp/Min: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1203,29 +1205,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Tempo para próximo nível por %d min: %s"
msgstr[1] "Tempo para próximo nível por %d mins: %s"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Exp de última morte:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Tempo para próximo JackO:"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr "Tempo para próximo nível: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "Aparição do JackO"
@@ -1408,7 +1410,7 @@ msgid "Nuke"
msgstr "Desaparecer"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Adicionar comentário"
@@ -1428,7 +1430,7 @@ msgstr "Adicionar a prioridade na lista de ataques"
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
@@ -1441,7 +1443,7 @@ msgid "Players"
msgstr "Jogadores"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Chutar do grupo"
@@ -1449,8 +1451,8 @@ msgstr "Chutar do grupo"
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Nome no chat"
@@ -1462,8 +1464,8 @@ msgstr "Mapa Item"
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "A Remover"
@@ -1519,179 +1521,179 @@ msgstr "Sair"
msgid "Copy to clipboard"
msgstr "CopiaCopiar para a área de transferência"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
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:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr "Queda nítida de janela"
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "Resetar barra amarela"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Copiar para o chat"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Mover a cima"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Mover a baixo"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Limpar conjunto de roupas"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Ser Amigo(a)"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Ser inimigo(a)"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr "Lista Negra"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr "Definir como inimigo(a)"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Mostar itens"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2553,26 +2555,26 @@ msgstr "A cor vai ficar assim"
msgid "Type:"
msgstr "Tipo:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Estático"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulso"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Arco-íris"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Espectro"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Atraso:"
@@ -2588,7 +2590,7 @@ msgstr "Verde:"
msgid "Blue:"
msgstr "Azul:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Alpha:"
@@ -2669,7 +2671,7 @@ msgstr "Gire o bastão sem precionar botões"
msgid "Misc"
msgstr "Diversos"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monstros"
@@ -3928,151 +3930,155 @@ msgstr "##1 tente novamente mais tarde."
msgid "Completed"
msgstr "Concluído"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Personagem"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Nome de Amigos"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Nome de Desconsiderados"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Nome de Ignorados"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Nome de Apagados"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Nomes de outros jogadores"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Próprio nome"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "Nomes dos GMs"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Barra de HP"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Barra de HP do inimigo (segunda cor)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Membros do grupo"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Membros da guilda"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Efeitos de partícula"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Aviso ao pegar algum item"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Aviso de experiência"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "Barra de HP do jogador"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "Barra de HP do jogador (segunda cor)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Jogador acerta Monstro"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Monstro Acerta Jogador"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Outro jogador(a) ataca você"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Golpe crítico"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Jogador Acerta Monstro"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Golpe Crítico do Jogador"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Jogador Erra o Golpe"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Golpes errados"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "Destaque do portal"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "Destaque de colisão padrão"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "Detaque de colisão no ar"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "Destaque de colisão na água"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "Destaque de caminho"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Alcance de ataque"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Borda de Alcance de ataque"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Alcance do monstro"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "Lugar Inicial"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "Borda do Lugar Inicial"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "Ponto de estrada"
@@ -6043,7 +6049,7 @@ msgstr "Bolha '...' flutuante"
msgid "Floating bubble"
msgstr "Bolha Flutuante"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "sem nome"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2c92aa56d..2b8e9b7ee 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
"manaplus/language/pt_BR/)\n"
@@ -49,12 +49,12 @@ msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "I"
@@ -411,7 +411,7 @@ msgstr "Falar"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Mover"
@@ -425,7 +425,7 @@ msgstr "Resetar"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Comprar"
@@ -474,7 +474,7 @@ msgid "Shop"
msgstr "Loja"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vender"
@@ -487,12 +487,12 @@ msgstr "Vender"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -784,9 +784,9 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Ignora"
@@ -1002,8 +1002,8 @@ msgid "Equipment"
msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Desequipar"
@@ -1045,26 +1045,26 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Dividir"
@@ -1078,17 +1078,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Descartar"
@@ -1150,49 +1150,51 @@ msgstr "Resetar Status"
msgid "Reset timer"
msgstr "Resetar tempo"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nível: %d em %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d Falta: %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d ex, avg mob por 1%%: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Mortes: %s Total exp: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mortes/Min: %s Exp/Min: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1206,29 +1208,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Tempo para o próximo nível %d min: %s "
msgstr[1] "Tempo para o próximo nível %d mins: %s "
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Ultima exp por morte:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Tempo para próxima aparição do JackO:"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr "Tempo para próximo nível: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "Aparição do JackO"
@@ -1411,7 +1413,7 @@ msgid "Nuke"
msgstr "Desaparecer"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Add comentário"
@@ -1431,7 +1433,7 @@ msgstr "Adicionar na prioridade da lista de ataques"
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
@@ -1444,7 +1446,7 @@ msgid "Players"
msgstr "Jogadores"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Expulsar do grupo"
@@ -1452,8 +1454,8 @@ msgstr "Expulsar do grupo"
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Nome no chat"
@@ -1465,8 +1467,8 @@ msgstr "Mapa Item"
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Remover"
@@ -1522,179 +1524,179 @@ msgstr "Sair"
msgid "Copy to clipboard"
msgstr "Copiar para a área de transferência"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
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:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr "Queda nítida de janela"
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "Zerar barra amarela"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Copiar para chat"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Mover para cima"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Mover para baixo"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Despir"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Ser amigo(a)"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Ser inimigo(a)"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr "Lista Negra"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr "Definir como inimigo"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "vender (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Mostrar itens"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2556,26 +2558,26 @@ msgstr "A cor vai ficar assim"
msgid "Type:"
msgstr "Tipo:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Estático"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulso"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Arco-íris"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Espectro"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Atraso:"
@@ -2591,7 +2593,7 @@ msgstr "Verde:"
msgid "Blue:"
msgstr "Azul:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Alpha:"
@@ -2672,7 +2674,7 @@ msgstr "Girar o bastão e não pressionar os botões"
msgid "Misc"
msgstr "Diversos"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monstros"
@@ -3932,151 +3934,155 @@ msgstr "##1 tente novamente mais tarde."
msgid "Completed"
msgstr "Concluído"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Personagem"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Nome de Amigos"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Nome de Desconsiderados"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Nome de Ignorados"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Nome de Apagados"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Nomes de outros jogadores"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Próprio nome"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "Nomes dos GMs"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Barra de HP"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Barra de HP do inimigo (segunda cor)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Membros do grupo"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Membros da guilda"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Efeitos de partícula"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Aviso ao pegar algum item"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Aviso de experiência"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "Barra de HP do jogador"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "Barra de HP do jogador (segunda cor)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Jogador acerta Monstro"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Monstro Acerta Jogador"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Outro jogador(a) ataca você"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Golpe crítico"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Jogador Acerta Monstro"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Golpe Crítico do Jogador"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Jogador Erra o Golpe"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Golpes errados"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "Destaque do portal"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "Destaque de colisão padrão"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "Destaque de colisão de ar"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "Destaque de colisão de água"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "Destaque de caminho"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Alcance de ataque"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Borda de Alcance de ataque"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Alcance do monstro"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "Lugar Inicial"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "Borda do Lugar Inicial"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "Ponto de estrada"
@@ -6046,7 +6052,7 @@ msgstr "Bolha '...' flutuante"
msgid "Floating bubble"
msgstr "Bolha Flutuante"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "sem nome"
diff --git a/po/ru.po b/po/ru.po
index 6af306048..2e769430a 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: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:58+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:07+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/"
"language/ru/)\n"
@@ -48,12 +48,12 @@ msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "Б"
@@ -416,7 +416,7 @@ msgstr "Разговор"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "Движение"
@@ -430,7 +430,7 @@ msgstr "Сбросить"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Купить"
@@ -479,7 +479,7 @@ msgid "Shop"
msgstr "Магазин"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Продать"
@@ -492,12 +492,12 @@ msgstr "Продать"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -789,9 +789,9 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "Игнорировать"
@@ -1007,8 +1007,8 @@ msgid "Equipment"
msgstr "Снаряжение"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Снять"
@@ -1050,26 +1050,26 @@ msgid "Filter:"
msgstr "Фильтр:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Надеть"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Использовать"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "Бросить"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Разделить"
@@ -1083,17 +1083,17 @@ msgid "Weight:"
msgstr "Вес:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Сохранить"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Получить"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Бросить"
@@ -1155,49 +1155,51 @@ msgstr "Сбросить стат."
msgid "Reset timer"
msgstr "Сбросить таймер"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "Уровень: %d на %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Опыт: %d/%d Осталось: %d"
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d опыта, среднее кол-во мобов для 1%%: %s"
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Убийств: %s, опыта: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr "Средний опып: %s"
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Средн. кол-во монстров до след. уров.: %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1213,29 +1215,29 @@ msgstr[0] "Время до следующего уровня в мин. %d: %s"
msgstr[1] "Время до следующего уровня в мин. %d: %s"
msgstr[2] "Время до следующего уровня в мин. %d: %s"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Опыт за последнее убийство:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Время до появления jacko:"
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Время до следующего уровня: %s"
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "jacko появляется"
@@ -1418,7 +1420,7 @@ msgid "Nuke"
msgstr "Уничтожить"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "Добавить коментарий"
@@ -1438,7 +1440,7 @@ msgstr "Добавить в приоритетный список"
msgid "Add to attack list"
msgstr "Добавить в список атаки"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr "Добавить в список игнорирования"
@@ -1451,7 +1453,7 @@ msgid "Players"
msgstr "Игроки"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "Выкинуть из группы"
@@ -1459,8 +1461,8 @@ msgstr "Выкинуть из группы"
msgid "Pick up"
msgstr "Поднять"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "Добавить в чат"
@@ -1472,8 +1474,8 @@ msgstr "Элмент карты"
msgid "Rename"
msgstr "Переименовать"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr "Удалить"
@@ -1529,179 +1531,179 @@ msgstr "Покинуть"
msgid "Copy to clipboard"
msgstr "Копировать в буфер обмена"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr "Пригласить в группу"
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "Сменить позицию в гильдии"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "Переименовать знак на карте"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "Имя: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "Комментарий "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "Комментарий: "
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr "Добавить к сделке"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr "Добавить к сделке 10"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr "Добавить к сделке половину"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr "Добавить к торговле все"
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "Сохранить 10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "Сохранить половину"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "Сохранить все"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "Бросить все"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "Получить 10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "Получить половину"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "Получить все"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr "Очистить окно дропов"
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "Спрятать"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "Показать"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr "сбросить настройки"
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Скопировать в чат"
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(по умолчанию)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "Передвинуть выше"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr "Передвинуть ниже"
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr "Раздеть"
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "Подружиться"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr "Пренебречь"
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr "Черный список"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr "Сделать врагом"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr "Стереть"
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr "Не игнорировать"
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "@@ignore|Полностью игнорировать@@"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "Следовать"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr "Имитировать"
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "Купить (?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "Продать (?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "Показать предметы"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr "Удалить из поднятия"
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr "Сделать поднимаемым"
@@ -2563,26 +2565,26 @@ msgstr "Вот, как выглядит сей цвет"
msgid "Type:"
msgstr "Введите: "
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Статичный"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Пульсирующий"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Радуга"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Спектр"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "Задержка:"
@@ -2598,7 +2600,7 @@ msgstr "Зеленый:"
msgid "Blue:"
msgstr "Синий:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "Прозрачность:"
@@ -2679,7 +2681,7 @@ msgstr "Вращайте стик и не нажимайте другие кно
msgid "Misc"
msgstr "Разное"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Монстры"
@@ -3947,151 +3949,155 @@ msgstr "##1 попытаться еще раз немного погодя."
msgid "Completed"
msgstr "Завершено"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Существо"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr "Имена Друзей"
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "Имена пренебрегаемых"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "Игнорируемые имена"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr "Стертые имена"
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Имена других игроков"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Собственное имя"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "Имена ГМ"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "Боты"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "Полоса жизни монстров"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "Полоса жизни монстров (второй цвет)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "Члены группы"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "Члены гильдии"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Эффекты частиц"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Сообщение о подборе предмета"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "Сообщение об изменении опыта"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "Полоса жизни игрока"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "Полоса жизни игрока (второй цвет)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "Удары игрока по монстру"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "Удары монстра по игроку"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "Другой игрок бъет локального игрока"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Критический удар"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr "Удары игроков вокруг по монстру"
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "Критический удар игрока"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr "Промах соседнего игрока"
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Промахи"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "Подсветка переходов"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr "Подсветка непроходимых клеток"
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr "Подстветка только воздушных клетов"
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr "Подсветка клеток с водой"
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr "Подсветка спец. областей"
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "Подсветка доступных участков карты"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr "Зона атаки соседнего игрока"
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr "Граница зоны атаки соседнего игрока"
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "Зона атаки монстра"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "Домашняя позиция"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "Бордюр домашней позиции"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "Точка дороги"
@@ -6060,7 +6066,7 @@ msgstr "Плавающий '...' пузырек"
msgid "Floating bubble"
msgstr "Плавающий пузырек"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "безымянный"
diff --git a/po/sk.po b/po/sk.po
index c8fc20baa..1755c3f9a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -407,7 +407,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -421,7 +421,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Kúpiť"
@@ -470,7 +470,7 @@ msgid "Shop"
msgstr "Obchod"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Predaj"
@@ -483,12 +483,12 @@ msgstr "Predaj"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -780,9 +780,9 @@ msgstr "Áno"
msgid "No"
msgstr "Nie"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -998,8 +998,8 @@ msgid "Equipment"
msgstr "Vybavenie"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Odstrojiť"
@@ -1041,26 +1041,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Vystrojiť"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Použiť"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1074,17 +1074,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Zahodiť"
@@ -1146,49 +1146,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1204,29 +1206,29 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1409,7 +1411,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1429,7 +1431,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1442,7 +1444,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1450,8 +1452,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1463,8 +1465,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1520,179 +1522,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2554,26 +2556,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2589,7 +2591,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2668,7 +2670,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3923,151 +3925,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6012,7 +6018,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 945270b76..b661b76e7 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -478,12 +478,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 5f0fa88c4..9de6bb90e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:03+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr "Prata"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr "Återställ"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Köp"
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr "Affär"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Sälj"
@@ -478,12 +478,12 @@ msgstr "Sälj"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr "Utrustning"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "Avrusta"
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Utrusta"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Använd"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Dela"
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr "Vikt:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Lagra"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Hämta"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Släpp"
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr "Spelare"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr "Så här ser färgen ut"
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Statisk"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Pulserande"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Regnbåge"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spektrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Monster"
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr "Färdig"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "Varelse"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Andra spelares namn"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "Eget namn"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM-namn"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPC:er"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "Partikeleffekter"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "Upplocksnotis"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "XP-notifiering"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Kritisk träff"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "Missar"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "namnlös"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 4662f70dd..8c1f22cfa 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/manaplus/language/sv_SE/)\n"
"MIME-Version: 1.0\n"
@@ -42,12 +42,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -401,7 +401,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -415,7 +415,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -464,7 +464,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -477,12 +477,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -774,9 +774,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -992,8 +992,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1035,26 +1035,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1068,17 +1068,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1140,49 +1140,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1196,29 +1198,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1401,7 +1403,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1421,7 +1423,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1434,7 +1436,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1442,8 +1444,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1455,8 +1457,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1512,179 +1514,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2546,26 +2548,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2581,7 +2583,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2660,7 +2662,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3915,151 +3917,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6003,7 +6009,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/te.po b/po/te.po
index 7361779e3..cc3a180f5 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -465,7 +465,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -478,12 +478,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -775,9 +775,9 @@ msgstr "అవును"
msgid "No"
msgstr "కాదు"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -993,8 +993,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1036,26 +1036,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1069,17 +1069,17 @@ msgid "Weight:"
msgstr "బరువు:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1141,49 +1141,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1197,29 +1199,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1402,7 +1404,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1422,7 +1424,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1435,7 +1437,7 @@ msgid "Players"
msgstr "ఆటగాళ్ళు"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1443,8 +1445,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1456,8 +1458,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1513,179 +1515,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2547,26 +2549,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "ఇంద్ర ధనస్సు"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2582,7 +2584,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2661,7 +2663,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3916,151 +3918,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/th.po b/po/th.po
index da726bc0a..e082dc818 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -411,7 +411,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "ซื้อ"
@@ -460,7 +460,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -473,12 +473,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -770,9 +770,9 @@ msgstr "ใช่"
msgid "No"
msgstr "ไม่"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -988,8 +988,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1031,26 +1031,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "ใช้"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1064,17 +1064,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "ทิ้ง"
@@ -1136,49 +1136,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1190,29 +1192,29 @@ msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1395,7 +1397,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1415,7 +1417,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1428,7 +1430,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1436,8 +1438,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1449,8 +1451,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1506,179 +1508,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2540,26 +2542,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2575,7 +2577,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2654,7 +2656,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3909,151 +3911,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -5996,7 +6002,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index de2aee00a..4b7d2ebe7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -397,7 +397,7 @@ msgstr "Konuş"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -411,7 +411,7 @@ msgstr "Sıfırla"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "Satın al"
@@ -460,7 +460,7 @@ msgid "Shop"
msgstr "Mağaza"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Satış"
@@ -473,12 +473,12 @@ msgstr "Satış"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -770,9 +770,9 @@ msgstr "Evet"
msgid "No"
msgstr "Hayır"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -988,8 +988,8 @@ msgid "Equipment"
msgstr "Ekipman"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1031,26 +1031,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "Donatmak"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Kullan"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "Bölme"
@@ -1064,17 +1064,17 @@ msgid "Weight:"
msgstr "Ağırlık:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "Depo"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "Almak"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1136,49 +1136,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1190,29 +1192,29 @@ msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1395,7 +1397,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1415,7 +1417,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1428,7 +1430,7 @@ msgid "Players"
msgstr "Oyuncular"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1436,8 +1438,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1449,8 +1451,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1506,179 +1508,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2540,26 +2542,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "Sabit"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "Darbe"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "Gökkuşağı"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "Spektrum"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2575,7 +2577,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2654,7 +2656,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "Canavarlar"
@@ -3909,151 +3911,155 @@ msgstr ""
msgid "Completed"
msgstr "Tamamlandı"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "Diğer oyuncuların isimleri"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM isimleri"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "Kritik Hit"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -5996,7 +6002,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "isimsiz"
diff --git a/po/vls.po b/po/vls.po
index 393c28a91..edd749873 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Vlaams (http://www.transifex.net/projects/p/manaplus/language/vls/)\n"
"MIME-Version: 1.0\n"
@@ -42,12 +42,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -401,7 +401,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -415,7 +415,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr ""
@@ -464,7 +464,7 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
@@ -477,12 +477,12 @@ msgstr ""
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -774,9 +774,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -992,8 +992,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr ""
@@ -1035,26 +1035,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr ""
@@ -1068,17 +1068,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1140,49 +1140,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1196,29 +1198,29 @@ msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1401,7 +1403,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1421,7 +1423,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1434,7 +1436,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1442,8 +1444,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1455,8 +1457,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1512,179 +1514,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2546,26 +2548,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2581,7 +2583,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2660,7 +2662,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3915,151 +3917,155 @@ msgstr ""
msgid "Completed"
msgstr ""
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -6003,7 +6009,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6a337e8c7..1d45da681 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: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
"language/zh_CN/)\n"
@@ -46,12 +46,12 @@ msgid "miss"
msgstr "无法出售无法出售的物品。"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr "I"
@@ -400,7 +400,7 @@ msgstr "说话"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr "移动"
@@ -414,7 +414,7 @@ msgstr "重置"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "购买"
@@ -463,7 +463,7 @@ msgid "Shop"
msgstr "商店"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "出售"
@@ -476,12 +476,12 @@ msgstr "出售"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -773,9 +773,9 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr "忽略"
@@ -991,8 +991,8 @@ msgid "Equipment"
msgstr "装备"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "卸下装备"
@@ -1034,26 +1034,26 @@ msgid "Filter:"
msgstr "过滤器:"
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "装备"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr "掉落... ..."
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "分离"
@@ -1067,17 +1067,17 @@ msgid "Weight:"
msgstr "重量:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "存储"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "取回"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "丢弃"
@@ -1139,49 +1139,51 @@ msgstr "复位统计"
msgid "Reset timer"
msgstr "复位定时器"
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr "等级:%d 在 %f%%"
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1193,29 +1195,29 @@ msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "最后EXP:"
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1398,7 +1400,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr "发表评论"
@@ -1418,7 +1420,7 @@ msgstr "优先攻击列表"
msgid "Add to attack list"
msgstr "加入攻击清单"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1431,7 +1433,7 @@ msgid "Players"
msgstr "玩家"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr "踢从党"
@@ -1439,8 +1441,8 @@ msgstr "踢从党"
msgid "Pick up"
msgstr "拾取"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr "加入聊天"
@@ -1452,8 +1454,8 @@ msgstr "地图项"
msgid "Rename"
msgstr "重命名"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1509,179 +1511,179 @@ msgstr "留下"
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr "更改公会的立场"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr "重命名的地图标志"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr "名称:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr "玩家评论"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr "评论:"
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr "商店10"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr "商店的一半"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr "商店所有"
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr "所有"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr "拿出10"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr "拿出一半"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr "检索所有"
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr "隐藏"
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr "显示"
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr "(默认)"
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr "x"
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr "是朋友"
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "完全忽略"
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr "按照"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr "购买(?)"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr "出售(?)"
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr "显示项目"
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2543,26 +2545,26 @@ msgstr "这就是该色彩看起来的样子"
msgid "Type:"
msgstr "类型:"
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "静止的"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "脉冲"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "彩虹"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "色谱"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr "延迟:"
@@ -2578,7 +2580,7 @@ msgstr "绿色:"
msgid "Blue:"
msgstr "蓝色:"
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr "阿尔法:"
@@ -2657,7 +2659,7 @@ msgstr ""
msgid "Misc"
msgstr "杂项"
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "怪物"
@@ -3911,151 +3913,155 @@ msgstr ""
msgid "Completed"
msgstr "已完成"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "存在"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr "豁免计算名称"
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr "忽略名称"
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "其他玩家名"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "自己的名字"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "GM名"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "NPCs"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr "怪物的HPl"
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr "怪物的HP指示栏(第二个颜色)"
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr "党的议员"
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr "公会成员"
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "粒子效果"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "拾起通知"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "到期通知"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr "玩家惠普酒吧"
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr "玩家HP指示栏(第二个颜色)"
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr "玩家怪物"
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr "怪物点击播放器"
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr "其他玩家点击本土球员"
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "会心一击"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr "当前玩家"
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "失误"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr "门户高亮"
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr "步行高亮"
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr "怪物攻击范围"
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr "家居广场"
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr "家居广场边界"
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr "路点"
@@ -6004,7 +6010,7 @@ msgstr ""
msgid "Floating bubble"
msgstr "流动的泡沫"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "未知怪兽"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4d8e6b21f..5a524ca85 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -411,7 +411,7 @@ msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "購買"
@@ -460,7 +460,7 @@ msgid "Shop"
msgstr "商店"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "出售"
@@ -473,12 +473,12 @@ msgstr "出售"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -770,9 +770,9 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -988,8 +988,8 @@ msgid "Equipment"
msgstr "裝備"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "卸下裝備"
@@ -1031,26 +1031,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "裝備"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "分開"
@@ -1064,17 +1064,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "丟棄"
@@ -1136,49 +1136,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1190,29 +1192,29 @@ msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1395,7 +1397,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1415,7 +1417,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1428,7 +1430,7 @@ msgid "Players"
msgstr "玩家"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1436,8 +1438,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1449,8 +1451,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1506,179 +1508,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2540,26 +2542,26 @@ msgstr ""
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr ""
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr ""
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr ""
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr ""
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2575,7 +2577,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2654,7 +2656,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr ""
@@ -3909,151 +3911,155 @@ msgstr ""
msgid "Completed"
msgstr "已完成"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr ""
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr ""
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr ""
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr ""
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr ""
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr ""
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr ""
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr ""
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr ""
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -5996,7 +6002,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e67af68cc..87e6d6eb1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-25 19:50+0300\n"
-"PO-Revision-Date: 2012-05-25 16:55+0000\n"
+"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"PO-Revision-Date: 2012-05-31 22:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,12 @@ msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
msgid "I"
msgstr ""
@@ -397,7 +397,7 @@ msgstr "說話"
#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
+#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1542
msgid "Move"
msgstr ""
@@ -411,7 +411,7 @@ msgstr "重設"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2097
+#: src/gui/popupmenu.cpp:2098
msgid "Buy"
msgstr "購買"
@@ -460,7 +460,7 @@ msgid "Shop"
msgstr "商店"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "出售"
@@ -473,12 +473,12 @@ msgstr "出售"
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
-#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
-#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
-#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
-#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
@@ -770,9 +770,9 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
-#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
-#: src/gui/popupmenu.cpp:2066
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
+#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2067
msgid "Ignore"
msgstr ""
@@ -988,8 +988,8 @@ msgid "Equipment"
msgstr "裝備"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
msgid "Unequip"
msgstr "卸下裝備"
@@ -1031,26 +1031,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1796
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
+#: src/gui/popupmenu.cpp:1797
msgid "Equip"
msgstr "裝備"
#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Split"
msgstr "分開"
@@ -1064,17 +1064,17 @@ msgid "Weight:"
msgstr "重量:"
#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
msgid "Store"
msgstr "寄放"
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1666
msgid "Retrieve"
msgstr "取回"
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1655
+#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "丟棄"
@@ -1136,49 +1136,51 @@ msgstr ""
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:203
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:208
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:214
+#: src/gui/killstats.cpp:225
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:236 src/gui/killstats.cpp:460
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:217 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
+#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:310
-#: src/gui/killstats.cpp:328
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1190,29 +1192,29 @@ msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:246
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:360
-#: src/gui/killstats.cpp:366 src/gui/killstats.cpp:372
-#: src/gui/killstats.cpp:377
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:299 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:316 src/gui/killstats.cpp:323
-#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:342
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
@@ -1395,7 +1397,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2139
msgid "Add comment"
msgstr ""
@@ -1415,7 +1417,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
msgid "Add to ignore list"
msgstr ""
@@ -1428,7 +1430,7 @@ msgid "Players"
msgstr "玩家"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2128
+#: src/gui/popupmenu.cpp:2129
msgid "Kick from party"
msgstr ""
@@ -1436,8 +1438,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Add to chat"
msgstr ""
@@ -1449,8 +1451,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
-#: src/gui/popupmenu.cpp:1981
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1982
msgid "Remove"
msgstr ""
@@ -1506,179 +1508,179 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1129
+#: src/gui/popupmenu.cpp:1130
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1131
+#: src/gui/popupmenu.cpp:1132
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1154
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1156
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1612
+#: src/gui/popupmenu.cpp:1613
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1617
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1618
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1619
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1628
+#: src/gui/popupmenu.cpp:1629
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1630
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1631
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
+#: src/gui/popupmenu.cpp:1807
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1670
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1671
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1672
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1827
+#: src/gui/popupmenu.cpp:1828
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
+#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1905
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
#: src/gui/socialwindow.cpp:885
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2028
+#: src/gui/popupmenu.cpp:2029
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
+#: src/gui/popupmenu.cpp:2074
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2068
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
+#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
-#: src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2084
+#: src/gui/popupmenu.cpp:2085
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2086
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:2137
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2148
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2152
msgid "Add to pickup list"
msgstr ""
@@ -2540,26 +2542,26 @@ msgstr "這是顏色看起來的樣子"
msgid "Type:"
msgstr ""
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
msgid "Static"
msgstr "狀態"
#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:411
msgid "Pulse"
msgstr "暫停"
#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Rainbow"
msgstr "彩虹"
#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:412
msgid "Spectrum"
msgstr "光譜"
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
msgid "Delay:"
msgstr ""
@@ -2575,7 +2577,7 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: src/gui/setup_colors.cpp:315
+#: src/gui/setup_colors.cpp:317
msgid "Alpha:"
msgstr ""
@@ -2654,7 +2656,7 @@ msgstr ""
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:126
msgid "Monsters"
msgstr "怪物"
@@ -3909,151 +3911,155 @@ msgstr ""
msgid "Completed"
msgstr "已完成"
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
msgid "Being"
msgstr "物件"
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:118
msgid "Friend Names"
msgstr ""
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:119
msgid "Disregarded Names"
msgstr ""
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:120
msgid "Ignored Names"
msgstr ""
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:121
msgid "Erased Names"
msgstr ""
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:122
msgid "Other Players' Names"
msgstr "其他使用者名字"
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:123
msgid "Own Name"
msgstr "我的名字"
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:124
msgid "GM Names"
msgstr "遊戲管理者名字"
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:125
msgid "NPCs"
msgstr "電腦"
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:127
msgid "Monster HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:129
msgid "Monster HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
msgid "Party Members"
msgstr ""
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:131
msgid "Guild Members"
msgstr ""
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:132
msgid "Particle Effects"
msgstr "粒子效果"
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
msgid "Pickup Notification"
msgstr "撿拾通知"
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:134
msgid "Exp Notification"
msgstr "經驗值通知"
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
msgid "Player HP bar"
msgstr ""
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
msgid "Player HP bar (second color)"
msgstr ""
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:138
msgid "Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:139
msgid "Monster Hits Player"
msgstr ""
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:141
msgid "Other Player Hits Local Player"
msgstr ""
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:142
msgid "Critical Hit"
msgstr "致命一擊"
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:144
msgid "Local Player Hits Monster"
msgstr ""
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:146
msgid "Local Player Critical Hit"
msgstr ""
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:148
msgid "Local Player Miss"
msgstr ""
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:149
msgid "Misses"
msgstr "失誤"
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
msgid "Portal Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
msgid "Default collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:154
msgid "Air collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
msgid "Water collision Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:158
+msgid "Special ground collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
msgstr ""
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:162
msgid "Local Player Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:164
msgid "Local Player Attack Range Border"
msgstr ""
-#: src/gui/userpalette.cpp:163
+#: src/gui/userpalette.cpp:166
msgid "Monster Attack Range"
msgstr ""
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:168
msgid "Home Place"
msgstr ""
-#: src/gui/userpalette.cpp:167
+#: src/gui/userpalette.cpp:170
msgid "Home Place Border"
msgstr ""
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Road Point"
msgstr ""
@@ -5996,7 +6002,7 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:256
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "未知物品"