summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-08-22 20:20:44 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-08-22 20:20:44 +0200
commit9335b37de029837fde82ac64cc7e27365fbd200c (patch)
tree2795f9344b88ceacc433f574e52c2b7aca710416 /src
parentupdated RELEASE instructions (not yet ready, anyway..) (diff)
parentAdded some FIXME notes about some strings (diff)
downloadrekonq-9335b37de029837fde82ac64cc7e27365fbd200c.tar.xz
Merge commit 'pano/string-fixes'
Diffstat (limited to 'src')
-rw-r--r--src/application.cpp4
-rw-r--r--src/cleardata.ui4
-rw-r--r--src/main.cpp2
-rw-r--r--src/networkaccessmanager.cpp6
-rw-r--r--src/panelhistory.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 711e3fb8..812081de 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -250,7 +250,7 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
if ( !url.isValid() )
{
- KMessageBox::error(0, i18n("Malformed URL\n%1", url.url()));
+ KMessageBox::error(0, i18n("Malformed URL:\n%1", url.url()));
return;
}
@@ -289,7 +289,7 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
if ( !KProtocolInfo::isKnownProtocol( loadingUrl ) )
{
- KMessageBox::error(0, i18n("Protocol not supported\n%1", url.protocol()));
+ KMessageBox::error(0, i18n("Protocol not supported:\n%1", url.protocol()));
return;
}
diff --git a/src/cleardata.ui b/src/cleardata.ui
index 94a39c69..b27a8f63 100644
--- a/src/cleardata.ui
+++ b/src/cleardata.ui
@@ -24,7 +24,7 @@
<item>
<widget class="QCheckBox" name="clearHistory">
<property name="text">
- <string>history</string>
+ <string>History</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -54,7 +54,7 @@
<item>
<widget class="QCheckBox" name="clearWebIcons">
<property name="text">
- <string>Website Icons</string>
+ <string>Website icons</string>
</property>
<property name="checked">
<bool>true</bool>
diff --git a/src/main.cpp b/src/main.cpp
index d6189049..0758abfa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
"");
about.addCredit(ki18n("Abuus"),
- ki18n("Webview mouse event support"),
+ ki18n("Webview mouse event support"),
"buusmail@gmail.com",
"");
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index a06b20aa..473fa770 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -141,8 +141,8 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
passwordWidget.iconLabel->setText(QString());
passwordWidget.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
-
- QString introMessage = i18n("<qt>Enter username and password for %1 at %2</qt>",
+ //FIXME Replace the text below with an explanation of what exactly %1 and %2 stand for
+ 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()) );
passwordWidget.introLabel->setText(introMessage);
@@ -172,7 +172,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
proxyWdg.iconLabel->setText(QString());
proxyWdg.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
-
+ //FIXME Connect to proxy %1 using what? Best solution would be adding a %2 after the "using:" part and explain %1 and %2 in an i18nc call
QString introMessage = i18n("<qt>Connect to proxy %1 using:</qt>", Qt::escape(proxy.hostName()) );
proxyWdg.introLabel->setText(introMessage);
proxyWdg.introLabel->setWordWrap(true);
diff --git a/src/panelhistory.cpp b/src/panelhistory.cpp
index f9ac9da0..d6367669 100644
--- a/src/panelhistory.cpp
+++ b/src/panelhistory.cpp
@@ -51,7 +51,7 @@ PanelHistory::PanelHistory(QWidget *parent)
// add search bar
QHBoxLayout *hBoxLayout = new QHBoxLayout;
hBoxLayout->setContentsMargins(5, 0, 0, 0);
- QLabel *searchLabel = new QLabel(i18n("Search: "));
+ QLabel *searchLabel = new QLabel(i18n("Search:"));
hBoxLayout->addWidget(searchLabel);
KLineEdit *search = new KLineEdit;
hBoxLayout->addWidget(search);