summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/findbar.cpp2
-rw-r--r--src/mainview.cpp7
-rw-r--r--src/mainwindow.cpp8
-rw-r--r--src/networkaccessmanager.cpp2
-rw-r--r--src/settings_general.ui14
-rw-r--r--src/webpage.cpp6
6 files changed, 20 insertions, 19 deletions
diff --git a/src/findbar.cpp b/src/findbar.cpp
index 4ec93d87..f6c05702 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -66,7 +66,7 @@ FindBar::FindBar(KMainWindow *mainwindow)
layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop);
// label
- QLabel *label = new QLabel(i18n("Find: "));
+ QLabel *label = new QLabel(i18n("Find:"));
layout->addWidget(label);
// lineEdit, focusProxy
diff --git a/src/mainview.cpp b/src/mainview.cpp
index d02dd37d..f994aa25 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -409,9 +409,10 @@ void MainView::slotCloseTab(int index)
if (tab->isModified())
{
int risp = KMessageBox::questionYesNo(this,
- i18n("You have modified this page and when closing it you would lose the modifications.\n"
- "Do you really want to close this page?\n"),
- i18n("Closing tab confirmation"));
+ i18n("This tab contains changes that have not been submitted.\n"
+ "Closing the tab will discard these changes.\n"
+ "Do you really want to close this tab?\n"),
+ i18n("Closing Modified Tab"));
if (risp == KMessageBox::No)
return;
}
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 53527a4f..4ac97e3c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -364,7 +364,7 @@ void MainWindow::setupActions()
actionCollection()->addAction(QLatin1String("bookmarksActionMenu"), bmMenu);
// Add to preferred
- a = new KAction(KIcon("rating"), i18n("Add to preferred"), this);
+ a = new KAction(KIcon("rating"), i18n("Add to Preferred"), this);
actionCollection()->addAction(QLatin1String("add_to_preferred"), a);
connect(a, SIGNAL(triggered(bool)), this, SLOT(addPreferredLink()));
}
@@ -836,11 +836,11 @@ bool MainWindow::queryClose()
int answer = KMessageBox::questionYesNoCancel(
this,
i18np("Are you sure you want to close the window?\n" \
- "You have 1 tab open.",
+ "You still have 1 tab open.",
"Are you sure you want to close the window?\n" \
- "You have %1 tabs open.",
+ "You still have %1 tabs open.",
m_view->count()),
- i18n("Closing..."),
+ i18n("Closing rekonq"),
KStandardGuiItem::quit(),
KGuiItem(i18n("C&lose Current Tab"), KIcon("tab-close")),
KStandardGuiItem::cancel(),
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index c7f9790b..f95fa456 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -128,7 +128,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
passwordWidget.iconLabel->setText(QString());
passwordWidget.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
- //FIXME Replace the text below with an explanation of what exactly %1 and %2 stand for
+ //FIXME Replace the text below with an explanation of what exactly %1 and %2 mean
QString introMessage = i18nc("%1=stuff %2=stuff2", "<qt>Enter username and password for %1 at %2</qt>",
Qt::escape(reply->url().toString()),
Qt::escape(reply->url().toString()) );
diff --git a/src/settings_general.ui b/src/settings_general.ui
index 8e62182f..d12d254f 100644
--- a/src/settings_general.ui
+++ b/src/settings_general.ui
@@ -76,7 +76,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
- <string>New tabs open </string>
+ <string>New tab opens:</string>
</property>
</widget>
</item>
@@ -87,17 +87,17 @@
</property>
<item>
<property name="text">
- <string>new tab page</string>
+ <string>New Tab Page</string>
</property>
</item>
<item>
<property name="text">
- <string>blank page</string>
+ <string>Blank Page</string>
</property>
</item>
<item>
<property name="text">
- <string>home page</string>
+ <string>Home Page</string>
</property>
</item>
</widget>
@@ -114,7 +114,7 @@
<item>
<widget class="QCheckBox" name="kcfg_openTabNoWindow">
<property name="text">
- <string>Open links in new tab instead of new window</string>
+ <string>Open links in new tab instead of in new window</string>
</property>
</widget>
</item>
@@ -128,14 +128,14 @@
<item>
<widget class="QCheckBox" name="kcfg_openTabsBack">
<property name="text">
- <string>Open tabs in the background</string>
+ <string>Open new tabs in the background</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="kcfg_openTabsNearCurrent">
<property name="text">
- <string>Open new tabs near currently active</string>
+ <string>Open new tabs after currently active one</string>
</property>
</widget>
</item>
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 49896892..b1fc0da2 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -231,17 +231,17 @@ QString WebPage::errorPage(QNetworkReply *reply)
return QString("");
}
- QString title = i18n("Error loading: ") + reply->url().path();
+ QString title = i18n("Error loading: %1", reply->url().path());
QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics");
QString msg = "<h1>" + reply->errorString() + "</h1>";
- msg += "<h2>" + i18n("When connecting to: ") + reply->url().toString() + "</h2>";
+ msg += "<h2>" + i18nc("%1=an URL, e.g.'kde.org'", "When connecting to: %1", reply->url().toString()) + "</h2>";
msg += "<ul><li>" + i18n("Check the address for errors such as <b>ww</b>.kde.org instead of <b>www</b>.kde.org");
msg += "</li><li>" + i18n("If the address is correct, try to check the network connection.") + "</li><li>" ;
msg += i18n("If your computer or network is protected by a firewall or proxy, make sure that rekonq is permitted to access the network.");
- msg += "</li><li>" + i18n("Of course, if rekonq doesn't work properly, you can always say it's a programmer error ;)");
+ msg += "</li><li>" + i18n("Of course, if rekonq does not work properly, you can always say it is a programmer error ;)");
msg += "</li></ul><br/><br/>";
msg += "<input type=\"button\" id=\"reloadButton\" onClick=\"document.location.href='" + reply->url().path() + "';\" value=\"";
msg += i18n("Try Again") + "\" />";