All: Qt4 intf i18n fix (part 1)

diff --git a/configure.ac b/configure.ac
index 3d33cc4a6c962ebff9e2705d18342c46eefdb0e5..145e823545cc46faea1859441959cb407fa7dc9e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -363,7 +363,6 @@ AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
   ])
 ])
 AC_SUBST(INCLUDED_LIBINTL)
-XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS" 
 
 dnl
 dnl Iconv stuff

diff --git a/modules/gui/qt4/components/infopanels.cpp b/modules/gui/qt4/components/infopanels.cpp
index 5e7c2516bac63f8656178bbb1961f2018f4ea220..7c231f65c4316a3b7ab2ff323c00b8558a32ac0a 100644 (file)
--- a/modules/gui/qt4/components/infopanels.cpp
+++ b/modules/gui/qt4/components/infopanels.cpp
@@ -44,12 +44,12 @@ MetaPanel::MetaPanel( QWidget *parent, intf_thread_t *_p_intf ) :
     int line = 0;
     QGridLayout *l = new QGridLayout( this );
 #define ADD_META( string, widget ) {                            \
-    l->addWidget( new QLabel( qfu( string ) ), line, 0 );       \
+    l->addWidget( new QLabel( qtr( string ) ), line, 0 );       \
     widget = new QLabel( "" );                                  \
     l->addWidget( widget, line, 1 );                            \
     line++;            }
