diff --git a/po/POTFILES.in b/po/POTFILES.in
index 510ad7e0077a30bfbe6def16ff08a30d410d500e..87825998151d89d65768a2192c9779856116843d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,19 +21,24 @@ include/snapshot.h
 include/stream_output.h
 include/variables.h
 include/video_output.h
+include/vlc/aout.h
+include/vlc/control.h
+include/vlc/decoder.h
+include/vlc/input.h
+include/vlc/intf.h
+include/vlc/sout.h
+include/vlc/vlc.h
+include/vlc/vout.h
 include/vlc_access.h
 include/vlc_acl.h
-include/vlc/aout.h
 include/vlc_bits.h
 include/vlc_block.h
 include/vlc_block_helper.h
 include/vlc_codec.h
 include/vlc_common.h
-include/vlc_config_cat.h
 include/vlc_config.h
-include/vlc/control.h
+include/vlc_config_cat.h
 include/vlc_cpu.h
-include/vlc/decoder.h
 include/vlc_demux.h
 include/vlc_error.h
 include/vlc_es.h
@@ -42,9 +47,8 @@ include/vlc_filter.h
 include/vlc_httpd.h
 include/vlc_image.h
 include/vlc_input.h
-include/vlc/input.h
+include/vlc_interaction.h
 include/vlc_interface.h
-include/vlc/intf.h
 include/vlc_keys.h
 include/vlc_md5.h
 include/vlc_messages.h
@@ -52,17 +56,14 @@ include/vlc_meta.h
 include/vlc_objects.h
 include/vlc_osd.h
 include/vlc_playlist.h
-include/vlc/sout.h
 include/vlc_spu.h
 include/vlc_stream.h
-include/vlc_threads_funcs.h
 include/vlc_threads.h
+include/vlc_threads_funcs.h
 include/vlc_tls.h
 include/vlc_video.h
-include/vlc/vlc.h
 include/vlc_vlm.h
 include/vlc_vod.h
-include/vlc/vout.h
 include/vlc_xml.h
 include/vout_synchro.h
 include/win32_specific.h
@@ -79,9 +80,9 @@ src/control/init.c
 src/control/plugin.c
 src/control/util.c
 src/extras/dirent.c
-src/extras/getopt1.c
 src/extras/getopt.c
 src/extras/getopt.h
+src/extras/getopt1.c
 src/extras/libc.c
 src/input/access.c
 src/input/clock.c
@@ -95,6 +96,7 @@ src/input/mem_stream.c
 src/input/stream.c
 src/input/subtitles.c
 src/input/var.c
+src/interface/interaction.c
 src/interface/interface.c
 src/interface/intf_eject.c
 src/libvlc.c
@@ -106,8 +108,6 @@ src/misc/configuration.c
 src/misc/cpu.c
 src/misc/darwin_specific.m
 src/misc/error.c
-src/misc/getaddrinfo.c
-src/misc/httpd.c
 src/misc/image.c
 src/misc/iso-639_def.h
 src/misc/iso_lang.c
@@ -115,21 +115,25 @@ src/misc/md5.c
 src/misc/messages.c
 src/misc/modules.c
 src/misc/mtime.c
-src/misc/net.c
 src/misc/objects.c
 src/misc/threads.c
-src/misc/tls.c
 src/misc/unicode.c
 src/misc/variables.c
 src/misc/vlm.c
 src/misc/win32_specific.c
 src/misc/xml.c
+src/network/getaddrinfo.c
+src/network/httpd.c
+src/network/io.c
+src/network/tcp.c
+src/network/tls.c
+src/network/udp.c
 src/osd/osd.c
 src/osd/osd_parser.c
 src/osd/osd_text.c
 src/osd/osd_widgets.c
-src/playlist/item.c
 src/playlist/item-ext.c
+src/playlist/item.c
 src/playlist/loadsave.c
 src/playlist/playlist.c
 src/playlist/services_discovery.c
@@ -150,9 +154,9 @@ src/video_output/vout_synchro.c
 src/vlc.c
 
 # modules
+modules/access/cdda.c
 modules/access/cdda/access.c
 modules/access/cdda/access.h
-modules/access/cdda.c
 modules/access/cdda/callback.c
 modules/access/cdda/callback.h
 modules/access/cdda/cdda.c
@@ -165,17 +169,15 @@ modules/access/dshow/crossbar.cpp
 modules/access/dshow/dshow.cpp
 modules/access/dshow/filter.cpp
 modules/access/dshow/filter.h
