Localized the stings inside the .ui and update the po files.

Makefile.am

@@ -931,8 +931,9 @@ update-po:
 	    | sort ; \
 	  echo "" ; \
 	  echo "# modules" ; \
-	  find modules -name '*.[chm]' -o -name '*.[ch]pp' \
+	  find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui'\
 	    | grep -v '\(\.moc\.\|gui/gtk2/\)' \
+	    | grep -vE 'qt4/ui/.*.h' \
 	    | sort ; \
 	} > $(top_srcdir)/po/POTFILES.in
 	rm -f $(top_srcdir)/po/vlc.pot

modules/gui/qt4/Modules.am

@@ -72,6 +72,7 @@ $(UIH): %.h: %.ui
 	rm -f $@
 	echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@
 	$(UIC) -tr "Q_" $< >> $@
+	sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@
 
 
 SOURCES_qt4 = 	qt4.cpp \

modules/gui/qt4/ui/file_open.ui

@@ -13,7 +13,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Form</string>
+   <string>_("Form")</string>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
@@ -33,7 +33,7 @@
      <item>
       <widget class="QLabel" name="label" >
        <property name="text" >
-        <string>File</string>
+        <string>_("File")</string>
        </property>
       </widget>
      </item>
@@ -43,7 +43,7 @@
      <item>
       <widget class="QPushButton" name="browseButton" >
        <property name="text" >
-        <string>Browse</string>
+        <string>_("Browse")</string>
        </property>
       </widget>
      </item>
@@ -52,7 +52,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Subtitles file</string>
+      <string>_("Subtitles file")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -75,7 +75,7 @@
         <item>
          <widget class="QLabel" name="label_2" >
           <property name="text" >
-           <string>File</string>
+           <string>_("File")</string>
           </property>
          </widget>
         </item>
@@ -85,7 +85,7 @@
         <item>
          <widget class="QPushButton" name="subbrowseButon" >
           <property name="text" >
-           <string>Browse</string>
+           <string>_("Browse")</string>
           </property>
          </widget>
         </item>
@@ -94,7 +94,7 @@
       <item>
        <widget class="QGroupBox" name="groupBox_2" >
         <property name="title" >
-         <string>Advanced options</string>
+         <string>_("Advanced options")</string>
         </property>
         <layout class="QHBoxLayout" >
          <property name="margin" >
@@ -114,7 +114,7 @@
            <item row="1" column="0" >
             <widget class="QLabel" name="label_5" >
              <property name="text" >
-              <string>FPS</string>
+              <string>_("FPS")</string>
              </property>
             </widget>
            </item>
@@ -127,7 +127,7 @@
            <item row="1" column="2" >
             <widget class="QLabel" name="label_6" >
              <property name="text" >
-              <string>Delay</string>
+              <string>_("Delay")</string>
              </property>
             </widget>
            </item>
@@ -137,14 +137,14 @@
            <item row="0" column="0" >
             <widget class="QLabel" name="label_3" >
              <property name="text" >
-              <string>Font size</string>
+              <string>_("Font size")</string>
              </property>
             </widget>
            </item>
            <item row="0" column="2" >
             <widget class="QLabel" name="label_4" >
              <property name="text" >
-              <string>Justification</string>
+              <string>_("Justification")</string>
              </property>
             </widget>
            </item>
@@ -154,7 +154,7 @@
            <item row="2" column="0" >
             <widget class="QLabel" name="label_7" >
              <property name="text" >
-              <string>Encoding</string>
+              <string>_("Encoding")</string>
              </property>
             </widget>
            </item>

modules/gui/qt4/ui/input_stats.ui

@@ -13,7 +13,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Form</string>
+   <string>_("Form")</string>
   </property>
   <widget class="QGroupBox" name="groupBox_3" >
    <property name="geometry" >
@@ -25,7 +25,7 @@
     </rect>
    </property>
    <property name="title" >
-    <string>Streaming</string>
+    <string>_("Streaming")</string>
    </property>
    <layout class="QGridLayout" >
     <property name="margin" >
@@ -67,21 +67,21 @@
     <item row="2" column="0" >
      <widget class="QLabel" name="label_13" >
       <property name="text" >
-       <string>Send bitrate</string>
+       <string>_("Send bitrate")</string>
       </property>
      </widget>
     </item>
     <item row="1" column="0" >
      <widget class="QLabel" name="label_12" >
       <property name="text" >
-       <string>Sent bytes</string>
+       <string>_("Sent bytes")</string>
       </property>
      </widget>
     </item>
     <item row="0" column="0" >
      <widget class="QLabel" name="label_11" >
       <property name="text" >
