16 files changed, 951 insertions, 802 deletions

diff --git a/po/da.po b/po/da.po
index 374549f7c..9971bf1de 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Synlige navne"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr ""
 
@@ -283,12 +283,12 @@ msgstr "Skriftstørrelse"
 msgid "Cache size:"
 msgstr "Skriftstørrelse"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Opret"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Slet"
@@ -1883,26 +1883,26 @@ msgstr "Farver"
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Fastlåst"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulserende"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Regnbuefarvet"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 #, fuzzy
 msgid "Delay:"
 msgstr "Forsinkelse: "
@@ -1922,7 +1922,7 @@ msgstr "Grøn: "
 msgid "Blue:"
 msgstr "Blå: "
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3321,165 +3321,175 @@ msgstr "##1  du prøver igen senere"
 msgid "Completed"
 msgstr "Udført"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Skabning"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Friend Names"
 msgstr "Ven"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Se bort fra"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorer"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM-navne"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Andre spilleres navne"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Eget navn"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "GM-navne"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPC'er"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monstre"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster rammer spiller"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 #, fuzzy
 msgid "Party Members"
 msgstr "Gruppe"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 #, fuzzy
 msgid "Guild Members"
 msgstr "Opret en guild"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Opsamlingsnotits"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "XP-notits"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player HP bar"
 msgstr "Monster rammer spiller"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Spiller rammer monster"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monster rammer spiller"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Andre spilleres navne"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Kritisk sår"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Spiller rammer monster"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Spiller rammer monster"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 #, fuzzy
 msgid "Local Player Miss"
 msgstr "Gem bruger liste"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Rammer forbi"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:149
 #, fuzzy
-msgid "Collision Highlight"
+msgid "Default collision Highlight"
 msgstr "Fremhæv"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Fremhæv"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Fremhæv"
+
+#: src/gui/userpalette.cpp:155
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster rammer spiller"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index efeb000e6..e63321bf0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2010-01-02 15:26+0000\n"
 "Last-Translator: Jonathan Raphael Joachim Kolberg\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -43,11 +43,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Sichtbare Namen"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr "verfehlt"
 
@@ -305,12 +305,12 @@ msgstr "Schriftgröße"
 msgid "Cache size:"
 msgstr "Schriftgröße"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Erstellen"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Löschen"
@@ -1888,26 +1888,26 @@ msgstr "Farben"
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Statisch"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulsierend"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Regenbogen"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr "Verzögerung: "
 
@@ -1923,7 +1923,7 @@ msgstr "Grün: "
 msgid "Blue:"
 msgstr "Blau: "
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3323,166 +3323,176 @@ msgstr "##1 es später erneut zu versuchen."
 msgid "Completed"
 msgstr "Fertig"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Aktionen"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Friend Names"
 msgstr "Freund"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Unbeachtet"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignoriere %s"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 #, fuzzy
 msgid "Erased Names"
 msgstr "Namen von GM"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Namen anderer Spieler"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Eigener Name"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "Namen von GM"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster trifft Spieler"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 #, fuzzy
 msgid "Party Members"
 msgstr "Party"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 #, fuzzy
 msgid "Guild Members"
 msgstr "Gildenname"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "aufgehobene Gegenstände"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Anzeige der Erfahrungspunkte"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player HP bar"
 msgstr "Spieler"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr "Monster trifft Spieler"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Kritischer Treffer"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Kritischer Treffer"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 #, fuzzy
 msgid "Local Player Miss"
 msgstr "Spielerliste sichern"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Verfehlt"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Hervorgehobener Tab"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:149
 #, fuzzy
-msgid "Collision Highlight"
+msgid "Default collision Highlight"
 msgstr "Hervorgehoben"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Hervorgehoben"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Hervorgehoben"
+
+#: src/gui/userpalette.cpp:155
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Hervorgehobener Tab"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 #, fuzzy
 msgid "Local Player Attack Range"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 #, fuzzy
 msgid "Local Player Attack Range Border"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster trifft Spieler"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 56b9b8ccd..0b446acc4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Visible names"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr ""
 
@@ -286,12 +286,12 @@ msgstr "Font size"
 msgid "Cache size:"
 msgstr "Font size"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Create"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Delete"
@@ -1886,26 +1886,26 @@ msgstr "Colours"
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Static"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulse"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Rainbow"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 #, fuzzy
 msgid "Delay:"
 msgstr "Delay: "
