From 669a1c695b3c3dd5761d9a68114b6b8887290ee1 Mon Sep 17 00:00:00 2001 From: Jonathan Hooverman Date: Fri, 16 Dec 2011 19:38:29 +0100 Subject: [PATCH 1/2] Small fixes --- src/adblock/adblockicon.cpp | 2 +- src/app/commandlineoptions.cpp | 2 +- src/app/mainapplication.cpp | 2 +- src/app/qupzilla.cpp | 4 ++-- src/autofill/autofillnotification.cpp | 2 +- src/bookmarks/bookmarksmanager.cpp | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/adblock/adblockicon.cpp b/src/adblock/adblockicon.cpp index 0e90f3ac7..f56bca33e 100644 --- a/src/adblock/adblockicon.cpp +++ b/src/adblock/adblockicon.cpp @@ -26,7 +26,7 @@ AdBlockIcon::AdBlockIcon(QupZilla* mainClass, QWidget* parent) { setMaximumHeight(16); setCursor(Qt::PointingHandCursor); - setToolTip(tr("AdBlock let you block any unwanted content on pages")); + setToolTip(tr("AdBlock lets you block unwanted content on web-pages")); connect(this, SIGNAL(clicked(QPoint)), this, SLOT(showMenu(QPoint))); } diff --git a/src/app/commandlineoptions.cpp b/src/app/commandlineoptions.cpp index 7556c648c..6f18ea97d 100644 --- a/src/app/commandlineoptions.cpp +++ b/src/app/commandlineoptions.cpp @@ -144,7 +144,7 @@ void CommandLineOptions::parseActions() } if (m_argc > 1 && !found) { - cout << " Used bad arguments! Please see help below." << endl; + cout << " Invalid option! Please see help below." << endl; showHelp(); ActionPair pair; pair.action = ExitAction; diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp index 4619d6f91..bdbdbd545 100644 --- a/src/app/mainapplication.cpp +++ b/src/app/mainapplication.cpp @@ -659,7 +659,7 @@ bool MainApplication::restoreStateSlot(QupZilla* window) } if (settings.value("isCrashed", false).toBool() && afterStart != 3) { QMessageBox::StandardButton button = QMessageBox::warning(window, tr("Last session crashed"), - tr("QupZilla crashed :-(
Oops, last session of QupZilla ends with its crash. We are very sorry. Would you try to restore saved state?"), + tr("QupZilla crashed :-(
Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); if (button != QMessageBox::Yes) { m_isRestoring = false; diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index 0dec23718..c3350c853 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -1248,7 +1248,7 @@ void QupZilla::startPrivate(bool state) bool askNow = settings.value("Browser-View-Settings/AskOnPrivate", true).toBool(); if (state && askNow) { - QString title = tr("Are you sure you want to turn on private browsing?"); + QString title = tr("Are you sure you want to turn to private browsing?"); QString text1 = tr("When private browsing is turned on, some actions concerning your privacy will be disabled:"); QStringList actions; @@ -1399,7 +1399,7 @@ bool QupZilla::quitApp() QDialog* dialog = new QDialog(this); Ui_CloseDialog* ui = new Ui_CloseDialog(); ui->setupUi(dialog); - ui->textLabel->setText(tr("There are still %1 open tabs and your session won't be stored. Are you sure to quit?").arg(m_tabWidget->count())); + ui->textLabel->setText(tr("There are still %1 open tabs and your session won't be stored. Are you sure to quit QupZilla?").arg(m_tabWidget->count())); ui->iconLabel->setPixmap(style()->standardPixmap(QStyle::SP_MessageBoxWarning)); if (dialog->exec() != QDialog::Accepted) { return false; diff --git a/src/autofill/autofillnotification.cpp b/src/autofill/autofillnotification.cpp index 84fa798dd..925c5a8e2 100644 --- a/src/autofill/autofillnotification.cpp +++ b/src/autofill/autofillnotification.cpp @@ -32,7 +32,7 @@ AutoFillNotification::AutoFillNotification(const QUrl &url, const QByteArray &da { setAttribute(Qt::WA_DeleteOnClose); ui->setupUi(widget()); - ui->label->setText(tr("Do you want QupZilla to remember password for %1 on %2?").arg(user, url.host())); + ui->label->setText(tr("Do you want QupZilla to remember the password for %1 on %2?").arg(user, url.host())); ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton)); connect(ui->remember, SIGNAL(clicked()), this, SLOT(remember())); diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index 44b16e140..4584d93cb 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -547,7 +547,7 @@ void BookmarksManager::insertBookmark(const QUrl &url, const QString &title, con layout->addWidget(edit); layout->addWidget(combo); if (m_bookmarksModel->isBookmarked(url)) { - layout->addWidget(new QLabel(tr("Warning: You already have this page bookmarked!"))); + layout->addWidget(new QLabel(tr("Warning: You already have bookmarked this page!"))); } layout->addWidget(box); @@ -560,7 +560,7 @@ void BookmarksManager::insertBookmark(const QUrl &url, const QString &title, con combo->addItem(style()->standardIcon(QStyle::SP_DirIcon), query.value(0).toString()); } - label->setText(tr("Choose name and location of bookmark.")); + label->setText(tr("Choose name and location of this bookmark.")); edit->setText(title); edit->setCursorPosition(0); dialog->setWindowIcon(_iconForUrl(url)); From 4618119b8709d944b8025904b30ad65ed07603ad Mon Sep 17 00:00:00 2001 From: Jonathan Hooverman Date: Fri, 16 Dec 2011 19:42:49 +0100 Subject: [PATCH 2/2] Small fixes --- src/app/qupzilla.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index c3350c853..d71891c11 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -1248,7 +1248,7 @@ void QupZilla::startPrivate(bool state) bool askNow = settings.value("Browser-View-Settings/AskOnPrivate", true).toBool(); if (state && askNow) { - QString title = tr("Are you sure you want to turn to private browsing?"); + QString title = tr("Are you sure you want to turn on private browsing?"); QString text1 = tr("When private browsing is turned on, some actions concerning your privacy will be disabled:"); QStringList actions;