From 148b0f6a8c078da4064b16eb6e86ad45117e36d8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:14:01 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 ChangeLog                                      | 10 +++++-----
 doc/konversation/index.docbook                 |  4 ++--
 doc/sv/index.docbook                           |  4 ++--
 konversation/src/alias_preferences.cpp         |  2 +-
 konversation/src/alias_preferencesui.ui        |  2 +-
 konversation/src/autoreplace_preferences.cpp   |  2 +-
 konversation/src/autoreplace_preferencesui.ui  |  2 +-
 konversation/src/awaymanager.cpp               |  2 +-
 konversation/src/channel.h                     |  2 +-
 konversation/src/channellistpanel.cpp          |  4 ++--
 konversation/src/channellistviewitem.h         |  2 +-
 konversation/src/channeloptionsdialog.cpp      |  4 ++--
 konversation/src/channeloptionsdialog.h        |  2 +-
 konversation/src/channeloptionsui.ui           |  8 ++++----
 konversation/src/chatwindow.cpp                |  4 ++--
 konversation/src/config/preferences.cpp        |  2 +-
 konversation/src/dccchat.cpp                   |  2 +-
 konversation/src/dcctransferpanel.cpp          |  4 ++--
 konversation/src/dcctransferpanelitem.h        |  2 +-
 konversation/src/fontappearance_preferences.ui |  6 +++---
 konversation/src/highlight_preferences.cpp     |  2 +-
 konversation/src/highlight_preferencesui.ui    |  2 +-
 konversation/src/highlightviewitem.cpp         |  2 +-
 konversation/src/ignore_preferences.cpp        |  2 +-
 konversation/src/ignore_preferencesui.ui       |  2 +-
 konversation/src/ignorelistviewitem.h          |  2 +-
 konversation/src/ircview.cpp                   |  6 +++---
 konversation/src/konversationapplication.cpp   |  2 +-
 konversation/src/konversationmainwindow.cpp    | 12 ++++++------
 konversation/src/konversationmainwindow.h      |  4 ++--
 konversation/src/konvibookmarkhandler.cpp      |  2 +-
 konversation/src/konvibookmarkmenu.cpp         |  4 ++--
 konversation/src/konvisettingsdialog.cpp       | 14 +++++++-------
 konversation/src/konvisettingsdialog.h         |  4 ++--
 .../src/linkaddressbook/addresseeitem.h        |  2 +-
 .../src/linkaddressbook/linkaddressbookui.cpp  |  4 ++--
 .../linkaddressbook/linkaddressbookui_base.ui  |  6 +++---
 ...ctdelisttooltip.cpp => nicklisttooltip.cpp} |  0
 .../{nictdelisttooltip.h => nicklisttooltip.h} |  0
 .../src/linkaddressbook/nicksonlinetooltip.cpp |  2 +-
 konversation/src/logfilereader.cpp             |  2 +-
 konversation/src/main.cpp                      |  2 +-
 konversation/src/nick.cpp                      |  2 +-
 konversation/src/nick.h                        |  2 +-
 ...es.cpp => nicklistbehavior_preferences.cpp} | 18 +++++++++---------
 ...rences.h => nicklistbehavior_preferences.h} |  6 +++---
 ...ui.ui => nicklistbehavior_preferencesui.ui} |  6 +++---
 .../{nictdelistview.cpp => nicklistview.cpp}   |  2 +-
 .../src/{nictdelistview.h => nicklistview.h}   |  2 +-
 konversation/src/nicksonline.cpp               |  2 +-
 konversation/src/nicksonlineitem.h             |  2 +-
 konversation/src/osd_preferences.cpp           |  2 +-
 konversation/src/osd_preferencesui.ui          |  2 +-
 konversation/src/query.cpp                     |  2 +-
 konversation/src/quickbuttons_preferences.cpp  |  2 +-
 konversation/src/quickbuttons_preferencesui.ui |  2 +-
 konversation/src/server.cpp                    | 10 +++++-----
 konversation/src/server.h                      |  2 +-
 konversation/src/servergroupdialog.cpp         |  2 +-
 konversation/src/servergroupdialogui.ui        |  4 ++--
 konversation/src/serverlistview.h              |  2 +-
 konversation/src/theme_preferences.cpp         |  2 +-
 konversation/src/theme_preferencesui.ui        |  2 +-
 konversation/src/topiclabel.cpp                |  2 +-
 konversation/src/urlcatcher.cpp                |  6 +++---
 konversation/src/valuelistviewitem.h           |  2 +-
 konversation/src/viewcontainer.cpp             |  2 +-
 konversation/src/viewcontainer.h               |  2 +-
 konversation/src/viewtree.h                    |  2 +-
 konversation/src/warnings_preferences.cpp      |  2 +-
 konversation/src/warnings_preferencesui.ui     |  2 +-
 .../src/watchednicknames_preferencesui.ui      |  2 +-
 po/ar/konversation.po                          |  6 +++---
 po/bg/konversation.po                          |  8 ++++----
 po/ca/konversation.po                          |  6 +++---
 po/da/konversation.po                          |  6 +++---
 po/de/konversation.po                          |  6 +++---
 po/el/konversation.po                          |  6 +++---
 po/en_GB/konversation.po                       | 10 +++++-----
 po/es/konversation.po                          |  6 +++---
 po/et/konversation.po                          |  6 +++---
 po/fi/konversation.po                          |  6 +++---
 po/fr/konversation.po                          |  6 +++---
 po/gl/konversation.po                          |  6 +++---
 po/he/konversation.po                          |  6 +++---
 po/hu/konversation.po                          |  6 +++---
 po/it/konversation.po                          |  8 ++++----
 po/ja/konversation.po                          |  6 +++---
 po/ka/konversation.po                          |  6 +++---
 po/ko/konversation.po                          |  6 +++---
 po/pa/konversation.po                          |  6 +++---
 po/pt/konversation.po                          |  8 ++++----
 po/ru/konversation.po                          |  6 +++---
 po/sr/konversation.po                          |  6 +++---
 po/sr@Latn/konversation.po                     |  6 +++---
 po/sv/konversation.po                          | 16 ++++++++--------
 po/tr/konversation.po                          |  6 +++---
 po/zh_CN/konversation.po                       |  6 +++---
 po/zh_TW/konversation.po                       |  6 +++---
 99 files changed, 214 insertions(+), 214 deletions(-)
 rename konversation/src/linkaddressbook/{nictdelisttooltip.cpp => nicklisttooltip.cpp} (100%)
 rename konversation/src/linkaddressbook/{nictdelisttooltip.h => nicklisttooltip.h} (100%)
 rename konversation/src/{nictdelistbehavior_preferences.cpp => nicklistbehavior_preferences.cpp} (84%)
 rename konversation/src/{nictdelistbehavior_preferences.h => nicklistbehavior_preferences.h} (80%)
 rename konversation/src/{nictdelistbehavior_preferencesui.ui => nicklistbehavior_preferencesui.ui} (97%)
 rename konversation/src/{nictdelistview.cpp => nicklistview.cpp} (99%)
 rename konversation/src/{nictdelistview.h => nicklistview.h} (98%)

diff --git a/ChangeLog b/ChangeLog
index 2c265f3..01bf50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -165,7 +165,7 @@ Interface Misc
   encoding setting.
 * Update actions on charset changes.
 * Added Notifications Toggle and Encoding sub-menu to the window menu.
-* Moved "Hide Nicklist" menu action from Edit to Settings.
+* Moved "Hide Nictdelist" menu action from Edit to Settings.
 * Fixed the "Automatically join channel on invite" setting not to show an
   inquiring dialog anyway.
 * Fixed saving the state of the invitation dialog option in the Warning Dialogs
@@ -647,7 +647,7 @@ there
 * A bug that could lead to an application crash when closing the tab after
 choosing
   to ignore someone in a query has been fixed.
-* The "Hide Nicklist" menu action will now be disabled properly when the tab
+* The "Hide Nictdelist" menu action will now be disabled properly when the tab
 shown
   does not have a nickname list has been fixed.
 * The actions in the "Insert" menu will now be disabled properly when the
@@ -1063,7 +1063,7 @@ Highlight.
 - An option to disable clickable nicks . Add ClickableNicks=false to
 konversationrc to disable it.
 - Fixed a big memory leak in message processing
-- Nicklist slider now correctly resizes in all channels when its resized and
+- Nictdelist slider now correctly resizes in all channels when its resized and
 correctly restores on startup
 - [[foo]] is now a link to http://en.wikipedia.org/wiki/foo . We will expand
 this to local wikipedia's in a later release [Update: Now fixed in 0.19]
@@ -1085,7 +1085,7 @@ Changes from 0.16 to 0.17
 Changes from 0.15 to 0.16
 - Dropping URLs onto nick on nicklist or onto query initiates DCC send
 - You can now do SSL connections from Quick Connect Dialog
-- Nicklist Icon Themes
+- Nictdelist Icon Themes
 - New topic widget
 - Added a channel dialog
 - Made the nickname box optional