@@ -1925,7 +1925,7 @@ msgstr "Green: "
 msgid "Blue:"
 msgstr "Blue: "
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3322,164 +3322,174 @@ msgstr "##1  you try again later"
 msgid "Completed"
 msgstr "Completed"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Being"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Friend Names"
 msgstr "Friend"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Disregarded"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignored"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM Names"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Other Players' Names"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Own Name"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "GM Names"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster hits Player"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 #, fuzzy
 msgid "Party Members"
 msgstr "Party"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 #, fuzzy
 msgid "Guild Members"
 msgstr "Guild"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Particle Effects"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Pickup Notification"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Exp Notification"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player HP bar"
 msgstr "Monster hits Player"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Player hits Monster"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monster hits Player"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Other Players' Names"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Critical Hit"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Player hits Monster"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Player hits Monster"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Misses"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:149
 #, fuzzy
-msgid "Collision Highlight"
+msgid "Default collision Highlight"
 msgstr "Highlight"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Highlight"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Highlight"
+
+#: src/gui/userpalette.cpp:155
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster hits Player"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 40c9de420..05c8175a8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2011-04-29 16:22+0000\n"
 "Last-Translator: nelson6e65 <nelson6eeduardo65@gmail.com>\n"
 "Language-Team: Spanish (Castilian) <>\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr "falla"
 
@@ -265,12 +265,12 @@ msgstr "tamaño de caché de fuente"
 msgid "Cache size:"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Creado: "
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Eliminado: "
@@ -1784,26 +1784,26 @@ msgstr "Colores"
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Estático"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulso"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Arcoiris"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr "Atraso:"
 
@@ -1819,7 +1819,7 @@ msgstr "Verde:"
 msgid "Blue:"
 msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -3148,147 +3148,158 @@ msgstr "##1 lo intentes de nuevo más tarde."
 msgid "Completed"
 msgstr "Completado"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Personaje"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Friend Names"
 msgstr "Nombres de amigo"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
 msgstr "Nombres Desatendidos"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Ignored Names"
 msgstr "Nombres Ignorados"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "Erased Names"
 msgstr "Nombres Borrados"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Nombres de otros jugadores"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Propio Nombre"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "Nombres De Los GMs"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monstruos"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Monster HP bar"
 msgstr "Barra de energía del monstruo"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr "Barra de energía del monstruo (segundo color)"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Party Members"
 msgstr "Miembros del grupo"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Guild Members"
 msgstr "Miembros del guild"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Efectos Particulares"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Aviso al cojer un objeto"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Aviso de experiencia"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 msgid "Player HP bar"
 msgstr "Barra de energía del jugador"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr "Barra de energía del jugador (segundo color)"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
 msgstr "Jugador le pega a Monstruo"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr "Cuando un monstruo te ataca"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 msgid "Other Player Hits Local Player"
 msgstr "Otros Jugadores le pegan al Jugador Local"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Golpe Critico"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 msgid "Local Player Hits Monster"
 msgstr "Cuando le atacas al monstruo"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 msgid "Local Player Critical Hit"
 msgstr "Golpe Critico del jugador"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr "Cuando fallas un ataque"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Muchos fallos al atacar"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 msgid "Portal Highlight"
 msgstr "Resaltar portal"
 
-#: src/gui/userpalette.cpp:147
-msgid "Collision Highlight"
+#: src/gui/userpalette.cpp:149
+#, fuzzy
+msgid "Default collision Highlight"
 msgstr "Resaltar colisión"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Resaltar colisión"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Resaltar colisión"
+
+#: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
 msgstr "Mostrar las partes accesibles"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr "Alcance de ataque de Jugador local"
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr "Borde de alcance de ataque de Jugador local"
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 msgid "Monster Attack Range"
 msgstr "Alcance de ataque de Monstruos"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr "Lugar de Inicio"
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr "Limites de Lugar de Inicio"
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr "Mostrar camino"
 
@@ -4673,7 +4684,6 @@ msgid "M.Defense"
 msgstr "Defensa M."
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
 msgid "% Accuracy"
 msgstr "% Presición"
 
diff --git a/po/fr.po b/po/fr.po
index 92e35ee66..8ee86c3ff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,30 +2,31 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2011-05-09 04:21+0000\n"
 "Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
+"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1022
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr "raté"
 