+modules/access/dv.c
 modules/access/dvb/access.c
 modules/access/dvb/dvb.h
 modules/access/dvb/en50221.c
 modules/access/dvb/linux_dvb.c
-modules/access/dv.c
 modules/access/dvdnav.c
 modules/access/dvdread.c
 modules/access/fake.c
 modules/access/file.c
-modules/access_filter/record.c
-modules/access_filter/timeshift.c
 modules/access/ftp.c
 modules/access/gnomevfs.c
 modules/access/http.c
@@ -189,19 +191,12 @@ modules/access/mms/mmsh.c
 modules/access/mms/mmsh.h
 modules/access/mms/mmstu.c
 modules/access/mms/mmstu.h
-modules/access_output/bonjour.c
-modules/access_output/bonjour.h
-modules/access_output/dummy.c
-modules/access_output/file.c
-modules/access_output/http.c
-modules/access_output/shout.c
-modules/access_output/udp.c
 modules/access/pvr/pvr.c
 modules/access/pvr/videodev2.h
 modules/access/rtsp/access.c
-modules/access/rtsp/real_asmrp.c
 modules/access/rtsp/real.c
 modules/access/rtsp/real.h
+modules/access/rtsp/real_asmrp.c
 modules/access/rtsp/real_rmff.c
 modules/access/rtsp/real_rmff.h
 modules/access/rtsp/real_sdpplin.c
@@ -233,6 +228,15 @@ modules/access/vcdx/vcd.c
 modules/access/vcdx/vcd.h
 modules/access/vcdx/vcdplayer.c
 modules/access/vcdx/vcdplayer.h
+modules/access_filter/record.c
+modules/access_filter/timeshift.c
+modules/access_output/bonjour.c
+modules/access_output/bonjour.h
+modules/access_output/dummy.c
+modules/access_output/file.c
+modules/access_output/http.c
+modules/access_output/shout.c
+modules/access_output/udp.c
 modules/audio_filter/channel_mixer/dolby.c
 modules/audio_filter/channel_mixer/headphone.c
 modules/audio_filter/channel_mixer/simple.c
@@ -458,24 +462,26 @@ modules/gui/macosx/open.m
 modules/gui/macosx/output.h
 modules/gui/macosx/output.m
 modules/gui/macosx/playlist.h
+modules/gui/macosx/playlist.m
 modules/gui/macosx/playlistinfo.h
 modules/gui/macosx/playlistinfo.m
-modules/gui/macosx/playlist.m
 modules/gui/macosx/prefs.h
 modules/gui/macosx/prefs.m
 modules/gui/macosx/prefs_widgets.h
 modules/gui/macosx/prefs_widgets.m
-modules/gui/macosx/voutgl.m
+modules/gui/macosx/sfilters.h
+modules/gui/macosx/sfilters.m
 modules/gui/macosx/vout.h
 modules/gui/macosx/vout.m
+modules/gui/macosx/voutgl.m
 modules/gui/macosx/voutqt.m
 modules/gui/macosx/wizard.h
 modules/gui/macosx/wizard.m
 modules/gui/ncurses.c
 modules/gui/pda/pda.c
+modules/gui/pda/pda.h
 modules/gui/pda/pda_callbacks.c
 modules/gui/pda/pda_callbacks.h
-modules/gui/pda/pda.h
 modules/gui/pda/pda_interface.c
 modules/gui/pda/pda_interface.h
 modules/gui/pda/pda_support.c
@@ -550,6 +556,7 @@ modules/gui/skins2/events/evt_input.hpp
 modules/gui/skins2/events/evt_key.cpp
 modules/gui/skins2/events/evt_key.hpp
 modules/gui/skins2/events/evt_leave.hpp
+modules/gui/skins2/events/evt_menu.hpp
 modules/gui/skins2/events/evt_motion.hpp
 modules/gui/skins2/events/evt_mouse.cpp
 modules/gui/skins2/events/evt_mouse.hpp
@@ -566,6 +573,8 @@ modules/gui/skins2/macosx/macosx_graphics.cpp
 modules/gui/skins2/macosx/macosx_graphics.hpp
 modules/gui/skins2/macosx/macosx_loop.cpp
 modules/gui/skins2/macosx/macosx_loop.hpp
+modules/gui/skins2/macosx/macosx_popup.cpp
+modules/gui/skins2/macosx/macosx_popup.hpp
 modules/gui/skins2/macosx/macosx_timer.cpp
 modules/gui/skins2/macosx/macosx_timer.hpp
 modules/gui/skins2/macosx/macosx_tooltip.cpp