-       <string>Sent packets</string>
+       <string>_("Sent packets")</string>
       </property>
      </widget>
     </item>
@@ -97,7 +97,7 @@
     </rect>
    </property>
    <property name="title" >
-    <string>Audio</string>
+    <string>_("Audio")</string>
    </property>
    <layout class="QGridLayout" >
     <property name="margin" >
@@ -139,21 +139,21 @@
     <item row="2" column="0" >
      <widget class="QLabel" name="label_10" >
       <property name="text" >
-       <string>Lost buffers</string>
+       <string>_("Lost buffers")</string>
       </property>
      </widget>
     </item>
     <item row="1" column="0" >
      <widget class="QLabel" name="label_9" >
       <property name="text" >
-       <string>Played buffers</string>
+       <string>_("Played buffers")</string>
       </property>
      </widget>
     </item>
     <item row="0" column="0" >
      <widget class="QLabel" name="label_8" >
       <property name="text" >
-       <string>Decoded blocks</string>
+       <string>_("Decoded blocks")</string>
       </property>
      </widget>
     </item>
@@ -169,7 +169,7 @@
     </rect>
    </property>
    <property name="title" >
-    <string>Video</string>
+    <string>_("Video")</string>
    </property>
    <layout class="QGridLayout" >
     <property name="margin" >
@@ -181,7 +181,7 @@
     <item row="2" column="0" >
      <widget class="QLabel" name="label_6" >
       <property name="text" >
-       <string>Lost frames</string>
+       <string>_("Lost frames")</string>
       </property>
      </widget>
     </item>
@@ -198,14 +198,14 @@
     <item row="1" column="0" >
      <widget class="QLabel" name="label_4" >
       <property name="text" >
-       <string>Displayed frames</string>
+       <string>_("Displayed frames")</string>
       </property>
      </widget>
     </item>
     <item row="0" column="0" >
      <widget class="QLabel" name="label_2" >
       <property name="text" >
-       <string>Decoded blocks</string>
+       <string>_("Decoded blocks")</string>
       </property>
      </widget>
     </item>
@@ -241,7 +241,7 @@
     </rect>
    </property>
    <property name="title" >
-    <string>Input</string>
+    <string>_("Input")</string>
    </property>
    <layout class="QGridLayout" >
     <property name="margin" >
@@ -283,28 +283,28 @@
     <item row="1" column="0" >
      <widget class="QLabel" name="label_5" >
       <property name="text" >
-       <string>Input bitrate</string>
+       <string>_("Input bitrate")</string>
       </property>
      </widget>
     </item>
     <item row="0" column="0" >
      <widget class="QLabel" name="label" >
       <property name="text" >
-       <string>Read at media</string>
+       <string>_("Read at media")</string>
       </property>
      </widget>
     </item>
     <item row="3" column="0" >
      <widget class="QLabel" name="label_3" >
       <property name="text" >
-       <string>Stream bitrate</string>
+       <string>_("Stream bitrate")</string>
       </property>
      </widget>
     </item>
     <item row="2" column="0" >
      <widget class="QLabel" name="label_7" >
       <property name="text" >
-       <string>Demuxed</string>
+       <string>_("Demuxed")</string>
       </property>
      </widget>
     </item>

modules/gui/qt4/ui/inputdialog.ui

@@ -53,14 +53,14 @@
      <item>
       <widget class="QPushButton" name="okButton" >
        <property name="text" >
-        <string>OK</string>
+        <string>_("OK")</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="cancelButton" >
        <property name="text" >
-        <string>Cancel</string>
+        <string>_("Cancel")</string>
        </property>
       </widget>
      </item>

modules/gui/qt4/ui/logindialog.ui

@@ -30,7 +30,7 @@
      <item row="1" column="0" >
       <widget class="QLabel" name="label" >
        <property name="text" >
-        <string>Login</string>
+        <string>_("Login")</string>
        </property>
       </widget>
      </item>
@@ -40,7 +40,7 @@
      <item row="2" column="0" >
       <widget class="QLabel" name="label_2" >
        <property name="text" >
-        <string>Password</string>
+        <string>_("Password")</string>
        </property>
       </widget>
      </item>
@@ -80,14 +80,14 @@
      <item>
       <widget class="QPushButton" name="okButton" >
        <property name="text" >
-        <string>OK</string>
+        <string>_("OK")</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="cancelButton" >
        <property name="text" >
-        <string>Cancel</string>
+        <string>_("Cancel")</string>
        </property>
       </widget>
      </item>