-    ADD_META( _( "Name" ), name_text );
-    ADD_META( _( "URI" ), uri_text );
+    ADD_META( qtr( "Name" ), name_text );
+    ADD_META( qtr( "URI" ), uri_text );
     ADD_META( VLC_META_ARTIST, artist_text );
     ADD_META( VLC_META_GENRE, genre_text );
     ADD_META( VLC_META_COPYRIGHT, copyright_text );

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index c1684fea9b6242fdd2ca0179a9524c7f4241a1a7..89d2e2b748ac3ff4276615effc68a5f3237a8ee8 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -63,10 +63,10 @@ void PlaylistDialog::createPlMenuBar( QMenuBar *bar, intf_thread_t *p_intf )
 {
     QMenu *manageMenu = new QMenu();
     manageMenu->setTitle( qtr("Manage") );
-    manageMenu->addAction( "Open playlist file", THEDP, SLOT( openPlaylist() ),
+    manageMenu->addAction( qtr("Open playlist file"), THEDP, SLOT( openPlaylist() ),
             qtr( "Ctrl+L") );
     manageMenu->addSeparator();
-    manageMenu->addAction( "Dock playlist", this, SLOT( dock() ), 
+    manageMenu->addAction( qtr("Dock playlist"), this, SLOT( dock() ), 
             qtr( "Ctrl+U" ) );
     bar->addMenu( manageMenu );
     bar->addMenu( QVLCMenu::SDMenu( p_intf ) );

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index d1a7f2ceec27b4218f63103477cb05cdc29326fa..8db41cceb13b10bafc10ef9b26b9e53ed16de91b 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -281,7 +281,7 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
     {
         menu->addSeparator();
         menu->addAction( qtr("Switch to skins"), THEDP, SLOT(switchToSkins()),
-                qtr("Ctrl+Z") );
+                "Ctrl+Z" );
     }
 
     CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );

diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index 6eb15d3ab775792770d3176bec3931f972fd06f7..f77ec74b40cff6009cc3e37382c5430743728b5a 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -23,7 +23,7 @@
    <item>
     <widget class="QCheckBox" name="enableAudio" >
      <property name="text" >
-      <string>Enable audio</string>
+      <string>_("Enable audio")</string>
      </property>
      <property name="checked" >
       <bool>true</bool>
@@ -33,7 +33,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
-      <string>General Audio</string>
+      <string>_("General Audio")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -45,7 +45,7 @@
       <item row="2" column="0" >
        <widget class="QLabel" name="label_8" >
         <property name="text" >
-         <string>Force detection of Dolby Surround</string>
+         <string>_("Force detection of Dolby Surround")</string>
         </property>
        </widget>
       </item>
@@ -73,14 +73,14 @@
       <item row="1" column="0" colspan="2" >
        <widget class="QCheckBox" name="spdifBox" >
         <property name="text" >
-         <string>Use S/PDIF when available</string>
+         <string>_("Use S/PDIF when available")</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0" >
        <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>Preferred audio language</string>
+         <string>_("Preferred audio language")</string>
         </property>
        </widget>
       </item>
@@ -108,7 +108,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_2" >
         <property name="text" >
-         <string>Default volume</string>
+         <string>_("Default volume")</string>
         </property>
        </widget>
       </item>
@@ -136,21 +136,21 @@
       <item row="4" column="2" >
        <widget class="QPushButton" name="fileBrowseButton" >
         <property name="text" >
-         <string>Browse...</string>
+         <string>_("Browse...")</string>
         </property>
        </widget>
       </item>
       <item row="4" column="0" >
        <widget class="QLabel" name="label_7" >
         <property name="text" >
-         <string>File</string>
+         <string>_("File")</string>
         </property>
        </widget>
       </item>
       <item row="3" column="2" >
        <widget class="QPushButton" name="OSSBrowse" >
         <property name="text" >
-         <string>Browse...</string>
+         <string>_("Browse...")</string>
         </property>
        </widget>
       </item>
@@ -160,14 +160,14 @@
       <item row="3" column="0" >
        <widget class="QLabel" name="OSSLabel" >
         <property name="text" >
-         <string>OSS Device</string>
+         <string>_("OSS Device")</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0" >
        <widget class="QLabel" name="DirectXLabel" >
         <property name="text" >
-         <string>DirectX Device</string>
+         <string>_("DirectX Device")</string>
         </property>
        </widget>
       </item>
@@ -177,7 +177,7 @@
       <item row="1" column="0" >
        <widget class="QLabel" name="alsaLabel" >
         <property name="text" >
-         <string>Alsa Device</string>
+         <string>_("Alsa Device")</string>
         </property>
        </widget>
       </item>
@@ -190,7 +190,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>Type</string>
+         <string>_("Type")</string>
         </property>
        </widget>
       </item>
@@ -200,7 +200,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Effects</string>
+      <string>_("Effects")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -215,21 +215,21 @@
       <item row="0" column="0" >
        <widget class="QCheckBox" name="headphoneEffect" >
         <property name="text" >
-         <string>Headphone surround effect</string>
+         <string>_("Headphone surround effect")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QCheckBox" name="volumeNormalizer" >
         <property name="text" >
-         <string>Volume normalizer</string>
+         <string>_("Volume normalizer")</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0" >
        <widget class="QLabel" name="label_5" >
         <property name="text" >
-         <string>Visualisation</string>
+         <string>_("Visualisation")</string>
         </property>
        </widget>
       </item>

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index 67a2f66cfc6170c12dd6ba14b04f520cb78bbe91..5ceb626c3dcbfb21e663f79e35a357d2a7c68bfa 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -23,7 +23,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Disk Devices</string>
+      <string>_("Disk Devices")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -35,7 +35,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>Disk Device</string>
+         <string>_("Disk Device")</string>
         </property>
        </widget>
       </item>
@@ -45,7 +45,7 @@
       <item row="0" column="2" >
        <widget class="QPushButton" name="DVDBrowse" >
         <property name="text" >
-         <string>Browse...</string>
+         <string>_("Browse...")</string>
         </property>
        </widget>
       </item>
@@ -55,7 +55,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
-      <string>Network</string>
+      <string>_("Network")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -67,14 +67,14 @@
       <item row="2" column="0" colspan="2" >
        <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>Default Network caching in ms</string>
+         <string>_("Default Network caching in ms")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="label_7" >
         <property name="text" >
-         <string>HTTP Proxy</string>
+         <string>_("HTTP Proxy")</string>
         </property>
        </widget>
       </item>
@@ -113,7 +113,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>Server Default Port</string>
+         <string>_("Server Default Port")</string>
         </property>
        </widget>
       </item>
@@ -123,7 +123,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
-      <string>Codecs / Muxers</string>
+      <string>_("Codecs / Muxers")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -135,7 +135,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_5" >
         <property name="text" >
-         <string>Post-Processing Quality</string>
+         <string>_("Post-Processing Quality")</string>
         </property>
        </widget>
       </item>
@@ -158,7 +158,7 @@
       <item row="1" column="0" >
        <widget class="QLabel" name="label_6" >
         <property name="text" >
-         <string>Repair AVI files</string>
+         <string>_("Repair AVI files")</string>
         </property>
        </widget>
       </item>
@@ -168,14 +168,14 @@
       <item row="3" column="0" colspan="2" >
        <widget class="QCheckBox" name="systemCodecBox" >
         <property name="text" >
-         <string>Use system codecs if available (better quality)</string>
+         <string>_("Use system codecs if available (better quality)")</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0" colspan="2" >
        <widget class="QCheckBox" name="RTSP_TCPBox" >
         <property name="text" >
-         <string>Use RTP over RTSP (TCP)</string>
+         <string>_("Use RTP over RTSP (TCP)")</string>
         </property>
        </widget>
       </item>
@@ -185,7 +185,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_4" >
      <property name="title" >
-      <string>Access Filter</string>
+      <string>_("Access Filter")</string>
      </property>
      <layout class="QHBoxLayout" >
       <property name="margin" >
@@ -197,21 +197,21 @@
       <item>
        <widget class="QCheckBox" name="timeshiftBox" >
         <property name="text" >
-         <string>Timeshift</string>
+         <string>_("Timeshift")</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="RecordBox" >
         <property name="text" >
-         <string>Record</string>
+         <string>_("Record")</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="DumpBox" >
         <property name="text" >
-         <string>Dump</string>
+         <string>_("Dump")</string>
         </property>
        </widget>
       </item>

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 720d12693d534833664bb15d7ab4faf1c40cda5d..a6f527ce03fb3d361dda28644034a09162b099f0 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -22,7 +22,7 @@
    <item row="1" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Default Interface</string>
+      <string>_("Default Interface")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -52,7 +52,7 @@
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="text" >
-         <string>This is VLC's skinnable interface. You can download skins at http://www.videolan.org/vlc/skins.php to customize your player.</string>
+         <string>_("This is VLC's skinnable interface. You can download skins at http://www.videolan.org/vlc/skins.php to customize your player.")</string>
         </property>
         <property name="alignment" >
          <set>Qt::AlignBottom|Qt::AlignJustify</set>
@@ -71,14 +71,14 @@
       <item row="4" column="2" >
        <widget class="QPushButton" name="skinBrowse" >
         <property name="text" >
-         <string>Browse...</string>
+         <string>_("Browse...")</string>
         </property>
        </widget>
       </item>
       <item row="4" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>Skin File</string>
+         <string>_("Skin File")</string>
         </property>
        </widget>
       </item>
@@ -91,7 +91,7 @@
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="text" >
-         <string>This is VLC's default interface, with a native look and feel.</string>
+         <string>_("This is VLC's default interface, with a native look and feel.")</string>
         </property>
         <property name="textFormat" >
          <enum>Qt::RichText</enum>
@@ -107,21 +107,21 @@
       <item row="0" column="0" >
        <widget class="QRadioButton" name="qt4" >
         <property name="text" >
-         <string>Default</string>
+         <string>_("Default")</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0" >
        <widget class="QRadioButton" name="skins" >
         <property name="text" >
-         <string>Skins</string>
+         <string>_("Skins")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1" colspan="2" >
        <widget class="QCheckBox" name="qtAlwaysVideo" >
         <property name="text" >
-         <string>Always display the video</string>
+         <string>_("Always display the video")</string>
         </property>
        </widget>
       </item>
@@ -134,14 +134,14 @@
    <item row="0" column="0" >
     <widget class="QLabel" name="languageLabel" >
      <property name="text" >
-      <string>Language</string>
+      <string>_("Language")</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0" colspan="2" >
     <widget class="QGroupBox" name="OneInterfaceBox" >
      <property name="title" >
-      <string>Instances</string>
+      <string>_("Instances")</string>
      </property>
      <layout class="QVBoxLayout" >
       <property name="margin" >
@@ -153,14 +153,14 @@
       <item>
        <widget class="QCheckBox" name="OneInterfaceMode" >
         <property name="text" >
-         <string>Allow only one instance</string>
+         <string>_("Allow only one instance")</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
         <property name="text" >
-         <string>Enqueue files in playlist when in one interface mode</string>
+         <string>_("Enqueue files in playlist when in one interface mode")</string>
         </property>
        </widget>
       </item>

diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui
index bfcfb46421e745f51161b458a2aac76567e505ec..99d794b133edd558a4be36fb1dafcfa044537fab 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_video.ui
+++ b/modules/gui/qt4/ui/sprefs_video.ui
@@ -23,7 +23,7 @@
    <item>
     <widget class="QCheckBox" name="enableVideo" >
      <property name="text" >
-      <string>Enable video</string>
+      <string>_("Enable video")</string>
      </property>
      <property name="checked" >
       <bool>true</bool>
@@ -33,7 +33,7 @@
    <item>
     <widget class="QGroupBox" name="displayBox" >
      <property name="title" >
-      <string>Display</string>
+      <string>_("Display")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -45,7 +45,7 @@
       <item row="1" column="2" >
        <widget class="QCheckBox" name="windowDecorations" >
         <property name="text" >
-         <string>Window decorations</string>
+         <string>_("Window decorations")</string>
         </property>
         <property name="checked" >
          <bool>true</bool>
@@ -58,14 +58,14 @@
       <item row="0" column="0" colspan="2" >
        <widget class="QCheckBox" name="fullscreen" >
         <property name="text" >
-         <string>Fullscreen</string>
+         <string>_("Fullscreen")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" colspan="2" >
        <widget class="QCheckBox" name="alwaysOnTop" >
         <property name="text" >
-         <string>Always on top</string>
+         <string>_("Always on top")</string>
         </property>
        </widget>
       </item>
@@ -75,14 +75,14 @@
       <item row="3" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>Output</string>
+         <string>_("Output")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="2" >
        <widget class="QCheckBox" name="overlay" >
         <property name="text" >
-         <string>Accelerated video output</string>
+         <string>_("Accelerated video output")</string>
         </property>
         <property name="checked" >
          <bool>true</bool>
@@ -95,7 +95,7 @@
       <item row="2" column="0" colspan="2" >
        <widget class="QCheckBox" name="skipFrames" >
         <property name="text" >
-         <string>Skip Frames</string>
+         <string>_("Skip Frames")</string>
         </property>
         <property name="checked" >
          <bool>true</bool>
@@ -105,7 +105,7 @@
       <item row="2" column="2" >
        <widget class="QCheckBox" name="overlay" >
         <property name="text" >
-         <string>Overlay</string>
+         <string>_("Overlay")</string>
         </property>
         <property name="checked" >
          <bool>true</bool>
@@ -118,7 +118,7 @@
    <item>
     <widget class="QGroupBox" name="directXBox" >
      <property name="title" >
-      <string>DirectX</string>
+      <string>_("DirectX")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -133,14 +133,14 @@
       <item row="1" column="0" >
        <widget class="QLabel" name="label_5" >
         <property name="text" >
-         <string>Display Device</string>
+         <string>_("Display Device")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" colspan="2" >
        <widget class="QCheckBox" name="wallpaperMode" >
         <property name="text" >
-         <string>Enable Wallpaper Mode</string>
+         <string>_("Enable Wallpaper Mode")</string>
         </property>
        </widget>
       </item>
@@ -150,7 +150,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Video snapshots</string>
+      <string>_("Video snapshots")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -165,21 +165,21 @@
       <item row="0" column="3" >
        <widget class="QPushButton" name="snapshotsDirectoryBrowse" >
         <property name="text" >
-         <string>Browse...</string>
+         <string>_("Browse...")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>Directory</string>
+         <string>_("Directory")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="label_2" >
         <property name="text" >
-         <string>Prefix</string>
+         <string>_("Prefix")</string>
         </property>
        </widget>
       </item>
@@ -193,7 +193,7 @@
       <item row="2" column="0" >
        <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>Format</string>
+         <string>_("Format")</string>
         </property>
        </widget>
       </item>
@@ -203,7 +203,7 @@
       <item row="1" column="2" colspan="2" >
        <widget class="QCheckBox" name="snapshotsSequentialNumbering" >
         <property name="text" >
-         <string>Sequential numbering</string>
+         <string>_("Sequential numbering")</string>
         </property>
        </widget>
       </item>

diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui
index a1c9e1b7c83162656ab998acead57efe0c2d6ee1..e4c3940c77f2753d3d154c7f7b50fd2031b1f3ba 100644 (file)
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -22,14 +22,14 @@
    <item row="11" column="0" >
     <widget class="QCheckBox" name="invertEnable" >
      <property name="text" >
-      <string>Color invert</string>
+      <string>_("Color invert")</string>
      </property>
     </widget>
    </item>
    <item rowspan="4" row="7" column="0" >
     <widget class="QGroupBox" name="colorthresEnable" >
      <property name="title" >
-      <string>Color threshold</string>
+      <string>_("Color threshold")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -47,7 +47,7 @@
       <item row="4" column="0" >
        <widget class="QLabel" name="label_14" >
         <property name="text" >
-         <string>Similarity</string>
+         <string>_("Similarity")</string>
         </property>
        </widget>
       </item>
@@ -68,7 +68,7 @@
       <item row="3" column="0" >
        <widget class="QLabel" name="label_13" >
         <property name="text" >
-         <string>Saturation</string>
+         <string>_("Saturation")</string>
         </property>
        </widget>
       </item>
@@ -120,7 +120,7 @@
    <item rowspan="3" row="9" column="2" colspan="3" >
     <widget class="QGroupBox" name="advancedVideoFilterBox" >
      <property name="title" >
-      <string>Advanced video filter controls</string>
+      <string>_("Advanced video filter controls")</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -138,35 +138,35 @@
       <item row="3" column="0" colspan="2" >
        <widget class="QPushButton" name="filtersResetButton" >
         <property name="text" >
-         <string>Reset</string>
+         <string>_("Reset")</string>
         </property>
        </widget>
       </item>
       <item row="3" column="2" >
        <widget class="QPushButton" name="filtersUpdateButton" >
         <property name="text" >
-         <string>Update</string>
+         <string>_("Update")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="label_33" >
         <property name="text" >
-         <string>Video filters</string>
+         <string>_("Video filters")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="label_32" >
         <property name="text" >
-         <string>Vout filters</string>
+         <string>_("Vout filters")</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0" >
        <widget class="QLabel" name="label_34" >
         <property name="text" >
-         <string>Subpicture filters</string>
+         <string>_("Subpicture filters")</string>
         </property>
        </widget>
       </item>
@@ -179,7 +179,7 @@
    <item rowspan="4" row="5" column="3" >
     <widget class="QGroupBox" name="eraseEnable" >
      <property name="title" >
-      <string>Logo erase</string>
+      <string>_("Logo erase")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -197,14 +197,14 @@
       <item row="1" column="0" >
        <widget class="QLabel" name="label_16" >
         <property name="text" >
-         <string>Top</string>
+         <string>_("Top")</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0" >
        <widget class="QLabel" name="label_17" >
         <property name="text" >
-         <string>Left</string>
+         <string>_("Left")</string>
         </property>
        </widget>
       </item>
@@ -220,7 +220,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_15" >
         <property name="text" >
-         <string>Mask</string>
+         <string>_("Mask")</string>
         </property>
        </widget>
       </item>
@@ -230,21 +230,21 @@
    <item row="9" column="1" >
     <widget class="QCheckBox" name="rippleEnable" >
      <property name="text" >
-      <string>Water effect</string>
+      <string>_("Water effect")</string>
      </property>
     </widget>
    </item>
    <item row="10" column="1" >
     <widget class="QCheckBox" name="waveEnable" >
      <property name="text" >
-      <string>Waves</string>
+      <string>_("Waves")</string>
      </property>
     </widget>
    </item>
    <item rowspan="6" row="2" column="4" >
     <widget class="QGroupBox" name="logoEnable" >
      <property name="title" >
-      <string>Add logo</string>
+      <string>_("Add logo")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -262,21 +262,21 @@
       <item row="3" column="0" >
        <widget class="QLabel" name="label_22" >
         <property name="text" >
-         <string>Transparency</string>
+         <string>_("Transparency")</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0" colspan="2" >
        <widget class="QLabel" name="label_21" >
         <property name="text" >
-         <string>Left</string>
+         <string>_("Left")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" colspan="2" >
        <widget class="QLabel" name="label_20" >
         <property name="text" >
-         <string>Top</string>
+         <string>_("Top")</string>
         </property>
        </widget>
       </item>
@@ -296,7 +296,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_19" >
         <property name="text" >
-         <string>Logo</string>
+         <string>_("Logo")</string>
         </property>
        </widget>
       </item>
@@ -309,14 +309,14 @@
    <item row="8" column="2" >
     <widget class="QCheckBox" name="magnifyEnable" >
      <property name="text" >
-      <string>Magnification</string>
+      <string>_("Magnification")</string>
      </property>
     </widget>
    </item>
    <item rowspan="2" row="0" column="4" >
     <widget class="QGroupBox" name="marqEnable" >
      <property name="title" >
-      <string>Add text</string>
+      <string>_("Add text")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -334,14 +334,14 @@
       <item row="1" column="0" >
        <widget class="QLabel" name="label_24" >
         <property name="text" >
-         <string>Position</string>
+         <string>_("Position")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="label_23" >
         <property name="text" >
-         <string>Text</string>
+         <string>_("Text")</string>
         </property>
        </widget>
       </item>
@@ -357,7 +357,7 @@
    <item row="0" column="3" >
     <widget class="QGroupBox" name="cloneEnable" >
      <property name="title" >
-      <string>Clone</string>
+      <string>_("Clone")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -375,7 +375,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_9" >
         <property name="text" >
-         <string>Number of clones</string>
+         <string>_("Number of clones")</string>
         </property>
        </widget>
       </item>
@@ -395,7 +395,7 @@
    <item rowspan="4" row="1" column="3" >
     <widget class="QGroupBox" name="wallEnable" >
      <property name="title" >
-      <string>Wall</string>
+      <string>_("Wall")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -413,14 +413,14 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_31" >
         <property name="text" >
-         <string>Rows</string>
+         <string>_("Rows")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="label_30" >
         <property name="text" >
-         <string>Columns</string>
+         <string>_("Columns")</string>
         </property>
        </widget>
       </item>
@@ -450,7 +450,7 @@
    <item rowspan="3" row="5" column="2" >
     <widget class="QGroupBox" name="puzzleEnable" >
      <property name="title" >
-      <string>Puzzle game</string>
+      <string>_("Puzzle game")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -488,21 +488,21 @@
       <item row="2" column="0" colspan="2" >
        <widget class="QCheckBox" name="puzzleBlackSlotCheck" >
         <property name="text" >
-         <string>Black slot</string>
+         <string>_("Black slot")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="label_26" >
         <property name="text" >
-         <string>Columns</string>
+         <string>_("Columns")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="label_27" >
         <property name="text" >
-         <string>Rows</string>
+         <string>_("Rows")</string>
         </property>
        </widget>
       </item>
@@ -512,7 +512,7 @@
    <item rowspan="4" row="1" column="2" >
     <widget class="QGroupBox" name="rotateEnable" >
      <property name="title" >
-      <string>Rotate</string>
+      <string>_("Rotate")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -543,7 +543,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_28" >
         <property name="text" >
-         <string>Angle</string>
+         <string>_("Angle")</string>
         </property>
        </widget>
       </item>
@@ -553,7 +553,7 @@
    <item row="0" column="2" >
     <widget class="QGroupBox" name="transformEnable" >
      <property name="title" >
-      <string>Transform</string>
+      <string>_("Transform")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -577,7 +577,7 @@
    <item rowspan="2" row="0" column="1" >
     <widget class="QGroupBox" name="gradientEnable" >
      <property name="title" >
-      <string>Gradient</string>
+      <string>_("Gradient")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -595,21 +595,21 @@
       <item row="2" column="0" colspan="2" >
        <widget class="QCheckBox" name="gradientCartoonCheck" >
         <property name="text" >
-         <string>Cartoon</string>
+         <string>_("Cartoon")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" colspan="2" >
        <widget class="QCheckBox" name="gradientTypeCheck" >
         <property name="text" >
-         <string>Color</string>
+         <string>_("Color")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="label_18" >
         <property name="text" >
-         <string>Mode</string>
+         <string>_("Mode")</string>
         </property>
        </widget>
       </item>
@@ -622,14 +622,14 @@
    <item row="5" column="1" >
     <widget class="QCheckBox" name="noiseEnable" >
      <property name="text" >
-      <string>Noise</string>
+      <string>_("Noise")</string>
      </property>
     </widget>
    </item>
    <item row="4" column="1" >
     <widget class="QCheckBox" name="motiondetectEnable" >
      <property name="text" >
-      <string>Motion detect</string>
+      <string>_("Motion detect")</string>
      </property>
     </widget>
    </item>
@@ -639,7 +639,7 @@
       <bool>true</bool>
      </property>
      <property name="title" >
-      <string>Image adjust</string>
+      <string>_("Image adjust")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -719,42 +719,42 @@
       <item row="4" column="0" >
        <widget class="QLabel" name="label_5" >
         <property name="text" >
-         <string>Gamma</string>
+         <string>_("Gamma")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="label_2" >
         <property name="text" >
-         <string>Contrast</string>
+         <string>_("Contrast")</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0" >
        <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>Brightness</string>
+         <string>_("Brightness")</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>Saturation</string>
+         <string>_("Saturation")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>Hue</string>
+         <string>_("Hue")</string>
         </property>
        </widget>
       </item>
       <item row="5" column="1" >
        <widget class="QCheckBox" name="brightnessThresholdCheck" >
         <property name="text" >
-         <string>Brightness threshold</string>
+         <string>_("Brightness threshold")</string>
         </property>
        </widget>
       </item>
@@ -764,7 +764,7 @@
    <item rowspan="4" row="3" column="0" >
     <widget class="QGroupBox" name="extractEnable" >
      <property name="title" >
-      <string>Color extraction</string>
+      <string>_("Color extraction")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -803,21 +803,21 @@
       <item row="2" column="0" >
        <widget class="QLabel" name="label_8" >
         <property name="text" >
-         <string>Blue</string>
+         <string>_("Blue")</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="label_7" >
         <property name="text" >
-         <string>Green</string>
+         <string>_("Green")</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="label_6" >
         <property name="text" >
-         <string>Red</string>
+         <string>_("Red")</string>
         </property>
        </widget>
       </item>
@@ -827,7 +827,7 @@
    <item rowspan="2" row="7" column="1" >
     <widget class="QGroupBox" name="sharpenEnable" >
      <property name="title" >
-      <string>Sharpen</string>
+      <string>_("Sharpen")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -845,7 +845,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_29" >
         <property name="text" >
-         <string>Sigma</string>
+         <string>_("Sigma")</string>
         </property>
        </widget>
       </item>
@@ -862,7 +862,7 @@
    <item rowspan="2" row="2" column="1" >
     <widget class="QGroupBox" name="blurEnable" >
      <property name="title" >
-      <string>Motion blur</string>
+      <string>_("Motion blur")</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
@@ -880,7 +880,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="label_25" >
         <property name="text" >
-         <string>Factor</string>
+         <string>_("Factor")</string>
         </property>
        </widget>
       </item>
@@ -897,7 +897,7 @@
    <item row="6" column="1" >
     <widget class="QCheckBox" name="psychedelicEnable" >
      <property name="text" >
-      <string>Psychedelic</string>
+      <string>_("Psychedelic")</string>
      </property>
     </widget>
    </item>

diff --git a/po/Makevars b/po/Makevars
index a5744ea202b95c106914c64b552f726a4d935a67..d3453274be9aa60859e414208490a3f26024bbed 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --language=C++
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=_NS --keyword=_ANS --keyword=qtr --language=C++
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding