diff --git a/po/POTFILES.in b/po/POTFILES.in
index 69a657d29b11779cbf36154c074e3a1502a2f9a3..ccf22c9bf9e0749541ce7ef0f132229f4f0d8db9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,9 +8,6 @@ include/charset.h
 include/codecs.h
 include/configuration.h
 include/darwin_specific.h
-include/input_ext-dec.h
-include/input_ext-intf.h
-include/input_ext-plugins.h
 include/intf_eject.h
 include/iso_lang.h
 include/main.h
@@ -19,10 +16,9 @@ include/modules.h
 include/modules_inner.h
 include/mtime.h
 include/network.h
-include/ninput.h
 include/os_specific.h
 include/osd.h
-include/stream_control.h
+include/snapshot.h
 include/stream_output.h
 include/variables.h
 include/video_output.h
@@ -33,6 +29,7 @@ include/vlc/intf.h
 include/vlc/sout.h
 include/vlc/vlc.h
 include/vlc/vout.h
+include/vlc_access.h
 include/vlc_bits.h
 include/vlc_block.h
 include/vlc_block_helper.h
@@ -40,16 +37,21 @@ include/vlc_codec.h
 include/vlc_common.h
 include/vlc_config.h
 include/vlc_cpu.h
+include/vlc_demux.h
 include/vlc_error.h
 include/vlc_es.h
+include/vlc_es_out.h
+include/vlc_filter.h
 include/vlc_help.h
 include/vlc_httpd.h
+include/vlc_input.h
 include/vlc_interface.h
 include/vlc_keys.h
 include/vlc_messages.h
 include/vlc_meta.h
 include/vlc_objects.h
 include/vlc_playlist.h
+include/vlc_stream.h
 include/vlc_threads.h
 include/vlc_threads_funcs.h
 include/vlc_video.h
@@ -69,17 +71,17 @@ src/extras/getopt.c
 src/extras/getopt.h
 src/extras/getopt1.c
 src/extras/libc.c
+src/input/access.c
+src/input/clock.c
 src/input/control.c
+src/input/decoder.c
 src/input/demux.c
 src/input/es_out.c
 src/input/input.c
-src/input/input_clock.c
-src/input/input_dec.c
-src/input/input_ext-intf.c
-src/input/input_ext-plugins.c
-src/input/input_programs.c
+src/input/input_internal.h
 src/input/stream.c
 src/input/subtitles.c
+src/input/var.c
 src/interface/interface.c
 src/interface/intf_eject.c
 src/libvlc.c
@@ -115,6 +117,7 @@ src/stream_output/sap.c
 src/stream_output/stream_output.c
 src/video_output/video_output.c
 src/video_output/video_text.c
+src/video_output/video_widgets.c
 src/video_output/vout_intf.c
 src/video_output/vout_pictures.c
 src/video_output/vout_pictures.h
@@ -134,36 +137,8 @@ modules/access/dshow/filter.h
 modules/access/dvb/access.c
 modules/access/dvb/dvb.h
 modules/access/dvb/linux_dvb.c
-modules/access/dvd/access.c
-modules/access/dvd/demux.c
-modules/access/dvd/dvd.c
-modules/access/dvd/dvd.h
-modules/access/dvd/dvdcss.h
-modules/access/dvd/es.c
-modules/access/dvd/es.h
-modules/access/dvd/ifo.c
-modules/access/dvd/ifo.h
-modules/access/dvd/seek.c
-modules/access/dvd/seek.h
-modules/access/dvd/summary.c
-modules/access/dvd/summary.h
-modules/access/dvd/udf.c
-modules/access/dvd/udf.h
-modules/access/dvdplay/access.c
-modules/access/dvdplay/access.h
-modules/access/dvdplay/demux.c
-modules/access/dvdplay/demux.h
-modules/access/dvdplay/dvd.c
-modules/access/dvdplay/dvd.h
-modules/access/dvdplay/es.c
-modules/access/dvdplay/es.h
-modules/access/dvdplay/intf.c
-modules/access/dvdplay/intf.h
-modules/access/dvdplay/tools.c
-modules/access/dvdplay/tools.h
-modules/access/dvdread/dvdread.c
-modules/access/dvdread/input.c
-modules/access/dvdread/input.h
+modules/access/dvdnav.c
+modules/access/dvdread.c
 modules/access/file.c
 modules/access/ftp.c
 modules/access/http.c
@@ -183,6 +158,12 @@ modules/access/satellite/access.c
 modules/access/satellite/dvb.c
 modules/access/satellite/dvb.h
 modules/access/satellite/satellite.c
+modules/access/screen/beos.cpp
+modules/access/screen/mac.c
+modules/access/screen/screen.c
+modules/access/screen/screen.h
+modules/access/screen/win32.c
+modules/access/screen/x11.c
 modules/access/slp.c
 modules/access/tcp.c
 modules/access/udp.c
@@ -225,6 +206,9 @@ modules/audio_filter/converter/s16tofloat32swab.c
 modules/audio_filter/converter/s8tofloat32.c
 modules/audio_filter/converter/u8tofixed32.c
 modules/audio_filter/converter/u8tofloat32.c
+modules/audio_filter/equalizer.c
+modules/audio_filter/equalizer_presets.h
+modules/audio_filter/normvol.c
 modules/audio_filter/resampler/bandlimited.c
 modules/audio_filter/resampler/bandlimited.h
 modules/audio_filter/resampler/coreaudio.c
@@ -263,6 +247,9 @@ modules/codec/cmml/xtag.c
 modules/codec/cmml/xtag.h
 modules/codec/cmml/xurl.c
 modules/codec/cmml/xurl.h
+modules/codec/dmo/buffer.c
+modules/codec/dmo/dmo.c
+modules/codec/dmo/dmo.h
 modules/codec/dts.c
 modules/codec/dv.c
 modules/codec/dvbsub.c
@@ -305,21 +292,26 @@ modules/codec/quicktime.c
 modules/codec/rawvideo.c
 modules/codec/speex.c
 modules/codec/spudec/parse.c
-modules/codec/spudec/render.c
 modules/codec/spudec/spudec.c
 modules/codec/spudec/spudec.h
 modules/codec/subsdec.c
 modules/codec/tarkin.c
 modules/codec/theora.c
+modules/codec/toolame.c
 modules/codec/vorbis.c
 modules/codec/x264.c
 modules/codec/xvid.c
 modules/control/corba/corba.c
+modules/control/corba/mediacontrol-core.c
+modules/control/corba/mediacontrol-core.h
+modules/control/corba/mediacontrol-init.c
+modules/control/corba/mediacontrol-plugin.c
 modules/control/gestures.c
 modules/control/hotkeys.c
 modules/control/http.c
 modules/control/joystick.c
 modules/control/lirc.c
+modules/control/netsync.c
 modules/control/ntservice.c
 modules/control/rc.c
 modules/control/telnet.c
@@ -333,14 +325,13 @@ modules/demux/au.c
 modules/demux/avi/avi.c
 modules/demux/avi/libavi.c
 modules/demux/avi/libavi.h
-modules/demux/demux2.c
 modules/demux/demuxdump.c
 modules/demux/demuxstream.c
 modules/demux/dts.c
-modules/demux/dvdnav.c
 modules/demux/flac.c
 modules/demux/livedotcom.cpp
 modules/demux/m3u.c
+modules/demux/mjpeg.c
 modules/demux/mkv.cpp
 modules/demux/mod.c
 modules/demux/mp4/drms.c
@@ -353,10 +344,6 @@ modules/demux/mpeg/h264.c
 modules/demux/mpeg/m4v.c
 modules/demux/mpeg/mpga.c
 modules/demux/mpeg/mpgv.c
-modules/demux/mpeg/ps.c
-modules/demux/mpeg/system.c
-modules/demux/mpeg/system.h
-modules/demux/mpeg/ts.c
 modules/demux/nsv.c
 modules/demux/ogg.c
 modules/demux/playlist/m3u.c
@@ -370,12 +357,11 @@ modules/demux/pva.c
 modules/demux/rawdv.c
 modules/demux/real.c
 modules/demux/sgimb.c
+modules/demux/subtitle.c
 modules/demux/ts.c
 modules/demux/util/id3.c
 modules/demux/util/id3genres.h
 modules/demux/util/id3tag.c
-modules/demux/util/sub.c
-modules/demux/util/sub.h
 modules/demux/wav.c
 modules/gui/beos/AudioOutput.cpp
 modules/gui/beos/BeOS.cpp
@@ -400,8 +386,6 @@ modules/gui/beos/TransportButton.cpp
 modules/gui/beos/TransportButton.h
 modules/gui/beos/VideoOutput.cpp
 modules/gui/beos/VideoWindow.h
-modules/gui/beos/VlcWrapper.cpp
-modules/gui/beos/VlcWrapper.h
 modules/gui/gtk/common.h
 modules/gui/gtk/control.c
 modules/gui/gtk/control.h
@@ -462,8 +446,8 @@ modules/gui/macosx/applescript.h
 modules/gui/macosx/applescript.m
 modules/gui/macosx/controls.h
 modules/gui/macosx/controls.m
-modules/gui/macosx/info.h
-modules/gui/macosx/info.m
+modules/gui/macosx/equalizer.h
+modules/gui/macosx/equalizer.m
 modules/gui/macosx/intf.h
 modules/gui/macosx/intf.m
 modules/gui/macosx/macosx.m
@@ -483,7 +467,9 @@ modules/gui/macosx/prefs_widgets.h
 modules/gui/macosx/prefs_widgets.m
 modules/gui/macosx/vout.h
 modules/gui/macosx/vout.m
-modules/gui/ncurses/ncurses.c
+modules/gui/macosx/voutgl.m
+modules/gui/macosx/voutqt.m
+modules/gui/ncurses.c
 modules/gui/pda/pda.c
 modules/gui/pda/pda.h
 modules/gui/pda/pda_callbacks.c
@@ -602,6 +588,8 @@ modules/gui/skins2/commands/cmd_input.cpp
 modules/gui/skins2/commands/cmd_input.hpp
 modules/gui/skins2/commands/cmd_layout.cpp
 modules/gui/skins2/commands/cmd_layout.hpp
+modules/gui/skins2/commands/cmd_minimize.cpp
+modules/gui/skins2/commands/cmd_minimize.hpp
 modules/gui/skins2/commands/cmd_on_top.cpp
 modules/gui/skins2/commands/cmd_on_top.hpp
 modules/gui/skins2/commands/cmd_playlist.cpp
@@ -770,6 +758,7 @@ modules/gui/skins2/x11/x11_window.cpp
 modules/gui/skins2/x11/x11_window.hpp
 modules/gui/wxwindows/bookmarks.cpp
 modules/gui/wxwindows/dialogs.cpp
+modules/gui/wxwindows/extrapanel.cpp
 modules/gui/wxwindows/fileinfo.cpp
 modules/gui/wxwindows/interface.cpp
 modules/gui/wxwindows/iteminfo.cpp
@@ -780,8 +769,8 @@ modules/gui/wxwindows/playlist.cpp
 modules/gui/wxwindows/preferences.cpp
 modules/gui/wxwindows/preferences_widgets.cpp
 modules/gui/wxwindows/preferences_widgets.h
+modules/gui/wxwindows/streamdata.h
 modules/gui/wxwindows/streamout.cpp
-modules/gui/wxwindows/streamwizard.cpp
 modules/gui/wxwindows/subtitles.cpp
 modules/gui/wxwindows/timer.cpp
 modules/gui/wxwindows/video.cpp
@@ -810,6 +799,7 @@ modules/misc/playlist/old.c
 modules/misc/qte_main.cpp
 modules/misc/sap.c
 modules/misc/screensaver.c
+modules/misc/svg.c
 modules/misc/testsuite/test1.c
 modules/misc/testsuite/test2.cpp
 modules/misc/testsuite/test3.m
@@ -825,7 +815,9 @@ modules/mux/mpeg/pes.c
 modules/mux/mpeg/pes.h
 modules/mux/mpeg/ps.c
 modules/mux/mpeg/ts.c
