String updates ( some are meant to match the macosx interface and simplify translator...

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 51f5928ce6a1bf0a740569bbbf1ddf946cfbabec..b7adeb76cea7852bb4abf7a1f6c91c686066021e 100755 (executable)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -1294,7 +1294,7 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
     updateButton = new QToolButton;
     updateButton->setAutoRaise( true );
     updateButton->setText( "u" );
-    updateButton->setToolTip( qtr( "Force update of the values in this dialog" ) );
+    updateButton->setToolTip( qtr( "Force update of this dialog's values" ) );
     mainLayout->addWidget( updateButton, 0, 4, 1, 1 );
 
 

diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index 4f1612f0660fc0fe05a25618a8c22e432b5cc302..afcd93f67f302f57f391bc0dbd7e98698462b751 100644 (file)
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -419,7 +419,7 @@ InfoPanel::InfoPanel( QWidget *parent,
      QList<QTreeWidgetItem *> items;
 
      QLabel *topLabel = new QLabel( qtr( "Information about what your media or"
-              " stream is made of.\n Muxer, Audio and Video Codecs, Subtitles "
+              " stream is made of.\nMuxer, Audio and Video Codecs, Subtitles "
               "are shown." ) );
      topLabel->setWordWrap( true );
      layout->addWidget( topLabel, 0, 0 );
@@ -492,8 +492,8 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
 
      QList<QTreeWidgetItem *> items;
 
-     QLabel *topLabel = new QLabel( qtr( "Various statistics about the current"
-                 " media or stream.\n Played and streamed info are shown." ) );
+     QLabel *topLabel = new QLabel( qtr( "Statistics about the currently "
+                 "playing media or stream." ) );
      topLabel->setWordWrap( true );
      layout->addWidget( topLabel, 0, 0 );
 
@@ -540,7 +540,7 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
     CREATE_AND_ADD_TO_CAT( send_stat, qtr("Sent packets"), "0", streaming, "" );
     CREATE_AND_ADD_TO_CAT( send_bytes_stat, qtr("Sent bytes"),
                            "0", streaming, "kB" );
-    CREATE_AND_ADD_TO_CAT( send_bitrate_stat, qtr("Sent bitrates"),
+    CREATE_AND_ADD_TO_CAT( send_bitrate_stat, qtr("Sent bitrate"),
                            "0", streaming, "kb/s" );
 
     CREATE_AND_ADD_TO_CAT( adecoded_stat, qtr("Decoded blocks"),

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index bb1d2bb517be29355dcd8add87a2da665bf60729..bcb6457a3e1a1170e5f3d4da0b6bfeedb507ba53 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -81,7 +81,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     dialogBox->setSizeGripEnabled( false );
 
     /* Add a tooltip */
-    dialogBox->setToolTip( qtr( "Select one or multiple files, or a folder" ) );
+    dialogBox->setToolTip( qtr( "Select one or multiple files" ) );
 
     // But hide the two OK/Cancel buttons. Enable them for debug.
     QDialogButtonBox *fileDialogAcceptBox =
@@ -733,7 +733,7 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
 
     /* Jack Main panel */
     /* Channels */
-    QLabel *jackChannelsLabel = new QLabel( qtr( "Channels :" ) );
+    QLabel *jackChannelsLabel = new QLabel( qtr( "Channels:" ) );
     jackDevLayout->addWidget( jackChannelsLabel, 1, 0 );
 
     jackChannels = new QSpinBox;
@@ -746,7 +746,7 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     /* Jack Props panel */
 
     /* Selected ports */
-    QLabel *jackPortsLabel = new QLabel( qtr( "Selected ports :" ) );
+    QLabel *jackPortsLabel = new QLabel( qtr( "Selected ports:" ) );
     jackPropLayout->addWidget( jackPortsLabel, 0 , 0 );
 
     jackPortsSelected = new QLineEdit( qtr( ".*") );
@@ -754,7 +754,7 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     jackPropLayout->addWidget( jackPortsSelected, 0, 1 );
 
     /* Caching */
-    QLabel *jackCachingLabel = new QLabel( qtr( "Input caching :" ) );
+    QLabel *jackCachingLabel = new QLabel( qtr( "Input caching:" ) );
     jackPropLayout->addWidget( jackCachingLabel, 1 , 0 );
     jackCaching = new QSpinBox;
     setSpinBoxFreq( jackCaching );

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 325554ce8d473ccc6cd2a546c0351f4b83b35f59..de0373f17991667947b186804c2707db9b9964f2 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -72,7 +72,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i,
     art->setMaximumWidth( 128 );
     art->setScaledContents( true );
     art->setPixmap( QPixmap( ":/noart.png" ) );
-    art->setToolTip( qtr( "Double click to get the media informations" ) );
+    art->setToolTip( qtr( "Double click to get media informations" ) );
 
     artContLay->addWidget( art, 1 );
 

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 761daef6a2fafb3daaa8892414dc814e5109d278..5173645805b9e181c0f96d9c9b9a5507cb5d902d 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -178,7 +178,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         /******************************
          * VIDEO Panel Implementation *
          ******************************/
-        START_SPREFS_CAT( Video , qtr("General video settings") );
+        START_SPREFS_CAT( Video , qtr("General Video Settings") );
             CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
 
             CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen );
@@ -208,7 +208,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         /******************************
          * AUDIO Panel Implementation *
          ******************************/
-        START_SPREFS_CAT( Audio, qtr("General audio settings") );
+        START_SPREFS_CAT( Audio, qtr("General Audio Settings") );
 
             CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
 
@@ -347,7 +347,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         END_SPREFS_CAT;
 
         /* Input and Codecs Panel Implementation */
-        START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") );
+        START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs Settings") );
 
             /* Disk Devices */
             {
@@ -448,7 +448,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         /*******************
          * Interface Panel *
          *******************/
-        START_SPREFS_CAT( Interface, qtr("Interface settings") );
+        START_SPREFS_CAT( Interface, qtr("Interface Settings") );
             ui.defaultLabel->setFont( italicFont );
             ui.skinsLabel->setFont( italicFont );
 
@@ -507,7 +507,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 #endif
         END_SPREFS_CAT;
 
-        START_SPREFS_CAT( Subtitles, qtr("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/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index 3e45580c8d4bb4976ee84de2235320d2ba4d6fcd..c68bb5d9f07bf65fd699a09098135e16b19c551a 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -58,7 +58,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     audioTab->addTab( spatial, qtr( "Spatializer" ) );
     audioLayout->addWidget( audioTab );
 
-    mainTabW->addTab( audioWidget, qtr( "Audio effects" ) );
+    mainTabW->addTab( audioWidget, qtr( "Audio Effects" ) );
 
     /* Video Effects */
     QWidget *videoWidget = new QWidget;

diff --git a/modules/gui/qt4/dialogs/gototime.cpp b/modules/gui/qt4/dialogs/gototime.cpp
index bf1bc1f8f97bd330536b7bb3838f0ee3993ed309..8258fd543f6ecfec8685cb97090a85b7c10b85ce 100644 (file)
--- a/modules/gui/qt4/dialogs/gototime.cpp
+++ b/modules/gui/qt4/dialogs/gototime.cpp
@@ -59,7 +59,7 @@ GotoTimeDialog::GotoTimeDialog( QWidget *parent, intf_thread_t *_p_intf)
     QGroupBox *timeGroupBox = new QGroupBox;
     QGridLayout *boxLayout = new QGridLayout( timeGroupBox );
 
-    QLabel *timeIntro = new QLabel( qtr( "Go to time:" ) );
+    QLabel *timeIntro = new QLabel( qtr( "Go to time" ) + ":" );
     timeIntro->setWordWrap( true );
     timeIntro->setAlignment( Qt::AlignCenter );
 

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index a968c5634e52e29d5a2d6004c4dcad3cbed63be8..7b6b0fdbdbc8f2b6f4fff2276a894481390316e5 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -99,7 +99,7 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
     closeButton->setDefault( true );
 
     QLabel *introduction = new QLabel(
-            qtr( "VLC media player " VERSION_MESSAGE ) );
+            qtr( "VLC media player" " " VERSION_MESSAGE ) );
     QLabel *iconVLC = new QLabel;
     if( QDate::currentDate().dayOfYear() >= 354 )
         iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) );
@@ -124,7 +124,7 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
             + "Compiler: " + qfu( VLC_Compiler() ) + ".\n"
             + qtr( "Based on Git commit: " ) + qfu( VLC_Changeset() ) + ".\n"
             + qtr( "You are using the Qt4 Interface.\n\n" )
-            + qtr( "Copyright (c) " COPYRIGHT_YEARS " by the VideoLAN Team.\n" )
+            + qtr( "Copyright © " COPYRIGHT_YEARS " by the VideoLAN Team.\n" )
             + "vlc@videolan.org, http://www.videolan.org" );
     infoLabel->setWordWrap( infoLabel );
 

diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
index ba6e60d40326b187265f74410133fc6067ca23e1..70a393452303a3484ab5a31ba0344c850edbd398 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.cpp
+++ b/modules/gui/qt4/dialogs/vlm.cpp
@@ -80,9 +80,9 @@ VLMDialog::VLMDialog( QWidget *parent, intf_thread_t *_p_intf ) : QVLCDialog( pa
 
     /* Schedule Stuffs */
     QGridLayout *schetimelayout = new QGridLayout( ui.schedBox );
-    QLabel *schetimelabel = new QLabel( qtr( "Hours/Minutes/Seconds:" ) );
+    QLabel *schetimelabel = new QLabel( qtr( "Hours / Minutes / Seconds:" ) );
     schetimelayout->addWidget( schetimelabel, 0, 0 );
-    QLabel *schedatelabel = new QLabel( qtr( "Day Month Year:" ) );
+    QLabel *schedatelabel = new QLabel( qtr( "Day / Month / Year:" ) );
     schetimelayout->addWidget( schedatelabel, 1, 0 );
     QLabel *scherepeatLabel = new QLabel( qtr( "Repeat:" ) );
     schetimelayout->addWidget( scherepeatLabel, 2, 0 );

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 7a9cb339d113efc12a490443deee5842f1860bcf..63f9beabd13f7fba6d6d2bea7168d2ef91258652 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -379,7 +379,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
 
         /* FullScreen View */
         action = menu->addAction( qtr( "Toggle Fullscreen Interface" ), mi,
-                                  SLOT( toggleFullScreen() ), qtr( "F11" ) );
+                                  SLOT( toggleFullScreen() ), QString( "F11" ) );
 
         /* Advanced Controls */
         action = menu->addAction( qtr( "Advanced controls" ), mi,

diff --git a/modules/gui/qt4/ui/equalizer.ui b/modules/gui/qt4/ui/equalizer.ui
index 814c4ad3d27be03938b7e020308f99da85537ce8..e537c6bb139b08e3b270df883c39e246a23a146f 100644 (file)
--- a/modules/gui/qt4/ui/equalizer.ui
+++ b/modules/gui/qt4/ui/equalizer.ui
@@ -13,7 +13,7 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-  <item>
+   <item>
     <layout class="QHBoxLayout" >
      <property name="spacing" >
       <number>6</number>
@@ -31,7 +31,7 @@
      <item>
       <widget class="QCheckBox" name="eq2PassCheck" >
        <property name="text" >
-        <string>_("2 pass")</string>
+        <string>_("2 Pass")</string>
        </property>
       </widget>
      </item>
@@ -40,7 +40,7 @@
        <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>40</width>
          <height>20</height>
@@ -72,7 +72,7 @@
      <property name="margin" >
       <number>0</number>
      </property>
-     <item row="1" column="0" colspan="2">
+     <item row="1" column="0" colspan="2" >
       <widget class="QLabel" name="preampLabel" >
        <property name="text" >
         <string>_("Preamp")</string>
@@ -94,7 +94,7 @@
        <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>40</width>
          <height>20</height>