12 files changed, 19 insertions, 19 deletions

diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 5371ac119..869ddca8e 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -165,7 +165,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   if ( !count )
     return true;
 
-  const int nbMessages = 200; // read 200 mails at a time (see kabc resource)
+  const int nbMessages = 200; // read 200 mails at a time (see tdeabc resource)
 
   const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
                            : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
diff --git a/tderesources/kolab/kcal/resourcekolab_plugin.cpp b/tderesources/kolab/kcal/resourcekolab_plugin.cpp
index eb56897ae..7b9e85d04 100644
--- a/tderesources/kolab/kcal/resourcekolab_plugin.cpp
+++ b/tderesources/kolab/kcal/resourcekolab_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB
         <info@klaralvdalens-datakonsult.se>
 
diff --git a/tderesources/kolab/knotes/resourcekolab_plugin.cpp b/tderesources/kolab/knotes/resourcekolab_plugin.cpp
index f589986cb..0cd126bd8 100644
--- a/tderesources/kolab/knotes/resourcekolab_plugin.cpp
+++ b/tderesources/kolab/knotes/resourcekolab_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB
         <info@klaralvdalens-datakonsult.se>
 
diff --git a/tderesources/kolab/shared/subresource.cpp b/tderesources/kolab/shared/subresource.cpp
index 7520d275a..cc51c6403 100644
--- a/tderesources/kolab/shared/subresource.cpp
+++ b/tderesources/kolab/shared/subresource.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
         <info@klaralvdalens-datakonsult.se>
 
diff --git a/tderesources/kolab/shared/subresource.h b/tderesources/kolab/shared/subresource.h
index 79104a747..4c79632d3 100644
--- a/tderesources/kolab/shared/subresource.h
+++ b/tderesources/kolab/shared/subresource.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
         <info@klaralvdalens-datakonsult.se>
 
diff --git a/tderesources/kolab/tdeabc/CMakeLists.txt b/tderesources/kolab/tdeabc/CMakeLists.txt
index f3a5596e6..9a77705ca 100644
--- a/tderesources/kolab/tdeabc/CMakeLists.txt
+++ b/tderesources/kolab/tdeabc/CMakeLists.txt
@@ -39,14 +39,14 @@ install(
 
 tde_add_kpart( tdeabc_kolab AUTOMOC
   SOURCES resourcekolab_plugin.cpp
-  LINK kabckolab-shared
+  LINK tdeabckolab-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### kabckolab (shared) ########################
+##### tdeabckolab (shared) ########################
 
-tde_add_library( kabckolab SHARED AUTOMOC
+tde_add_library( tdeabckolab SHARED AUTOMOC
   SOURCES resourcekolab.cpp contact.cpp
   VERSION 0.0.0
   LINK resourcekolabshared-static kgroupwarebase-shared
diff --git a/tderesources/kolab/tdeabc/Makefile.am b/tderesources/kolab/tdeabc/Makefile.am
index e750d5464..64df12be1 100644
--- a/tderesources/kolab/tdeabc/Makefile.am
+++ b/tderesources/kolab/tdeabc/Makefile.am
@@ -3,11 +3,11 @@ METASOURCES = AUTO
 INCLUDES = -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) $(all_includes)
 
 # The kolab wizard links to this library too
-lib_LTLIBRARIES = libkabckolab.la
+lib_LTLIBRARIES = libtdeabckolab.la
 
-libkabckolab_la_SOURCES = resourcekolab.cpp contact.cpp
-libkabckolab_la_LDFLAGS = $(all_libraries) -no-undefined
-libkabckolab_la_LIBADD =  \
+libtdeabckolab_la_SOURCES = resourcekolab.cpp contact.cpp
+libtdeabckolab_la_LDFLAGS = $(all_libraries) -no-undefined
+libtdeabckolab_la_LIBADD =  \
 	$(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \
 	-ltderesources -ltdeabc
 
@@ -17,7 +17,7 @@ noinst_HEADERS = resourcekolab.h contact.h
 
 tdeabc_kolab_la_SOURCES = resourcekolab_plugin.cpp
 tdeabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-tdeabc_kolab_la_LIBADD = libkabckolab.la
+tdeabc_kolab_la_LIBADD = libtdeabckolab.la
 
 servicedir = $(kde_servicesdir)/tderesources/tdeabc
 service_DATA = kolab.desktop
diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp
index 337dbe5c1..13f679b98 100644
--- a/tderesources/kolab/tdeabc/contact.cpp
+++ b/tderesources/kolab/tdeabc/contact.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
         <info@klaralvdalens-datakonsult.se>
 
diff --git a/tderesources/kolab/tdeabc/contact.h b/tderesources/kolab/tdeabc/contact.h
index f13b0a7cb..bed71b440 100644
--- a/tderesources/kolab/tdeabc/contact.h
+++ b/tderesources/kolab/tdeabc/contact.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB
         <info@klaralvdalens-datakonsult.se>
 
diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp
index f4391f76d..7476212e6 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB
         <info@klaralvdalens-datakonsult.se>
 
diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h
index 52fa93d35..a19dfbaa0 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.h
+++ b/tderesources/kolab/tdeabc/resourcekolab.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB
         <info@klaralvdalens-datakonsult.se>
 
@@ -162,7 +162,7 @@ protected:
                        TQ_UINT32 sernum, const KMailICalIface::StorageFormat format );
 
   TQString configFile() const {
-    return Kolab::ResourceKolabBase::configFile( "kabc" );
+    return Kolab::ResourceKolabBase::configFile( "tdeabc" );
   }
 
   void writeConfig();
diff --git a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
index a66cb9bdd..67f2408b1 100644
--- a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB
         <info@klaralvdalens-datakonsult.se>