[vlc-devel] commit: Qt: Sout strings modification. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 15 02:38:03 2009 +0100| [db8ce6ef046913ed2bc38a9f770fc2bc05fbbc73] | committer: Jean-Baptiste Kempf 

Qt: Sout strings modification.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db8ce6ef046913ed2bc38a9f770fc2bc05fbbc73
---

 modules/gui/qt4/components/sout/sout_widgets.cpp |   17 +++++++++++------
 modules/gui/qt4/dialogs/sout.cpp                 |   11 ++++++-----
 modules/gui/qt4/ui/sout.ui                       |    6 +++---
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index 9dfb940..6d089fe 100644
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -86,7 +86,7 @@ FileDestBox::FileDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     QGridLayout *layout = new QGridLayout( this );
 
     QLabel *fileOutput = new QLabel(
-         qtr( "This modules outputs to a file on your disk."), this );
+         qtr( "This module writes the transcoded stream to a file."), this );
     layout->addWidget(fileOutput, 0, 0, 1, -1);
 
     QLabel *fileLabel = new QLabel( qtr( "Filename"), this );
@@ -134,7 +134,8 @@ HTTPDestBox::HTTPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     QGridLayout *layout = new QGridLayout( this );
 
     QLabel *httpOutput = new QLabel(
-         qtr( "This modules streams on the networks with the HTTP protocol."), this );
+        qtr( "This module outputs the transcoded stream to a network via HTTP."),
+        this );
     layout->addWidget(httpOutput, 0, 0, 1, -1);
 
     QLabel *HTTPLabel = new QLabel( qtr("Address"), this );
@@ -177,7 +178,8 @@ MMSHDestBox::MMSHDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     QGridLayout *layout = new QGridLayout( this );
 
     QLabel *mmshOutput = new QLabel(
-         qtr( "This modules streams on the networks with the mms: protocol."), this );
+        qtr( "This module outputs the transcoded stream to a network "
+             " via the mms protocol." ), this );
     layout->addWidget(mmshOutput, 0, 0, 1, -1);
 
     QLabel *MMSHLabel = new QLabel( qtr("Address"), this );
@@ -220,7 +222,8 @@ UDPDestBox::UDPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     QGridLayout *layout = new QGridLayout( this );
 
     QLabel *udpOutput = new QLabel(
-         qtr( "This modules streams on the networks with the UDP protocol."), this );
+        qtr( "This module outputs the transcoded stream to a network via UDP."),
+        this );
     layout->addWidget(udpOutput, 0, 0, 1, -1);
 
     QLabel *UDPLabel = new QLabel( qtr("Address"), this );
@@ -265,7 +268,8 @@ RTPDestBox::RTPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     QGridLayout *layout = new QGridLayout( this );
 
     QLabel *rtpOutput = new QLabel(
-         qtr( "This modules streams on the networks with the RTP protocol."), this );
+        qtr( "This module outputs the transcoded stream to a network via RTP."),
+        this );
     layout->addWidget(rtpOutput, 0, 0, 1, -1);
 
     QLabel *RTPLabel = new QLabel( qtr("Address"), this );
@@ -340,7 +344,8 @@ ICEDestBox::ICEDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     QGridLayout *layout = new QGridLayout( this );
 
     QLabel *iceOutput = new QLabel(
-         qtr( "This modules streams using IceCast."), this );
+        qtr( "This module outputs the transcoded stream to an Icecast server."),
+        this );
     layout->addWidget(iceOutput, 0, 0, 1, -1);
 
     QLabel *ICELabel = new QLabel( qtr("Address"), this );
diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index f7ec1a3..d41402b 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -45,11 +45,12 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, QString inputMR
     /* UI stuff */
     ui.setupUi( this );
     ui.inputBox->setMRL( inputMRL );
-    ui.helpEdit->setPlainText( "This dialog will allow you to stream or convert "
-            "your media, locally, on your private network or on the "
-            "Internet.\n"
-            "You should start by checking that your input matches what you "
-            "want and go on with the \"Next\" button.\n" );
+    ui.helpEdit->setPlainText( "This dialog will allow you to stream or "
+            "convert your media for use locally, on your private network, "
+            "or on the Internet.\n"
+            "You should start by checking that source matches what you want "
+            "your input to be and then press the \"Next\" "
+            "button to continue.\n" );
 
     ui.mrlEdit->setToolTip ( qtr( "Stream output string.\n"
                 "This is automatically generated "
diff --git a/modules/gui/qt4/ui/sout.ui b/modules/gui/qt4/ui/sout.ui
index ef50354..6dc9221 100644
--- a/modules/gui/qt4/ui/sout.ui
+++ b/modules/gui/qt4/ui/sout.ui
@@ -137,7 +137,7 @@
        </rect>
       </property>
       <attribute name="label">
-       <string>_("Destination")</string>
+       <string>_("Destinations")</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_6">
        <item row="0" column="0" colspan="3">
@@ -270,13 +270,13 @@
        </rect>
       </property>
       <attribute name="label">
-       <string>_("Transcoding")</string>
+       <string>_("Options")</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0" colspan="2">
         <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
-          <string>_("Miscellaneous")</string>
+          <string>_("Miscellaneous Options")</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_4">
           <item row="0" column="0" colspan="3">