From 35ceee25eeb5b43996c8f41170efd84352234b39 Mon Sep 17 00:00:00 2001 From: nowrep Date: Fri, 5 Apr 2013 11:39:19 +0200 Subject: [PATCH] [Preferences][Win] Changed labels on "Set as default" button. Also renamed QtSingleApplication::removeLockedFile to removeLockFile --- src/lib/3rdparty/qtsingleapplication.cpp | 2 +- src/lib/3rdparty/qtsingleapplication.h | 2 +- src/lib/app/mainapplication.cpp | 2 +- src/lib/preferences/preferences.cpp | 6 +- translations/empty.ts | 88 +++++++++++++----------- 5 files changed, 55 insertions(+), 45 deletions(-) diff --git a/src/lib/3rdparty/qtsingleapplication.cpp b/src/lib/3rdparty/qtsingleapplication.cpp index e0bfc0785..6bab7d088 100644 --- a/src/lib/3rdparty/qtsingleapplication.cpp +++ b/src/lib/3rdparty/qtsingleapplication.cpp @@ -277,7 +277,7 @@ QWidget* QtSingleApplication::activationWindow() const return actWin; } -void QtSingleApplication::removeLockedFile() +void QtSingleApplication::removeLockFile() { peer->removeLockedFile(); } diff --git a/src/lib/3rdparty/qtsingleapplication.h b/src/lib/3rdparty/qtsingleapplication.h index 41d92b5a7..e899d9d7c 100644 --- a/src/lib/3rdparty/qtsingleapplication.h +++ b/src/lib/3rdparty/qtsingleapplication.h @@ -84,7 +84,7 @@ public: void initialize(bool dummy = true) { isRunning(); Q_UNUSED(dummy) } - void removeLockedFile(); + void removeLockFile(); public Q_SLOTS: bool sendMessage(const QString &message, int timeout = 5000); diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index e4e2868af..fd0c82db7 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -747,7 +747,7 @@ void MainApplication::quitApplication() // // * this can occur on Mac OS (see #157) - removeLockedFile(); + removeLockFile(); quit(); } diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index c1030249b..dffb402ea 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -109,11 +109,11 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) #ifdef Q_OS_WIN ui->checkDefaultBrowser->setChecked(settings.value("Web-Browser-Settings/CheckDefaultBrowser", DEFAULT_CHECK_DEFAULTBROWSER).toBool()); if (mApp->associationManager()->isDefaultForAllCapabilities()) { - ui->checkNowDefaultBrowser->setText(tr("QupZilla is default")); + ui->checkNowDefaultBrowser->setText(tr("Default")); ui->checkNowDefaultBrowser->setEnabled(false); } else { - ui->checkNowDefaultBrowser->setText(tr("Make QupZilla default")); + ui->checkNowDefaultBrowser->setText(tr("Set as default")); ui->checkNowDefaultBrowser->setEnabled(true); connect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeQupZillaDefault())); } @@ -530,7 +530,7 @@ void Preferences::makeQupZillaDefault() #ifdef Q_OS_WIN disconnect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeQupZillaDefault())); mApp->associationManager()->registerAllAssociation(); - ui->checkNowDefaultBrowser->setText(tr("QupZilla is default")); + ui->checkNowDefaultBrowser->setText(tr("Default")); ui->checkNowDefaultBrowser->setEnabled(false); #endif } diff --git a/translations/empty.ts b/translations/empty.ts index dfa308e64..2dbe4da4c 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -2202,22 +2202,22 @@ MainApplication - + QupZilla is not currently your default browser. Would you like to make it your default browser? - + Always perform this check when starting QupZilla. - + Default Browser - + QupZilla is a new, fast and secure open-source WWW browser. QupZilla is licensed under GPL version 3 or (at your option) any later version. It is based on WebKit core and Qt Framework. @@ -2578,67 +2578,67 @@ - + QupZilla - + General - + Appearance - + Tabs - + Browsing - + Fonts - + Keyboard Shortcuts - + Downloads - + Password Manager - + Privacy - + Notifications - + Extensions - + Other @@ -2650,7 +2650,7 @@ - + Note: You cannot delete active profile. @@ -3494,89 +3494,89 @@ - - - QupZilla is default + + + Default - - Make QupZilla default + + Set as default - + OSD Notification - + Drag it on the screen to place it where you want. - + Choose download location... - + Choose stylesheet location... - + Deleted - + Choose executable location... - + Choose cache path... - + New Profile - + Enter the new profile's name: - - + + Error! - + This profile already exists! - + Cannot create profile directory! - + Confirmation - + Are you sure to permanently delete "%1" profile? This action cannot be undone! - + Select Color @@ -5911,6 +5911,16 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Choose file... + + + Cannot read data from <b>%1</b>. Upload was cancelled! + + + + + Cannot read file! + + WebSearchBar