summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPino Toscano <pino@kde.org>2013-06-07 09:54:38 +0200
committerPino Toscano <pino@kde.org>2013-06-07 09:54:38 +0200
commit43d4fc732abb294a89127ce55b80d7f78fd606c7 (patch)
treea36eee0653f737df1f8254d2f6a901c72b426cda /src
parentFix behavior on unloaded sites (diff)
downloadrekonq-43d4fc732abb294a89127ce55b80d7f78fd606c7.tar.xz
i18n fixes
- remove string puzzles when possible - remove exclamation marks - remove contractions ("don't" -> "do not", etc) - lowercase "NOT" (do not shout to the user) - remove extra spaces, or add them where needed - few style/spelling fixes
Diffstat (limited to 'src')
-rw-r--r--src/history/historymodels.cpp6
-rw-r--r--src/settings/privacywidget.cpp2
-rw-r--r--src/sync/ftpsynchandler.cpp12
-rw-r--r--src/sync/googlesynchandler.cpp18
-rw-r--r--src/sync/operasynchandler.cpp24
-rw-r--r--src/tabwindow/tabwidget.cpp2
-rw-r--r--src/urlbar/adblockwidget.cpp2
-rw-r--r--src/urlbar/bookmarkwidget.cpp2
-rw-r--r--src/urlbar/listitem.cpp2
-rw-r--r--src/urlbar/resourcelinkdialog.cpp2
-rw-r--r--src/urlbar/sslwidget.cpp4
-rw-r--r--src/urlbar/urlbar.cpp2
-rw-r--r--src/webtab/searchenginebar.cpp2
-rw-r--r--src/webtab/sslinfodialog.cpp4
-rw-r--r--src/webtab/webpage.cpp20
-rw-r--r--src/webtab/webtab.cpp10
-rw-r--r--src/webtab/webview.cpp2
-rw-r--r--src/webwindow/webwindow.cpp2
18 files changed, 60 insertions, 58 deletions
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index 76b504d3..3c846d2f 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -155,9 +155,9 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const
int visitCount = item.visitCount;
tooltip += QL1S("<center> <b>") + item.url + QL1S("</b> </center>");
tooltip += QL1S("<hr/>");
- tooltip += i18n("First Visit: ") + firstVisit + QL1S("<br/>");
- tooltip += i18n("Last Visit: ") + lastVisit + QL1S("<br/>");
- tooltip += i18n("Number of Visits: ") + QString::number(visitCount);
+ tooltip += i18n("First Visit: %1", firstVisit) + QL1S("<br/>");
+ tooltip += i18n("Last Visit: %1", lastVisit) + QL1S("<br/>");
+ tooltip += i18n("Number of Visits: %1", QString::number(visitCount));
return tooltip;
}
diff --git a/src/settings/privacywidget.cpp b/src/settings/privacywidget.cpp
index 46774a63..f1523ee9 100644
--- a/src/settings/privacywidget.cpp
+++ b/src/settings/privacywidget.cpp
@@ -88,7 +88,7 @@ void PrivacyWidget::reload()
}
else
{
- QString str = i18n("Javascript is NOT enabled, cannot change these settings");
+ QString str = i18n("Javascript is not enabled, cannot change these settings");
kcfg_javascriptCanOpenWindows->setToolTip(str);
kcfg_javascriptCanAccessClipboard->setToolTip(str);
}
diff --git a/src/sync/ftpsynchandler.cpp b/src/sync/ftpsynchandler.cpp
index ad845d09..4c731db7 100644
--- a/src/sync/ftpsynchandler.cpp
+++ b/src/sync/ftpsynchandler.cpp
@@ -145,7 +145,7 @@ void FTPSyncHandler::onBookmarksStatFinished(KJob *job)
KIO::Job *job = KIO::file_copy(_localBookmarksUrl, _remoteBookmarksUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
connect(job, SIGNAL(finished(KJob*)), this, SLOT(onBookmarksSyncFinished(KJob*)));
- emit syncStatus(Rekonq::Bookmarks, true, i18n("Remote bookmarks file does NOT exists. Exporting local copy..."));
+ emit syncStatus(Rekonq::Bookmarks, true, i18n("Remote bookmarks file does not exists. Exporting local copy..."));
_firstTimeSynced = true;
}
else
@@ -158,7 +158,7 @@ void FTPSyncHandler::onBookmarksStatFinished(KJob *job)
KIO::Job *job = KIO::file_copy(_remoteBookmarksUrl, _localBookmarksUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
connect(job, SIGNAL(finished(KJob*)), this, SLOT(onBookmarksSyncFinished(KJob*)));
- emit syncStatus(Rekonq::Bookmarks, true, i18n("Remote bookmarks file exists! Syncing local copy..."));
+ emit syncStatus(Rekonq::Bookmarks, true, i18n("Remote bookmarks file exists. Syncing local copy..."));
_firstTimeSynced = true;
}
}
@@ -201,7 +201,7 @@ void FTPSyncHandler::onHistoryStatFinished(KJob *job)
KIO::Job *job = KIO::file_copy(_localHistoryUrl, _remoteHistoryUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
connect(job, SIGNAL(finished(KJob*)), this, SLOT(onHistorySyncFinished(KJob*)));
- emit syncStatus(Rekonq::History, true, i18n("Remote history file does NOT exists. Exporting local copy..."));
+ emit syncStatus(Rekonq::History, true, i18n("Remote history file does not exists. Exporting local copy..."));
_firstTimeSynced = true;
}
else
@@ -214,7 +214,7 @@ void FTPSyncHandler::onHistoryStatFinished(KJob *job)
KIO::Job *job = KIO::file_copy(_remoteHistoryUrl, _localHistoryUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
connect(job, SIGNAL(finished(KJob*)), this, SLOT(onHistorySyncFinished(KJob*)));
- emit syncStatus(Rekonq::History, true, i18n("Remote history file exists! Syncing local copy..."));
+ emit syncStatus(Rekonq::History, true, i18n("Remote history file exists. Syncing local copy..."));
_firstTimeSynced = true;
}
}
@@ -257,7 +257,7 @@ void FTPSyncHandler::onPasswordsStatFinished(KJob *job)
KIO::Job *job = KIO::file_copy(_localPasswordsUrl, _remotePasswordsUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
connect(job, SIGNAL(finished(KJob*)), this, SLOT(onPasswordsSyncFinished(KJob*)));
- emit syncStatus(Rekonq::Passwords, true, i18n("Remote passwords file does NOT exists. Exporting local copy..."));
+ emit syncStatus(Rekonq::Passwords, true, i18n("Remote passwords file does not exists. Exporting local copy..."));
_firstTimeSynced = true;
}
else
@@ -270,7 +270,7 @@ void FTPSyncHandler::onPasswordsStatFinished(KJob *job)
KIO::Job *job = KIO::file_copy(_remotePasswordsUrl, _localPasswordsUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
connect(job, SIGNAL(finished(KJob*)), this, SLOT(onPasswordsSyncFinished(KJob*)));
- emit syncStatus(Rekonq::Passwords, true, i18n("Remote passwords file exists! Syncing local copy..."));
+ emit syncStatus(Rekonq::Passwords, true, i18n("Remote passwords file exists. Syncing local copy..."));
_firstTimeSynced = true;
}
}
diff --git a/src/sync/googlesynchandler.cpp b/src/sync/googlesynchandler.cpp
index f2e23da8..44388803 100644
--- a/src/sync/googlesynchandler.cpp
+++ b/src/sync/googlesynchandler.cpp
@@ -83,12 +83,12 @@ void GoogleSyncHandler::initialLoadAndCheck()
if (ReKonfig::syncHistory())
{
- emit syncStatus(Rekonq::History, false, i18n("Not supported!"));
+ emit syncStatus(Rekonq::History, false, i18n("Not supported"));
}
if (ReKonfig::syncHistory())
{
- emit syncStatus(Rekonq::Passwords, false, i18n("Not supported!"));
+ emit syncStatus(Rekonq::Passwords, false, i18n("Not supported"));
}
}
@@ -111,7 +111,7 @@ bool GoogleSyncHandler::syncRelativeEnabled(bool check)
void GoogleSyncHandler::syncHistory()
{
kDebug() << "Syncing history not supported!";
- emit syncStatus(Rekonq::History, false, i18n("Syncing history not supported!"));
+ emit syncStatus(Rekonq::History, false, i18n("Syncing history not supported"));
emit syncHistoryFinished(false);
}
@@ -119,7 +119,7 @@ void GoogleSyncHandler::syncHistory()
void GoogleSyncHandler::syncPasswords()
{
kDebug() << "Syncing passwords not supported!";
- emit syncStatus(Rekonq::Passwords, false, i18n("Syncing passwords not supported!"));
+ emit syncStatus(Rekonq::Passwords, false, i18n("Syncing passwords not supported"));
emit syncPasswordsFinished(false);
}
@@ -141,7 +141,7 @@ void GoogleSyncHandler::startLogin()
if (ReKonfig::syncUser().isEmpty() || ReKonfig::syncPass().isEmpty())
{
kDebug() << "No username or password!";
- emit syncStatus(Rekonq::Bookmarks, false, i18n("No username or password!"));
+ emit syncStatus(Rekonq::Bookmarks, false, i18n("No username or password"));
emit syncBookmarksFinished(false);
return;
}
@@ -161,7 +161,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
if (!ok)
{
kDebug() << "Error loading: " << _webPage.mainFrame()->url();
- emit syncStatus(Rekonq::Bookmarks, false, i18n("Error loading: " + _webPage.mainFrame()->url().toEncoded()));
+ emit syncStatus(Rekonq::Bookmarks, false, i18n("Error loading: %1", _webPage.mainFrame()->url().toEncoded()));
_isSyncing = false;
return;
@@ -201,7 +201,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
}
else if (path == QL1S("/ServiceLoginAuth") )
{
- emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed!"));
+ emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed"));
_isSyncing = false;
}
else if (path == QL1S("/bookmarks/mark") )
@@ -260,7 +260,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
else if (path == QL1S("/Logout") )
{
//Session finished
- emit syncStatus(Rekonq::Bookmarks, true, i18n("Done!"));
+ emit syncStatus(Rekonq::Bookmarks, true, i18n("Done"));
emit syncBookmarksFinished(true);
_isSyncing = false;
}
@@ -299,7 +299,7 @@ void GoogleSyncHandler::fetchingBookmarksFinished()
{
//Add bookmark
kDebug() << "Add bookmark";
- emit syncStatus(Rekonq::Bookmarks, true, i18n("Adding bookmark "));
+ emit syncStatus(Rekonq::Bookmarks, true, i18n("Adding bookmark"));
root.addBookmark(title.isEmpty() ? url : title, KUrl(url));
manager->manager()->emitChanged(root);
}
diff --git a/src/sync/operasynchandler.cpp b/src/sync/operasynchandler.cpp
index d603f381..0f39f4ab 100644
--- a/src/sync/operasynchandler.cpp
+++ b/src/sync/operasynchandler.cpp
@@ -86,12 +86,12 @@ void OperaSyncHandler::initialLoadAndCheck()
if (ReKonfig::syncHistory())
{
- emit syncStatus(Rekonq::History, false, i18n("Not supported!"));
+ emit syncStatus(Rekonq::History, false, i18n("Not supported"));
}
if (ReKonfig::syncHistory())
{
- emit syncStatus(Rekonq::Passwords, false, i18n("Not supported!"));
+ emit syncStatus(Rekonq::Passwords, false, i18n("Not supported"));
}
}
@@ -114,7 +114,7 @@ bool OperaSyncHandler::syncRelativeEnabled(bool check)
void OperaSyncHandler::syncHistory()
{
kDebug() << "Syncing history not supported!";
- emit syncStatus(Rekonq::History, false, i18n("Syncing history not supported!"));
+ emit syncStatus(Rekonq::History, false, i18n("Syncing history not supported"));
emit syncHistoryFinished(false);
}
@@ -122,7 +122,7 @@ void OperaSyncHandler::syncHistory()
void OperaSyncHandler::syncPasswords()
{
kDebug() << "Syncing passwords not supported!";
- emit syncStatus(Rekonq::Passwords, false, i18n("Syncing passwords not supported!"));
+ emit syncStatus(Rekonq::Passwords, false, i18n("Syncing passwords not supported"));
emit syncPasswordsFinished(false);
}
@@ -144,7 +144,7 @@ void OperaSyncHandler::startLogin()
if (ReKonfig::syncUser().isEmpty() || ReKonfig::syncPass().isEmpty())
{
kDebug() << "No username or password!";
- emit syncStatus(Rekonq::Bookmarks, false, i18n("No username or password!"));
+ emit syncStatus(Rekonq::Bookmarks, false, i18n("No username or password"));
emit syncBookmarksFinished(false);
return;
}
@@ -169,7 +169,7 @@ void OperaSyncHandler::startLogin()
if (_qoauth.error() != QOAuth::NoError)
{
kDebug() << "Error occurred while fetching request tokens. Error code is : " << _qoauth.error();
- emit syncStatus(Rekonq::Bookmarks, false, i18n("OAuth : Error fetching request token."));
+ emit syncStatus(Rekonq::Bookmarks, false, i18n("OAuth: Error fetching request token"));
_isSyncing = false;
return;
}
@@ -199,7 +199,7 @@ void OperaSyncHandler::loadFinished(bool ok)
if (!ok)
{
kDebug() << "Error loading: " << _webPage.mainFrame()->url();
- emit syncStatus(Rekonq::Bookmarks, false, i18n("Error loading: " + _webPage.mainFrame()->url().toEncoded()));
+ emit syncStatus(Rekonq::Bookmarks, false, i18n("Error loading: %1", _webPage.mainFrame()->url().toEncoded()));
_isSyncing = false;
return;
@@ -242,14 +242,14 @@ void OperaSyncHandler::loadFinished(bool ok)
kDebug() << "OAuth verifier code is : " << verifier;
authParams.insert("oauth_verifier", verifier);
- emit syncStatus(Rekonq::Bookmarks, true, i18n("OAuth : Sending verification code."));
+ emit syncStatus(Rekonq::Bookmarks, true, i18n("OAuth: Sending verification code"));
QOAuth::ParamMap resultParam = _qoauth.accessToken("https://auth.opera.com/service/oauth/access_token", QOAuth::POST,
_requestToken, _requestTokenSecret, QOAuth::HMAC_SHA1, authParams);
if (_qoauth.error() != QOAuth::NoError)
{
kDebug() << "Error occurred while fetching access tokens. Error code is : " << _qoauth.error();
- emit syncStatus(Rekonq::Bookmarks, false, i18n("OAuth : Error fetching access token."));
+ emit syncStatus(Rekonq::Bookmarks, false, i18n("OAuth: Error fetching access token"));
_isSyncing = false;
return;
}
@@ -268,7 +268,7 @@ void OperaSyncHandler::loadFinished(bool ok)
else if (_doLogin == false)
{
//Login failed
- emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed!"));
+ emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed"));
kDebug() << "Login failed!";
_isSyncing = false;
}
@@ -345,7 +345,7 @@ void OperaSyncHandler::fetchBookmarksResultSlot(KJob* job)
if (_mode == RECEIVE_CHANGES)
{
handleResponse(responseList, root);
- emit syncStatus(Rekonq::Bookmarks, true, i18n("Done!"));
+ emit syncStatus(Rekonq::Bookmarks, true, i18n("Done"));
// _isSyncing = false;
_mode = SEND_CHANGES;
}
@@ -910,7 +910,7 @@ void OperaSyncHandler::decreaseRequestCount()
if (_requestCount <= 0)
{
- emit syncStatus(Rekonq::Bookmarks, true, i18n("Done!"));
+ emit syncStatus(Rekonq::Bookmarks, true, i18n("Done"));
_isSyncing = false;
}
}
diff --git a/src/tabwindow/tabwidget.cpp b/src/tabwindow/tabwidget.cpp
index 494d99f0..3b06350d 100644
--- a/src/tabwindow/tabwidget.cpp
+++ b/src/tabwindow/tabwidget.cpp
@@ -777,7 +777,7 @@ void TabWidget::reloadAllTabs()
void TabWidget::bookmarkAllTabs()
{
KBookmarkGroup rGroup = BookmarkManager::self()->rootGroup();
- KBookmarkGroup folderGroup = rGroup.createNewFolder(i18n("Bookmarked tabs: ") + QDate::currentDate().toString());
+ KBookmarkGroup folderGroup = rGroup.createNewFolder(i18n("Bookmarked tabs: %1", QDate::currentDate().toString()));
for (int i = 0; i < count(); ++i)
{
WebWindow *tab = webWindow(i);
diff --git a/src/urlbar/adblockwidget.cpp b/src/urlbar/adblockwidget.cpp
index 063658eb..5fd27fb2 100644
--- a/src/urlbar/adblockwidget.cpp
+++ b/src/urlbar/adblockwidget.cpp
@@ -75,7 +75,7 @@ AdBlockWidget::AdBlockWidget(const QUrl &url, QWidget *parent)
}
// Checkbox
- _chBox->setText(i18n("Enable adblock for this site"));
+ _chBox->setText(i18n("Enable AdBlock for this site"));
_chBox->setChecked(_isAdblockEnabledHere);
layout->addWidget(title);
diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp
index 76e1c9ac..5c556672 100644
--- a/src/urlbar/bookmarkwidget.cpp
+++ b/src/urlbar/bookmarkwidget.cpp
@@ -150,7 +150,7 @@ BookmarkWidget::BookmarkWidget(const KBookmark &bookmark, QWidget *parent)
QLabel *tagLabel = new QLabel(this);
tagLabel->setText(i18n("Tags:"));
tagLabel->setAlignment(Qt::AlignLeft);
- m_tagLine->setPlaceholderText(i18n("add tags(comma separated)"));
+ m_tagLine->setPlaceholderText(i18n("add tags (comma separated)"));
QList<Nepomuk2::Tag> tagList = Nepomuk2::Tag::allTags();
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 580eea53..4e6795f0 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -439,7 +439,7 @@ SearchListItem::SearchListItem(const UrlSuggestionItem &item, const QString &tex
hLayout->addWidget(m_iconLabel);
hLayout->addWidget(m_titleLabel);
- hLayout->addWidget(new QLabel(i18n("Engines: "), this));
+ hLayout->addWidget(new QLabel(i18n("Engines:"), this));
hLayout->addWidget(m_engineBar);
hLayout->addWidget(new TypeIconLabel(item.type, this));
diff --git a/src/urlbar/resourcelinkdialog.cpp b/src/urlbar/resourcelinkdialog.cpp
index 668dc65e..bafe3d52 100644
--- a/src/urlbar/resourcelinkdialog.cpp
+++ b/src/urlbar/resourcelinkdialog.cpp
@@ -128,7 +128,7 @@ Nepomuk2::ResourceLinkDialog::ResourceLinkDialog(Nepomuk2::Resource &nfoResource
connect(d->m_searchBox, SIGNAL(textChanged(QString)), this, SLOT(dynamicSearchingSlot()));
d->m_resourceView = new QListView(mainWidget());
- d->m_resourceView->setToolTip(i18n(" Double click to link resource "));
+ d->m_resourceView->setToolTip(i18n("Double click to link resource"));
d->m_resourceModel = new Utils::SimpleResourceModel(this);
d->m_resourceView->setModel(d->m_resourceModel);
diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp
index 59161267..a7d7640d 100644
--- a/src/urlbar/sslwidget.cpp
+++ b/src/urlbar/sslwidget.cpp
@@ -85,7 +85,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent)
label->setWordWrap(true);
if (cert.isNull())
{
- label->setText(i18n("Warning: this site is NOT carrying a certificate."));
+ label->setText(i18n("Warning: this site is not carrying a certificate."));
imageLabel->setPixmap(KIcon("security-low").pixmap(c_dim));
layout->addWidget(label, rows++, 1);
}
@@ -138,7 +138,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent)
{
label = new QLabel(this);
label->setWordWrap(true);
- label->setText(i18n("Your connection to %1 is NOT encrypted.\n", m_url.host()));
+ label->setText(i18n("Your connection to %1 is not encrypted.\n", m_url.host()));
layout->addWidget(label, rows++ , 1);
imageLabel->setPixmap(KIcon("security-low").pixmap(c_dim));
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index e12c5842..6775e02c 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -576,7 +576,7 @@ IconButton *UrlBar::addRightIcon(UrlBar::icon ic)
else
{
rightIcon->setIcon(KIcon("preferences-web-browser-adblock").pixmap(32, 32, QIcon::Disabled));
- rightIcon->setToolTip(i18n("AdBlock is NOT enabled on this site"));
+ rightIcon->setToolTip(i18n("AdBlock is not enabled on this site"));
}
break;
}
diff --git a/src/webtab/searchenginebar.cpp b/src/webtab/searchenginebar.cpp
index 441facf7..e463ba27 100644
--- a/src/webtab/searchenginebar.cpp
+++ b/src/webtab/searchenginebar.cpp
@@ -58,7 +58,7 @@ SearchEngineBar::SearchEngineBar(QWidget *parent)
setCloseButtonVisible(false);
- setText(i18n("You don't have a default search engine set. Without it, rekonq will not show proper url suggestions."));
+ setText(i18n("You do not have a default search engine set. Without it, rekonq will not show proper URL suggestions."));
KAction *acceptAction = new KAction(i18n("Set it"), this);
connect(acceptAction, SIGNAL(triggered(bool)), this, SIGNAL(accepted()));
diff --git a/src/webtab/sslinfodialog.cpp b/src/webtab/sslinfodialog.cpp
index 8572febc..1465bfae 100644
--- a/src/webtab/sslinfodialog.cpp
+++ b/src/webtab/sslinfodialog.cpp
@@ -119,12 +119,12 @@ void SslInfoDialog::displayFromChain(int i)
if (cert.isValid() && errors.isEmpty())
{
QStringList certInfo;
- certInfo << i18n("The Certificate is Valid!");
+ certInfo << i18n("The certificate is valid");
showCertificateInfo(cert, certInfo);
}
else
{
- errors.prepend(i18n("The certificate for this site is NOT valid for the following reasons:"));
+ errors.prepend(i18n("The certificate for this site is not valid for the following reasons:"));
showCertificateInfo(cert, errors);
}
}
diff --git a/src/webtab/webpage.cpp b/src/webtab/webpage.cpp
index 6042cf32..bae10f5a 100644
--- a/src/webtab/webpage.cpp
+++ b/src/webtab/webpage.cpp
@@ -699,7 +699,7 @@ QString WebPage::errorPage(QNetworkReply *reply)
// test to see if networking is enabled on the system
if (Solid::Networking::status() != Solid::Networking::Connected)
{
- msg += QL1S("<h2>") + i18n("Network is NOT available") + QL1S("</h2>");
+ msg += QL1S("<h2>") + i18n("Network is not available") + QL1S("</h2>");
QString faceIconPath = QString("file://") + KIconLoader::global()->iconPath("face-surprise" , -KIconLoader::SizeHuge, false);
msg += QL1S("<table>");
@@ -743,21 +743,23 @@ QString WebPage::errorPage(QNetworkReply *reply)
msg += QL1S("<p>");
if (defaultEngine)
{
- msg += i18n("Ask your default search engine about:");
- msg += QL1S(" <a href=\"") + SearchEngine::buildQuery(defaultEngine, urlString) + QL1S("\">");
- msg += i18n("search with %1", defaultEngine->name());
- msg += QL1S("</a>!<br />");
+ msg += i18n("Ask your default search engine about: "
+ "<a href=\"%1\">search with %2</a>.<br />",
+ SearchEngine::buildQuery(defaultEngine, urlString),
+ defaultEngine->name());
}
else
{
- msg += i18n("You don't have a default search engine set. We won't suggest you one.");
+ msg += i18n("You do not have a default search engine set. We will not suggest you one.");
}
msg += QL1S("</p>");
msg += QL1S("<p>");
- msg += i18n("Consult a cached snapshot of the site: ");
- msg += i18n("try checking the <a href=\"%1\">Wayback Machine</a>", QL1S("http://wayback.archive.org/web/*/") + urlString);
- msg += i18n(" or the <a href=\"%1\">Google Cache</a>.", QL1S("http://google.com/search?q=cache:") + urlString);
+ msg += i18n("Consult a cached snapshot of the site: "
+ "try checking the <a href=\"%1\">Wayback Machine</a>"
+ " or the <a href=\"%2\">Google Cache</a>.",
+ QL1S("http://wayback.archive.org/web/*/") + urlString,
+ QL1S("http://google.com/search?q=cache:") + urlString);
msg += QL1S("</p>");
msg += QL1S("<h5>") + i18n("<a href='%1'>Try Again</a>", urlString) + QL1S("</h5>");
msg += QL1S("</td></tr></table>");
diff --git a/src/webtab/webtab.cpp b/src/webtab/webtab.cpp
index fba824a1..d589692a 100644
--- a/src/webtab/webtab.cpp
+++ b/src/webtab/webtab.cpp
@@ -423,7 +423,7 @@ void WebTab::zoomIn()
{
if (m_zoomFactor == 50)
{
- emit infoToShow(i18n("Max zoom reached: ") + QString::number(m_zoomFactor * 10) + QL1S("%"));
+ emit infoToShow(i18n("Max zoom reached: %1%", QString::number(m_zoomFactor * 10)));
return;
}
@@ -439,7 +439,7 @@ void WebTab::zoomIn()
KConfigGroup group(config, "Zoom");
group.writeEntry(url().host(), m_zoomFactor);
- emit infoToShow(i18n("Zooming: ") + QString::number(m_zoomFactor * 10) + QL1S("%"));
+ emit infoToShow(i18n("Zooming: %1%", QString::number(m_zoomFactor * 10)));
}
@@ -447,7 +447,7 @@ void WebTab::zoomOut()
{
if (m_zoomFactor == 1)
{
- emit infoToShow(i18n("Min zoom reached: ") + QString::number(m_zoomFactor * 10) + QL1S("%"));
+ emit infoToShow(i18n("Min zoom reached: %1%", QString::number(m_zoomFactor * 10)));
return;
}
@@ -459,7 +459,7 @@ void WebTab::zoomOut()
KConfigGroup group(config, "Zoom");
group.writeEntry(url().host(), m_zoomFactor);
- emit infoToShow(i18n("Zooming: ") + QString::number(m_zoomFactor * 10) + QL1S("%"));
+ emit infoToShow(i18n("Zooming: %1%", QString::number(m_zoomFactor * 10)));
}
@@ -473,7 +473,7 @@ void WebTab::zoomDefault()
KConfigGroup group(config, "Zoom");
group.writeEntry(url().host(), m_zoomFactor);
- emit infoToShow(i18n("Default zoom: ") + QString::number(m_zoomFactor * 10) + QL1S("%"));
+ emit infoToShow(i18n("Default zoom: %1%", QString::number(m_zoomFactor * 10)));
}
diff --git a/src/webtab/webview.cpp b/src/webtab/webview.cpp
index e9d48f29..56ac1e7a 100644
--- a/src/webtab/webview.cpp
+++ b/src/webtab/webview.cpp
@@ -337,7 +337,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
{
// send by mail: page url
sendByMailAction->setData(page()->currentFrame()->url());
- sendByMailAction->setText(i18n("Share page url"));
+ sendByMailAction->setText(i18n("Share page URL"));
// navigation
QWebHistory *history = page()->history();
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index 1a695f9c..34daa9ba 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -839,7 +839,7 @@ void WebWindow::viewPageSource()
// srcTab->page()->setIsOnRekonqPage(true);
// srcTab->setPart(pa, tmpUrl);
// srcTab->urlBar()->setQUrl(url.pathOrUrl());
-// m_view->setTabText(m_view->currentIndex(), i18n("Source of: ") + url.prettyUrl());
+// m_view->setTabText(m_view->currentIndex(), i18n("Source of: %1", url.prettyUrl()));
// updateHistoryActions();
// }