From: Jean-Baptiste Kempf Date: Wed, 17 Sep 2008 22:27:57 +0000 (-0700) Subject: String updates from tonsofpcs X-Git-Tag: 1.0.0-pre1~3169 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4f6fb365fce5a202ceb917d2e18b83a9f9a44b8a;p=vlc String updates from tonsofpcs --- diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp index 59e8fbad0c..6f9cfabdc0 100644 --- a/modules/gui/qt4/dialogs/messages.cpp +++ b/modules/gui/qt4/dialogs/messages.cpp @@ -81,9 +81,9 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf) /* Buttons and general layout */ QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); closeButton->setDefault( true ); - clearUpdateButton = new QPushButton( qtr( "&Clear" ) ); + clearUpdateButton = new QPushButton( qtr( "C&lear" ) ); saveLogButton = new QPushButton( qtr( "&Save as..." ) ); - saveLogButton->setToolTip( qtr( "Save all the displayed logs to a file" ) ); + saveLogButton->setToolTip( qtr( "Saves all the displayed logs to a file" ) ); verbosityBox = new QSpinBox(); verbosityBox->setRange( 0, 2 ); @@ -246,7 +246,7 @@ void MessagesDialog::clear() bool MessagesDialog::save() { QString saveLogFileName = QFileDialog::getSaveFileName( - this, qtr( "Select a name for the logs file" ), + this, qtr( "Save log file as..." ), qfu( config_GetHomeDir() ), qtr( "Texts / Logs (*.log *.txt);; All (*.*) ") ); @@ -255,7 +255,7 @@ bool MessagesDialog::save() QFile file( saveLogFileName ); if ( !file.open( QFile::WriteOnly | QFile::Text ) ) { QMessageBox::warning( this, qtr( "Application" ), - qtr( "Cannot write file %1:\n%2." ) + qtr( "Cannot write to file %1:\n%2." ) .arg( saveLogFileName ) .arg( file.errorString() ) ); return false; diff --git a/modules/gui/qt4/dialogs/podcast_configuration.cpp b/modules/gui/qt4/dialogs/podcast_configuration.cpp index de509a3951..69d0dc906b 100644 --- a/modules/gui/qt4/dialogs/podcast_configuration.cpp +++ b/modules/gui/qt4/dialogs/podcast_configuration.cpp @@ -34,7 +34,7 @@ PodcastConfigDialog::PodcastConfigDialog( QWidget *parent, intf_thread_t *_p_int { ui.setupUi( this ); - ui.podcastDelete->setToolTip( qtr( "Delete the selected item" ) ); + ui.podcastDelete->setToolTip( qtr( "Deletes the selected item" ) ); QPushButton *okButton = new QPushButton( qtr( "&Close" ), this ); QPushButton *cancelButton = new QPushButton( qtr( "&Cancel" ), this ); ui.okCancel->addButton( okButton, QDialogButtonBox::AcceptRole ); diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp index f00fec2d72..f8146eecf9 100644 --- a/modules/gui/qt4/dialogs/preferences.cpp +++ b/modules/gui/qt4/dialogs/preferences.cpp @@ -68,10 +68,10 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf ) QHBoxLayout *types_l = new QHBoxLayout; types_l->setSpacing( 3 ); types_l->setMargin( 3 ); small = new QRadioButton( qtr( "Simple" ), types ); - small->setToolTip( qtr( "Switch to simple preferences" ) ); + small->setToolTip( qtr( "Switch to simple preferences view" ) ); types_l->addWidget( small ); all = new QRadioButton( qtr("All"), types ); types_l->addWidget( all ); - all->setToolTip( qtr( "Switch to complete preferences" ) ); + all->setToolTip( qtr( "Switch to full preferences view" ) ); types->setLayout( types_l ); small->setChecked( true ); @@ -351,8 +351,7 @@ void PrefsDialog::reset() int ret = QMessageBox::question( this, qtr( "Reset Preferences" ), - qtr( "This will reset your VLC media player preferences.\n" - "Are you sure you want to continue?" ), + qtr( "Are you sure you want to reset your VLC media player preferences?" ), QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok); diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp index 2beef9147e..d834312298 100644 --- a/modules/gui/qt4/dialogs/sout.cpp +++ b/modules/gui/qt4/dialogs/sout.cpp @@ -234,7 +234,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, ui.mrlEdit->setToolTip ( qtr( "Stream output string.\n" "This is automatically generated " "when you change the above settings,\n" - "but you can update it manually." ) ) ; + "but you can change it manually." ) ) ; // /* Connect everything to the updateMRL function */ #define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() ); @@ -286,7 +286,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, void SoutDialog::fileBrowse() { - QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file" ), "", + QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file..." ), "", qtr( "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv)" ) ); ui.fileEdit->setText( fileName ); updateMRL(); diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp index c6b013aaf4..daeb652d21 100644 --- a/modules/gui/qt4/dialogs/vlm.cpp +++ b/modules/gui/qt4/dialogs/vlm.cpp @@ -130,10 +130,10 @@ VLMDialog::VLMDialog( QWidget *parent, intf_thread_t *_p_intf ) : QVLCDialog( pa new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding); vlmItemLayout->addItem( spacer ); - QPushButton *importButton = new QPushButton( qtr( "Import" ) ); + QPushButton *importButton = new QPushButton( qtr( "I&mport" ) ); ui.buttonBox->addButton( importButton, QDialogButtonBox::ActionRole ); - QPushButton *exportButton = new QPushButton( qtr( "Export" ) ); + QPushButton *exportButton = new QPushButton( qtr( "E&xport" ) ); ui.buttonBox->addButton( exportButton, QDialogButtonBox::ActionRole ); QPushButton *closeButton = new QPushButton( qtr( "&Close" ) ); @@ -263,7 +263,7 @@ void VLMDialog::addVLMItem() bool VLMDialog::exportVLMConf() { QString saveVLMConfFileName = QFileDialog::getSaveFileName( - this, qtr( "Choose a filename to save the VLM configuration..." ), + this, qtr( "Save VLM configuration as..." ), qfu( config_GetHomeDir() ), qtr( "VLM conf (*.vlm) ;; All (*.*)" ) ); @@ -333,7 +333,7 @@ void VLMDialog::mediasPopulator() bool VLMDialog::importVLMConf() { QString openVLMConfFileName = QFileDialog::getOpenFileName( - this, qtr( "Open a VLM Configuration File" ), + this, qtr( "Open VLM configuration..." ), qfu( config_GetHomeDir() ), qtr( "VLM conf (*.vlm) ;; All (*.*)" ) ); diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index 92df106f84..44f74c8aa2 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -455,7 +455,7 @@ void DialogsProvider::MLAppendDir() ****************/ void DialogsProvider::openAPlaylist() { - QStringList files = showSimpleOpen( qtr( "Open playlist file" ), + QStringList files = showSimpleOpen( qtr( "Open playlist..." ), EXT_FILTER_PLAYLIST ); foreach( QString file, files ) { @@ -466,7 +466,7 @@ void DialogsProvider::openAPlaylist() void DialogsProvider::saveAPlaylist() { QFileDialog *qfd = new QFileDialog( NULL, - qtr( "Choose a filename to save playlist" ), + qtr( "Save playlist as..." ), qfu( p_intf->p_sys->psz_filepath ), qtr( "XSPF playlist (*.xspf);; " ) + qtr( "M3U playlist (*.m3u);; Any (*.*) " ) ); @@ -626,7 +626,7 @@ void DialogsProvider::loadSubtitlesFile() char *sep = strrchr( path, DIR_SEP_CHAR ); if( sep ) *sep = '\0'; - QStringList qsl = showSimpleOpen( qtr( "Open subtitles file" ), + QStringList qsl = showSimpleOpen( qtr( "Open subtitles..." ), EXT_FILTER_SUBTITLE, path ); free( path ); diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index 764222feca..c02227bb4c 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -486,13 +486,13 @@ int MainInterface::privacyDialog( QList *controls ) QLabel *text = new QLabel( qtr( "

The VideoLAN Team doesn't like when an application goes " "online without authorization.

\n " - "

VLC media player can request limited information on " - "the Internet, especially to get CD covers or to know " - "if updates are available.

\n" + "

VLC media player can retreive limited information from " + "the Internet in order to get CD covers or to check " + "for available updates.

\n" "

VLC media player DOES NOT send or collect ANY " "information, even anonymously, about your usage.

\n" - "

Therefore please check the following options, the default being " - "almost no access on the web.

\n") ); + "

Therefore please select from the following options, the default being " + "almost no access to the web.

\n") ); text->setWordWrap( true ); text->setTextFormat( Qt::RichText ); diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 20bf859897..536bb633b9 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -490,7 +490,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current ); action = current->addMenu( submenu ); action->setData( "spu-es" ); - addDPStaticEntry( submenu, qtr( "Load File..." ), "", "", + addDPStaticEntry( submenu, qtr( "Open File..." ), "", "", SLOT( loadSubtitlesFile() ) ); submenu->addSeparator();