10 files changed, 22 insertions, 96 deletions
diff --git a/konqueror/about/CMakeLists.txt b/konqueror/about/CMakeLists.txt
index 5eb9cc0f6..ffa5d4b96 100644
--- a/konqueror/about/CMakeLists.txt
+++ b/konqueror/about/CMakeLists.txt
@@ -23,8 +23,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES konq_aboutpage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES konqaboutpage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE konq_aboutpage.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR konqueror-desktops
+)
+
+tde_create_translated_desktop(
+  SOURCE konqaboutpage.desktop
+  DESTINATION ${SERVICETYPES_INSTALL_DIR}
+  PO_DIR konqueror-desktops
+)
 
 install( FILES
     box-centre-konqueror.png top-right-konqueror.png
@@ -38,7 +47,7 @@ install( FILES
 set( target konq_aboutpage )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES konq_aboutpage.cc
+  SOURCES konq_aboutpage.cpp
   LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/about/Makefile.am b/konqueror/about/Makefile.am
index 0a33f9bb7..f4ede2182 100644
--- a/konqueror/about/Makefile.am
+++ b/konqueror/about/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = konq_aboutpage.la
 
 INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/libkonq $(all_includes)
-konq_aboutpage_la_SOURCES = konq_aboutpage.cc
+konq_aboutpage_la_SOURCES = konq_aboutpage.cpp
 konq_aboutpage_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 konq_aboutpage_la_LIBADD = $(LIB_TDEHTML)
 
diff --git a/konqueror/about/intro.html b/konqueror/about/intro.html
index efa4d62a9..d9a2943cc 100644
--- a/konqueror/about/intro.html
+++ b/konqueror/about/intro.html
@@ -87,4 +87,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cpp
index cb2149f90..9d9fe4c71 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cpp
@@ -8,7 +8,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kurifilter.h>
@@ -54,7 +54,7 @@ KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, co
                                                       TQObject *parent, const char *name,
                                                       const char *, const TQStringList & )
 {
-    //KonqFrame *frame = tqt_dynamic_cast<KonqFrame *>( parentWidget );
+    //KonqFrame *frame = dynamic_cast<KonqFrame *>( parentWidget );
     //if ( !frame ) return 0;
 
     return new KonqAboutPage( //frame->childView()->mainWindow(),
@@ -81,7 +81,7 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file )
 		       file.left( file.findRev( '/' )) +
 		       TQString::fromLatin1("/\">\n");
     TQRegExp reg("<head>");
-    reg.setCaseSensitive(FALSE);
+    reg.setCaseSensitive(false);
     res.replace(reg, "<head>\n\t" + basehref);
     return res;
 }
@@ -111,7 +111,7 @@ TQString KonqAboutPageFactory::launch()
   TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
   res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-  if ( kapp->reverseLayout() )
+  if ( tdeApp->reverseLayout() )
     res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
   else
     res = res.arg( "" );
@@ -196,7 +196,7 @@ TQString KonqAboutPageFactory::intro()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -251,7 +251,7 @@ TQString KonqAboutPageFactory::specs()
 	return res;
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -348,7 +348,7 @@ TQString KonqAboutPageFactory::tips()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -412,7 +412,7 @@ TQString KonqAboutPageFactory::plugins()
     if ( s_plugins_html )
         return *s_plugins_html;
 
-    TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
+    TQString res = loadFile( locate( "data", tdeApp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
                   .arg(i18n("Installed Plugins"))
                   .arg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
                   .arg(i18n("Installed"))
diff --git a/konqueror/about/konq_aboutpage.desktop b/konqueror/about/konq_aboutpage.desktop
index da91b3a67..5b9b8f0c7 100644
--- a/konqueror/about/konq_aboutpage.desktop
+++ b/konqueror/about/konq_aboutpage.desktop
@@ -1,85 +1,6 @@
 [Desktop Entry]
 Type=Service
 Name=About-Page for Konqueror
-Name[af]=About-Page vir Konqueror
-Name[ar]=ضفحة حول لِــ Konqueror
-Name[az]=Konqueror Haqqında Səhifəsi
-Name[be]=Інфармацыйная старонка Konqueror
-Name[bg]=Страница с информация за Konqueror
-Name[bn]=কনকরার পরিচিতি পৃষ্ঠা
-Name[br]=Pajenn diwar-benn Konqueror
-Name[bs]=About-stranica za Konqueror
-Name[ca]=Pàgina quant al Konqueror
-Name[cs]=O aplikaci Konqueror
-Name[csb]=Starna "Ò programie" Konquerora
-Name[cy]=Tudalen Ynghylch i Konqueror
-Name[da]='Om'-side for Konqueror
-Name[de]=Über Konqueror
-Name[el]=Σελίδα πληροφοριών για τον Konqueror
-Name[eo]=Informpaĝo por Konkeranto
-Name[es]=Página 'Acerca de' para Konqueror
-Name[et]=Konquerori info
-Name[eu]='Honi buruzko orria' Konquerorrerako
-Name[fa]=صفحۀ درباره برای Konqueror
-Name[fi]=Konquerorin tietoja-sivu
-Name[fr]=À propos de Konqueror
-Name[fy]=Ynformaasjeside foar Konqueror
-Name[ga]=Leathanach Eolais le haghaidh Konqueror
-Name[gl]=Páxina Acerca de Konqueror
-Name[he]=דף אודות Konqueror
-Name[hi]=के-बारे में पृष्ठ कॉन्करर के लिए
-Name[hr]=O programu Konqueror
-Name[hu]=A Konqueror névjegye
-Name[id]=Tentang halaman untuk Konqueror
-Name[is]=Upplýsingasíða Konqueror
-Name[it]=Pagina di informazioni di Konqueror
-Name[ja]=Konqueror のバージョン情報ページ
-Name[ka]=Konqueror-ის ცნობათა ფურცელი
-Name[kk]=Konqueror туралы парақ
-Name[km]=ទំព័រអំពី របស់ Konqueror
-Name[ko]=Konqueror 정보 페이지
-Name[lo]=ຫນ້າກ່ງວກັບສຳລັບ Konqueror
-Name[lt]=Apie Konqueror
-Name[lv]=Par-Lapa priekš Iekarotāja
-Name[mk]=Страница за Konqueror
-Name[mn]=Конкюрорын тухай
-Name[ms]=Tentang Halaman untuk Konqueror
-Name[mt]=Paġna dwar Konqueror
-Name[nb]=Om-side for Konqueror
-Name[nds]=Infosiet över Konqueror
-Name[ne]=कन्क्वेररका लागि पृष्ठका बारेमा
-Name[nl]=Informatiepagina voor Konqueror
-Name[nn]=Om-side Konqueror
-Name[nso]=Kaga letlakala la Konqueror
-Name[pa]=ਕੋਨਕਿਉਰੋਰ ਬਾਰੇ ਸਫਾ
-Name[pl]=Strona "O programie" Konquerora
-Name[pt]=Página Acerca do Konqueror
-Name[pt_BR]=Página "Sobre" do Konqueror
-Name[ro]=Pagină informații pentru Konqueror
-Name[ru]=Страница сведений о Konqueror
-Name[rw]=Ibijyanye-Ipaji ya Konqueror 
-Name[se]=Diehtusiidu Konqueror várás
-Name[sk]=Stránka o programe Konqueror
-Name[sl]=Stran o Konquerorju
-Name[sr]=Информативна страница о Konqueror-у
-Name[sr@Latn]=Informativna stranica o Konqueror-u
-Name[sv]=Om-sida för Konqueror
-Name[ta]=கான்கொரர்க்கான பக்கம்-பற்றி
-Name[te]=కాంకెరర్ కొరకు గురించి పుట
-Name[tg]=Саҳифаи маълумот дар бораи Konqueror
-Name[th]=หน้าเกี่ยวกับคอนเควอร์เรอร์
-Name[tr]=Konqueror Hakkında Sayfası
-Name[tt]=Konqueror Turında
-Name[uk]=Сторінка "Про" для Konqueror
-Name[uz]=Konqueror haqida sahifa
-Name[uz@cyrillic]=Konqueror ҳақида саҳифа
-Name[ven]=Nga ha siatari la Konqueror
-Name[vi]=Trang giới thiệu của Konqueror
-Name[wa]=Pådje åd fait di Konqueror
-Name[xh]=Malunga-Nephepha le Konqueror
-Name[zh_CN]=Konqueror 的关于页面
-Name[zh_TW]=Konqueror 相關資訊
-Name[zu]=Mayelana-nekhasi le-Konqueror
 X-TDE-ServiceTypes=KonqAboutPage,KParts/ReadOnlyPart
 X-TDE-Library=konq_aboutpage
 X-TDE-BrowserView-HideFromMenus=true
diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h
index a4192d570..1c359a89e 100644
--- a/konqueror/about/konq_aboutpage.h
+++ b/konqueror/about/konq_aboutpage.h
@@ -34,7 +34,7 @@ private:
 
 class KonqAboutPage : public TDEHTMLPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqAboutPage( /*KonqMainWindow *mainWindow,*/
                    TQWidget *parentWidget, const char *widgetName,
diff --git a/konqueror/about/launch.html b/konqueror/about/launch.html
index 6e84049a7..a9d569350 100644
--- a/konqueror/about/launch.html
+++ b/konqueror/about/launch.html
@@ -131,4 +131,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/specs.html b/konqueror/about/specs.html
index 752c162da..be40c90bb 100644
--- a/konqueror/about/specs.html
+++ b/konqueror/about/specs.html
@@ -204,4 +204,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/tips.html b/konqueror/about/tips.html
index cf4a37862..085b630a8 100644
--- a/konqueror/about/tips.html
+++ b/konqueror/about/tips.html
@@ -124,4 +124,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/top-right-konqueror.png b/konqueror/about/top-right-konqueror.png
index f685d4a3c..7ad4ea948 100644
--- a/konqueror/about/top-right-konqueror.png
+++ b/konqueror/about/top-right-konqueror.png