diff --git a/src/gui/item_color.hpp b/src/gui/item_color.hpp
diff --git a/src/gui/item_colorchanel.cpp b/src/gui/item_colorchanel.cpp
diff --git a/src/gui/item_colorchanel.hpp b/src/gui/item_colorchanel.hpp
diff --git a/src/gui/item_colordisplay.cpp b/src/gui/item_colordisplay.cpp
diff --git a/src/gui/item_colordisplay.hpp b/src/gui/item_colordisplay.hpp
diff --git a/src/gui/item_intfield.cpp b/src/gui/item_intfield.cpp
diff --git a/src/gui/item_intfield.hpp b/src/gui/item_intfield.hpp
diff --git a/src/gui/item_numfield.cpp b/src/gui/item_numfield.cpp
diff --git a/src/gui/item_numfield.hpp b/src/gui/item_numfield.hpp
diff --git a/src/gui/item_textfield.cpp b/src/gui/item_textfield.cpp
diff --git a/src/gui/item_textfield.hpp b/src/gui/item_textfield.hpp
diff --git a/src/gui/item_toggle.cpp b/src/gui/item_toggle.cpp
diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
diff --git a/src/gui/menu_action.hpp b/src/gui/menu_action.hpp
diff --git a/src/gui/menu_color.cpp b/src/gui/menu_color.cpp
diff --git a/src/gui/menu_color.hpp b/src/gui/menu_color.hpp
diff --git a/src/gui/menu_item.hpp b/src/gui/menu_item.hpp
diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
diff --git a/src/object/ambient_sound.hpp b/src/object/ambient_sound.hpp
diff --git a/src/object/background.cpp b/src/object/background.cpp
diff --git a/src/object/background.hpp b/src/object/background.hpp
diff --git a/src/object/bicycle_platform.cpp b/src/object/bicycle_platform.cpp
diff --git a/src/object/bicycle_platform.hpp b/src/object/bicycle_platform.hpp
diff --git a/src/object/bonus_block.cpp b/src/object/bonus_block.cpp
diff --git a/src/object/bonus_block.hpp b/src/object/bonus_block.hpp
diff --git a/src/object/bouncy_coin.hpp b/src/object/bouncy_coin.hpp
diff --git a/src/object/brick.hpp b/src/object/brick.hpp
diff --git a/src/object/broken_brick.hpp b/src/object/broken_brick.hpp
diff --git a/src/object/bullet.hpp b/src/object/bullet.hpp
diff --git a/src/object/camera.cpp b/src/object/camera.cpp
diff --git a/src/object/camera.hpp b/src/object/camera.hpp
diff --git a/src/object/candle.cpp b/src/object/candle.cpp
diff --git a/src/object/candle.hpp b/src/object/candle.hpp
diff --git a/src/object/cloud_particle_system.cpp b/src/object/cloud_particle_system.cpp
diff --git a/src/object/cloud_particle_system.hpp b/src/object/cloud_particle_system.hpp
diff --git a/src/object/coin.cpp b/src/object/coin.cpp
diff --git a/src/object/coin.hpp b/src/object/coin.hpp
diff --git a/src/object/coin_explode.hpp b/src/object/coin_explode.hpp
diff --git a/src/object/coin_rain.cpp b/src/object/coin_rain.cpp
diff --git a/src/object/coin_rain.hpp b/src/object/coin_rain.hpp
diff --git a/src/object/comet_particle_system.cpp b/src/object/comet_particle_system.cpp
diff --git a/src/object/comet_particle_system.hpp b/src/object/comet_particle_system.hpp
diff --git a/src/object/decal.cpp b/src/object/decal.cpp
diff --git a/src/object/decal.hpp b/src/object/decal.hpp
diff --git a/src/object/display_effect.hpp b/src/object/display_effect.hpp
diff --git a/src/object/electrifier.hpp b/src/object/electrifier.hpp
diff --git a/src/object/endsequence.hpp b/src/object/endsequence.hpp
diff --git a/src/object/explosion.hpp b/src/object/explosion.hpp
diff --git a/src/object/falling_coin.hpp b/src/object/falling_coin.hpp
diff --git a/src/object/firefly.cpp b/src/object/firefly.cpp
diff --git a/src/object/firefly.hpp b/src/object/firefly.hpp
diff --git a/src/object/fireworks.hpp b/src/object/fireworks.hpp
diff --git a/src/object/floating_image.hpp b/src/object/floating_image.hpp
diff --git a/src/object/floating_text.hpp b/src/object/floating_text.hpp
diff --git a/src/object/flower.hpp b/src/object/flower.hpp
diff --git a/src/object/ghost_particle_system.cpp b/src/object/ghost_particle_system.cpp
diff --git a/src/object/ghost_particle_system.hpp b/src/object/ghost_particle_system.hpp
diff --git a/src/object/gradient.cpp b/src/object/gradient.cpp
diff --git a/src/object/gradient.hpp b/src/object/gradient.hpp
diff --git a/src/object/growup.hpp b/src/object/growup.hpp
diff --git a/src/object/hurting_platform.cpp b/src/object/hurting_platform.cpp
diff --git a/src/object/hurting_platform.hpp b/src/object/hurting_platform.hpp
diff --git a/src/object/icecrusher.cpp b/src/object/icecrusher.cpp
diff --git a/src/object/icecrusher.hpp b/src/object/icecrusher.hpp
diff --git a/src/object/infoblock.cpp b/src/object/infoblock.cpp
diff --git a/src/object/infoblock.hpp b/src/object/infoblock.hpp
diff --git a/src/object/invisible_block.cpp b/src/object/invisible_block.cpp
diff --git a/src/object/invisible_block.hpp b/src/object/invisible_block.hpp
diff --git a/src/object/invisible_wall.cpp b/src/object/invisible_wall.cpp
diff --git a/src/object/invisible_wall.hpp b/src/object/invisible_wall.hpp
diff --git a/src/object/ispy.cpp b/src/object/ispy.cpp
diff --git a/src/object/ispy.hpp b/src/object/ispy.hpp
diff --git a/src/object/lantern.cpp b/src/object/lantern.cpp
diff --git a/src/object/lantern.hpp b/src/object/lantern.hpp
diff --git a/src/object/level_time.cpp b/src/object/level_time.cpp
diff --git a/src/object/level_time.hpp b/src/object/level_time.hpp
diff --git a/src/object/light.hpp b/src/object/light.hpp
diff --git a/src/object/magicblock.cpp b/src/object/magicblock.cpp
diff --git a/src/object/magicblock.hpp b/src/object/magicblock.hpp
diff --git a/src/object/moving_sprite.cpp b/src/object/moving_sprite.cpp
diff --git a/src/object/moving_sprite.hpp b/src/object/moving_sprite.hpp
diff --git a/src/object/oneup.hpp b/src/object/oneup.hpp
diff --git a/src/object/particles.hpp b/src/object/particles.hpp
diff --git a/src/object/particlesystem.cpp b/src/object/particlesystem.cpp
diff --git a/src/object/particlesystem.hpp b/src/object/particlesystem.hpp
diff --git a/src/object/particlesystem_interactive.hpp b/src/object/particlesystem_interactive.hpp
diff --git a/src/object/path.cpp b/src/object/path.cpp
diff --git a/src/object/path.hpp b/src/object/path.hpp
diff --git a/src/object/platform.cpp b/src/object/platform.cpp
diff --git a/src/object/platform.hpp b/src/object/platform.hpp
diff --git a/src/object/player.cpp b/src/object/player.cpp
diff --git a/src/object/player.hpp b/src/object/player.hpp
diff --git a/src/object/pneumatic_platform.cpp b/src/object/pneumatic_platform.cpp
diff --git a/src/object/pneumatic_platform.hpp b/src/object/pneumatic_platform.hpp
diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp
diff --git a/src/object/powerup.hpp b/src/object/powerup.hpp
diff --git a/src/object/pushbutton.cpp b/src/object/pushbutton.cpp
diff --git a/src/object/pushbutton.hpp b/src/object/pushbutton.hpp
diff --git a/src/object/rain_particle_system.cpp b/src/object/rain_particle_system.cpp
diff --git a/src/object/rain_particle_system.hpp b/src/object/rain_particle_system.hpp
diff --git a/src/object/rainsplash.hpp b/src/object/rainsplash.hpp
diff --git a/src/object/rock.cpp b/src/object/rock.cpp
diff --git a/src/object/rock.hpp b/src/object/rock.hpp
diff --git a/src/object/rusty_trampoline.cpp b/src/object/rusty_trampoline.cpp
diff --git a/src/object/rusty_trampoline.hpp b/src/object/rusty_trampoline.hpp
diff --git a/src/object/scripted_object.cpp b/src/object/scripted_object.cpp
diff --git a/src/object/scripted_object.hpp b/src/object/scripted_object.hpp
diff --git a/src/object/skull_tile.hpp b/src/object/skull_tile.hpp
diff --git a/src/object/smoke_cloud.hpp b/src/object/smoke_cloud.hpp
diff --git a/src/object/snow_particle_system.cpp b/src/object/snow_particle_system.cpp
diff --git a/src/object/snow_particle_system.hpp b/src/object/snow_particle_system.hpp
diff --git a/src/object/specialriser.hpp b/src/object/specialriser.hpp
diff --git a/src/object/spotlight.cpp b/src/object/spotlight.cpp
diff --git a/src/object/spotlight.hpp b/src/object/spotlight.hpp
diff --git a/src/object/sprite_particle.hpp b/src/object/sprite_particle.hpp
diff --git a/src/object/star.hpp b/src/object/star.hpp
diff --git a/src/object/text_object.hpp b/src/object/text_object.hpp
diff --git a/src/object/thunderstorm.cpp b/src/object/thunderstorm.cpp
diff --git a/src/object/thunderstorm.hpp b/src/object/thunderstorm.hpp
diff --git a/src/object/tilemap.cpp b/src/object/tilemap.cpp
diff --git a/src/object/tilemap.hpp b/src/object/tilemap.hpp
diff --git a/src/object/torch.cpp b/src/object/torch.cpp
diff --git a/src/object/torch.hpp b/src/object/torch.hpp
diff --git a/src/object/trampoline.cpp b/src/object/trampoline.cpp
diff --git a/src/object/trampoline.hpp b/src/object/trampoline.hpp
diff --git a/src/object/unstable_tile.cpp b/src/object/unstable_tile.cpp
diff --git a/src/object/unstable_tile.hpp b/src/object/unstable_tile.hpp
diff --git a/src/object/weak_block.cpp b/src/object/weak_block.cpp
diff --git a/src/object/weak_block.hpp b/src/object/weak_block.hpp
diff --git a/src/object/wind.cpp b/src/object/wind.cpp
diff --git a/src/object/wind.hpp b/src/object/wind.hpp
diff --git a/src/physfs/ifile_streambuf.cpp b/src/physfs/ifile_streambuf.cpp
diff --git a/src/physfs/ifile_streambuf.hpp b/src/physfs/ifile_streambuf.hpp
diff --git a/src/supertux/collision.hpp b/src/supertux/collision.hpp
diff --git a/src/supertux/console.cpp b/src/supertux/console.cpp
diff --git a/src/supertux/direction.cpp b/src/supertux/direction.cpp
diff --git a/src/supertux/direction.hpp b/src/supertux/direction.hpp
diff --git a/src/supertux/game_object.cpp b/src/supertux/game_object.cpp
diff --git a/src/supertux/game_object.hpp b/src/supertux/game_object.hpp
diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp
diff --git a/src/supertux/level.cpp b/src/supertux/level.cpp
diff --git a/src/supertux/level.hpp b/src/supertux/level.hpp
diff --git a/src/supertux/levelintro.cpp b/src/supertux/levelintro.cpp
diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
diff --git a/src/supertux/menu/editor_level_menu.cpp b/src/supertux/menu/editor_level_menu.cpp
diff --git a/src/supertux/menu/editor_level_menu.hpp b/src/supertux/menu/editor_level_menu.hpp
diff --git a/src/supertux/menu/editor_level_select_menu.cpp b/src/supertux/menu/editor_level_select_menu.cpp
diff --git a/src/supertux/menu/editor_level_select_menu.hpp b/src/supertux/menu/editor_level_select_menu.hpp
diff --git a/src/supertux/menu/editor_levelset_select_menu.cpp b/src/supertux/menu/editor_levelset_select_menu.cpp
diff --git a/src/supertux/menu/editor_levelset_select_menu.hpp b/src/supertux/menu/editor_levelset_select_menu.hpp
diff --git a/src/supertux/menu/editor_menu.cpp b/src/supertux/menu/editor_menu.cpp
diff --git a/src/supertux/menu/editor_menu.hpp b/src/supertux/menu/editor_menu.hpp
diff --git a/src/supertux/menu/editor_objectgroup_menu.cpp b/src/supertux/menu/editor_objectgroup_menu.cpp
diff --git a/src/supertux/menu/editor_objectgroup_menu.hpp b/src/supertux/menu/editor_objectgroup_menu.hpp
diff --git a/src/supertux/menu/editor_sector_menu.cpp b/src/supertux/menu/editor_sector_menu.cpp
diff --git a/src/supertux/menu/editor_sector_menu.hpp b/src/supertux/menu/editor_sector_menu.hpp
diff --git a/src/supertux/menu/editor_sectors_menu.cpp b/src/supertux/menu/editor_sectors_menu.cpp
diff --git a/src/supertux/menu/editor_sectors_menu.hpp b/src/supertux/menu/editor_sectors_menu.hpp
diff --git a/src/supertux/menu/editor_tilegroup_menu.cpp b/src/supertux/menu/editor_tilegroup_menu.cpp
diff --git a/src/supertux/menu/editor_tilegroup_menu.hpp b/src/supertux/menu/editor_tilegroup_menu.hpp
diff --git a/src/supertux/menu/main_menu.cpp b/src/supertux/menu/main_menu.cpp
diff --git a/src/supertux/menu/menu_storage.cpp b/src/supertux/menu/menu_storage.cpp
diff --git a/src/supertux/menu/menu_storage.hpp b/src/supertux/menu/menu_storage.hpp
diff --git a/src/supertux/moving_object.cpp b/src/supertux/moving_object.cpp
diff --git a/src/supertux/moving_object.hpp b/src/supertux/moving_object.hpp
diff --git a/src/supertux/object_factory.cpp b/src/supertux/object_factory.cpp
diff --git a/src/supertux/screen_manager.cpp b/src/supertux/screen_manager.cpp
diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
diff --git a/src/supertux/sector.hpp b/src/supertux/sector.hpp
diff --git a/src/supertux/sector_parser.cpp b/src/supertux/sector_parser.cpp
diff --git a/src/supertux/spawn_point.cpp b/src/supertux/spawn_point.cpp
diff --git a/src/supertux/spawn_point.hpp b/src/supertux/spawn_point.hpp
diff --git a/src/supertux/tile_set.cpp b/src/supertux/tile_set.cpp
diff --git a/src/supertux/tile_set.hpp b/src/supertux/tile_set.hpp
diff --git a/src/supertux/tile_set_parser.cpp b/src/supertux/tile_set_parser.cpp
diff --git a/src/trigger/climbable.cpp b/src/trigger/climbable.cpp
diff --git a/src/trigger/climbable.hpp b/src/trigger/climbable.hpp
diff --git a/src/trigger/door.cpp b/src/trigger/door.cpp
diff --git a/src/trigger/door.hpp b/src/trigger/door.hpp
diff --git a/src/trigger/scripttrigger.cpp b/src/trigger/scripttrigger.cpp
diff --git a/src/trigger/scripttrigger.hpp b/src/trigger/scripttrigger.hpp
diff --git a/src/trigger/secretarea_trigger.cpp b/src/trigger/secretarea_trigger.cpp
diff --git a/src/trigger/secretarea_trigger.hpp b/src/trigger/secretarea_trigger.hpp
diff --git a/src/trigger/sequence_trigger.cpp b/src/trigger/sequence_trigger.cpp
diff --git a/src/trigger/sequence_trigger.hpp b/src/trigger/sequence_trigger.hpp
diff --git a/src/trigger/switch.cpp b/src/trigger/switch.cpp
diff --git a/src/trigger/switch.hpp b/src/trigger/switch.hpp
diff --git a/src/util/reader_mapping.cpp b/src/util/reader_mapping.cpp
diff --git a/src/util/reader_mapping.hpp b/src/util/reader_mapping.hpp
diff --git a/src/video/color.hpp b/src/video/color.hpp
diff --git a/src/video/texture.hpp b/src/video/texture.hpp
diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp
diff --git a/src/worldmap/tux.cpp b/src/worldmap/tux.cpp
diff --git a/src/worldmap/tux.hpp b/src/worldmap/tux.hpp
diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp
diff --git a/translations b/translations
+6 −0		.gitignore
+1 −1		bonus1.pot
+2 −2		bonus2.pot
+1 −1		bonus3.pot
+2 −2		credits.pot
+1 −1		halloween2014.pot
+9 −22		incubator.pot
+38 −36		messages.pot
+1 −1		misc.pot
+21 −1		test.pot
+1 −1		test_old.pot
+1 −1		world1.pot
+1 −1		world2.pot