X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fhelp.cpp;h=1b135bab2ab3a3ed4fe8db740f9bbb61791dedae;hb=223419069363b3eab712cff2d0ac671a94d8fc65;hp=a968c5634e52e29d5a2d6004c4dcad3cbed63be8;hpb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;p=vlc diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index a968c5634e..1b135bab2a 100644 --- 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" ) ); @@ -117,14 +117,15 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf) qtr( "VLC media player is a free media player, " "encoder and streamer that can read from files, " "CDs, DVDs, network streams, capture cards and even more!\n" - "Also, VLC works on essentially every popular platform.\n\n" ) + "VLC uses its internal codecs and works on essentially every " + "popular platform.\n\n" ) + qtr( "This version of VLC was compiled by:\n " ) + qfu( VLC_CompileBy() )+ "@" + qfu( VLC_CompileHost() ) + "." + qfu( VLC_CompileDomain() ) + ".\n" + "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 (C) " COPYRIGHT_YEARS " by the VideoLAN Team.\n" ) + "vlc@videolan.org, http://www.videolan.org" ); infoLabel->setWordWrap( infoLabel ); @@ -146,9 +147,9 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf) QVBoxLayout *thanksLayout = new QVBoxLayout( thanksWidget ); QLabel *thanksLabel = new QLabel( qtr( "We would like to thank the whole " - "community, the testers, our users and the following people " + "VLC community, the testers, our users and the following people " "(and the missing ones...) for their collaboration to " - "provide the best software." ) ); + "create the best free software." ) ); thanksLabel->setWordWrap( true ); thanksLayout->addWidget( thanksLabel ); QTextEdit *thanksEdit = new QTextEdit( this ); @@ -256,7 +257,7 @@ void UpdateDialog::UpdateOrDownload() { updateButton->setEnabled( false ); QString dest_dir = QFileDialog::getExistingDirectory( this, - qtr( "Select a directory ..." ), + qtr( "Select a directory..." ), qfu( config_GetHomeDir() ) ); if( dest_dir != "" ) @@ -292,6 +293,9 @@ void UpdateDialog::updateNotify( bool b_result ) updateButton->setText( "Download" ); updateLabel->setText( qtr( "There is a new version of VLC :\n" ) + qfu( p_release->psz_desc ) ); + + /* Force the dialog to be shown */ + this->show(); } else updateLabel->setText( qtr( "You have the latest version of VLC" ) );