summaryrefslogtreecommitdiff
path: root/src/settings.cpp
diff options
context:
space:
mode:
authoradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-06-02 22:41:57 +0000
committeradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-06-02 22:41:57 +0000
commitc9d8f10a2a361dd5dffa5d61b96bc96f0d50129d (patch)
treea2c949860fb01f2efb3dfd3b439a726a4e3ea753 /src/settings.cpp
parentMerge branch 'master' into local-svn (diff)
parentnew cookie management system. That (hopefully) works well..;) (diff)
downloadrekonq-c9d8f10a2a361dd5dffa5d61b96bc96f0d50129d.tar.xz
Merge branch 'master' into local-svn
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@976901 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/settings.cpp')
-rw-r--r--src/settings.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index 198ab3e0..f6e73412 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -30,7 +30,8 @@
// Local Includes
#include "application.h"
#include "mainwindow.h"
-#include "cookiejar.h"
+#include "cookiedialog.h"
+#include "cookieexceptiondialog.h"
#include "history.h"
#include "networkaccessmanager.h"
#include "webview.h"
@@ -102,7 +103,7 @@ Private::Private(SettingsDialog *parent)
widget = new QWidget;
webkitUi.setupUi(widget);
widget->layout()->setMargin(0);
- pageItem = parent->addPage(widget , i18n("Webkit"));
+ pageItem = parent->addPage(widget , i18n("WebKit"));
QString webkitIconPath = KStandardDirs::locate("appdata", "pics/webkit-icon.png");
kWarning() << webkitIconPath;
KIcon webkitIcon = KIcon(QIcon(webkitIconPath));
@@ -120,7 +121,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
setFaceType(KPageDialog::List);
showButtonSeparator(true);
- setWindowTitle(i18n("rekonfig.."));
+ setWindowTitle(i18n("rekonfig..."));
setModal(true);
readConfig();
@@ -214,4 +215,3 @@ void SettingsDialog::setHomeToCurrentPage()
d->generalUi.kcfg_homePage->setText(webView->url().prettyUrl());
}
}
-