summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-07-10 16:05:34 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-07-10 16:05:34 +0200
commitec9a0b2865aa6ee51dcfebee0ce49661bc345a14 (patch)
treea3c806c972b032dca09913a843b35734a4d77566 /src
parentCleaning settings ui && making optional hovering links popups (diff)
parentChanged the icon for tabs without own favicon to a generic html-icon (diff)
downloadrekonq-ec9a0b2865aa6ee51dcfebee0ce49661bc345a14.tar.xz
Merge commit 'pano/master'
Diffstat (limited to 'src')
-rw-r--r--src/application.cpp2
-rw-r--r--src/historymenu.cpp2
-rw-r--r--src/settings.cpp20
3 files changed, 12 insertions, 12 deletions
diff --git a/src/application.cpp b/src/application.cpp
index bc77f60a..afd6a2cc 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -190,7 +190,7 @@ KIcon Application::icon(const KUrl &url)
KIcon icon = KIcon(QWebSettings::iconForUrl(url));
if (icon.isNull())
{
- icon = KIcon("kde");
+ icon = KIcon("text-html");
}
return icon;
}
diff --git a/src/historymenu.cpp b/src/historymenu.cpp
index b5edae3f..4f11d82c 100644
--- a/src/historymenu.cpp
+++ b/src/historymenu.cpp
@@ -86,7 +86,7 @@ void HistoryMenu::postPopulated()
void HistoryMenu::clearHistory()
{
- int res = KMessageBox::warningYesNo(this, i18n("Are you sure you want to delete history?"), i18n("History") );
+ int res = KMessageBox::warningYesNo(this, i18n("Are you sure you want to clear the history?"), i18n("Clear History") );
if (res == KMessageBox::Yes)
{
diff --git a/src/settings.cpp b/src/settings.cpp
index ab315a9d..dda00a0e 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -145,16 +145,16 @@ void SettingsDialog::setWebSettingsToolTips()
{
d->webkitUi.kcfg_autoLoadImages->setToolTip(i18n("Specifies whether images are automatically loaded in web pages"));
d->webkitUi.kcfg_javascriptEnabled->setToolTip(i18n("Enables the execution of JavaScript programs."));
- d->webkitUi.kcfg_javaEnabled->setToolTip(i18n("Enables Java applets."));
- d->webkitUi.kcfg_pluginsEnabled->setToolTip(i18n("Enables plugins in web pages."));
- d->webkitUi.kcfg_javascriptCanOpenWindows->setToolTip(i18n("Allows JavaScript programs to open new windows."));
- d->webkitUi.kcfg_javascriptCanAccessClipboard->setToolTip(i18n("Allows JavaScript programs to read from and to write to the clipboard."));
- d->webkitUi.kcfg_linksIncludedInFocusChain->setToolTip(i18n("Includes hyperlinks in the keyboard focus chain."));
- d->webkitUi.kcfg_zoomTextOnly->setToolTip(i18n("Applies the zoom factor on a frame to only the text or all content."));
- d->webkitUi.kcfg_printElementBackgrounds->setToolTip(i18n("Draws also background color and images when the page is printed."));
- d->webkitUi.kcfg_offlineStorageDatabaseEnabled->setToolTip(i18n("Support for the HTML 5 offline storage feature."));
- d->webkitUi.kcfg_offlineWebApplicationCacheEnabled->setToolTip(i18n("Support for the HTML 5 web application cache feature."));
- d->webkitUi.kcfg_localStorageDatabaseEnabled->setToolTip(i18n("Support for the HTML 5 local storage feature."));
+ d->webkitUi.kcfg_javaEnabled->setToolTip(i18n("Enables support for Java applets."));
+ d->webkitUi.kcfg_pluginsEnabled->setToolTip(i18n("Enables support for plugins in web pages."));
+ d->webkitUi.kcfg_javascriptCanOpenWindows->setToolTip(i18n("If enabled, JavaScript programs are allowed to open new windows."));
+ d->webkitUi.kcfg_javascriptCanAccessClipboard->setToolTip(i18n("If enabled, JavaScript programs are allowed to read from and to write to the clipboard."));
+ d->webkitUi.kcfg_linksIncludedInFocusChain->setToolTip(i18n("If enabled, hyperlinks are included in the keyboard focus chain."));
+ d->webkitUi.kcfg_zoomTextOnly->setToolTip(i18n("If enabled, the zoom factor on a frame is only applied to the text."));
+ d->webkitUi.kcfg_printElementBackgrounds->setToolTip(i18n("If enabled, background colors and images are also drawn when the page is printed."));
+ d->webkitUi.kcfg_offlineStorageDatabaseEnabled->setToolTip(i18n("Enables support for the HTML 5 offline storage feature."));
+ d->webkitUi.kcfg_offlineWebApplicationCacheEnabled->setToolTip(i18n("Enables support for the HTML 5 web application cache feature."));
+ d->webkitUi.kcfg_localStorageDatabaseEnabled->setToolTip(i18n("Enables support for the HTML 5 local storage feature."));
}