modules/gui/qt4/ui/main_interface.ui

@@ -21,7 +21,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle" >
-   <string>VLC media player</string>
+   <string>_("VLC media player")</string>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
@@ -219,7 +219,7 @@
      <item>
       <widget class="QPushButton" name="playlistButton" >
        <property name="text" >
-        <string>Playlist</string>
+        <string>_("Playlist")</string>
        </property>
       </widget>
      </item>

modules/gui/qt4/ui/okcanceldialog.ui

@@ -50,14 +50,14 @@
      <item>
       <widget class="QPushButton" name="okButton" >
        <property name="text" >
-        <string>OK</string>
+        <string>_("OK")</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="cancelButton" >
        <property name="text" >
-        <string>Cancel</string>
+        <string>_("Cancel")</string>
        </property>
       </widget>
      </item>

modules/gui/qt4/ui/progressdialog.ui

@@ -63,7 +63,7 @@
      <item>
       <widget class="QPushButton" name="cancelButton" >
        <property name="text" >
-        <string>Cancel</string>
+        <string>_("Cancel")</string>
        </property>
       </widget>
      </item>

modules/gui/qt4/ui/yesnocanceldialog.ui

@@ -50,21 +50,21 @@
      <item>
       <widget class="QPushButton" name="yesButton" >
        <property name="text" >
-        <string>Yes</string>
+        <string>_("Yes")</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="noButton" >
        <property name="text" >
-        <string>No</string>
+        <string>_("No")</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="cancelButton" >
        <property name="text" >
-        <string>Cancel</string>
+        <string>_("Cancel")</string>
        </property>
       </widget>
      </item>

po/POTFILES.in

@@ -23,26 +23,18 @@ 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.h
 include/vlc_config_cat.h
+include/vlc_config.h
 include/vlc_cpu.h
+include/vlc/decoder.h
 include/vlc_demux.h
 include/vlc_devices.h
 include/vlc_error.h
@@ -52,26 +44,34 @@ 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/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_strings.h
-include/vlc_threads.h
 include/vlc_threads_funcs.h
+include/vlc_threads.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
@@ -94,9 +94,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
@@ -180,9 +180,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
@@ -195,16 +195,18 @@ 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
@@ -218,11 +220,18 @@ 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
@@ -255,15 +264,6 @@ 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
@@ -470,10 +470,10 @@ modules/gui/beos/TransportButton.cpp
 modules/gui/beos/TransportButton.h
 modules/gui/beos/VideoOutput.cpp
 modules/gui/beos/VideoWindow.h
-modules/gui/macosx/AppleRemote.h
-modules/gui/macosx/AppleRemote.m
 modules/gui/macosx/about.h
 modules/gui/macosx/about.m
+modules/gui/macosx/AppleRemote.h
+modules/gui/macosx/AppleRemote.m
 modules/gui/macosx/applescript.h
 modules/gui/macosx/applescript.m
 modules/gui/macosx/bookmarks.h
@@ -498,9 +498,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
@@ -509,17 +509,18 @@ 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/opie/opie.ui
 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
@@ -547,10 +548,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/streaminfo.cpp
-modules/gui/qt4/dialogs/streaminfo.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/input_manager.cpp
 modules/gui/qt4/input_manager.hpp
 modules/gui/qt4/main_interface.cpp
@@ -561,7 +562,15 @@ 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/input_stats.h
+modules/gui/qt4/resources.cpp
+modules/gui/qt4/ui/file_open.ui
+modules/gui/qt4/ui/inputdialog.ui
+modules/gui/qt4/ui/input_stats.ui
+modules/gui/qt4/ui/logindialog.ui
+modules/gui/qt4/ui/main_interface.ui
+modules/gui/qt4/ui/okcanceldialog.ui
+modules/gui/qt4/ui/progressdialog.ui
+modules/gui/qt4/ui/yesnocanceldialog.ui
 modules/gui/qt4/util/directslider.hpp
 modules/gui/qt4/util/input_slider.cpp
 modules/gui/qt4/util/input_slider.hpp
@@ -663,8 +672,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
@@ -747,6 +756,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
@@ -755,7 +765,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/equalizer.cpp
 modules/gui/skins2/vars/equalizer.hpp
 modules/gui/skins2/vars/playtree.cpp
@@ -814,9 +823,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
@@ -885,8 +894,8 @@ modules/misc/growl.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/msn.c
 modules/misc/network/ipv4.c
 modules/misc/network/ipv6.c
@@ -957,11 +966,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