i18n fixes

diff --git a/modules/gui/qt4/components/infopanels.cpp b/modules/gui/qt4/components/infopanels.cpp
index 638c0382c888f15c39ec9c3928e9cf0bd129e842..499f1ab0fb621724686951b3098aa54c3ddfcc4c 100644 (file)
--- a/modules/gui/qt4/components/infopanels.cpp
+++ b/modules/gui/qt4/components/infopanels.cpp
@@ -64,17 +64,17 @@ MetaPanel::MetaPanel( QWidget *parent, intf_thread_t *_p_intf ) :
     l->addWidget( genre_text, line, 1, 1, 6 );
     /* Date (Should be in years) */
     date_text = new QSpinBox; setSpinBounds( date_text );
-    l->addWidget( new QLabel( qfu( VLC_META_DATE ) + " :" ), line, 7 );
+    l->addWidget( new QLabel( qtr( VLC_META_DATE ) + " :" ), line, 7 );
     l->addWidget( date_text, line, 8, 1, 2 );
     line++;
 
     /* Number and Rating */
-    l->addWidget( new QLabel( qfu( _("Track number/Position" ) ) + " :" ),
+    l->addWidget( new QLabel( qtr( "Track number/Position" )  + " :" ),
                   line, 0 );
     seqnum_text = new QSpinBox; setSpinBounds( seqnum_text );
     l->addWidget( seqnum_text, line, 1, 1, 4 );
 
-    l->addWidget( new QLabel( qfu( VLC_META_RATING ) + " :" ), line, 5 );
+    l->addWidget( new QLabel( qtr( VLC_META_RATING ) + " :" ), line, 5 );
     rating_text = new QSpinBox; setSpinBounds( rating_text) ;
     l->addWidget( rating_text, line, 6, 1, 4 );
     line++;
@@ -85,7 +85,7 @@ MetaPanel::MetaPanel( QWidget *parent, intf_thread_t *_p_intf ) :
     l->addWidget( new QLabel( qfu( VLC_META_LANGUAGE ) + " :" ), line, 0 );
     language_text = new QLineEdit;
     l->addWidget( language_text, line, 1, 1, 4 );
-    l->addWidget( new QLabel( qfu( VLC_META_SETTING ) + " :" ), line, 5 );
+    l->addWidget( new QLabel( qtr( VLC_META_SETTING ) + " :" ), line, 5 );
     setting_text = new QLineEdit;
     l->addWidget( setting_text, line, 6, 1, 4 );
     line++;

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 52cf0569a0e896f7ff2b936c92cfa41da99dd136..18c1f9ea213cd5433adc4247af33d5e7806a0249 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -138,7 +138,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         {                                   \
             Ui::SPrefs ## name ui;          \
             ui.setupUi( panel );            \
-            panel_label->setText( qtr( label ) );
+            panel_label->setText( label );
 
 #define END_SPREFS_CAT      \
             break;          \
@@ -166,7 +166,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     switch( number )
     {
         /* Video Panel Implementation */
-        START_SPREFS_CAT( Video , "General video settings" );
+        START_SPREFS_CAT( Video , qtr("General video settings") );
            CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
 
             CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen );
@@ -195,7 +195,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
          END_SPREFS_CAT;
 
          /* Audio Panel Implementation */
-        START_SPREFS_CAT( Audio,  "General audio settings" );
+        START_SPREFS_CAT( Audio, qtr("General audio settings") );
 #ifdef WIN32
             ui.OSSBrowse->hide();
             ui.OSSDevice->hide();
@@ -236,7 +236,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         END_SPREFS_CAT;
 
         /* Input and Codecs Panel Implementation */
-        START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings"  );
+        START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") );
           /* Disk Devices */
 /*          CONFIG_GENERIC( );*/ //FIXME
 
@@ -260,7 +260,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         END_SPREFS_CAT;
 
         /* Interface Panel */
-        START_SPREFS_CAT( Interface, "Interface settings" );
+        START_SPREFS_CAT( Interface, qtr("Interface settings") );
             ui.defaultLabel->setFont( italicFont );
             ui.skinsLabel->setFont( italicFont );
 
@@ -295,7 +295,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 #endif
         END_SPREFS_CAT;
 
-        START_SPREFS_CAT( Subtitles, "Subtitles & OSD settings" );
+        START_SPREFS_CAT( Subtitles, qtr("Subtitles & OSD settings") );
             CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
 
             CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 996ea53093776930bdc386ff1c6c93cd8ae71699..540e455bdf77c75838c23b6aed4242aaa64e516f 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -61,8 +61,9 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
     types->setAlignment( Qt::AlignHCenter );
     QHBoxLayout *types_l = new QHBoxLayout(0);
     types_l->setSpacing( 3 ); types_l->setMargin( 3 );
-    small = new QRadioButton( "Basic", types ); types_l->addWidget( small );
-    all = new QRadioButton( "All", types ); types_l->addWidget( all );
+    small = new QRadioButton( qtr("Basic"), types ); 
+    types_l->addWidget( small );
+    all = new QRadioButton( qtr("All"), types ); types_l->addWidget( all );
     types->setLayout( types_l );
     small->setChecked( true );
 

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index 174ef19a3f84a25d79e3f7f1797b53b0941d4b03..ddf2af42b14e2e10c691b9b668e32c5888257d4f 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -68,10 +68,10 @@ vlc_module_begin();
     add_integer( CFG_PREFIX "color", 0x00FF0000, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, VLC_FALSE );
         change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
-    add_integer( CFG_PREFIX "saturationthres", 20, NULL, "saturaton threshold",
-                 "", VLC_FALSE );
-    add_integer( CFG_PREFIX "similaritythres", 15, NULL, "similarity threshold",
-                 "", VLC_FALSE );
+    add_integer( CFG_PREFIX "saturationthres", 20, NULL,
+                 _("Saturaton threshold"), "", VLC_FALSE );
+    add_integer( CFG_PREFIX "similaritythres", 15, NULL, 
+                 _("Similarity threshold"), "", VLC_FALSE );
     set_callbacks( Create, Destroy );
 vlc_module_end();