diff --git a/po/POTFILES.in b/po/POTFILES.in
index cc51e1eb1a1f26782f4cc59fc9b4fe3709f37465..69c0735a6cdc965338c7a41f87e306d41403564b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,29 +17,23 @@ include/modules_inner.h
 include/mtime.h
 include/network.h
 include/os_specific.h
-include/osd.h
 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.h
 include/vlc_config_cat.h
+include/vlc_config.h
+include/vlc/control.h
 include/vlc_cpu.h
+include/vlc/decoder.h
 include/vlc_demux.h
 include/vlc_error.h
 include/vlc_es.h
@@ -48,7 +42,9 @@ include/vlc_filter.h
 include/vlc_httpd.h
 include/vlc_image.h
 include/vlc_input.h
+include/vlc/input.h
 include/vlc_interface.h
+include/vlc/intf.h
 include/vlc_keys.h
 include/vlc_md5.h
 include/vlc_messages.h
@@ -56,14 +52,17 @@ 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.h
 include/vlc_threads_funcs.h
+include/vlc_threads.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
@@ -80,9 +79,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
@@ -127,9 +126,10 @@ src/misc/win32_specific.c
 src/misc/xml.c
 src/osd/osd.c
 src/osd/osd_parser.c
+src/osd/osd_text.c
 src/osd/osd_widgets.c
-src/playlist/item-ext.c
 src/playlist/item.c
+src/playlist/item-ext.c
 src/playlist/loadsave.c
 src/playlist/playlist.c
 src/playlist/services_discovery.c
@@ -150,9 +150,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
@@ -173,7 +173,10 @@ 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
 modules/access/mms/asf.c
 modules/access/mms/asf.h
@@ -185,8 +188,25 @@ 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_rmff.c
+modules/access/rtsp/real_rmff.h
+modules/access/rtsp/real_sdpplin.c
+modules/access/rtsp/real_sdpplin.h
+modules/access/rtsp/rtsp.c
+modules/access/rtsp/rtsp.h
 modules/access/screen/beos.cpp
 modules/access/screen/mac.c
 modules/access/screen/screen.c
@@ -212,12 +232,6 @@ 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/dummy.c
-modules/access_output/file.c
-modules/access_output/http.c
-modules/access_output/udp.c
 modules/audio_filter/channel_mixer/headphone.c
 modules/audio_filter/channel_mixer/simple.c
 modules/audio_filter/channel_mixer/trivial.c
@@ -308,6 +322,7 @@ modules/codec/mpeg_audio.c
 modules/codec/png.c
 modules/codec/quicktime.c
 modules/codec/rawvideo.c
+modules/codec/realaudio.c
 modules/codec/sdl_image.c
 modules/codec/speex.c
 modules/codec/spudec/parse.c
@@ -368,6 +383,7 @@ modules/demux/mpeg/m4a.c
 modules/demux/mpeg/m4v.c
 modules/demux/mpeg/mpga.c
 modules/demux/mpeg/mpgv.c
+modules/demux/nsc.c
 modules/demux/nsv.c
 modules/demux/nuv.c
 modules/demux/ogg.c
@@ -438,26 +454,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/update.h
 modules/gui/macosx/update.m
+modules/gui/macosx/voutgl.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
@@ -553,8 +569,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.hpp
 modules/gui/skins2/parser/builder_data.hpp
+modules/gui/skins2/parser/builder.hpp
 modules/gui/skins2/parser/expr_evaluator.cpp
 modules/gui/skins2/parser/expr_evaluator.hpp
 modules/gui/skins2/parser/interpreter.cpp
@@ -625,6 +641,7 @@ 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
@@ -633,7 +650,6 @@ 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/playlist.cpp
 modules/gui/skins2/vars/playlist.hpp
 modules/gui/skins2/vars/playtree.cpp
@@ -724,8 +740,8 @@ modules/misc/gnutls.c
 modules/misc/gtk_main.c
 modules/misc/logger.c
 modules/misc/memcpy/fastmemcpy.h
-modules/misc/memcpy/memcpy.c
 modules/misc/memcpy/memcpyaltivec.c
+modules/misc/memcpy/memcpy.c
 modules/misc/network/ipv4.c
 modules/misc/network/ipv6.c
 modules/misc/playlist/export.c
@@ -762,6 +778,7 @@ modules/packetizer/h264.c
 modules/packetizer/mpeg4audio.c
 modules/packetizer/mpeg4video.c
 modules/packetizer/mpegvideo.c
+modules/services_discovery/bonjour.c
 modules/services_discovery/daap.c
 modules/services_discovery/hal.c
 modules/services_discovery/sap.c
@@ -787,11 +804,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
@@ -821,13 +838,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.c
 modules/video_filter/swscale/yuv2rgb_altivec.c
+modules/video_filter/swscale/yuv2rgb.c
 modules/video_filter/swscale/yuv2rgb_mlib.c
 modules/video_filter/swscale/yuv2rgb_template.c
 modules/video_filter/time.c
@@ -857,8 +874,6 @@ 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
@@ -893,6 +908,8 @@ 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