@@ -126,11 +127,11 @@ msgstr "Vous ne pouvez pas envoyer des messages privés vides."
 #: src/commandhandler.cpp:397
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom "
-"\"%s\". Soit elle existe déjà, soit il s'agit de vous même."
+"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
+"\". Soit elle existe déjà, soit il s'agit de vous même."
 
 #: src/commandhandler.cpp:417
 #, c-format
@@ -266,11 +267,11 @@ msgstr "Cache de polices"
 msgid "Cache size:"
 msgstr "Dimension du cache :"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 msgid "Created:"
 msgstr "Créé : "
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 msgid "Deleted:"
 msgstr "Effacé :"
 
@@ -278,8 +279,8 @@ msgstr "Effacé :"
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", "
-"\"true\", \"false\", \"1\", \"0\"."
+"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
+"\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
 msgid "General"
@@ -1754,26 +1755,26 @@ msgstr "Couleurs"
 msgid "Type:"
 msgstr "Type : "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Statique"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Impulsion"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spectre"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr "Délai : "
 
@@ -1789,7 +1790,7 @@ msgstr "Vert : "
 msgid "Blue:"
 msgstr "Bleu : "
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr "Opacité : "
 
@@ -2493,8 +2494,8 @@ msgstr "Choisissez le nom de la guilde."
 #: src/gui/socialwindow.cpp:1293
 msgid "Received guild request, but one already exists."
 msgstr ""
-"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà"
-" dans une."
+"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
+"dans une."
 
 #: src/gui/socialwindow.cpp:1299
 #, c-format
@@ -3083,8 +3084,7 @@ msgid "Change"
 msgstr "Changer"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
@@ -3128,147 +3128,158 @@ msgstr "##1 Essayez à nouveau plus tard"
 msgid "Completed"
 msgstr "Terminé"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Forme de vie"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Friend Names"
 msgstr "Noms des amis"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
 msgstr "Noms des écartés"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Ignored Names"
 msgstr "Noms des ignorés"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "Erased Names"
 msgstr "Noms supprimés"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Nom des autres joueurs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Mon nom"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "Nom des MJ"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "PNJs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monstres"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Monster HP bar"
 msgstr "Barre de vie des monstres"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr "Barre de vie du monstre (Couleur secondaire)"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Party Members"
 msgstr "Membres du groupe"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Guild Members"
 msgstr "Membres de la guilde"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Effets de particules"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Information de récupération"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Information d'expérience"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 msgid "Player HP bar"
 msgstr "Barre de vie du Joueur"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr "Barre de vie du joueur (Couleur secondaire)"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
 msgstr "Coups de joueurs sur les montres"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr "Le monstre touche le joueur"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 msgid "Other Player Hits Local Player"
 msgstr "Un autre joueur vous attaque"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Coup critique"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 msgid "Local Player Hits Monster"
 msgstr "Votre personnage touche le monstre"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 msgid "Local Player Critical Hit"
 msgstr "Coup critique"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr "Votre personnage manque son coup"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Coups manqués"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 msgid "Portal Highlight"
 msgstr "Surbrillance des portes d'entrée et de sortie"
 
-#: src/gui/userpalette.cpp:147
-msgid "Collision Highlight"
+#: src/gui/userpalette.cpp:149
+#, fuzzy
+msgid "Default collision Highlight"
 msgstr "Surbrillance des points de collisions"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Surbrillance des points de collisions"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Surbrillance des points de collisions"
+
+#: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
 msgstr "Surbrillance des parties praticables"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr "Portée de de vos attaques"
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr "Délimitation de la portée de vos attaques"
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 msgid "Monster Attack Range"
 msgstr "Portée d'attaque des monstres"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr "Emplacement de référence"
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr "Limites de votre position"
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr "Point de route"
 
@@ -3322,8 +3333,7 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:65
 msgid "This command shows the users in this channel."
-msgstr ""
-"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:69
 msgid "Command: /topic <message>"
@@ -3433,10 +3443,8 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:62
 msgid "BC"
@@ -3906,8 +3914,8 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
-"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une"
-" des touches ou attendez vous à un possible comportement étrange du jeu."
+"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
+"des touches ou attendez vous à un possible comportement étrange du jeu."
 
 #: src/localplayer.cpp:344
 msgid "You were killed by "
@@ -4063,8 +4071,7 @@ msgstr ""
 
 #: src/main.cpp:69
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:70
 msgid "     --safemode       : Start game in safe mode"
