diff --git a/articleview.cc b/articleview.cc index 8b3d4678..18a235ed 100644 --- a/articleview.cc +++ b/articleview.cc @@ -904,7 +904,7 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, if ( resourceDownloadRequests.empty() ) // No requests were queued { - QMessageBox::critical( this, tr( "GoldenDict" ), tr( "The referenced resource doesn't exist." ) ); + QMessageBox::critical( this, "GoldenDict", tr( "The referenced resource doesn't exist." ) ); return; } else @@ -934,7 +934,7 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, { delete req; - QMessageBox::critical( this, tr( "GoldenDict" ), + QMessageBox::critical( this, "GoldenDict", error ); } @@ -943,7 +943,7 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, } // Still here? No such program exists. - QMessageBox::critical( this, tr( "GoldenDict" ), + QMessageBox::critical( this, "GoldenDict", tr( "The referenced audio program doesn't exist." ) ); } else @@ -1377,7 +1377,7 @@ void ArticleView::resourceDownloadFinished() } catch( ExternalViewer::Ex & e ) { - QMessageBox::critical( this, tr( "GoldenDict" ), tr( "Failed to run a player to play sound file: %1" ).arg( e.what() ) ); + QMessageBox::critical( this, "GoldenDict", tr( "Failed to run a player to play sound file: %1" ).arg( e.what() ) ); } } } @@ -1395,7 +1395,7 @@ void ArticleView::resourceDownloadFinished() if ( !tmp.open() || (size_t) tmp.write( &data.front(), data.size() ) != data.size() ) { - QMessageBox::critical( this, tr( "GoldenDict" ), tr( "Failed to create temporary file." ) ); + QMessageBox::critical( this, "GoldenDict", tr( "Failed to create temporary file." ) ); return; } @@ -1405,7 +1405,7 @@ void ArticleView::resourceDownloadFinished() } if ( !QDesktopServices::openUrl( QUrl::fromLocalFile( desktopOpenedTempFile ) ) ) - QMessageBox::critical( this, tr( "GoldenDict" ), + QMessageBox::critical( this, "GoldenDict", tr( "Failed to auto-open resource file, try opening manually: %1." ).arg( desktopOpenedTempFile ) ); } diff --git a/mainwindow.cc b/mainwindow.cc index aa554222..25d71522 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -635,7 +635,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ): // After we have dictionaries and groups, we can populate history // historyChanged(); - setWindowTitle( tr( "GoldenDict" ) ); + setWindowTitle( "GoldenDict" ); blockUpdateWindowTitle = true; addNewTab(); @@ -1484,7 +1484,7 @@ void MainWindow::updateWindowTitle() if( !str.isEmpty() ) { if( !blockUpdateWindowTitle ) - setWindowTitle( tr( "%1 - %2" ).arg( str, tr ( "GoldenDict" ) ) ); + setWindowTitle( tr( "%1 - %2" ).arg( str, "GoldenDict" ) ); blockUpdateWindowTitle = false; } } @@ -2415,7 +2415,7 @@ void MainWindow::installHotKeys() } catch( HotkeyWrapper::exInit & ) { - QMessageBox::critical( this, tr( "GoldenDict" ), + QMessageBox::critical( this, "GoldenDict", tr( "Failed to initialize hotkeys monitoring mechanism.
" "Make sure your XServer has RECORD extension turned on." ) ); diff --git a/mainwindow.ui b/mainwindow.ui index 28f9b634..45c90fde 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -11,7 +11,7 @@ - GoldenDict + GoldenDict diff --git a/scanpopup.cc b/scanpopup.cc index 8e8e0ed5..9205bbe4 100644 --- a/scanpopup.cc +++ b/scanpopup.cc @@ -466,7 +466,7 @@ void ScanPopup::engagePopup( bool forcePopup, bool giveFocus ) } if ( ui.pinButton->isChecked() ) - setWindowTitle( QString( "%1 - %2" ).arg( elideInputWord(), tr( "GoldenDict" ) ) ); + setWindowTitle( tr( "%1 - %2" ).arg( elideInputWord(), "GoldenDict" ) ); showTranslationFor( inputWord ); } @@ -811,7 +811,7 @@ void ScanPopup::pinButtonClicked( bool checked ) uninterceptMouse(); setWindowFlags( Qt::Dialog ); - setWindowTitle( QString( "%1 - %2" ).arg( elideInputWord(), tr( "GoldenDict" ) ) ); + setWindowTitle( tr( "%1 - %2" ).arg( elideInputWord(), "GoldenDict" ) ); dictionaryBar.setMovable( true ); hideTimer.stop(); }