@@ -1309,7 +1309,7 @@ Changes from 0.7 to 0.8:
 - Added support for /invite and 341 reply
 - Added support for 401 error reply
 - Added /smsg for "silent messages"
-- Text and Nicklist-Fonts can now be selected via GUI
+- Text and Nictdelist-Fonts can now be selected via GUI
 - Changed server ping response again to make dalnet ircd happy
 - Fixed nicklist sorting in channels
 - Switched to tdevelop 2.1.4 to hopefully fix some compile problems
diff --git a/doc/konversation/index.docbook b/doc/konversation/index.docbook
index 35ac068..bdb9bb6 100644
--- a/doc/konversation/index.docbook
+++ b/doc/konversation/index.docbook
@@ -1043,7 +1043,7 @@ This is also the place where you can <link linkend="linkaddressbook">associate a
 <para>To hide the <interface>Nick Panel</interface>, choose
 <menuchoice>
 	<guisubmenu>Window</guisubmenu>
-	<guisubmenu>Hide Nicklist</guisubmenu>
+	<guisubmenu>Hide Nictdelist</guisubmenu>
 </menuchoice> from the main menu.
 </para>
 
@@ -3165,7 +3165,7 @@ or menu bars. -->
 					<keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo>
 				</shortcut>
 				<guimenu>Window</guimenu>
-				<guimenuitem>Hide Nicklist</guimenuitem>
+				<guimenuitem>Hide Nictdelist</guimenuitem>
 			</menuchoice></term>
 		<listitem><para>
 				<action>Hides (or displays) the panel of &nickname;s in channel tabs.
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
index df50e85..28122e0 100644
--- a/doc/sv/index.docbook
+++ b/doc/sv/index.docbook
@@ -1332,12 +1332,12 @@ Limits on Real Name and Ident?
 >. Meddelandet samt alla andras meddelanden syns i kanalfönstret ovanför. Varje meddelande inleds med tiden och användarens smeknamn.</para>
 
  <para
->Du kan också klistra in text från klippbordet. Om den inklistrade texten har mer än en rad (nyrader), visas en dialogruta. Redigera texten enligt dina önskemål och klicka på <guibutton
+>Du kan också tdelistra in text från klippbordet. Om den intdelistrade texten har mer än en rad (nyrader), visas en dialogruta. Redigera texten enligt dina önskemål och klicka på <guibutton
 >Ok</guibutton
 >. </para>
 
  <para
->Om den inklistrade texten är längre än 256 tecken, eller om den består av mer än en rad, visas ett varningsmeddelande som informerar dig om att långa inlägg kan orsaka återställningar av anslutningen och överfyllnad. Du kan fortfarande fortsätta med den inmatade texten, men det är inte en god idé att göra det, eftersom överfyllnad kan irritera övriga användare av kanalen, eller göra att du kopplas ner från servern. Det är bättre att skicka meddelandet i kortare delar.</para>
+>Om den intdelistrade texten är längre än 256 tecken, eller om den består av mer än en rad, visas ett varningsmeddelande som informerar dig om att långa inlägg kan orsaka återställningar av anslutningen och överfyllnad. Du kan fortfarande fortsätta med den inmatade texten, men det är inte en god idé att göra det, eftersom överfyllnad kan irritera övriga användare av kanalen, eller göra att du kopplas ner från servern. Det är bättre att skicka meddelandet i kortare delar.</para>
 
  <!-- Uncomment when this is implemented.
  &konversation; will automatically split messages that exceed the 510 character RFC limit into multiple messages.
diff --git a/konversation/src/alias_preferences.cpp b/konversation/src/alias_preferences.cpp
index e30f887..5d4e4c7 100644
--- a/konversation/src/alias_preferences.cpp
+++ b/konversation/src/alias_preferences.cpp
@@ -22,7 +22,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 Alias_Config::Alias_Config(TQWidget* parent, const char* name)
diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui
index f173c4f..9f86107 100644
--- a/konversation/src/alias_preferencesui.ui
+++ b/konversation/src/alias_preferencesui.ui
@@ -169,6 +169,6 @@
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp
index 5cb2075..d1fde5e 100644
--- a/konversation/src/autoreplace_preferences.cpp
+++ b/konversation/src/autoreplace_preferences.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui
index 5c1d185..b19f5eb 100644
--- a/konversation/src/autoreplace_preferencesui.ui
+++ b/konversation/src/autoreplace_preferencesui.ui
@@ -285,7 +285,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/konversation/src/awaymanager.cpp b/konversation/src/awaymanager.cpp
index 99a5751..3f91de6 100644
--- a/konversation/src/awaymanager.cpp
+++ b/konversation/src/awaymanager.cpp
@@ -20,7 +20,7 @@
 #include <tqtimer.h>
 
 #include <dcopref.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 #include <kdebug.h>
diff --git a/konversation/src/channel.h b/konversation/src/channel.h
index e177ce2..e7a2c86 100644
--- a/konversation/src/channel.h
+++ b/konversation/src/channel.h
@@ -129,7 +129,7 @@ class Channel : public ChatWindow
         virtual void serverOnline(bool online);
 
 
-//Nicklist
+//Nictdelist
     public:
         ChannelNickPtr getOwnChannelNick();
         ChannelNickPtr getChannelNick(const TQString &ircnick);
diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp
index 44a1ae0..7bbf891 100644
--- a/konversation/src/channellistpanel.cpp
+++ b/konversation/src/channellistpanel.cpp
@@ -31,13 +31,13 @@
 #include <tqwhatsthis.h>
 
 #include <krun.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeversion.h>
 
 
diff --git a/konversation/src/channellistviewitem.h b/konversation/src/channellistviewitem.h
index aa2fae0..523bf33 100644
--- a/konversation/src/channellistviewitem.h
+++ b/konversation/src/channellistviewitem.h
@@ -17,7 +17,7 @@
 
 #include <tqstring.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class ChannelListViewItem : public TDEListViewItem
diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp
index 58711d4..fd5007c 100644
--- a/konversation/src/channeloptionsdialog.cpp
+++ b/konversation/src/channeloptionsdialog.cpp
@@ -23,11 +23,11 @@
 #include <tqtoolbutton.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ktextedit.h>
 #include <klineedit.h>
 #include <knuminput.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kiconloader.h>
 
 
diff --git a/konversation/src/channeloptionsdialog.h b/konversation/src/channeloptionsdialog.h
index f5763a9..2ecf53e 100644
--- a/konversation/src/channeloptionsdialog.h
+++ b/konversation/src/channeloptionsdialog.h
@@ -17,7 +17,7 @@
 #include <tqstringlist.h>
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 namespace Konversation
diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui
index 535aec0..aa54230 100644
--- a/konversation/src/channeloptionsui.ui
+++ b/konversation/src/channeloptionsui.ui
@@ -546,14 +546,14 @@ the Free Software Foundation; either version 2 of the License, or
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>ktextedit.h</includehint>
     <includehint>ktextedit.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistviewsearchline.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistviewsearchline.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp
index d394189..68740a4 100644
--- a/konversation/src/chatwindow.cpp
+++ b/konversation/src/chatwindow.cpp
@@ -27,8 +27,8 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kactioncollection.h>
-#include <kaction.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
 
 
 ChatWindow::ChatWindow(TQWidget* parent) : TQVBox(parent)
diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
index 06d1fd8..9a0e1ee 100644
--- a/konversation/src/config/preferences.cpp
+++ b/konversation/src/config/preferences.cpp
@@ -20,7 +20,7 @@
 #include "commit.h"
 #include "version.h"
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>
diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp
index 290acd1..99e37d8 100644
--- a/konversation/src/dccchat.cpp
+++ b/konversation/src/dccchat.cpp
@@ -40,7 +40,7 @@
 #include <kserversocket.h>
 #include <tdesocketaddress.h>
 #include <kstreamsocket.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #define DCCCHAT_BUFFER_SIZE 1024
 
diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
index 7233405..3a419a1 100644
--- a/konversation/src/dcctransferpanel.cpp
+++ b/konversation/src/dcctransferpanel.cpp
@@ -32,10 +32,10 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kapplication.h>
 
diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h
index 9820b69..a4ef8d2 100644
--- a/konversation/src/dcctransferpanelitem.h
+++ b/konversation/src/dcctransferpanelitem.h
@@ -20,7 +20,7 @@
 
 #include <tqdatetime.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <tdeio/global.h>
 
diff --git a/konversation/src/fontappearance_preferences.ui b/konversation/src/fontappearance_preferences.ui
index 1e288a2..5813b14 100644
--- a/konversation/src/fontappearance_preferences.ui
+++ b/konversation/src/fontappearance_preferences.ui
@@ -153,8 +153,8 @@ the Free Software Foundation; either version 2 of the License, or
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
index ccbdc0a..c810be7 100644
--- a/konversation/src/highlight_preferences.cpp
+++ b/konversation/src/highlight_preferences.cpp
@@ -26,7 +26,7 @@
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kcolorbutton.h>
 #include <klocale.h>
diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui
index d44ec8c..a37ca8b 100644
--- a/konversation/src/highlight_preferencesui.ui
+++ b/konversation/src/highlight_preferencesui.ui
@@ -437,7 +437,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/konversation/src/highlightviewitem.cpp b/konversation/src/highlightviewitem.cpp
index 3339db0..75d10f5 100644
--- a/konversation/src/highlightviewitem.cpp
+++ b/konversation/src/highlightviewitem.cpp
@@ -16,7 +16,7 @@
 #include "highlightviewitem.h"
 
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 HighlightViewItem::HighlightViewItem(TDEListView* parent, Highlight* passed_Highlight)
diff --git a/konversation/src/ignore_preferences.cpp b/konversation/src/ignore_preferences.cpp
index ea4281e..52c3890 100644
--- a/konversation/src/ignore_preferences.cpp
+++ b/konversation/src/ignore_preferences.cpp
@@ -16,7 +16,7 @@
 #include "preferences.h"
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlistview.h>
 #include <tqlineedit.h>
 #include <tqheader.h>
diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui
index d310614..0ec6558 100644
--- a/konversation/src/ignore_preferencesui.ui
+++ b/konversation/src/ignore_preferencesui.ui
@@ -211,7 +211,7 @@ the Free Software Foundation; either version 2 of the License, or
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/konversation/src/ignorelistviewitem.h b/konversation/src/ignorelistviewitem.h
index 7718811..c7df811 100644
--- a/konversation/src/ignorelistviewitem.h
+++ b/konversation/src/ignorelistviewitem.h
@@ -16,7 +16,7 @@
 
 #include <tqstring.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class IgnoreListViewItem : public TDEListViewItem
diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
index cad6dfd..7f5f2af 100644
--- a/konversation/src/ircview.cpp
+++ b/konversation/src/ircview.cpp
@@ -57,14 +57,14 @@
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <kshell.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 #include <kmenubar.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kglobal.h>
 
 
diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp
index e2529c8..ec267aa 100644
--- a/konversation/src/konversationapplication.cpp
+++ b/konversation/src/konversationapplication.cpp
@@ -545,7 +545,7 @@ void KonversationApplication::saveOptions(bool updateGUI)
 {
     TDEConfig* config=kapp->config();
 
-//    Should be handled in NicklistBehaviorConfigController now
+//    Should be handled in NictdelistBehaviorConfigController now
 //    config->setGroup("Sort Nicknames");
 
     // Clean up identity list
diff --git a/konversation/src/konversationmainwindow.cpp b/konversation/src/konversationmainwindow.cpp
index 2d644e7..87ca976 100644
--- a/konversation/src/konversationmainwindow.cpp
+++ b/konversation/src/konversationmainwindow.cpp
@@ -34,10 +34,10 @@
 #include <tqsignalmapper.h>
 #include <tqobjectlist.h>
 
-#include <kaccel.h>
-#include <kaccelmanager.h>
+#include <tdeaccel.h>
+#include <tdeaccelmanager.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -45,7 +45,7 @@
 #include <kkeydialog.h>
 #include <tdeversion.h>
 #include <kedittoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <twin.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
@@ -289,8 +289,8 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
     action = new TDEAction(i18n("Close &All Open Queries"), 0, TDEShortcut("F11"), m_viewContainer, TQT_SLOT(closeQueries()), actionCollection(), "close_queries");
     action->setEnabled(false);
 
-    TDEToggleAction* toggleChannelNickListsAction = new TDEToggleAction(i18n("Hide Nicklist"), 0,
-        TDEShortcut("Ctrl+H"), m_viewContainer, TQT_SLOT(toggleChannelNicklists()), actionCollection(), "hide_nicknamelist");
+    TDEToggleAction* toggleChannelNickListsAction = new TDEToggleAction(i18n("Hide Nictdelist"), 0,
+        TDEShortcut("Ctrl+H"), m_viewContainer, TQT_SLOT(toggleChannelNictdelists()), actionCollection(), "hide_nicknamelist");
     if (!Preferences::showNickList())
         toggleChannelNickListsAction->setChecked(true);
 
diff --git a/konversation/src/konversationmainwindow.h b/konversation/src/konversationmainwindow.h
index a891778..bddac8d 100644
--- a/konversation/src/konversationmainwindow.h
+++ b/konversation/src/konversationmainwindow.h
@@ -24,8 +24,8 @@
 
 #include <tqstringlist.h>
 
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 
 
 class TDEToggleAction;
diff --git a/konversation/src/konvibookmarkhandler.cpp b/konversation/src/konvibookmarkhandler.cpp
index af645a8..1d32ca6 100644
--- a/konversation/src/konvibookmarkhandler.cpp
+++ b/konversation/src/konvibookmarkhandler.cpp
@@ -23,7 +23,7 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
 
 #include <tqstring.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 
diff --git a/konversation/src/konvibookmarkmenu.cpp b/konversation/src/konvibookmarkmenu.cpp
index 14687b4..9a03fd6 100644
--- a/konversation/src/konvibookmarkmenu.cpp
+++ b/konversation/src/konvibookmarkmenu.cpp
@@ -20,8 +20,8 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
 
 #include <tqregexp.h>
 
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 
 
 KonviBookmarkMenu::KonviBookmarkMenu( KBookmarkManager* mgr,
diff --git a/konversation/src/konvisettingsdialog.cpp b/konversation/src/konvisettingsdialog.cpp
index b2549fc..c726aff 100644
--- a/konversation/src/konvisettingsdialog.cpp
+++ b/konversation/src/konvisettingsdialog.cpp
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
@@ -80,8 +80,8 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   //Interface/Themes
   m_confThemeWdg = new Theme_Config( this, "Theme" );
   pagePath.clear();
-  pagePath << i18n("Interface") << i18n("Nicklist Themes");
-  addPage ( m_confThemeWdg, pagePath, "iconthemes", i18n("Nicklist Themes") );
+  pagePath << i18n("Interface") << i18n("Nictdelist Themes");
+  addPage ( m_confThemeWdg, pagePath, "iconthemes", i18n("Nictdelist Themes") );
   m_indexToPageMapping.insert(lastAddedIndex(), m_confThemeWdg);
   connect(m_confThemeWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
 
@@ -130,12 +130,12 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   addPage ( m_confChatwindowBehaviourWdg, pagePath, "view_text", i18n("Chat Window") );
 
   //Behaviour/Nickname List
-  m_confNicklistBehaviorWdg = new NicklistBehavior_Config( this, "NicklistBehavior" );
+  m_confNictdelistBehaviorWdg = new NictdelistBehavior_Config( this, "NictdelistBehavior" );
   pagePath.clear();
   pagePath << i18n("Behavior") << i18n("Nickname List");
-  addPage ( m_confNicklistBehaviorWdg, pagePath, "player_playlist", i18n("Nickname List") );
-  connect(m_confNicklistBehaviorWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
-  m_indexToPageMapping.insert(lastAddedIndex(), m_confNicklistBehaviorWdg);
+  addPage ( m_confNictdelistBehaviorWdg, pagePath, "player_playlist", i18n("Nickname List") );
+  connect(m_confNictdelistBehaviorWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  m_indexToPageMapping.insert(lastAddedIndex(), m_confNictdelistBehaviorWdg);
 
   //Behaviour/Command Aliases
   m_confAliasWdg = new Alias_Config( this, "Alias" );
diff --git a/konversation/src/konvisettingsdialog.h b/konversation/src/konvisettingsdialog.h
index 4a34225..7ae3087 100644
--- a/konversation/src/konvisettingsdialog.h
+++ b/konversation/src/konvisettingsdialog.h
@@ -29,7 +29,7 @@ class ColorsAppearance_Config;
 class GeneralBehavior_Config;
 class ConnectionBehavior_Config;
 class ChatwindowBehaviour_Config;
-class NicklistBehavior_Config;
+class NictdelistBehavior_Config;
 class Tabs_Config;
 class Alias_Config;
 class QuickButtons_Config;
@@ -56,7 +56,7 @@ class TDEUI_EXPORT KonviSettingsDialog : public KonviConfigDialog
 	GeneralBehavior_Config* m_confGeneralBehaviorWdg;
 	ConnectionBehavior_Config* m_confConnectionBehaviorWdg;
 	ChatwindowBehaviour_Config* m_confChatwindowBehaviourWdg;
-	NicklistBehavior_Config* m_confNicklistBehaviorWdg;
+	NictdelistBehavior_Config* m_confNictdelistBehaviorWdg;
 	Tabs_Config* m_confTabBarWdg;
 	Alias_Config* m_confAliasWdg;
 	QuickButtons_Config* m_confQuickButtonsWdg;
diff --git a/konversation/src/linkaddressbook/addresseeitem.h b/konversation/src/linkaddressbook/addresseeitem.h
index 702a487..e7518b1 100644
--- a/konversation/src/linkaddressbook/addresseeitem.h
+++ b/konversation/src/linkaddressbook/addresseeitem.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <kabc/addressbook.h>
 
diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp
index ea13141..225c1db 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui.cpp
+++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp
@@ -41,8 +41,8 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 #include <kpushbutton.h>
 #include <kactivelabel.h>
 #include <kdebug.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <kabc/addressbook.h>
 #include <kabc/stdaddressbook.h>
 
diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
index 7ff10a2..ee1334f 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui
+++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
@@ -165,10 +165,10 @@
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistviewsearchline.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistviewsearchline.h</includehint>
 </includehints>
 <includes>
-    <include>klistviewsearchline.h</include>
+    <include>tdelistviewsearchline.h</include>
 </includes>
 </UI>
diff --git a/konversation/src/linkaddressbook/nictdelisttooltip.cpp b/konversation/src/linkaddressbook/nicklisttooltip.cpp
similarity index 100%
rename from konversation/src/linkaddressbook/nictdelisttooltip.cpp
rename to konversation/src/linkaddressbook/nicklisttooltip.cpp
diff --git a/konversation/src/linkaddressbook/nictdelisttooltip.h b/konversation/src/linkaddressbook/nicklisttooltip.h
similarity index 100%
rename from konversation/src/linkaddressbook/nictdelisttooltip.h
rename to konversation/src/linkaddressbook/nicklisttooltip.h
diff --git a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
index 8a16628..30cc808 100644
--- a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
+++ b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <tqtooltip.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class NickListView;
diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp
index 2e6e2bc..f3f03e6 100644
--- a/konversation/src/logfilereader.cpp
+++ b/konversation/src/logfilereader.cpp
@@ -29,7 +29,7 @@
 #include <tqwhatsthis.h>
 
 #include <kdialog.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
diff --git a/konversation/src/main.cpp b/konversation/src/main.cpp
index d088790..dab67de 100644
--- a/konversation/src/main.cpp
+++ b/konversation/src/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
     aboutData.addAuthor("Eike Hein",I18N_NOOP("Maintainer, Release Manager, User interface, Protocol handling"),"hein@kde.org");
     aboutData.addAuthor("Shintaro Matsuoka",I18N_NOOP("DCC, Encoding handling, OSD positioning"),"shin@shoegazed.org");
     aboutData.addAuthor("Eli MacKenzie",I18N_NOOP("Protocol handling, Input line"),"argonel@gmail.com");
-    aboutData.addAuthor("İsmail Dönmez",I18N_NOOP("Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"),"ismail@kde.org");
+    aboutData.addAuthor("İsmail Dönmez",I18N_NOOP("Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"),"ismail@kde.org");
     aboutData.addAuthor("John Tapsell",I18N_NOOP("Refactoring, KAddressBook/Kontact integration"), "john@geola.co.uk");
 
     aboutData.addCredit("Olivier Bédard",I18N_NOOP("Website hosting"));
diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp
index 0bfa9cb..dddb473 100644
--- a/konversation/src/nick.cpp
+++ b/konversation/src/nick.cpp
@@ -17,7 +17,7 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kabc/phonenumber.h>
 
diff --git a/konversation/src/nick.h b/konversation/src/nick.h
index c7f1a5c..4b96f0c 100644
--- a/konversation/src/nick.h
+++ b/konversation/src/nick.h
@@ -16,7 +16,7 @@
 #define NICK_H
 
 #include <tqobject.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "channelnick.h"
 
diff --git a/konversation/src/nictdelistbehavior_preferences.cpp b/konversation/src/nicklistbehavior_preferences.cpp
similarity index 84%
rename from konversation/src/nictdelistbehavior_preferences.cpp
rename to konversation/src/nicklistbehavior_preferences.cpp
index 711d8c7..a439696 100644
--- a/konversation/src/nictdelistbehavior_preferences.cpp
+++ b/konversation/src/nicklistbehavior_preferences.cpp
@@ -21,8 +21,8 @@
 #include <klocale.h>
 
 
-NicklistBehavior_Config::NicklistBehavior_Config(TQWidget *parent, const char *name)
- : NicklistBehavior_ConfigUI(parent, name)
+NictdelistBehavior_Config::NictdelistBehavior_Config(TQWidget *parent, const char *name)
+ : NictdelistBehavior_ConfigUI(parent, name)
 {
   // get page widget and populate listview
   loadSettings();
@@ -34,23 +34,23 @@ NicklistBehavior_Config::NicklistBehavior_Config(TQWidget *parent, const char *n
   connect(sortOrder,TQT_SIGNAL (moved()),this,TQT_SIGNAL (modified()) );
 }
 
-NicklistBehavior_Config::~NicklistBehavior_Config()
+NictdelistBehavior_Config::~NictdelistBehavior_Config()
 {
 }
 
-void NicklistBehavior_Config::restorePageToDefaults()
+void NictdelistBehavior_Config::restorePageToDefaults()
 {
   setNickList(Preferences::defaultNicknameSortingOrder());
 }
 
-void NicklistBehavior_Config::loadSettings()
+void NictdelistBehavior_Config::loadSettings()
 {
   // get sorting order string from preferences
   setNickList(Preferences::sortOrder());
   m_oldSortingOrder=currentSortingOrder();
 }
 
-void NicklistBehavior_Config::setNickList(const TQString &sortingOrder)
+void NictdelistBehavior_Config::setNickList(const TQString &sortingOrder)
 {
   sortOrder->clear();
   // loop through the sorting order string, insert the matching descriptions in reverse order
@@ -69,7 +69,7 @@ void NicklistBehavior_Config::setNickList(const TQString &sortingOrder)
   }
 }
 
-TQString NicklistBehavior_Config::currentSortingOrder()
+TQString NictdelistBehavior_Config::currentSortingOrder()
 {
   // get the uppermost entry of the sorting list
   TQListViewItem* item=sortOrder->firstChild();
@@ -88,7 +88,7 @@ TQString NicklistBehavior_Config::currentSortingOrder()
 }
 
 // save settings permanently
-void NicklistBehavior_Config::saveSettings()
+void NictdelistBehavior_Config::saveSettings()
 {
   // get the current sorting order
   TQString newSortingOrder=currentSortingOrder();
@@ -100,7 +100,7 @@ void NicklistBehavior_Config::saveSettings()
   m_oldSortingOrder=currentSortingOrder();
 }
 
-bool NicklistBehavior_Config::hasChanged()
+bool NictdelistBehavior_Config::hasChanged()
 {
   return(m_oldSortingOrder!=currentSortingOrder());
 }
diff --git a/konversation/src/nictdelistbehavior_preferences.h b/konversation/src/nicklistbehavior_preferences.h
similarity index 80%
rename from konversation/src/nictdelistbehavior_preferences.h
rename to konversation/src/nicklistbehavior_preferences.h
index f705cbf..63942ef 100644
--- a/konversation/src/nictdelistbehavior_preferences.h
+++ b/konversation/src/nicklistbehavior_preferences.h
@@ -19,14 +19,14 @@
 #include <tqobject.h>
 
 
-class NicklistBehavior_Config : public NicklistBehavior_ConfigUI, public KonviSettingsPage
+class NictdelistBehavior_Config : public NictdelistBehavior_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
   
 
     public:
-        explicit NicklistBehavior_Config(TQWidget *parent = 0, const char *name = 0);
-        ~NicklistBehavior_Config();
+        explicit NictdelistBehavior_Config(TQWidget *parent = 0, const char *name = 0);
+        ~NictdelistBehavior_Config();
 
         virtual void saveSettings();
         virtual void loadSettings();
diff --git a/konversation/src/nictdelistbehavior_preferencesui.ui b/konversation/src/nicklistbehavior_preferencesui.ui
similarity index 97%
rename from konversation/src/nictdelistbehavior_preferencesui.ui
rename to konversation/src/nicklistbehavior_preferencesui.ui
index 7d8335f..43e010f 100644
--- a/konversation/src/nictdelistbehavior_preferencesui.ui
+++ b/konversation/src/nicklistbehavior_preferencesui.ui
@@ -1,5 +1,5 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>NicklistBehavior_ConfigUI</class>
+<class>NictdelistBehavior_ConfigUI</class>
 <comment>This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -8,7 +8,7 @@ the Free Software Foundation; either version 2 of the License, or
 <author>Copyright (C) 2005 Peter Simonsson</author>
 <widget class="TQWidget">
     <property name="name">
-        <cstring>NicklistBehavior_ConfigUI</cstring>
+        <cstring>NictdelistBehavior_ConfigUI</cstring>
     </property>
     <property name="geometry">
         <rect>
@@ -154,7 +154,7 @@ the Free Software Foundation; either version 2 of the License, or
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/nictdelistview.cpp b/konversation/src/nicklistview.cpp
similarity index 99%
rename from konversation/src/nictdelistview.cpp
rename to konversation/src/nicklistview.cpp
index ba8cab9..d135d63 100644
--- a/konversation/src/nictdelistview.cpp
+++ b/konversation/src/nicklistview.cpp
@@ -17,7 +17,7 @@
 #include "images.h"
 #include "linkaddressbook/addressbook.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tqtooltip.h>
diff --git a/konversation/src/nictdelistview.h b/konversation/src/nicklistview.h
similarity index 98%
rename from konversation/src/nictdelistview.h
rename to konversation/src/nicklistview.h
index a7a2e8f..03198db 100644
--- a/konversation/src/nictdelistview.h
+++ b/konversation/src/nicklistview.h
@@ -20,7 +20,7 @@
 #include "images.h"
 #include "common.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class TQPopupMenu;
diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp
index 8213a60..5b00b3d 100644
--- a/konversation/src/nicksonline.cpp
+++ b/konversation/src/nicksonline.cpp
@@ -41,7 +41,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
diff --git a/konversation/src/nicksonlineitem.h b/konversation/src/nicksonlineitem.h
index 3fed49a..db498b5 100644
--- a/konversation/src/nicksonlineitem.h
+++ b/konversation/src/nicksonlineitem.h
@@ -12,7 +12,7 @@
 #ifndef NICKSONLINEITEM_H
 #define NICKSONLINEITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class NicksOnlineItem : public TDEListViewItem
diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp
index 838c2b8..7bf5532 100644
--- a/konversation/src/osd_preferences.cpp
+++ b/konversation/src/osd_preferences.cpp
@@ -23,7 +23,7 @@
 #include <kcombobox.h>
 #include <kcolorbutton.h>
 #include <tqcheckbox.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 
 #include <tdeconfigdialog.h>
 
diff --git a/konversation/src/osd_preferencesui.ui b/konversation/src/osd_preferencesui.ui
index 8e51e34..1601314 100644
--- a/konversation/src/osd_preferencesui.ui
+++ b/konversation/src/osd_preferencesui.ui
@@ -419,6 +419,6 @@
     <includehint>kcombobox.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp
index 4854fdf..b007d5d 100644
--- a/konversation/src/query.cpp
+++ b/konversation/src/query.cpp
@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 
 Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp
index 674126f..885a6ac 100644
--- a/konversation/src/quickbuttons_preferences.cpp
+++ b/konversation/src/quickbuttons_preferences.cpp
@@ -22,7 +22,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 QuickButtons_Config::QuickButtons_Config(TQWidget* parent, const char* name)
diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui
index 1aac4ca..a17197d 100644
--- a/konversation/src/quickbuttons_preferencesui.ui
+++ b/konversation/src/quickbuttons_preferencesui.ui
@@ -215,7 +215,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index 236992c..fd372dd 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -55,7 +55,7 @@
 #include <kmessagebox.h>
 #include <kresolver.h>
 #include <tdesocketdevice.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstringhandler.h>
 #include <tdeversion.h>
 #include <twin.h>
@@ -829,10 +829,10 @@ void Server::resetNickSelection()
 {
     m_nickIndices.clear();
     //for equivalence testing in case the identity gets changed underneath us
-    m_referenceNicklist = getIdentity()->getNicknameList();
+    m_referenceNictdelist = getIdentity()->getNicknameList();
     //where in this identities nicklist will we have started?
-    int start = m_referenceNicklist.findIndex(getNickname());
-    int len = m_referenceNicklist.count();
+    int start = m_referenceNictdelist.findIndex(getNickname());
+    int len = m_referenceNictdelist.count();
 
     //we first use this list of indices *after* we've already tried the current nick, which we don't want
     //to retry if we wrapped, so exclude its index here
@@ -849,7 +849,7 @@ void Server::resetNickSelection()
 TQString Server::getNextNickname()
 {
      //if the identity changed underneath us (likely impossible), start over
-    if (m_referenceNicklist != getIdentity()->getNicknameList())
+    if (m_referenceNictdelist != getIdentity()->getNicknameList())
         resetNickSelection();
 
     TQString newNick = getIdentity()->getNickname(m_nickIndices.front());
diff --git a/konversation/src/server.h b/konversation/src/server.h
index 91fc786..91c1acd 100644
--- a/konversation/src/server.h
+++ b/konversation/src/server.h
@@ -617,7 +617,7 @@ void resetNickSelection();
 
         unsigned int m_completeQueryPosition;
         TQValueList<int> m_nickIndices;
-        TQStringList m_referenceNicklist;
+        TQStringList m_referenceNictdelist;
 
         // TODO roll these into a TQMap.
         TQString m_serverNickPrefixes;               // Prefixes used by the server to indicate a mode
diff --git a/konversation/src/servergroupdialog.cpp b/konversation/src/servergroupdialog.cpp
index f8278e5..a4e6786 100644
--- a/konversation/src/servergroupdialog.cpp
+++ b/konversation/src/servergroupdialog.cpp
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kcombobox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 
 
diff --git a/konversation/src/servergroupdialogui.ui b/konversation/src/servergroupdialogui.ui
index bca7cac..882102a 100644
--- a/konversation/src/servergroupdialogui.ui
+++ b/konversation/src/servergroupdialogui.ui
@@ -308,10 +308,10 @@
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/konversation/src/serverlistview.h b/konversation/src/serverlistview.h
index 0e4434b..3cba300 100644
--- a/konversation/src/serverlistview.h
+++ b/konversation/src/serverlistview.h
@@ -15,7 +15,7 @@
 #ifndef SERVERLISTVIEW_H
 #define SERVERLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class TQDragObject;
diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp
index c01d1d0..75fd513 100644
--- a/konversation/src/theme_preferences.cpp
+++ b/konversation/src/theme_preferences.cpp
@@ -29,7 +29,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui
index 696ab55..a6e6402 100644
--- a/konversation/src/theme_preferencesui.ui
+++ b/konversation/src/theme_preferencesui.ui
@@ -217,6 +217,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
index 889ea3f..91f0408 100644
--- a/konversation/src/topiclabel.cpp
+++ b/konversation/src/topiclabel.cpp
@@ -28,7 +28,7 @@
 #include <kstringhandler.h>
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kbookmarkmanager.h>
 #include <tdeversion.h>
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
index f4234bc..d06614d 100644
--- a/konversation/src/urlcatcher.cpp
+++ b/konversation/src/urlcatcher.cpp
@@ -26,16 +26,16 @@
 #include <tqlayout.h>
 
 #include <kapplication.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <krun.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>
 #include <tdeversion.h>
 #include <kshell.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 
 UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
diff --git a/konversation/src/valuelistviewitem.h b/konversation/src/valuelistviewitem.h
index 9aa2864..6887355 100644
--- a/konversation/src/valuelistviewitem.h
+++ b/konversation/src/valuelistviewitem.h
@@ -15,7 +15,7 @@
 #ifndef VALUELISTVIEWITEM_H
 #define VALUELISTVIEWITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class ValueListViewItem : public TDEListViewItem
diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
index 30005fd..d833a6d 100644
--- a/konversation/src/viewcontainer.cpp
+++ b/konversation/src/viewcontainer.cpp
@@ -2257,7 +2257,7 @@ void ViewContainer::openChannelSettings()
     }
 }
 
-void ViewContainer::toggleChannelNicklists()
+void ViewContainer::toggleChannelNictdelists()
 {
     TDEToggleAction* action = static_cast<TDEToggleAction*>(actionCollection()->action("hide_nicknamelist"));
 
diff --git a/konversation/src/viewcontainer.h b/konversation/src/viewcontainer.h
index 625e56c..dc4a162 100644
--- a/konversation/src/viewcontainer.h
+++ b/konversation/src/viewcontainer.h
@@ -146,7 +146,7 @@ class ViewContainer : public TQObject
         Channel* addChannel(Server* server, const TQString& name);
         void rejoinChannel();
         void openChannelSettings();
-        void toggleChannelNicklists();
+        void toggleChannelNictdelists();
 
         Query* addQuery(Server* server,const NickInfoPtr & name, bool weinitiated=true);
         void updateQueryChrome(ChatWindow* view, const TQString& name);
diff --git a/konversation/src/viewtree.h b/konversation/src/viewtree.h
index b9f115c..4aaf55b 100644
--- a/konversation/src/viewtree.h
+++ b/konversation/src/viewtree.h
@@ -12,7 +12,7 @@
 #ifndef VIEWTREE_H
 #define VIEWTREE_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class ViewTreeItem;
diff --git a/konversation/src/warnings_preferences.cpp b/konversation/src/warnings_preferences.cpp
index ddb443e..8edd057 100644
--- a/konversation/src/warnings_preferences.cpp
+++ b/konversation/src/warnings_preferences.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 Warnings_Config::Warnings_Config( TQWidget* parent, const char* name, WFlags fl )
diff --git a/konversation/src/warnings_preferencesui.ui b/konversation/src/warnings_preferencesui.ui
index 62b7226..26cbd16 100644
--- a/konversation/src/warnings_preferencesui.ui
+++ b/konversation/src/warnings_preferencesui.ui
@@ -45,6 +45,6 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui
index 16341e8..ac4e486 100644
--- a/konversation/src/watchednicknames_preferencesui.ui
+++ b/konversation/src/watchednicknames_preferencesui.ui
@@ -408,7 +408,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/po/ar/konversation.po b/po/ar/konversation.po
index 55b9b90..0c9a31f 100644
--- a/po/ar/konversation.po
+++ b/po/ar/konversation.po
@@ -1447,7 +1447,7 @@ msgid "Close &All Open Queries"
 msgstr "غلق &كل المساءلات المفتوحة"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "إخفاء قائمة الأسماء المستعارة"
 
 #: src/konversationmainwindow.cpp:354
@@ -1941,7 +1941,7 @@ msgid "Protocol handling, Input line"
 msgstr "تدبير الميفاق، سطر الإدخال"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish، دعم SSL، منفذ KNetwork، أسماء مستعارة ملوّنة، سمات قائمة الأسماء "
 "المستعارة"
@@ -4265,7 +4265,7 @@ msgid "Chat Window"
 msgstr "نافذة محادثة"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "سماة لائحة الأسماء المستعارة"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/bg/konversation.po b/po/bg/konversation.po
index 1d29ea7..cadd4bd 100644
--- a/po/bg/konversation.po
+++ b/po/bg/konversation.po
@@ -1469,7 +1469,7 @@ msgid "Close &All Open Queries"
 msgstr "Затваряне на &всички отворени лични разговори"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Скриване на списъка с псевдоними"
 
 #: src/konversationmainwindow.cpp:354
@@ -1967,8 +1967,8 @@ msgid "Protocol handling, Input line"
 msgstr "Protocol handling, Input line"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
-msgstr "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
+msgstr "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 
 #: src/main.cpp:68
 msgid "Refactoring, KAddressBook/Kontact integration"
@@ -4324,7 +4324,7 @@ msgid "Chat Window"
 msgstr "Прозорец за разговор"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Теми за списъка с псевдоними"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/ca/konversation.po b/po/ca/konversation.po
index a262e46..cc3c972 100644
--- a/po/ca/konversation.po
+++ b/po/ca/konversation.po
@@ -1388,7 +1388,7 @@ msgid "Close &All Open Queries"
 msgstr "Tanca totes les converses obertes"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Amaga la llista de sobrenoms"
 
 #: src/konversationmainwindow.cpp:354
@@ -1861,7 +1861,7 @@ msgid "Protocol handling, Input line"
 msgstr "Gestió de protocols, línia d'entrada"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish, compatibilitat amb SSL, codi KNetwork, sobrenoms amb color, temes de "
 "la llista de sobrenoms"
@@ -4172,7 +4172,7 @@ msgid "Chat Window"
 msgstr "Finestra de xat"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Temes de la llista de sobrenoms"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/da/konversation.po b/po/da/konversation.po
index 4316d5d..9838ab5 100644
--- a/po/da/konversation.po
+++ b/po/da/konversation.po
@@ -1456,7 +1456,7 @@ msgid "Close &All Open Queries"
 msgstr "Luk &alle åbne forespørgsler"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Skjul aliasliste"
 
 #: src/konversationmainwindow.cpp:354
@@ -1951,7 +1951,7 @@ msgid "Protocol handling, Input line"
 msgstr "Protokolhåndtering, indtastningslinje"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish-understøttelse, SSL-understøttelse, overført til Knetwork, farvede "
 "aliasser, aliaslistetemaer"
@@ -4289,7 +4289,7 @@ msgid "Chat Window"
 msgstr "Chat-vindue"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Temaer for aliasliste"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/de/konversation.po b/po/de/konversation.po
index 6045cf4..3a4fca9 100644
--- a/po/de/konversation.po
+++ b/po/de/konversation.po
@@ -1482,7 +1482,7 @@ msgid "Close &All Open Queries"
 msgstr "&Alle offenen Queries schließen"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Benutzerliste ausblenden"
 
 #: src/konversationmainwindow.cpp:354
@@ -1979,7 +1979,7 @@ msgid "Protocol handling, Input line"
 msgstr "Protokollbehandlung, Eingabezeile"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish-Unterstützung, SSL-Unterstützung, Portierung nach KNetwork, farbige "
 "Spitznamen, Symboldesign der Benutzerliste"
@@ -4361,7 +4361,7 @@ msgid "Chat Window"
 msgstr "Chatfenster"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Design der Benutzerliste"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/el/konversation.po b/po/el/konversation.po
index 84e440d..659b32a 100644
--- a/po/el/konversation.po
+++ b/po/el/konversation.po
@@ -1482,7 +1482,7 @@ msgid "Close &All Open Queries"
 msgstr "Κλείσιμο ό&λων των ανοικτών ερωτημάτων"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Απόκρυψη λίστας ψευδωνύμων"
 
 #: src/konversationmainwindow.cpp:354
@@ -1986,7 +1986,7 @@ msgid "Protocol handling, Input line"
 msgstr "Χειρισμός πρωτοκόλλων, γραμμή εισαγωγής"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Υποστήριξη Blowfish, υποστήριξη SSL, μεταφορά στο KNetwork, χρωματιστά "
 "ψευδώνυμα, θέματα λίστας ψευδωνύμων"
@@ -4383,7 +4383,7 @@ msgid "Chat Window"
 msgstr "Παράθυρο συνομιλίας"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Θέματα λίστας ψευδωνύμων"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/en_GB/konversation.po b/po/en_GB/konversation.po
index 05e8a0c..91943af 100644
--- a/po/en_GB/konversation.po
+++ b/po/en_GB/konversation.po
@@ -1496,8 +1496,8 @@ msgid "Close &All Open Queries"
 msgstr "Close &All Open Queries"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
-msgstr "Hide Nicklist"
+msgid "Hide Nictdelist"
+msgstr "Hide Nictdelist"
 
 #: src/konversationmainwindow.cpp:354
 msgid ""
@@ -2020,7 +2020,7 @@ msgstr ""
 
 #: src/main.cpp:67
 #, fuzzy
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish Support, SSL Support, Ported to KNetwork, Coloured Nicknames, Icon "
 "Theme Support"
@@ -4439,7 +4439,7 @@ msgid "Chat Window"
 msgstr "&Clear Window"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr ""
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
@@ -8190,7 +8190,7 @@ msgstr "Server:"
 #~ msgstr "Tab Management"
 
 #, fuzzy
-#~ msgid "NicklistBehavior_Config"
+#~ msgid "NictdelistBehavior_Config"
 #~ msgstr "Behaviour"
 
 #, fuzzy
diff --git a/po/es/konversation.po b/po/es/konversation.po
index 14ed716..3890062 100644
--- a/po/es/konversation.po
+++ b/po/es/konversation.po
@@ -1469,7 +1469,7 @@ msgid "Close &All Open Queries"
 msgstr "Cerrar tod&as las consultas abiertas"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Ocultar la lista de apodos"
 
 #: src/konversationmainwindow.cpp:354
@@ -1974,7 +1974,7 @@ msgid "Protocol handling, Input line"
 msgstr "Manejo del protocolo, línea de entrada"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish, soporte de SSL, adaptación a KNetwork, apodos coloreados, temas de "
 "iconos"
@@ -4347,7 +4347,7 @@ msgid "Chat Window"
 msgstr "Ventana de conversación"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Temas de la lista de apodos"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/et/konversation.po b/po/et/konversation.po
index 0965ed8..36b3a22 100644
--- a/po/et/konversation.po
+++ b/po/et/konversation.po
@@ -1448,7 +1448,7 @@ msgid "Close &All Open Queries"
 msgstr "S&ulge kõik avatud vestlused"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Peida kasutajate nimekiri"
 
 #: src/konversationmainwindow.cpp:354
@@ -1942,7 +1942,7 @@ msgid "Protocol handling, Input line"
 msgstr "Protokolli käsitlemine, sisendirida"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfishi toetus, SSL toetus, portimine KNetworki, värvilised hüüdnimed, "
 "hüüdnimeteemad"
@@ -4262,7 +4262,7 @@ msgid "Chat Window"
 msgstr "Vestlusaken"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Hüüdnimeteemad"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/fi/konversation.po b/po/fi/konversation.po
index 629ce06..ee6c87a 100644
--- a/po/fi/konversation.po
+++ b/po/fi/konversation.po
@@ -1501,7 +1501,7 @@ msgid "Close &All Open Queries"
 msgstr "Sulje &kaikki avoimet keskustelut"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Piiloita nimimerkkiluettelo"
 
 #: src/konversationmainwindow.cpp:354
@@ -2029,7 +2029,7 @@ msgstr ""
 
 #: src/main.cpp:67
 #, fuzzy
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish-tuki, SSL-tuki, KNetwork-siirto, väritetyt nimimerkit, kuvakkeiden "
 "teematuki"
@@ -4465,7 +4465,7 @@ msgid "Chat Window"
 msgstr "&Tyhjennä ikkuna"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr ""
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/fr/konversation.po b/po/fr/konversation.po
index 652904e..97d7145 100644
--- a/po/fr/konversation.po
+++ b/po/fr/konversation.po
@@ -1487,7 +1487,7 @@ msgid "Close &All Open Queries"
 msgstr "Fermer &toutes les requêtes ouvertes"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Cacher la liste des pseudos"
 
 #: src/konversationmainwindow.cpp:354
@@ -1993,7 +1993,7 @@ msgid "Protocol handling, Input line"
 msgstr "Traitement du protocole, ligne de saisie"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Gestion de Blowfish et SSL, portage vers KNetwork, pseudos colorés, thèmes pour "
 "les listes de pseudos"
@@ -4390,7 +4390,7 @@ msgid "Chat Window"
 msgstr "Fenêtre de discussion"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Thèmes pour la liste des pseudos"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/gl/konversation.po b/po/gl/konversation.po
index 5992fcf..009cbd9 100644
--- a/po/gl/konversation.po
+++ b/po/gl/konversation.po
@@ -1469,7 +1469,7 @@ msgid "Close &All Open Queries"
 msgstr "Pechar Todas as Conversas privadas &Abertas"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Acochar a Lista de Alcumes"
 
 #: src/konversationmainwindow.cpp:354
@@ -1971,7 +1971,7 @@ msgid "Protocol handling, Input line"
 msgstr "Xestión do Protocolo, Liña de escrita"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Soporte de Blowfish e SSL, Portou para KNetwork, Alcumes Coloridos, Temas dos "
 "Ícones dos alcumes"
@@ -4350,7 +4350,7 @@ msgid "Chat Window"
 msgstr "Fiestra de Conversazón"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Temas da Lista de Alcumes"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/he/konversation.po b/po/he/konversation.po
index 4373605..3e59b3f 100644
--- a/po/he/konversation.po
+++ b/po/he/konversation.po
@@ -1369,7 +1369,7 @@ msgid "Close &All Open Queries"
 msgstr "סגור את &כל השאילתות הפתוחות"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "הסתר את רשימת הכינויים"
 
 #: src/konversationmainwindow.cpp:354
@@ -1829,7 +1829,7 @@ msgid "Protocol handling, Input line"
 msgstr "ניהול פרוטוקול, שורת קלט"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "תמיכה ב־Blowfish, תמיכה ב־SSL, הסבה אל KNetwork, צביעת שמות, תמיכה בערכות של "
 "כינויים"
@@ -4048,7 +4048,7 @@ msgid "Chat Window"
 msgstr "חלון שיחה"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "ערכות נושא של כינויים"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/hu/konversation.po b/po/hu/konversation.po
index e94b15c..8d89d9e 100644
--- a/po/hu/konversation.po
+++ b/po/hu/konversation.po
@@ -1485,7 +1485,7 @@ msgid "Close &All Open Queries"
 msgstr "Minden megnyitott kérés bezárás&a"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Becenévlista elrejtése"
 
 #: src/konversationmainwindow.cpp:354
@@ -2000,7 +2000,7 @@ msgstr ""
 
 #: src/main.cpp:67
 #, fuzzy
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish támogatás, SSL támogatás, KNetwork-re átírás, Szines becenevek, "
 "Ikontéma támogatás"
@@ -4394,7 +4394,7 @@ msgid "Chat Window"
 msgstr "Társalgás ablak"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr ""
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/it/konversation.po b/po/it/konversation.po
index 71a4ea2..fcec0f6 100644
--- a/po/it/konversation.po
+++ b/po/it/konversation.po
@@ -1454,7 +1454,7 @@ msgid "Close &All Open Queries"
 msgstr "Chiudi tutte le convers&azioni private aperte"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Nascondi l'elenco dei nick"
 
 #: src/konversationmainwindow.cpp:354
@@ -1952,7 +1952,7 @@ msgid "Protocol handling, Input line"
 msgstr "Gestione dei protocolli, riga di input"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish, supporto SSL, trasferimento di KNetwork, nick colorati, temi di "
 "elenchi di nick"
@@ -4295,7 +4295,7 @@ msgid "Chat Window"
 msgstr "Finestra di chat"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Temi degli elenchi di nick"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
@@ -7977,7 +7977,7 @@ msgstr "Server:"
 #~ msgid "Tab Management"
 #~ msgstr "Gestione delle schede"
 
-#~ msgid "NicklistBehavior_Config"
+#~ msgid "NictdelistBehavior_Config"
 #~ msgstr "ComportamentoListaNick_Configurazione"
 
 #~ msgid "Alt+I"
diff --git a/po/ja/konversation.po b/po/ja/konversation.po
index d8c37a7..58c5242 100644
--- a/po/ja/konversation.po
+++ b/po/ja/konversation.po
@@ -1406,7 +1406,7 @@ msgid "Close &All Open Queries"
 msgstr "すべてのクエリーを閉じる(&A)"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "ニックネームリストを隠す"
 
 #: src/konversationmainwindow.cpp:354
@@ -1882,7 +1882,7 @@ msgid "Protocol handling, Input line"
 msgstr "プロトコルの処理、入力ライン"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr "Blowfish, SSL サポート, KNetwork ポート, カラーニック, ニックリストのテーマ"
 
 #: src/main.cpp:68
@@ -4109,7 +4109,7 @@ msgid "Chat Window"
 msgstr "チャットウィンドウ"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "ニックリストのテーマ"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/ka/konversation.po b/po/ka/konversation.po
index 56acb9f..2d23343 100644
--- a/po/ka/konversation.po
+++ b/po/ka/konversation.po
@@ -1479,7 +1479,7 @@ msgid "Close &All Open Queries"
 msgstr "&ყველა გახსნილი გამოკითხვის დახურვა"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "მეტსახელთა სიის დამალვა"
 
 #: src/konversationmainwindow.cpp:354
@@ -1988,7 +1988,7 @@ msgstr ""
 
 #: src/main.cpp:67
 #, fuzzy
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish მხარდაჭერა, SSL მხარდაჭერა, KNetwork-სკენ გადადება, შეფერილი "
 "მეტსახელები, ხატულათა გაფორმების მხარდაჭერა"
@@ -4349,7 +4349,7 @@ msgid "Chat Window"
 msgstr "სასაუბრო ფანჯარა"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr ""
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/ko/konversation.po b/po/ko/konversation.po
index cbc8f94..bb92aae 100644
--- a/po/ko/konversation.po
+++ b/po/ko/konversation.po
@@ -1445,7 +1445,7 @@ msgid "Close &All Open Queries"
 msgstr "모든 열린 쿼리들을 닫음(&A)"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "닉네임목록 숨기기"
 
 #: src/konversationmainwindow.cpp:354
@@ -1938,7 +1938,7 @@ msgstr ""
 
 #: src/main.cpp:67
 #, fuzzy
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr "Blowfish 지원, SSL 지원, KNetwork에 포팅, 색상을 입힌 닉네임, 아이콘, 테마 지원"
 
 #: src/main.cpp:68
@@ -4241,7 +4241,7 @@ msgid "Chat Window"
 msgstr "채팅 창"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr ""
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/pa/konversation.po b/po/pa/konversation.po
index 4b204b1..5bda283 100644
--- a/po/pa/konversation.po
+++ b/po/pa/konversation.po
@@ -1368,7 +1368,7 @@ msgid "Close &All Open Queries"
 msgstr "ਸਭ ਖੁੱਲੀਆਂ ਕਿਊਰੀਆਂ ਬੰਦ ਕਰੋ(&A)"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "ਨਾਂ-ਲਿਸਟ ਓਹਲੇ"
 
 #: src/konversationmainwindow.cpp:354
@@ -1836,7 +1836,7 @@ msgid "Protocol handling, Input line"
 msgstr "ਪਰੋਟੋਕਾਲ ਹੈਡਲਿੰਗ, ਇੰਪੁੱਟ ਲਾਈਨ"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 
 #: src/main.cpp:68
@@ -4012,7 +4012,7 @@ msgid "Chat Window"
 msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "ਨਾਂ-ਲਿਸਟ ਥੀਮ"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/pt/konversation.po b/po/pt/konversation.po
index cabaa68..5028b09 100644
--- a/po/pt/konversation.po
+++ b/po/pt/konversation.po
@@ -20,7 +20,7 @@ msgstr ""
 "X-POFile-IgnoreConsistency: Highlight\n"
 "X-POFile-SpellExtra: ChannelOptionsUI WatchedNicknamesConfig\n"
 "X-POFile-SpellExtra: QuickButtonsConfig drag drop ConnectionBehaviorConfig\n"
-"X-POFile-SpellExtra: NicklistBehaviorConfig and ChatWindowAppearanceConfig\n"
+"X-POFile-SpellExtra: NictdelistBehaviorConfig and ChatWindowAppearanceConfig\n"
 "X-POFile-IgnoreConsistency: Alt+X\n"
 "X-POFile-IgnoreConsistency: Alt+C\n"
 "X-POFile-IgnoreConsistency: Alt+N\n"
@@ -1498,7 +1498,7 @@ msgid "Close &All Open Queries"
 msgstr "Fechar Todas as Pesquisas &Abertas"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Esconder a Lista de Alcunhas"
 
 #: src/konversationmainwindow.cpp:354
@@ -1998,7 +1998,7 @@ msgid "Protocol handling, Input line"
 msgstr "Tratamento do protocolo, linha de entrada"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish, Suporte de SSL, Mudanças para o KNetwork, Alcunhas Coloridas, Temas "
 "de Ícones"
@@ -4364,7 +4364,7 @@ msgid "Chat Window"
 msgstr "Janela de Conversação"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Temas da Lista de Alcunhas"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/ru/konversation.po b/po/ru/konversation.po
index a8a9ffb..9390256 100644
--- a/po/ru/konversation.po
+++ b/po/ru/konversation.po
@@ -1464,7 +1464,7 @@ msgid "Close &All Open Queries"
 msgstr "Закрыть &все приваты"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Скрыть список пользователей"
 
 #: src/konversationmainwindow.cpp:354
@@ -1964,7 +1964,7 @@ msgid "Protocol handling, Input line"
 msgstr "Поддержка протоколов, строка ввода"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Поддержка Blowfish, SSL, перенос на KNetwork, цветовое выделение пользователей, "
 "темы значков"
@@ -4314,7 +4314,7 @@ msgid "Chat Window"
 msgstr "Окно разговора"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Темы списка пользователей"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/sr/konversation.po b/po/sr/konversation.po
index 99bdce5..356f516 100644
--- a/po/sr/konversation.po
+++ b/po/sr/konversation.po
@@ -1448,7 +1448,7 @@ msgid "Close &All Open Queries"
 msgstr "Затвори све &отворене упите"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Сакриј листу надимака"
 
 #: src/konversationmainwindow.cpp:354
@@ -1943,7 +1943,7 @@ msgid "Protocol handling, Input line"
 msgstr "Руковање протоколом, улазна линија"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Подршка за SSL и Blowfish, пребацивање на KNetwork, надимци у боји, подршка за "
 "теме икона"
@@ -4277,7 +4277,7 @@ msgid "Chat Window"
 msgstr "Прозор ћаскања"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Теме за листу надимака"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/sr@Latn/konversation.po b/po/sr@Latn/konversation.po
index 6302908..57e2b1d 100644
--- a/po/sr@Latn/konversation.po
+++ b/po/sr@Latn/konversation.po
@@ -1449,7 +1449,7 @@ msgid "Close &All Open Queries"
 msgstr "Zatvori sve &otvorene upite"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Sakrij listu nadimaka"
 
 #: src/konversationmainwindow.cpp:354
@@ -1944,7 +1944,7 @@ msgid "Protocol handling, Input line"
 msgstr "Rukovanje protokolom, ulazna linija"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Podrška za SSL i Blowfish, prebacivanje na KNetwork, nadimci u boji, podrška za "
 "teme ikona"
@@ -4278,7 +4278,7 @@ msgid "Chat Window"
 msgstr "Prozor ćaskanja"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Teme za listu nadimaka"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/sv/konversation.po b/po/sv/konversation.po
index d6f2f41..84c3316 100644
--- a/po/sv/konversation.po
+++ b/po/sv/konversation.po
@@ -1452,7 +1452,7 @@ msgid "Close &All Open Queries"
 msgstr "Stäng &alla öppna frågekanaler"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Dölj smeknamnslista"
 
 #: src/konversationmainwindow.cpp:354
@@ -1869,13 +1869,13 @@ msgid ""
 "into the chat. This can cause connection resets or flood kills. Do you really "
 "want to continue?</qt>"
 msgstr ""
-"<qt>Du försöker klistra in en stor mängd text i chatten (%1 byte eller %2 "
+"<qt>Du försöker tdelistra in en stor mängd text i chatten (%1 byte eller %2 "
 "rader). Det kan orsaka återställning av anslutningen eller flöden med försök "
 "att avbryta. Vill du verkligen fortsätta?</qt>"
 
 #: src/ircinput.cpp:480
 msgid "Large Paste Warning"
-msgstr "Varning för stor inklistring"
+msgstr "Varning för stor intdelistring"
 
 #. i18n() will only work as soon as a kapplication object was made.
 #: src/main.cpp:35
@@ -1949,7 +1949,7 @@ msgid "Protocol handling, Input line"
 msgstr "Protokollhantering, inmatningsrad"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish-stöd, SSL-stöd, överfört till Knetwork, färgade smeknamn, "
 "smeknamnsteman"
@@ -3427,7 +3427,7 @@ msgstr "Varning vid mycket trafik för kanaler"
 
 #: src/warnings_preferences.cpp:117
 msgid "Warning on pasting large portions of text"
-msgstr "Varning då stora mängder text klistras in"
+msgstr "Varning då stora mängder text tdelistras in"
 
 #: src/warnings_preferences.cpp:118
 msgid "Warning on quitting Konversation"
@@ -3871,7 +3871,7 @@ msgstr "Spara webbadresslista"
 
 #: src/multilineedit.cpp:24
 msgid "Edit Multiline Paste"
-msgstr "Redigera flerraders inklistring"
+msgstr "Redigera flerraders intdelistring"
 
 #: src/multilineedit.cpp:26
 msgid "Add &Quotation Indicators"
@@ -4288,7 +4288,7 @@ msgid "Chat Window"
 msgstr "Chattfönster"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Teman för smeknamnslista"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
@@ -7157,7 +7157,7 @@ msgstr "Egna färger"
 #: rc.cpp:1141
 #, no-c-format
 msgid "&Use custom colors for input box, nickname list and tab list"
-msgstr "An&vänd egna färger för indatarutor, smeknamnslista och fliklista"
+msgstr "An&vänd egna färger för indatarutor, smeknamnslista och flitdelista"
 
 #. i18n: file ./src/colorsappearance_preferences.ui line 309
 #: rc.cpp:1144
diff --git a/po/tr/konversation.po b/po/tr/konversation.po
index 6c91779..39518f9 100644
--- a/po/tr/konversation.po
+++ b/po/tr/konversation.po
@@ -1468,7 +1468,7 @@ msgid "Close &All Open Queries"
 msgstr "&Tüm Açık Sohbetleri Kapat"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "Takma İsim Listesini Sakla"
 
 #: src/konversationmainwindow.cpp:354
@@ -1962,7 +1962,7 @@ msgid "Protocol handling, Input line"
 msgstr "Protokol işleme, Giriş satırı"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr ""
 "Blowfish Desteği,SSL Desteği, KNetwork Uyarlaması, Renklendirilmiş Takma "
 "İsimler, Simge Teması Desteği"
@@ -4281,7 +4281,7 @@ msgid "Chat Window"
 msgstr "Konuşma Penceresi"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "Takma ad listesi teması"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/zh_CN/konversation.po b/po/zh_CN/konversation.po
index 1dfb335..1e8a59c 100644
--- a/po/zh_CN/konversation.po
+++ b/po/zh_CN/konversation.po
@@ -1410,7 +1410,7 @@ msgid "Close &All Open Queries"
 msgstr "关闭全部打开的对话(&A)"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "隐藏昵称列表"
 
 #: src/konversationmainwindow.cpp:354
@@ -1882,7 +1882,7 @@ msgid "Protocol handling, Input line"
 msgstr "协议处理、输入行设计"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr "Blowfish、SSL 支持、KNetwork 移植、彩色昵称、昵称列表主题"
 
 #: src/main.cpp:68
@@ -4083,7 +4083,7 @@ msgid "Chat Window"
 msgstr "聊天窗口"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "昵称列表主题"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92
diff --git a/po/zh_TW/konversation.po b/po/zh_TW/konversation.po
index 0d577ea..eb091a0 100644
--- a/po/zh_TW/konversation.po
+++ b/po/zh_TW/konversation.po
@@ -1402,7 +1402,7 @@ msgid "Close &All Open Queries"
 msgstr "關閉全部開啟的對話(&A)"
 
 #: src/konversationmainwindow.cpp:292
-msgid "Hide Nicklist"
+msgid "Hide Nictdelist"
 msgstr "隱藏暱稱清單"
 
 #: src/konversationmainwindow.cpp:354
@@ -1871,7 +1871,7 @@ msgid "Protocol handling, Input line"
 msgstr "協定處理、輸入行"
 
 #: src/main.cpp:67
-msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nicklist themes"
+msgid "Blowfish, SSL support, KNetwork port, Colored nicks, Nictdelist themes"
 msgstr "Blowfish 支援、SSL 支援、移植到 KNetwork、彩色暱稱、暱稱清單圖示主題支援"
 
 #: src/main.cpp:68
@@ -4063,7 +4063,7 @@ msgid "Chat Window"
 msgstr "聊天視窗"
 
 #: src/konvisettingsdialog.cpp:83 src/konvisettingsdialog.cpp:84
-msgid "Nicklist Themes"
+msgid "Nictdelist Themes"
 msgstr "暱稱清單主題圖示"
 
 #: src/konvisettingsdialog.cpp:91 src/konvisettingsdialog.cpp:92