@@ -5143,18 +5150,16 @@ msgstr "Message"
 
 #: src/net/tmwa/playerhandler.cpp:341
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
-"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus"
-" en mesure de regagner vos points de vie."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
+"en mesure de regagner vos points de vie."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
-"Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous"
-" régénérez de nouveau."
+"Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous "
+"régénérez de nouveau."
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
diff --git a/po/hr.po b/po/hr.po
index 6eb3dd6e0..17aad4a3a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -25,11 +25,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Vidljiva imena"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr ""
 
@@ -292,12 +292,12 @@ msgstr "Veličina fonta"
 msgid "Cache size:"
 msgstr "Veličina fonta"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Stvori"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Obriši"
@@ -1891,26 +1891,26 @@ msgstr "Boje"
 msgid "Type:"
 msgstr "Tip: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Statično"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulsiranje"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Duga"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spektar"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 #, fuzzy
 msgid "Delay:"
 msgstr "Odgoda: "
@@ -1930,7 +1930,7 @@ msgstr "Zelena: "
 msgid "Blue:"
 msgstr "Plava: "
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3324,164 +3324,174 @@ msgstr "##1  pokušate ponovno kasnije"
 msgid "Completed"
 msgstr "Dovršeno"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Biće"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Friend Names"
 msgstr "Prijatelj"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Zanemareno"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorirano"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM Imena"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Imena Drugih Igrača"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Vlastito Ime"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "GM Imena"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Čudovišta"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Čudovište pogađa Igrača"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 #, fuzzy
 msgid "Party Members"
 msgstr "Partija"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 #, fuzzy
 msgid "Guild Members"
 msgstr "Ceh"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Efekti Čestica"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Obavijest Sakupljanja"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Exp Obavijest"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player HP bar"
 msgstr "Čudovište pogađa Igrača"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Igrač pogađa Čudovište"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Čudovište pogađa Igrača"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Imena Drugih Igrača"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Kritični Udarac"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Igrač pogađa Čudovište"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Igrač pogađa Čudovište"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Promašaji"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:149
 #, fuzzy
-msgid "Collision Highlight"
+msgid "Default collision Highlight"
 msgstr "Istakni"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Istakni"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Istakni"
+
+#: src/gui/userpalette.cpp:155
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Čudovište pogađa Igrača"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index ae4ccee22..032acb284 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Látható nevek"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr ""
 
@@ -285,12 +285,12 @@ msgstr "Betűméret"
 msgid "Cache size:"
 msgstr "Betűméret"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Létrehozás"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Törlés"
@@ -1887,26 +1887,26 @@ msgstr "Színek"
 msgid "Type:"
 msgstr "Típus: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Statikus"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulzáló"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Szivárvány"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Színkép"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 #, fuzzy
 msgid "Delay:"
 msgstr "Várakozás "
@@ -1926,7 +1926,7 @@ msgstr "Zöld: "
 msgid "Blue:"
 msgstr "Kék: "
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3323,164 +3323,174 @@ msgstr "##1 próbáld meg később"
 msgid "Completed"
 msgstr "Kész"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Nevek"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Friend Names"
 msgstr "Barát"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Semmibevett"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Tiltott"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM név"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Ismeretlen játékos neve"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Saját név"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "GM név"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "Gépjátékos neve"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Szörny neve"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Sérüléskor"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 #, fuzzy
 msgid "Party Members"
 msgstr "Csapat"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 #, fuzzy
 msgid "Guild Members"
 msgstr "Klán"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Effektek"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Tárgy felvételekor"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Tapasztalat szerzésekor"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player HP bar"
 msgstr "Sérüléskor"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Sebzéskor"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Sérüléskor"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Ismeretlen játékos neve"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Kritikális ütéskor"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Sebzéskor"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Sebzéskor"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Ha nincs találat."
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:149
 #, fuzzy
-msgid "Collision Highlight"
+msgid "Default collision Highlight"
 msgstr "Kijelölt"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Kijelölt"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Kijelölt"
+
+#: src/gui/userpalette.cpp:155
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Sérüléskor"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 31814bc4e..c3005561c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2011-04-15 17:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Italian <>\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr "Mancato"
 
@@ -264,12 +264,12 @@ msgstr ""
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Crea"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Elimina"
@@ -1776,26 +1776,26 @@ msgstr "Colori"
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Statico"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulsazione"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Gamma"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr ""
 
