update-po and fix rules for qt4 ui

Makefile.am

@@ -941,7 +941,7 @@ update-po:
 	    | sort ; \
 	  echo "" ; \
 	  echo "# modules" ; \
-	  find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name 'qt4/ui/*.ui'\
+	  find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
 	    | grep -v '\(\.moc\.\|gui/gtk2/\)' \
 	    | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \
 	    | sort ; \

po/POTFILES.in

@@ -23,18 +23,26 @@ include/snapshot.h
 include/stream_output.h
 include/variables.h
 include/video_output.h
+include/vlc/aout.h
+include/vlc/decoder.h
+include/vlc/input.h
+include/vlc/intf.h
+include/vlc/libvlc.h
+include/vlc/mediacontrol.h
+include/vlc/mediacontrol_structures.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_config_cat.h
 include/vlc_cpu.h
-include/vlc/decoder.h
 include/vlc_demux.h
 include/vlc_devices.h
 include/vlc_error.h
@@ -44,36 +52,28 @@ 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_intf_strings.h
 include/vlc_keys.h
-include/vlc/libvlc.h
 include/vlc_md5.h
-include/vlc/mediacontrol.h
-include/vlc/mediacontrol_structures.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_streaming.h
 include/vlc_strings.h
-include/vlc_threads_funcs.h
 include/vlc_threads.h
+include/vlc_threads_funcs.h
 include/vlc_tls.h
 include/vlc_update.h
 include/vlc_url.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
@@ -96,9 +96,9 @@ src/control/playlist.c
 src/control/video.c
 src/control/vlm.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
@@ -116,6 +116,7 @@ src/input/var.c
 src/interface/interaction.c
 src/interface/interface.c
 src/interface/intf_eject.c
+src/libvlc-common.c
 src/libvlc.c
 src/libvlc.h
 src/misc/beos_specific.cpp
@@ -184,9 +185,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
@@ -199,18 +200,16 @@ 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/http.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
@@ -224,18 +223,11 @@ 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.c
 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
@@ -251,8 +243,8 @@ modules/access/screen/x11.c
 modules/access/smb.c
 modules/access/tcp.c
 modules/access/udp.c
-modules/access/v4l2.c
 modules/access/v4l.c
+modules/access/v4l2.c
 modules/access/vcd/cdrom.c
 modules/access/vcd/cdrom.h
 modules/access/vcd/cdrom_internals.h
@@ -269,6 +261,15 @@ modules/access/vcdx/vcdplayer.c
 modules/access/vcdx/vcdplayer.h
 modules/access/videodev2.h
 modules/access/videodev_mjpeg.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
@@ -430,7 +431,6 @@ modules/demux/playlist/b4s.c
 modules/demux/playlist/dvb.c
 modules/demux/playlist/gvp.c
 modules/demux/playlist/m3u.c
-modules/demux/playlist/old.c
 modules/demux/playlist/playlist.c
 modules/demux/playlist/playlist.h
 modules/demux/playlist/pls.c
@@ -477,10 +477,10 @@ modules/gui/beos/TransportButton.cpp
 modules/gui/beos/TransportButton.h
 modules/gui/beos/VideoOutput.cpp
 modules/gui/beos/VideoWindow.h
-modules/gui/macosx/about.h
-modules/gui/macosx/about.m
 modules/gui/macosx/AppleRemote.h
 modules/gui/macosx/AppleRemote.m
+modules/gui/macosx/about.h
+modules/gui/macosx/about.m
 modules/gui/macosx/applescript.h
 modules/gui/macosx/applescript.m
 modules/gui/macosx/bookmarks.h
@@ -493,6 +493,8 @@ modules/gui/macosx/equalizer.h
 modules/gui/macosx/equalizer.m
 modules/gui/macosx/extended.h
 modules/gui/macosx/extended.m
+modules/gui/macosx/fspanel.h
+modules/gui/macosx/fspanel.m
 modules/gui/macosx/interaction.h
 modules/gui/macosx/interaction.m
 modules/gui/macosx/intf.h