@@ -573,8 +582,8 @@ modules/gui/skins2/macosx/macosx_tooltip.hpp
 modules/gui/skins2/macosx/macosx_window.cpp
 modules/gui/skins2/macosx/macosx_window.hpp
 modules/gui/skins2/parser/builder.cpp
-modules/gui/skins2/parser/builder_data.hpp
 modules/gui/skins2/parser/builder.hpp
+modules/gui/skins2/parser/builder_data.hpp
 modules/gui/skins2/parser/expr_evaluator.cpp
 modules/gui/skins2/parser/expr_evaluator.hpp
 modules/gui/skins2/parser/interpreter.cpp
@@ -585,6 +594,8 @@ modules/gui/skins2/parser/xmlparser.cpp
 modules/gui/skins2/parser/xmlparser.hpp
 modules/gui/skins2/src/anchor.cpp
 modules/gui/skins2/src/anchor.hpp
+modules/gui/skins2/src/anim_bitmap.cpp
+modules/gui/skins2/src/anim_bitmap.hpp
 modules/gui/skins2/src/bitmap_font.cpp
 modules/gui/skins2/src/bitmap_font.hpp
 modules/gui/skins2/src/dialogs.cpp
@@ -608,9 +619,12 @@ modules/gui/skins2/src/os_factory.cpp
 modules/gui/skins2/src/os_factory.hpp
 modules/gui/skins2/src/os_graphics.hpp
 modules/gui/skins2/src/os_loop.hpp
+modules/gui/skins2/src/os_popup.hpp
 modules/gui/skins2/src/os_timer.hpp
 modules/gui/skins2/src/os_tooltip.hpp
 modules/gui/skins2/src/os_window.hpp
+modules/gui/skins2/src/popup.cpp
+modules/gui/skins2/src/popup.hpp
 modules/gui/skins2/src/scaled_bitmap.cpp
 modules/gui/skins2/src/scaled_bitmap.hpp
 modules/gui/skins2/src/skin_common.hpp
@@ -650,7 +664,6 @@ modules/gui/skins2/utils/ustring.cpp
 modules/gui/skins2/utils/ustring.hpp
 modules/gui/skins2/utils/var_bool.cpp
 modules/gui/skins2/utils/var_bool.hpp
-modules/gui/skins2/utils/variable.hpp
 modules/gui/skins2/utils/var_list.cpp
 modules/gui/skins2/utils/var_list.hpp
 modules/gui/skins2/utils/var_percent.cpp
@@ -659,6 +672,7 @@ modules/gui/skins2/utils/var_text.cpp
 modules/gui/skins2/utils/var_text.hpp
 modules/gui/skins2/utils/var_tree.cpp
 modules/gui/skins2/utils/var_tree.hpp
+modules/gui/skins2/utils/variable.hpp
 modules/gui/skins2/vars/equalizer.cpp
 modules/gui/skins2/vars/equalizer.hpp
 modules/gui/skins2/vars/playlist.cpp
@@ -677,6 +691,8 @@ modules/gui/skins2/win32/win32_graphics.cpp
 modules/gui/skins2/win32/win32_graphics.hpp
 modules/gui/skins2/win32/win32_loop.cpp
 modules/gui/skins2/win32/win32_loop.hpp
+modules/gui/skins2/win32/win32_popup.cpp
+modules/gui/skins2/win32/win32_popup.hpp
 modules/gui/skins2/win32/win32_timer.cpp
 modules/gui/skins2/win32/win32_timer.hpp
 modules/gui/skins2/win32/win32_tooltip.cpp
@@ -693,6 +709,8 @@ modules/gui/skins2/x11/x11_graphics.cpp
 modules/gui/skins2/x11/x11_graphics.hpp
 modules/gui/skins2/x11/x11_loop.cpp
 modules/gui/skins2/x11/x11_loop.hpp
+modules/gui/skins2/x11/x11_popup.cpp
+modules/gui/skins2/x11/x11_popup.hpp
 modules/gui/skins2/x11/x11_timer.cpp
 modules/gui/skins2/x11/x11_timer.hpp
 modules/gui/skins2/x11/x11_tooltip.cpp
@@ -715,9 +733,9 @@ modules/gui/wince/timer.cpp
 modules/gui/wince/video.cpp
 modules/gui/wince/wince.cpp
 modules/gui/wince/wince.h
+modules/gui/wxwidgets/dialogs.cpp
 modules/gui/wxwidgets/dialogs/bookmarks.cpp
 modules/gui/wxwidgets/dialogs/bookmarks.hpp