@@ -1811,7 +1811,7 @@ msgstr ""
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3140,147 +3140,155 @@ msgstr ""
 msgid "Completed"
 msgstr "Completato"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Essere"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Friend Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Ignored Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "Erased Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Nomi degli altri giocatori"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Proprio nome"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "Nomi dei GM"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Mostri"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Monster HP bar"
 msgstr ""
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Party Members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Guild Members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Effetti particelle"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Notifica Esperienza"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 msgid "Player HP bar"
 msgstr ""
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 msgid "Other Player Hits Local Player"
 msgstr ""
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Colpo critico"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 msgid "Local Player Hits Monster"
 msgstr ""
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 msgid "Local Player Critical Hit"
 msgstr ""
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Perde"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 msgid "Portal Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
-msgid "Collision Highlight"
+#: src/gui/userpalette.cpp:149
+msgid "Default collision Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 msgid "Monster Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index ce870c6ef..c0cf0ba71 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,11 +22,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr ""
 
@@ -263,11 +263,11 @@ msgstr ""
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 msgid "Deleted:"
 msgstr ""
 
@@ -1746,26 +1746,26 @@ msgstr ""
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr ""
 
@@ -1781,7 +1781,7 @@ msgstr ""
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3105,147 +3105,155 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr ""
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Friend Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Ignored Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "Erased Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Monster HP bar"
 msgstr ""
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Party Members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Guild Members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 msgid "Player HP bar"
 msgstr ""
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 msgid "Other Player Hits Local Player"
 msgstr ""
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 msgid "Local Player Hits Monster"
 msgstr ""
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 msgid "Local Player Critical Hit"
 msgstr ""
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr ""
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 msgid "Portal Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
-msgid "Collision Highlight"
+#: src/gui/userpalette.cpp:149
+msgid "Default collision Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 msgid "Monster Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index c46ce418f..f7a8c3b84 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Zichtbare namen"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr ""
 
@@ -283,12 +283,12 @@ msgstr "Lettergrootte"
 msgid "Cache size:"
 msgstr "Lettergrootte"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Aanmaken"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Verwijderen"
@@ -1883,26 +1883,26 @@ msgstr "Kleuren"
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Statisch"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Puls"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Regenboog"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 #, fuzzy
 msgid "Delay:"
 msgstr "Vertraging: "
@@ -1922,7 +1922,7 @@ msgstr "Groen: "
 msgid "Blue:"
 msgstr "Blauw: "
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3320,163 +3320,173 @@ msgstr "##1 je later opnieuw probeert"
 msgid "Completed"
 msgstr "Voltooid"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Wezen"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Friend Names"
 msgstr "Vriend"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Genegeerd"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM Namen"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Namen van andere Spelers"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Eigen Naam"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "GM Namen"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster raakt Speler"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 #, fuzzy
 msgid "Party Members"
 msgstr "Groep"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 #, fuzzy
 msgid "Guild Members"
 msgstr "Guild"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Notificatie bij opnemen"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Ervaring Notificatie"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player HP bar"
 msgstr "Monster raakt Speler"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Speler raakt Monster"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monster raakt Speler"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Namen van andere Spelers"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Kritieke aanval"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Speler raakt Monster"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Speler raakt Monster"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Missers"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:149
 #, fuzzy
-msgid "Collision Highlight"
+msgid "Default collision Highlight"
 msgstr "Accentueren"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Accentueren"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Accentueren"
+
+#: src/gui/userpalette.cpp:155
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster raakt Speler"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index a9b08542b..018246ecb 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2011-03-29 18:51+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) <>\n"
@@ -22,11 +22,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Zichtbare namen"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr "mist"
 
@@ -265,12 +265,12 @@ msgstr "Lettergrootte"
 msgid "Cache size:"
 msgstr "Lettergrootte"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Aanmaken"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Verwijderen"
@@ -1773,26 +1773,26 @@ msgstr "Kleuren"
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Statisch"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Puls"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Regenboog"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr ""
 
@@ -1808,7 +1808,7 @@ msgstr ""
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3139,147 +3139,155 @@ msgstr ""
 msgid "Completed"
 msgstr "Voltooid"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Wezen"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Friend Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Ignored Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "Erased Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Namen van andere Spelers"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Eigen Naam"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "GM Namen"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Monster HP bar"
 msgstr ""
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Party Members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Guild Members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Notificatie bij opnemen"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Ervaring Notificatie"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 msgid "Player HP bar"
 msgstr ""
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 msgid "Other Player Hits Local Player"
 msgstr ""
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Kritieke aanval"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 msgid "Local Player Hits Monster"
 msgstr ""
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 msgid "Local Player Critical Hit"
 msgstr ""
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Missers"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 msgid "Portal Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
-msgid "Collision Highlight"
+#: src/gui/userpalette.cpp:149
+msgid "Default collision Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 msgid "Monster Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index bbcb7c189..9fd7fc4e8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Widoczne imiona"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr ""
 
