Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00
Code Releases Activity

Merge branch 'master' of github.com:nowrep/QupZilla

Browse Source
This commit is contained in:
nowrep 2011-12-16 19:46:05 +01:00
commit 348d0e5a18
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/adblock/adblockicon.cpp
View File

@ -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)));
}

2
src/app/commandlineoptions.cpp
View File

@ -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;

2
src/app/mainapplication.cpp
View File

@ -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("<b>QupZilla crashed :-(</b><br/>Oops, last session of QupZilla ends with its crash. We are very sorry. Would you try to restore saved state?"),
tr("<b>QupZilla crashed :-(</b><br/>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;

2
src/app/qupzilla.cpp
View File

@ -1406,7 +1406,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;

2
src/autofill/autofillnotification.cpp
View File

@ -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 <b>%1</b> on %2?").arg(user, url.host()));
ui->label->setText(tr("Do you want QupZilla to remember the password for <b>%1</b> on %2?").arg(user, url.host()));
ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton));
connect(ui->remember, SIGNAL(clicked()), this, SLOT(remember()));

4
src/bookmarks/bookmarksmanager.cpp
View File

@ -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("<b>Warning: </b>You already have this page bookmarked!")));
layout->addWidget(new QLabel(tr("<b>Warning: </b>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));