diff --git a/po/POTFILES.in b/po/POTFILES.in
index 734f2e05de..00701b7aff 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-# automatically created by toolbox --update-po
+# automatically created by make update-po
 
 # main sources
 include/aout_internal.h
@@ -16,30 +16,25 @@ include/modules.h
 include/modules_inner.h
 include/mtime.h
 include/network.h
-include/os_specific.h
 include/osd.h
+include/os_specific.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,21 +43,27 @@ 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
 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
@@ -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
@@ -124,8 +125,11 @@ src/misc/variables.c
 src/misc/vlm.c
 src/misc/win32_specific.c
 src/misc/xml.c
-src/playlist/item-ext.c
+src/osd/osd.c
+src/osd/osd_parser.c
+src/osd/osd_widgets.c
 src/playlist/item.c
+src/playlist/item-ext.c
 src/playlist/loadsave.c
 src/playlist/playlist.c
 src/playlist/services_discovery.c
@@ -146,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
@@ -169,6 +173,8 @@ 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/http.c
 modules/access/mms/asf.c
@@ -181,6 +187,10 @@ modules/access/mms/mmsh.c
 modules/access/mms/mmsh.h
 modules/access/mms/mmstu.c
 modules/access/mms/mmstu.h
+modules/access_output/dummy.c
+modules/access_output/file.c
+modules/access_output/http.c
+modules/access_output/udp.c
 modules/access/pvr/pvr.c
 modules/access/pvr/videodev2.h
 modules/access/screen/beos.cpp
@@ -189,7 +199,7 @@ 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/sftp.c
 modules/access/smb.c
 modules/access/tcp.c
 modules/access/udp.c
@@ -209,12 +219,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
@@ -325,7 +329,6 @@ 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
@@ -407,60 +410,6 @@ modules/gui/beos/TransportButton.cpp
 modules/gui/beos/TransportButton.h
 modules/gui/beos/VideoOutput.cpp
 modules/gui/beos/VideoWindow.h
-modules/gui/gtk/common.h
-modules/gui/gtk/control.c
-modules/gui/gtk/control.h
-modules/gui/gtk/display.c
-modules/gui/gtk/display.h
-modules/gui/gtk/gnome.c
-modules/gui/gtk/gnome_callbacks.c
-modules/gui/gtk/gnome_callbacks.h
-modules/gui/gtk/gnome_interface.c
-modules/gui/gtk/gnome_interface.h
-modules/gui/gtk/gnome_support.c
-modules/gui/gtk/gnome_support.h
-modules/gui/gtk/gtk.c
-modules/gui/gtk/gtk_callbacks.c
-modules/gui/gtk/gtk_callbacks.h
-modules/gui/gtk/gtk_interface.c
-modules/gui/gtk/gtk_interface.h
-modules/gui/gtk/gtk_support.c
-modules/gui/gtk/gtk_support.h
-modules/gui/gtk/menu.c
-modules/gui/gtk/menu.h
-modules/gui/gtk/modules.c
-modules/gui/gtk/modules.h
-modules/gui/gtk/open.c
-modules/gui/gtk/open.h
-modules/gui/gtk/playlist.c
-modules/gui/gtk/playlist.h
-modules/gui/gtk/preferences.c
-modules/gui/gtk/preferences.h
-modules/gui/gtk/sout.c
-modules/gui/kde/QConfigItem.cpp
-modules/gui/kde/QConfigItem.h
-modules/gui/kde/common.h
-modules/gui/kde/disc.cpp
-modules/gui/kde/disc.h
-modules/gui/kde/info.cpp
-modules/gui/kde/info.h
-modules/gui/kde/interface.cpp
-modules/gui/kde/interface.h
-modules/gui/kde/kde.cpp
-modules/gui/kde/languagemenu.cpp
-modules/gui/kde/languagemenu.h
-modules/gui/kde/menu.cpp
-modules/gui/kde/menu.h
-modules/gui/kde/messages.cpp
-modules/gui/kde/messages.h
-modules/gui/kde/net.cpp
-modules/gui/kde/net.h
-modules/gui/kde/pluginsbox.cpp
-modules/gui/kde/pluginsbox.h
-modules/gui/kde/preferences.cpp
-modules/gui/kde/preferences.h
-modules/gui/kde/slider.cpp
-modules/gui/kde/slider.h
 modules/gui/macosx/about.h
 modules/gui/macosx/about.m
 modules/gui/macosx/applescript.h
@@ -483,24 +432,24 @@ 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/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
@@ -508,9 +457,6 @@ modules/gui/pda/pda_support.h
 modules/gui/qnx/aout.c
 modules/gui/qnx/qnx.c
 modules/gui/qnx/vout.c
-modules/gui/qt/intf.cpp
-modules/gui/qt/intf.h
-modules/gui/qt/qt.cpp
 modules/gui/skins2/commands/async_queue.cpp
 modules/gui/skins2/commands/async_queue.hpp
 modules/gui/skins2/commands/cmd_add_item.cpp
@@ -595,8 +541,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
@@ -667,13 +613,13 @@ 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
 modules/gui/skins2/utils/var_percent.hpp
 modules/gui/skins2/utils/var_text.cpp
 modules/gui/skins2/utils/var_text.hpp
-modules/gui/skins2/utils/variable.hpp
 modules/gui/skins2/vars/playlist.cpp
 modules/gui/skins2/vars/playlist.hpp
 modules/gui/skins2/vars/time.cpp
@@ -762,8 +708,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
@@ -805,6 +751,8 @@ modules/services_discovery/hal.c
 modules/services_discovery/sap.c
 modules/services_discovery/shout.c
 modules/services_discovery/upnp.cpp
+modules/services_discovery/upnp_media_server.cpp
+modules/services_discovery/upnp_media_server.h
 modules/stream_out/announce.c
 modules/stream_out/announce.h
 modules/stream_out/bridge.c
@@ -825,11 +773,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
@@ -850,6 +798,7 @@ modules/video_filter/mosaic.c
 modules/video_filter/mosaic.h
 modules/video_filter/motionblur.c
 modules/video_filter/motiondetect.c
+modules/video_filter/osdmenu.c
 modules/video_filter/rss.c
 modules/video_filter/rv32.c
 modules/video_filter/scale.c
@@ -858,13 +807,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
@@ -894,8 +843,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
@@ -930,6 +877,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