-modules/gui/wxwidgets/dialogs.cpp
 modules/gui/wxwidgets/dialogs/fileinfo.cpp
 modules/gui/wxwidgets/dialogs/fileinfo.hpp
 modules/gui/wxwidgets/dialogs/iteminfo.cpp
@@ -752,13 +770,13 @@ modules/gui/wxwidgets/dialogs/wizard.cpp
 modules/gui/wxwidgets/dialogs/wizard.hpp
 modules/gui/wxwidgets/extrapanel.cpp
 modules/gui/wxwidgets/extrapanel.hpp
+modules/gui/wxwidgets/input_manager.cpp
+modules/gui/wxwidgets/input_manager.hpp
 modules/gui/wxwidgets/interface.cpp
 modules/gui/wxwidgets/interface.hpp
-modules/gui/wxwidgets/main_slider_manager.cpp
-modules/gui/wxwidgets/main_slider_manager.hpp
 modules/gui/wxwidgets/menus.cpp
-modules/gui/wxwidgets/slider_manager.cpp
-modules/gui/wxwidgets/slider_manager.hpp
+modules/gui/wxwidgets/playlist_manager.cpp
+modules/gui/wxwidgets/playlist_manager.hpp
 modules/gui/wxwidgets/streamdata.cpp
 modules/gui/wxwidgets/streamdata.h
 modules/gui/wxwidgets/timer.cpp
@@ -781,8 +799,8 @@ modules/misc/gnutls.c
 modules/misc/gtk_main.c
 modules/misc/logger.c
 modules/misc/memcpy/fastmemcpy.h
-modules/misc/memcpy/memcpyaltivec.c
 modules/misc/memcpy/memcpy.c
+modules/misc/memcpy/memcpyaltivec.c
 modules/misc/msn.c
 modules/misc/network/ipv4.c
 modules/misc/network/ipv6.c
@@ -845,11 +863,11 @@ modules/stream_out/transrate/getvlc.h
 modules/stream_out/transrate/putvlc.h
 modules/stream_out/transrate/transrate.c
 modules/stream_out/transrate/transrate.h
+modules/video_chroma/i420_rgb.c
+modules/video_chroma/i420_rgb.h
 modules/video_chroma/i420_rgb16.c
 modules/video_chroma/i420_rgb8.c
-modules/video_chroma/i420_rgb.c
 modules/video_chroma/i420_rgb_c.h
-modules/video_chroma/i420_rgb.h
 modules/video_chroma/i420_rgb_mmx.h
 modules/video_chroma/i420_ymga.c
 modules/video_chroma/i420_yuy2.c
@@ -880,13 +898,13 @@ modules/video_filter/swscale/filter.c
 modules/video_filter/swscale/rgb2rgb.c
 modules/video_filter/swscale/rgb2rgb.h
 modules/video_filter/swscale/rgb2rgb_template.c
-modules/video_filter/swscale/swscale_altivec_template.c
 modules/video_filter/swscale/swscale.c
 modules/video_filter/swscale/swscale.h
+modules/video_filter/swscale/swscale_altivec_template.c
 modules/video_filter/swscale/swscale_internal.h
 modules/video_filter/swscale/swscale_template.c
-modules/video_filter/swscale/yuv2rgb_altivec.c
 modules/video_filter/swscale/yuv2rgb.c
+modules/video_filter/swscale/yuv2rgb_altivec.c
 modules/video_filter/swscale/yuv2rgb_mlib.c
 modules/video_filter/swscale/yuv2rgb_template.c
 modules/video_filter/time.c
@@ -916,6 +934,8 @@ modules/video_output/x11/x11.c
 modules/video_output/x11/xcommon.c
 modules/video_output/x11/xcommon.h
 modules/video_output/x11/xvideo.c
+modules/visualization/galaktos/PCM.c
+modules/visualization/galaktos/PCM.h
 modules/visualization/galaktos/beat_detect.c
 modules/visualization/galaktos/beat_detect.h
 modules/visualization/galaktos/builtin_funcs.c
@@ -950,8 +970,6 @@ modules/visualization/galaktos/param.h
 modules/visualization/galaktos/param_types.h
 modules/visualization/galaktos/parser.c
 modules/visualization/galaktos/parser.h
-modules/visualization/galaktos/PCM.c
-modules/visualization/galaktos/PCM.h
 modules/visualization/galaktos/per_frame_eqn.c
 modules/visualization/galaktos/per_frame_eqn.h
 modules/visualization/galaktos/per_frame_eqn_types.h