@@ -505,9 +507,9 @@ 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
@@ -516,17 +518,17 @@ modules/gui/macosx/sfilters.h
 modules/gui/macosx/sfilters.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
@@ -534,6 +536,8 @@ modules/gui/pda/pda_support.h
 modules/gui/qnx/aout.c
 modules/gui/qnx/qnx.c
 modules/gui/qnx/vout.c
+modules/gui/qt4/components/equalizer.cpp
+modules/gui/qt4/components/equalizer.hpp
 modules/gui/qt4/components/infopanels.cpp
 modules/gui/qt4/components/infopanels.hpp
 modules/gui/qt4/components/open.cpp
@@ -560,10 +564,10 @@ modules/gui/qt4/dialogs/playlist.cpp
 modules/gui/qt4/dialogs/playlist.hpp
 modules/gui/qt4/dialogs/prefs_dialog.cpp
 modules/gui/qt4/dialogs/prefs_dialog.hpp
-modules/gui/qt4/dialogs_provider.cpp
-modules/gui/qt4/dialogs_provider.hpp
 modules/gui/qt4/dialogs/streaminfo.cpp
 modules/gui/qt4/dialogs/streaminfo.hpp
+modules/gui/qt4/dialogs_provider.cpp
+modules/gui/qt4/dialogs_provider.hpp
 modules/gui/qt4/input_manager.cpp
 modules/gui/qt4/input_manager.hpp
 modules/gui/qt4/main_interface.cpp
@@ -574,6 +578,17 @@ modules/gui/qt4/playlist_model.cpp
 modules/gui/qt4/playlist_model.hpp
 modules/gui/qt4/qt4.cpp
 modules/gui/qt4/qt4.hpp
+modules/gui/qt4/ui/equalizer.ui
+modules/gui/qt4/ui/file_open.ui
+modules/gui/qt4/ui/input_stats.ui
+modules/gui/qt4/ui/main_interface.ui
+modules/gui/qt4/ui/sprefs_audio.ui
+modules/gui/qt4/ui/sprefs_interface.ui
+modules/gui/qt4/ui/sprefs_playlist.ui
+modules/gui/qt4/ui/sprefs_subtitles.ui
+modules/gui/qt4/ui/sprefs_trivial.ui
+modules/gui/qt4/ui/sprefs_video.ui
+modules/gui/qt4/ui/streampanel.ui
 modules/gui/qt4/util/customwidgets.cpp
 modules/gui/qt4/util/customwidgets.hpp
 modules/gui/qt4/util/directslider.hpp
@@ -677,8 +692,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
@@ -761,7 +776,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
@@ -770,6 +784,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/playtree.cpp
@@ -828,9 +843,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/infopanels.cpp
@@ -884,6 +899,7 @@ modules/gui/wxwidgets/video.cpp
 modules/gui/wxwidgets/video.hpp
 modules/gui/wxwidgets/wxwidgets.cpp
 modules/gui/wxwidgets/wxwidgets.hpp
+modules/misc/audioscrobbler.c
 modules/misc/dummy/aout.c
 modules/misc/dummy/decoder.c
 modules/misc/dummy/dummy.c
@@ -895,16 +911,17 @@ modules/misc/dummy/renderer.c
 modules/misc/dummy/vout.c
 modules/misc/freetype.c
 modules/misc/gnutls.c
-modules/misc/growl.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/msn.c
+modules/misc/memcpy/memcpyaltivec.c
 modules/misc/network/ipv4.c
 modules/misc/network/ipv6.c
-modules/misc/notify.c
+modules/misc/notify/growl.c
+modules/misc/notify/msn.c
+modules/misc/notify/notify.c
+modules/misc/notify/xosd.c
 modules/misc/playlist/export.c
 modules/misc/playlist/m3u.c
 modules/misc/playlist/old.c
@@ -972,11 +989,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
@@ -1012,13 +1029,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
@@ -1051,6 +1068,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
@@ -1085,8 +1104,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
@@ -1112,4 +1129,3 @@ modules/visualization/visual/fft.c
 modules/visualization/visual/fft.h
 modules/visualization/visual/visual.c
 modules/visualization/visual/visual.h
-modules/visualization/xosd.c