@@ -294,12 +294,12 @@ msgstr "Rozmiar czcionki"
 msgid "Cache size:"
 msgstr "Rozmiar czcionki"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Utwórz"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Usuń"
@@ -1892,26 +1892,26 @@ msgstr "Kolory"
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Statyczny"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Puls"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Tęcza"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Widmo"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 #, fuzzy
 msgid "Delay:"
 msgstr "Opóźnienie: "
@@ -1931,7 +1931,7 @@ msgstr "Zielony: "
 msgid "Blue:"
 msgstr "Niebieski: "
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3329,165 +3329,175 @@ msgstr "##1 spróbował później"
 msgid "Completed"
 msgstr "Zakończono"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Byty"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Friend Names"
 msgstr "Przyjaciel"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Nielubiany"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorowany"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 #, fuzzy
 msgid "Erased Names"
 msgstr "Imiona GM"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Imiona Innych Graczy"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Własne Imię"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "Imiona GM"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPC"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Potwory"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Potwór uderza Gracza"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 #, fuzzy
 msgid "Party Members"
 msgstr "Grupa"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 #, fuzzy
 msgid "Guild Members"
 msgstr "Gildia"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Efekty Cząsteczkowe"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Powiadomienie o podniesieniu"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Powiadomienie o Exp"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player HP bar"
 msgstr "Potwór uderza Gracza"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Gracz uderza Potwora"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Potwór uderza Gracza"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Imiona Innych Graczy"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Uderzenie Krytyczne"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Gracz uderza Potwora"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Gracz uderza Potwora"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 #, fuzzy
 msgid "Local Player Miss"
 msgstr "Zapisz listę graczy"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Pudła"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:149
 #, fuzzy
-msgid "Collision Highlight"
+msgid "Default collision Highlight"
 msgstr "Podświetlenie"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Podświetlenie"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Podświetlenie"
+
+#: src/gui/userpalette.cpp:155
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Potwór uderza Gracza"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index 532e782fe..8b0b239b8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2011-04-27 20:40+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese <>\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr "errou"
 
@@ -265,12 +265,12 @@ msgstr "Tamanho do cache de fonte"
 msgid "Cache size:"
 msgstr "Tamanho do cache de fonte"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Deletado:"
@@ -1780,26 +1780,26 @@ msgstr "Cores"
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Estático"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulso"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Arco-íris"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr "Atraso:"
 
@@ -1815,7 +1815,7 @@ msgstr "Verde:"
 msgid "Blue:"
 msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -3144,147 +3144,158 @@ msgstr "##1  tente novamente mais tarde."
 msgid "Completed"
 msgstr "Concluído"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Personagem"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Friend Names"
 msgstr "Nome de Amigos"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
 msgstr "Nome de Desconsiderados"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Ignored Names"
 msgstr "Nome de Ignorados"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "Erased Names"
 msgstr "Nome de Apagados"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Nomes de outros jogadores"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Próprio nome"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "Nomes dos GMs"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Monster HP bar"
 msgstr "Barra de HP"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr "Barra de HP do inimigo (segunda cor)"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Party Members"
 msgstr "Membros do grupo"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Guild Members"
 msgstr "Membros da guilda"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Aviso ao pegar algo"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Aviso de experiência"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 msgid "Player HP bar"
 msgstr "Barra de HP do jogador"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr "Barra de HP do jogador (segunda cor)"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
 msgstr "Jogador acerta Monstro"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr "Monstro Acerta Jogador"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 msgid "Other Player Hits Local Player"
 msgstr "Outro jogador ataca você"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Golpe crítico"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 msgid "Local Player Hits Monster"
 msgstr "Jogador Acerta Monstro"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 msgid "Local Player Critical Hit"
 msgstr "Golpe Crítico do Jogador"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr "Jogador Erra o Golpe"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Golpes errados"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 msgid "Portal Highlight"
 msgstr "Destaque do portal"
 
-#: src/gui/userpalette.cpp:147
-msgid "Collision Highlight"
+#: src/gui/userpalette.cpp:149
+#, fuzzy
+msgid "Default collision Highlight"
 msgstr "Destaque de colisão"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Destaque de colisão"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Destaque de colisão"
