summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-04-26 00:40:03 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-04-26 00:40:03 +0200
commit90d50d668bdfe237b331808949617387adf6e790 (patch)
tree9c559eca84009c60ffab3326551df4833259305b
parentFix crash (diff)
parentfix typo + add colons (diff)
downloadrekonq-90d50d668bdfe237b331808949617387adf6e790.tar.xz
Merge commit 'refs/merge-requests/2252' of git://gitorious.org/rekonq/mainline into m2252
-rw-r--r--src/settings/settings_webkit.ui2
-rw-r--r--src/settings/settingsdialog.cpp2
-rw-r--r--src/urlbar/rsswidget.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index f2e616c8..55f34ab3 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -47,7 +47,7 @@
<item row="1" column="0">
<widget class="QCheckBox" name="kcfg_dnsPrefetch">
<property name="text">
- <string>prefetch DNS entries</string>
+ <string>Prefetch DNS entries</string>
</property>
</widget>
</item>
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 2f52a8c2..d01b5809 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -175,7 +175,7 @@ SettingsDialog::~SettingsDialog()
void SettingsDialog::setWebSettingsToolTips()
{
d->webkitUi.kcfg_autoLoadImages->setToolTip(i18n("Specifies whether images are automatically loaded in web pages."));
- d->webkitUi.kcfg_dnsPrefetch->setToolTip( i18n("Specifies whether WebKit will try to pre-fetch DNS entries to speed up browsing.") );
+ d->webkitUi.kcfg_dnsPrefetch->setToolTip( i18n("Specifies whether WebKit will try to prefetch DNS entries to speed up browsing.") );
d->webkitUi.kcfg_javascriptEnabled->setToolTip(i18n("Enables the execution of JavaScript programs."));
d->webkitUi.kcfg_javaEnabled->setToolTip(i18n("Enables support for Java applets."));
d->webkitUi.kcfg_pluginsEnabled->setToolTip(i18n("Enables support for plugins in web pages."));
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index 16e52ccf..62275a84 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -55,7 +55,7 @@ RSSWidget::RSSWidget(QMap< KUrl, QString > map, QWidget *parent)
QLabel *agregator = new QLabel(this);
- agregator->setText(i18n("Agregator"));
+ agregator->setText(i18n("Aggregator:"));
m_agregators = new KComboBox(this);
m_agregators->addItem(KIcon("application-rss+xml"), QString("Akregator"));
@@ -65,7 +65,7 @@ RSSWidget::RSSWidget(QMap< KUrl, QString > map, QWidget *parent)
QLabel *feed = new QLabel(this);
- feed->setText(i18n("Feed"));
+ feed->setText(i18n("Feed:"));
m_feeds = new KComboBox(this);
foreach(QString title, m_map)