summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-02-19 02:32:01 +0100
committerAndrea Diamantini <adjam7@gmail.com>2010-02-19 02:32:01 +0100
commitacc10a5216cdb29de479a9eb62c6765cb6e196ae (patch)
tree7e7cc3874c0c72beeaf154f6330b5046ad7f6fac
parentSet rekonq page (and fix focus) on new window creation. (diff)
parentChange window titles strings a bit (diff)
downloadrekonq-acc10a5216cdb29de479a9eb62c6765cb6e196ae.tar.xz
Merge commit 'refs/merge-requests/90' of git://gitorious.org/rekonq/mainline into ThursdayFixes
-rw-r--r--src/mainwindow.cpp6
-rw-r--r--src/settings/settingsdialog.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4c24440c..63c2c29d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -671,7 +671,7 @@ void MainWindow::updateWindowTitle(const QString &title)
{
if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
{
- setWindowTitle("rekonq (" + i18n("Private Browsing") + ')');
+ setWindowTitle(i18nc("Window title when private browsing is activated", "rekonq (Private Browsing)"));
}
else
{
@@ -682,11 +682,11 @@ void MainWindow::updateWindowTitle(const QString &title)
{
if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
{
- setWindowTitle(title + " - rekonq (" + i18n("Private Browsing") + ')');
+ setWindowTitle(i18nc("window title, %1 = Title of the active website", "%1 – rekonq (Private Browsing)", title) );
}
else
{
- setWindowTitle(title + " - rekonq");
+ setWindowTitle(i18nc("window title, %1 = title of the active website", "%1 – rekonq"));
}
}
}
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index a3bf7359..0b9d8e85 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -151,7 +151,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
, d(new Private(this))
{
showButtonSeparator(false);
- setWindowTitle(i18n("Configure - rekonq"));
+ setWindowTitle(i18nic("Window title of the settings dialog", "Configure – rekonq"));
setModal(true);
readConfig();