+
+#: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
 msgstr "Destaque de caminho"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr "Alcance de ataque"
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr "Borda de Alcance de ataque"
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 msgid "Monster Attack Range"
 msgstr "Alcance do monstro"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr "Lugar Inicial"
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr "Borda do Lugar Inicial"
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index de3e6fb77..c6a796eaa 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2011-04-27 20:40+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) <>\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr "errou"
 
@@ -265,12 +265,12 @@ msgstr "Tamanho de fonte Cache"
 msgid "Cache size:"
 msgstr "Tamanho de fonte Cache"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Deletado:"
@@ -1780,26 +1780,26 @@ msgstr "Cores"
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Estático"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulso"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Arco-íris"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr "Atraso:"
 
@@ -1815,7 +1815,7 @@ msgstr "Verde:"
 msgid "Blue:"
 msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -3144,147 +3144,158 @@ msgstr "##1  tente novamente mais tarde."
 msgid "Completed"
 msgstr "Concluído"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Personagem"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Friend Names"
 msgstr "Nome de Amigos"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
 msgstr "Nome de Desconsiderados"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Ignored Names"
 msgstr "Nome de Ignorados"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "Erased Names"
 msgstr "Nome de Apagados"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Nomes de outros jogadores"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Próprio nome"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "Nomes dos GMs"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Monster HP bar"
 msgstr "Barra de HP"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr "Barra de HP do inimigo (segunda cor)"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Party Members"
 msgstr "Membros do grupo"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Guild Members"
 msgstr "Membros da guilda"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Aviso ao pegar algo"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Aviso de experiência"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 msgid "Player HP bar"
 msgstr "Barra de HP do jogador"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr "Barra de HP do jogador (segunda cor)"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
 msgstr "Jogador acerta Monstro"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr "Monstro Acerta Jogador"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 msgid "Other Player Hits Local Player"
 msgstr "Outro jogador ataca você"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Golpe crítico"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 msgid "Local Player Hits Monster"
 msgstr "Jogador Acerta Monstro"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 msgid "Local Player Critical Hit"
 msgstr "Golpe Crítico do Jogador"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr "Jogador Erra o Golpe"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Golpes errados"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 msgid "Portal Highlight"
 msgstr "Destaque do portal"
 
-#: src/gui/userpalette.cpp:147
-msgid "Collision Highlight"
+#: src/gui/userpalette.cpp:149
+#, fuzzy
+msgid "Default collision Highlight"
 msgstr "Destaque de colisão"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Destaque de colisão"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Destaque de colisão"
+
+#: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
 msgstr "Destaque de caminho"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr "Alcance de ataque"
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr "Borda de Alcance de ataque"
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 msgid "Monster Attack Range"
 msgstr "Alcance do monstro"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr "Lugar Inicial"
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr "Borda do Lugar Inicial"
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
diff --git a/po/ru.po b/po/ru.po
index bd005d839..b52586e5e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
-"PO-Revision-Date: 2011-05-09 02:30+0000\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
+"PO-Revision-Date: 2011-05-09 20:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr "промах"
 
@@ -269,11 +269,11 @@ msgstr "размер кеша шрифта"
 msgid "Cache size:"
 msgstr "Размер кеша:"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 msgid "Created:"
 msgstr "Создано:"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 msgid "Deleted:"
 msgstr "Удалено:"
 
@@ -1753,26 +1753,26 @@ msgstr "Цвета"
 msgid "Type:"
 msgstr "Введите: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Статичный"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Пульсирующий"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Радуга"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Спектр"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr "Задержка:"
 