+modules/mux/mpjpeg.c
 modules/mux/ogg.c
+modules/mux/wav.c
 modules/packetizer/copy.c
 modules/packetizer/h264.c
 modules/packetizer/mpeg4audio.c
@@ -859,6 +851,7 @@ modules/video_chroma/i420_yuy2.h
 modules/video_chroma/i422_yuy2.c
 modules/video_chroma/i422_yuy2.h
 modules/video_filter/adjust.c
+modules/video_filter/blend.c
 modules/video_filter/clone.c
 modules/video_filter/crop.c
 modules/video_filter/deinterlace.c
@@ -873,20 +866,80 @@ modules/video_output/aa.c
 modules/video_output/caca.c
 modules/video_output/directx/directx.c
 modules/video_output/directx/events.c
+modules/video_output/directx/glwin32.c
 modules/video_output/directx/vout.h
 modules/video_output/fb.c
 modules/video_output/ggi.c
 modules/video_output/glide.c
+modules/video_output/hd1000v.cpp
 modules/video_output/mga.c
+modules/video_output/opengl.c
 modules/video_output/qte/qte.cpp
 modules/video_output/qte/qte.h
 modules/video_output/sdl.c
+modules/video_output/snapshot.c
 modules/video_output/svgalib.c
 modules/video_output/wingdi.c
+modules/video_output/x11/glx.c
 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
+modules/visualization/galaktos/builtin_funcs.h
+modules/visualization/galaktos/common.h
+modules/visualization/galaktos/compare.h
+modules/visualization/galaktos/custom_shape.c
+modules/visualization/galaktos/custom_shape.h
+modules/visualization/galaktos/custom_shape_types.h
+modules/visualization/galaktos/custom_wave.c
+modules/visualization/galaktos/custom_wave.h
+modules/visualization/galaktos/custom_wave_types.h
+modules/visualization/galaktos/engine_vars.c
+modules/visualization/galaktos/engine_vars.h
+modules/visualization/galaktos/eval.c
+modules/visualization/galaktos/eval.h
+modules/visualization/galaktos/expr_types.h
+modules/visualization/galaktos/fatal.h
+modules/visualization/galaktos/fftsg.c
+modules/visualization/galaktos/func.c
+modules/visualization/galaktos/func.h
+modules/visualization/galaktos/func_types.h
+modules/visualization/galaktos/idle_preset.h
+modules/visualization/galaktos/init_cond.c
+modules/visualization/galaktos/init_cond.h
+modules/visualization/galaktos/init_cond_types.h
+modules/visualization/galaktos/interface_types.h
+modules/visualization/galaktos/main.c
+modules/visualization/galaktos/main.h
+modules/visualization/galaktos/param.c
+modules/visualization/galaktos/param.h
+modules/visualization/galaktos/param_types.h
+modules/visualization/galaktos/parser.c
+modules/visualization/galaktos/parser.h
+modules/visualization/galaktos/per_frame_eqn.c
+modules/visualization/galaktos/per_frame_eqn.h
+modules/visualization/galaktos/per_frame_eqn_types.h
+modules/visualization/galaktos/per_pixel_eqn.c
+modules/visualization/galaktos/per_pixel_eqn.h
+modules/visualization/galaktos/per_pixel_eqn_types.h
+modules/visualization/galaktos/per_point_types.h
+modules/visualization/galaktos/plugin.c
+modules/visualization/galaktos/plugin.h
+modules/visualization/galaktos/preset.c
+modules/visualization/galaktos/preset.h
+modules/visualization/galaktos/preset_types.h
+modules/visualization/galaktos/splaytree.c
+modules/visualization/galaktos/splaytree.h
+modules/visualization/galaktos/splaytree_types.h
+modules/visualization/galaktos/tree_types.c
+modules/visualization/galaktos/tree_types.h
+modules/visualization/galaktos/video_init.c
+modules/visualization/galaktos/video_init.h
 modules/visualization/goom.c
 modules/visualization/visual/effects.c
 modules/visualization/visual/fft.c