@@ -1788,7 +1788,7 @@ msgstr "Зеленый:"
 msgid "Blue:"
 msgstr "Синий:"
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
@@ -3121,147 +3121,155 @@ msgstr "##1  попытаться еще раз немного погодя."
 msgid "Completed"
 msgstr "Завершено"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Существо"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Friend Names"
 msgstr "Имена Друзей"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
 msgstr "Имена пренебрегаемых"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Ignored Names"
 msgstr "Игнорируемые имена"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "Erased Names"
 msgstr "Стертые имена"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Имена других игроков"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Собственное имя"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "Имена ГМ"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "Боты"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Монстры"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Monster HP bar"
 msgstr "Полоса жизни монстров"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr "Полоса жизни монстров (второй цвет)"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Party Members"
 msgstr "Члены группы"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Guild Members"
 msgstr "Члены гильдии"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Эффекты частиц"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Сообщение о подборе предмета"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Сообщение об изменении опыта"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 msgid "Player HP bar"
 msgstr "Полоса жизни игрока"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr "Полоса жизни игрока (второй цвет)"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
 msgstr "Удары игрока по монстру"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr "Удары монстра по игроку"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 msgid "Other Player Hits Local Player"
 msgstr "Другой игрок бъет локального игрока"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Критический удар"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 msgid "Local Player Hits Monster"
 msgstr "Удары игроков вокруг по монстру"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 msgid "Local Player Critical Hit"
 msgstr "Критический удар игрока"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr "Промах соседнего игрока"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Промахи"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 msgid "Portal Highlight"
 msgstr "Подсветка переходов"
 
-#: src/gui/userpalette.cpp:147
-msgid "Collision Highlight"
-msgstr "Подсветка столкновений"
-
 #: src/gui/userpalette.cpp:149
+msgid "Default collision Highlight"
+msgstr "Подсветка нпроходимых клеток"
+
+#: src/gui/userpalette.cpp:151
+msgid "Air collision Highlight"
+msgstr "Подстветка только воздушных клетов"
+
+#: src/gui/userpalette.cpp:153
+msgid "Water collision Highlight"
+msgstr "Подсветка клеток с водой"
+
+#: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
 msgstr "Подсветка доступных участков карты"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr "Зона атаки соседнего игрока"
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr "Граница зоны атаки соседнего игрока"
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 msgid "Monster Attack Range"
 msgstr "Зона атаки монстра"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr "Домашняя позиция"
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr "Бордюр домашней позиции"
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr "Точка дороги"
 
diff --git a/po/sv.po b/po/sv.po
index 31b1ddf06..458649910 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 01:25+0300\n"
+"POT-Creation-Date: 2011-05-09 23:29+0300\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Synliga namn"
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:493
+#: src/being.cpp:495
 msgid "miss"
 msgstr ""
 
@@ -286,12 +286,12 @@ msgstr "Typsnittsgrad"
 msgid "Cache size:"
 msgstr "Typsnittsgrad"
 
-#: src/commandhandler.cpp:1085
+#: src/commandhandler.cpp:1086
 #, fuzzy
 msgid "Created:"
 msgstr "Skapa"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1088
 #, fuzzy
 msgid "Deleted:"
 msgstr "Ta bort"
@@ -1889,26 +1889,26 @@ msgstr "Färger"
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Statisk"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Pulserande"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Regnbåge"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 #, fuzzy
 msgid "Delay:"
 msgstr "Fördröjning: "
@@ -1928,7 +1928,7 @@ msgstr "Grön: "
 msgid "Blue:"
 msgstr "Blå: "
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
 msgstr ""
 
@@ -3326,165 +3326,175 @@ msgstr "##1  du försöker igen senare"
 msgid "Completed"
 msgstr "Färdig"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Varelse"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Friend Names"
 msgstr "Vän"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Förbisedd"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorerad"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM-namn"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Andra spelares namn"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Eget namn"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "GM-namn"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPC:er"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster slår spelare"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 #, fuzzy
 msgid "Party Members"
 msgstr "Grupp"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 #, fuzzy
 msgid "Guild Members"
 msgstr "Gille"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Upplocksnotis"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "XP-notifiering"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player HP bar"
 msgstr "Monster slår spelare"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Spelare slår monster"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monster slår spelare"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Andra spelares namn"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Kritisk träff"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Spelare slår monster"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Spelare slår monster"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 #, fuzzy
 msgid "Local Player Miss"
 msgstr "Kom ihåg spelarlista"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Missar"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:147
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:149
 #, fuzzy
-msgid "Collision Highlight"
+msgid "Default collision Highlight"
 msgstr "Markering"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:151
+#, fuzzy
+msgid "Air collision Highlight"
+msgstr "Markering"
+
+#: src/gui/userpalette.cpp:153
+#, fuzzy
+msgid "Water collision Highlight"
+msgstr "Markering"
+
+#: src/gui/userpalette.cpp:155
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:157
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:161
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster slår spelare"
 
-#: src/gui/userpalette.cpp:157
+#: src/gui/userpalette.cpp:163
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:159
+#: src/gui/userpalette.cpp:165
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:161
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
 msgstr ""