summaryrefslogtreecommitdiffstats
path: root/knetworkconf
diff options
context:
space:
mode:
Diffstat (limited to 'knetworkconf')
-rw-r--r--knetworkconf/CMakeL10n.txt2
-rw-r--r--knetworkconf/backends/debug.pl.in2
-rw-r--r--knetworkconf/backends/file.pl.in2
-rw-r--r--knetworkconf/backends/general.pl.in2
-rwxr-xr-xknetworkconf/backends/mkinstalldirs6
-rwxr-xr-xknetworkconf/backends/network-conf.in2
-rw-r--r--knetworkconf/backends/network.pl.in2
-rw-r--r--knetworkconf/backends/parse.pl.in2
-rw-r--r--knetworkconf/backends/platform.pl.in2
-rw-r--r--knetworkconf/backends/process.pl.in2
-rw-r--r--knetworkconf/backends/replace.pl.in2
-rw-r--r--knetworkconf/backends/report.pl.in2
-rw-r--r--knetworkconf/backends/service-list.pl.in2
-rw-r--r--knetworkconf/backends/service.pl.in2
-rw-r--r--knetworkconf/backends/util.pl.in2
-rw-r--r--knetworkconf/backends/xml.pl.in2
-rw-r--r--knetworkconf/knetworkconf/CMakeL10n.txt7
-rw-r--r--knetworkconf/knetworkconf/CMakeLists.txt7
-rw-r--r--knetworkconf/knetworkconf/Makefile.am2
-rw-r--r--knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop166
-rw-r--r--knetworkconf/knetworkconf/knetworkconf.cpp1
-rw-r--r--knetworkconf/knetworkconf/knetworkconf.desktop121
-rw-r--r--knetworkconf/knetworkconf/knetworkconf.h5
-rw-r--r--knetworkconf/knetworkconf/knetworkconfiface.h34
-rw-r--r--knetworkconf/knetworkconf/tdeselectdistrodlg.ui6
25 files changed, 21 insertions, 364 deletions
diff --git a/knetworkconf/CMakeL10n.txt b/knetworkconf/CMakeL10n.txt
index 262d960..c69774b 100644
--- a/knetworkconf/CMakeL10n.txt
+++ b/knetworkconf/CMakeL10n.txt
@@ -1,3 +1,5 @@
##### create translation templates ##############
tde_l10n_create_template( "knetworkconf" )
+
+tde_l10n_auto_add_subdirectories( )
diff --git a/knetworkconf/backends/debug.pl.in b/knetworkconf/backends/debug.pl.in
index 0512308..832af59 100644
--- a/knetworkconf/backends/debug.pl.in
+++ b/knetworkconf/backends/debug.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Functions for hacker debug.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/file.pl.in b/knetworkconf/backends/file.pl.in
index ac73301..afbbe16 100644
--- a/knetworkconf/backends/file.pl.in
+++ b/knetworkconf/backends/file.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Functions for file manipulation. Find, open, read, write, backup, etc.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/general.pl.in b/knetworkconf/backends/general.pl.in
index 4657487..a4e43a6 100644
--- a/knetworkconf/backends/general.pl.in
+++ b/knetworkconf/backends/general.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Common stuff for the ximian-setup-tools backends.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/mkinstalldirs b/knetworkconf/backends/mkinstalldirs
index d2d5f21..7cde4d4 100755
--- a/knetworkconf/backends/mkinstalldirs
+++ b/knetworkconf/backends/mkinstalldirs
@@ -103,9 +103,3 @@ do
done
exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
diff --git a/knetworkconf/backends/network-conf.in b/knetworkconf/backends/network-conf.in
index 0f5e52d..20fb5e0 100755
--- a/knetworkconf/backends/network-conf.in
+++ b/knetworkconf/backends/network-conf.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Network configurator. Designed to be architecture and distribution independent.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in
index 74f164a..53f9e8c 100644
--- a/knetworkconf/backends/network.pl.in
+++ b/knetworkconf/backends/network.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Common network stuff for the ximian-setup-tools backends.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/parse.pl.in b/knetworkconf/backends/parse.pl.in
index 25c9373..a710acf 100644
--- a/knetworkconf/backends/parse.pl.in
+++ b/knetworkconf/backends/parse.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# parse.pl: Common parsing stuff for the ximian-setup-tools backends.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/platform.pl.in b/knetworkconf/backends/platform.pl.in
index 76eebca..cbe006f 100644
--- a/knetworkconf/backends/platform.pl.in
+++ b/knetworkconf/backends/platform.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Determine the platform we're running on.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/process.pl.in b/knetworkconf/backends/process.pl.in
index 353f6ce..5593543 100644
--- a/knetworkconf/backends/process.pl.in
+++ b/knetworkconf/backends/process.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Common process stuff for the setup tools backends.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in
index a72e3ef..243426e 100644
--- a/knetworkconf/backends/replace.pl.in
+++ b/knetworkconf/backends/replace.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# replace.pl: Common in-line replacing stuff for the ximian-setup-tools backends.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/report.pl.in b/knetworkconf/backends/report.pl.in
index 68326dd..72ca110 100644
--- a/knetworkconf/backends/report.pl.in
+++ b/knetworkconf/backends/report.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# /* Functions for on-the-fly commentary on a tool's work. */
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/service-list.pl.in b/knetworkconf/backends/service-list.pl.in
index 3b7f2a1..dd5aaa7 100644
--- a/knetworkconf/backends/service-list.pl.in
+++ b/knetworkconf/backends/service-list.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Functions for getting service descriptions.
#
# Copyright (C) 2002 Ximian, Inc.
diff --git a/knetworkconf/backends/service.pl.in b/knetworkconf/backends/service.pl.in
index f92151f..72a149f 100644
--- a/knetworkconf/backends/service.pl.in
+++ b/knetworkconf/backends/service.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Functions for manipulating system services, like daemons and network.
#
# Copyright (C) 2002 Ximian, Inc.
diff --git a/knetworkconf/backends/util.pl.in b/knetworkconf/backends/util.pl.in
index b175fb8..5c8f511 100644
--- a/knetworkconf/backends/util.pl.in
+++ b/knetworkconf/backends/util.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# Utility functions.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in
index b9810c6..05b2622 100644
--- a/knetworkconf/backends/xml.pl.in
+++ b/knetworkconf/backends/xml.pl.in
@@ -1,6 +1,4 @@
#!/usr/bin/env perl
-#-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
# XML printing, scanning and parsing.
#
# Copyright (C) 2000-2001 Ximian, Inc.
diff --git a/knetworkconf/knetworkconf/CMakeL10n.txt b/knetworkconf/knetworkconf/CMakeL10n.txt
new file mode 100644
index 0000000..ab0bfac
--- /dev/null
+++ b/knetworkconf/knetworkconf/CMakeL10n.txt
@@ -0,0 +1,7 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/knetworkconf-desktops/"
+ SOURCES *.desktop
+ DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/knetworkconf/knetworkconf/CMakeLists.txt b/knetworkconf/knetworkconf/CMakeLists.txt
index a00d070..a8e9083 100644
--- a/knetworkconf/knetworkconf/CMakeLists.txt
+++ b/knetworkconf/knetworkconf/CMakeLists.txt
@@ -25,7 +25,7 @@ tde_add_kpart( kcm_knetworkconfmodule AUTOMOC
kroutinginfo.cpp kreloadnetworkdlg.ui kaddressvalidator.cpp kdnsinfo.cpp
knetworkinfo.cpp kadddevicedlg.ui kadddnsserverdlg.ui
knetworkconfigparser.cpp knetworkinterface.cpp knetworkconfdlg.ui
- knetworkconf.cpp main.cpp kadddevicedlgextension.ui knetworkconfiface.skel
+ knetworkconf.cpp main.cpp kadddevicedlgextension.ui
kwirelessinterface.cpp kadddevicewifiext.ui kadddevicecontainer.cpp
kprofileslistviewtooltip.cpp
LINK tdeui-shared
@@ -40,6 +40,7 @@ tde_install_icons( )
##### other data ################################
-install( FILES kcm_knetworkconfmodule.desktop
- DESTINATION ${XDG_APPS_INSTALL_DIR}
+tde_create_translated_desktop(
+ SOURCE kcm_knetworkconfmodule.desktop
+ PO_DIR knetworkconf-desktops
)
diff --git a/knetworkconf/knetworkconf/Makefile.am b/knetworkconf/knetworkconf/Makefile.am
index 2fe7ee1..4bd0c8c 100644
--- a/knetworkconf/knetworkconf/Makefile.am
+++ b/knetworkconf/knetworkconf/Makefile.am
@@ -33,7 +33,7 @@ xdg_apps_DATA = kcm_knetworkconfmodule.desktop
KDE_ICON = AUTO
messages: rc.cpp
- LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+ LIST=`find . -name \*.h -o -name \*.cpp`; \
if test -n "$$LIST"; then \
$(XGETTEXT) $$LIST -o $(podir)/knetworkconf.pot; \
fi
diff --git a/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop b/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
index 56ffd9f..23d724e 100644
--- a/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
+++ b/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
@@ -9,170 +9,8 @@ Exec=tdecmshell kcm_knetworkconfmodule
Icon=knetworkconf
X-DocPath=knetworkconf/index.html
OnlyShowIn=TDE;
-
-Comment=Configure Network Settings
-Comment[ar]=إعداد تعيينات الشبكة
-Comment[be]=Наставіць сетку
-Comment[bg]=Настройване на мрежата
-Comment[bn]=নেটওয়ার্ক মানসমূহ কনফিগার করে
-Comment[br]=Kefluniañ dibarzhoù ar rouedad
-Comment[bs]=Podesi postavke mreže
-Comment[ca]=Configura els paràmetres de la xarxa
-Comment[cs]=Nastavení sítě
-Comment[da]=Indstil netværksopsætning
-Comment[de]=Netzwerkeinstellungen einrichten
-Comment[el]=Διαμόρφωση ρυθμίσεων δικτύου
-Comment[es]=Configure los parámetros de red
-Comment[et]=Võrguseadistuste seadistamine
-Comment[eu]=Konfiguratu sareko ezarpenak
-Comment[fa]=پیکربندی تنظیمات شبکه
-Comment[fi]=Aseta tietoverkon asetukset
-Comment[fr]=Configuration des paramètres réseau
-Comment[ga]=Cumraigh na Socruithe Líonra
-Comment[gl]=Configuración da Rede
-Comment[he]=שינוי הגדרות רשת
-Comment[hr]=Konfiguriranje mrežnih postavki
-Comment[hu]=A hálózat beállításai
-Comment[is]=Umsjón netstillinga
-Comment[it]=Configura le impostazioni di rete
-Comment[ja]=ネットワーク設定
-Comment[ka]=ქსელის პარამეტრების კონფიგურაცია
-Comment[kk]=Желінің параметрлерін баптау
-Comment[km]=កំណត់​រចនា​សម្ព័ន្ធ​ការ​កំណត់​បណ្ដាញ
-Comment[ko]=네트워크 설정
-Comment[lt]=Konfigūruoti tinklo nustatymus
-Comment[mk]=Конфигурирајте ги поставуањата за мрежата
-Comment[nb]=Sett opp nettverksinnstillinger
-Comment[nds]=Nettwark-Instellen fastleggen
-Comment[ne]=सञ्जाल सेटिङ कन्फिगर गर्नुहोस्
-Comment[nl]=Netwerk instellen
-Comment[nn]=Set opp nettverket
-Comment[pa]=ਨੈੱਟਵਰਕ ਸਥਾਪਨ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguracja ustawień sieci
-Comment[pt]=Configurar Opções de Rede
-Comment[pt_BR]=Configurar rede
-Comment[ro]=Configurează setările de reţea
-Comment[ru]=Утилита настройки сети
-Comment[se]=Heivet fierpmádaga
-Comment[sk]=Konfigurácia sieťových nastavení
-Comment[sl]=Nastavite omrežne nastavitve
-Comment[sr]=Подешавање поставки мреже
-Comment[sr@Latn]=Podešavanje postavki mreže
-Comment[sv]=Anpassa nätverksinställningar
-Comment[th]=ตั้งค่าการปรับแต่งเครือข่าย
-Comment[tr]=Ağ Ayarlarını Yapılandır
-Comment[uk]=Налаштувати мережні параметри
-Comment[vi]=Cấu hình thiết lập mạng
-Comment[wa]=Apontiaedjes del rantoele
-Comment[zh_CN]=配置网络设置
-Comment[zh_HK]=設定網絡設置
-Comment[zh_TW]=設定網路
Terminal=false
+
Name=Network Settings
-Name[ar]=تعيينات الشبكة
-Name[be]=Наставіць сетку
-Name[bg]=Мрежови настройки
-Name[bn]=নেটওয়ার্ক মানসমূহ
-Name[br]=Kefluniadur ar Rouedad
-Name[bs]=Postavke mreže
-Name[ca]=Paràmetres de xarxa
-Name[cs]=Nastavení sítě
-Name[cy]=Gosodiadau Rhwydwaith
-Name[da]=Netværksopsætning
-Name[de]=Netzwerkeinstellungen
-Name[el]=Ρυθμίσεις δικτύου
-Name[es]=Parámetros de red
-Name[et]=Võrguseadistused
-Name[eu]=Sareko ezarpenak
-Name[fa]=تنظیمات شبکه
-Name[fi]=Verkkoasetukset
-Name[fr]=Paramètres réseau
-Name[ga]=Socruithe Líonra
-Name[gl]=Configuración da Rede
-Name[he]=הגדרות רשת
-Name[hr]=Mrežne postavke
-Name[hu]=Hálózati beállítások
-Name[is]=Netstillingar
-Name[it]=Impostazioni di rete
-Name[ja]=ネットワーク設定
-Name[ka]=ქსელის პარამეტრები
-Name[kk]=Желінің параметрлері
-Name[km]=ការ​កំណត់​បណ្ដាញ
-Name[ko]=네트워크 설정
-Name[lt]=Tinklo nustatymai
-Name[mk]=Поставувања на мрежа
-Name[nb]=Nettverksoppsett
-Name[nds]=Nettwark-Instellen
-Name[ne]=सञ्जाल सेटिङ
-Name[nl]=Netwerkinstellingen
-Name[nn]=Nettverksinnstillingar
-Name[pa]=ਨੈੱਟਵਰਕ ਸਥਾਪਨ
-Name[pl]=Ustawienia sieci
-Name[pt]=Configuração da Rede
-Name[pt_BR]=Configurações de Rede
-Name[ro]=Setări de reţea
-Name[ru]=Настройка сети
-Name[se]=Fierpmádatheivehusat
-Name[sk]=Sieťové nastavenia
-Name[sl]=Omrežne nastavitve
-Name[sr]=Поставке мреже
-Name[sr@Latn]=Postavke mreže
-Name[sv]=Nätverksinställningar
-Name[th]=ตั้งค่าเครือข่าย
-Name[tr]=Ağ Ayarları
-Name[uk]=Мережні параметри
-Name[vi]=Thiết lập mạng
-Name[wa]=Apontiaedjes del rantoele
-Name[zh_CN]=网络设置
-Name[zh_HK]=網絡設置
-Name[zh_TW]=網路設定
+Comment=Configure Network Settings
Keywords=Network;DNS;routes;interfaces;
-Keywords[ar]=الشبكة;خادم اسماء المجال;الطرق;الواجهات;
-Keywords[bg]=мрежа; рутер; интерфейс; мрежова; карта; Network; DNS; routes; interfaces;
-Keywords[br]=Rouedad;DNS;hentoù;etrefasoù;
-Keywords[bs]=Network;DNS;routes;interfaces;mreža;interfejsi;
-Keywords[ca]=Xarxa;DNS;rutes;interfícies;
-Keywords[cs]=síť;DNS;route;rozhraní;
-Keywords[da]=Netværk;DNS;routes;grænseflader;
-Keywords[de]=Netzwerk;DNS;Routen;Schnittstellen;
-Keywords[el]=Δίκτυο;DNS;routes;διεπαφές;
-Keywords[es]=Red; DNS; rutas; interfaces;
-Keywords[et]=Võrk;DNS;marsruudid;liidesed;
-Keywords[eu]=Sarea;DNS;bideak; iterfazeak;
-Keywords[fa]=شبکه، خدمت نام دامنه، مسیرها، واسطها;
-Keywords[fi]=tietoverkko;DNS;reitit;rajapinnat;
-Keywords[fr]=réseau;DNS;serveur de noms;routes;interfaces;
-Keywords[ga]=Líonra;DNS;róid;comhéadain;
-Keywords[gl]=Rede;DNS;rutas;interfaces;
-Keywords[he]=Network;DNS;routes;interfaces;רשת;כתובתשמות;ממשקים;נתיבים;
-Keywords[hr]=Network;DNS;routes;interfaces;mreža;preusmjeravanje;sučelja;
-Keywords[hu]=Hálózat;DNS;útvonalak;hálózati csatolók;
-Keywords[it]=Rete;DNS;route;interfacce;
-Keywords[ja]=ネットワーク;DNS;ルート;インターフェース;
-Keywords[ka]=ქსელი;DNS;ბილიკები;ინტერფეისი;
-Keywords[km]=បណ្ដាញ;DNS;ផ្លូវ;ចំណុច​ប្រទាក់;
-Keywords[ko]=네트워크;DNS;인터페이스;
-Keywords[lt]=Network;DNS;routes;interfaces;tinklas;DNS;maršrutai;sąsajos;
-Keywords[mk]=Network;DNS;routes;interfaces;Мрежа;рути;интерфејси;
-Keywords[nb]=Nettverk;DNS;ruter;grensesnitt;
-Keywords[nds]=Nettwark;DNS;route;Anslüss;Koppelsteed;Nettweg;
-Keywords[ne]=सञ्जाल; डीएनएस; मार्ग; इन्टरफेस;
-Keywords[nl]=netwerk;DNS;routes;interfaces;netwerkkaart;
-Keywords[nn]=nettverk;DNS;ruter;grensesnitt;
-Keywords[pa]=ਨੈੱਟਵਰਕ;DNS;ਰੂਟ;ਇੰਟਰਫੇਸ;
-Keywords[pl]=sieć;Internet;DNS;trasy;routowanie;rutowanie;interfejsy;
-Keywords[pt]=Rede;DNS;rotas;interfaces;
-Keywords[pt_BR]=Rede;DNS;rotas;interfaces;
-Keywords[ro]=Reţea;DNS;rute;interfeţe;
-Keywords[se]=Fierpmádat;DNS;routes;lavttat;
-Keywords[sl]=Network;DNS;routes;interfaces;omrežje;vmesniki;poti;usmerjanje;
-Keywords[sr]=Мрежа;DNS;руте;интерфејси;
-Keywords[sr@Latn]=Mreža;DNS;rute;interfejsi;
-Keywords[sv]=Nätverk;DNS;route;gränssnitt;
-Keywords[th]=เครือข่าย;DNS;routes;interfaces;
-Keywords[tr]=Ağ;DNS;routes;arayüzler;
-Keywords[uk]=Network;DNS;routes;interfaces;мережа;інтерфейси;
-Keywords[vi]=Network;mạng;DNS;routes;tuyến;interfaces;giao diện;
-Keywords[zh_CN]=Network;DNS;routes;interfaces;网络;路由;接口;
-Keywords[zh_HK]=Network;DNS;routes;interfaces;網絡;路由;介面;
-Keywords[zh_TW]=網路;DNS;路由;介面;
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index 9459cb1..36d4a46 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -16,6 +16,7 @@
***************************************************************************/
#include <kiconloader.h>
+#include <dcopclient.h>
#include "knetworkconf.h"
diff --git a/knetworkconf/knetworkconf/knetworkconf.desktop b/knetworkconf/knetworkconf/knetworkconf.desktop
index cf128df..f1ae1d6 100644
--- a/knetworkconf/knetworkconf/knetworkconf.desktop
+++ b/knetworkconf/knetworkconf/knetworkconf.desktop
@@ -3,125 +3,8 @@ Type=Application
Exec=tdesu knetworkconf -caption "%c" %i %m
Icon=knetworkconf
X-DocPath=knetworkconf/index.html
-Comment=Configure TCP/IP settings
-Comment[ar]=إعداد تعيينات ميفاق التحكم بلنقل/ميفاق الإنترنت
-Comment[be]=Наставіць TCP/IP
-Comment[bg]=Настройване настройките на TCP/IP
-Comment[bn]=টিসিপি/আইপি মানসমূহ কনফিগার করে
-Comment[br]=Kefluniañ an dibarzhoù TCP/IP
-Comment[bs]=Podesi postavke TCP/IP
-Comment[ca]=Configura els paràmetres TCP/IP
-Comment[cs]=Nastavení TCP/IP
-Comment[da]=Indstil opsætning af TCP/IP
-Comment[de]=TCP/IP-Einstellungen einrichten
-Comment[el]=Διαμόρφωση των ρυθμίσεων TCP/IP
-Comment[es]=Configure los parámetros TCP/IP
-Comment[et]=TCP/IP seadistuste seadistamine
-Comment[eu]=Konfiguratu TCP/IP ezarpenak
-Comment[fa]=پیکربندی تنظیمات TCP/IP
-Comment[fi]=Aseta TCP/IP-asetukset
-Comment[fr]=Configuration des paramètres TCP/IP
-Comment[ga]=Cumraigh Socruithe TCP/IP
-Comment[gl]=Configuración de TCP/IP
-Comment[he]=שינוי הגדרות TCP/IP
-Comment[hr]=Konfiguriranje TCP/IP postavki
-Comment[hu]=A TCP/IP beállításai
-Comment[is]=Umsjón TCP/IP stillinga
-Comment[it]=Configura le impostazioni TCP/IP
-Comment[ja]=TCP/IP の設定
-Comment[ka]=TCP/IP პარამეტრების კონფიგურაცია
-Comment[kk]=TCP/IP параметрлерін баптау
-Comment[km]=កំណត់​រចនា​សម្ព័ន្ធ​ការ​កំណត់ TCP/IP
-Comment[ko]=TCP/IP 설정
-Comment[lt]=Konfigūruoti TCP/IP nustatymus
-Comment[mk]=Конфигурирајте поставувања за TCP/IP
-Comment[nb]=Sett opp TCP/IP-innstillinger
-Comment[nds]=TCP/IP-Instellen fastleggen
-Comment[ne]=टीसीपी/आईपी सेटिङ कन्फिगर गर्नुहोस्
-Comment[nl]=TCP/IP instellen
-Comment[nn]=Set opp TCP/IP
-Comment[pa]=TCP/IP ਸਥਾਪਨ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguracja ustawień TCP/IP
-Comment[pt]=Configurar opções TCP/IP
-Comment[pt_BR]=Configura os ajustes TCP/IP
-Comment[ro]=Configurează setările TCP/IP
-Comment[ru]=Настройка параметров TCP/IP
-Comment[se]=Heivet TCP/IP:a
-Comment[sk]=Konfigurácia nastavení TCP/IP
-Comment[sl]=Nastavite TCP/IP nastavitve
-Comment[sr]=Подесите TCP/IP поставке
-Comment[sr@Latn]=Podesite TCP/IP postavke
-Comment[sv]=Anpassa TCP/IP-inställningar
-Comment[th]=ปรับแต่งการตั้งค่า TCP/IP
-Comment[tr]=TCP /IP Ayarlarını Yapılandır
-Comment[uk]=Налаштувати параметри TCP/IP
-Comment[vi]=Cấu hình thiết lập TCP/IP
-Comment[wa]=Apontiaedjes TCP/IP
-Comment[zh_CN]=配置 TCP/IP 设置
-Comment[zh_HK]=設定 TCP/IP 設置
-Comment[zh_TW]=設定 TCP/IP
Terminal=false
+
Name=KNetworkConf
-Name[ar]=برنامج KNetworkConf
-Name[bn]=কে-নেটওয়ার্ক-কন্ফ
-Name[ne]=केडीई सञ्जाल कन्फिगरेसन
-Name[pa]=ਕੇ-ਨੈੱਟਵਰਕ-ਸੰਰਚਨਾ
-Name[pt_BR]=KNetworkConf
-Name[sv]=Knetworkconf
-Name[th]=ปรับแต่งเครือข่าย - K
GenericName=Configure TCP/IP Settings
-GenericName[ar]=إعداد تعيينات ميفاق التحكم بلنقل/ميفاق الإنترنت
-GenericName[bg]=Настройване на TCP/IP
-GenericName[bn]=টিসিপি/আইপি মানসমূহ কনফিগারেশন
-GenericName[br]=Kefluniañ an dibarzhoù TCP/IP
-GenericName[bs]=Podesi TCP/IP postavke
-GenericName[ca]=Configura els paràmetres TCP/IP
-GenericName[cs]=Nastavení TCP/IP možností
-GenericName[da]=Indstil opsætning af TCP/IP
-GenericName[de]=TCP/IP-Einstellungen einrichten
-GenericName[el]=Διαμορφώστε τις ρυθμίσεις TCP/IP
-GenericName[es]=Configure los parámetros TCP/IP
-GenericName[et]=TCP/IP seadistuste seadistamine
-GenericName[eu]=Konfiguratu TCP/IP ezarpenak
-GenericName[fa]=پیکربندی تنظیمات TCP/IP
-GenericName[fi]=Aseta TCP/IP-asetukset
-GenericName[fr]=Configuration des paramètres TCP/IP
-GenericName[ga]=Cumraigh Socruithe TCP/IP
-GenericName[gl]=Configuración de TCP/IP
-GenericName[he]=שינוי הגדרות TCP/IP
-GenericName[hr]=Konfiguriranje TCP/IP postavki
-GenericName[hu]=TCP/IP-beállítások
-GenericName[is]=Umsjón TCP/IP stillinga
-GenericName[it]=Configura le impostazioni TCP/IP
-GenericName[ja]=TCP/IP の設定
-GenericName[ka]=TCP/IP პარამეტრების კონფიგურაცია
-GenericName[kk]=TCP/IP параметрлерін баптау
-GenericName[km]=កំណត់​រចនា​សម្ព័ន្ធ​ការ​កំណត់ TCP/IP
-GenericName[ko]=TCP/IP 설정
-GenericName[lt]=Konfigūruoti TCP/IP nustatymus
-GenericName[mk]=Конфигурирајте поставувања за TCP/IP
-GenericName[nb]=Sett opp TCP/IP-innstillinger
-GenericName[nds]=TCP/IP-Instellen setten
-GenericName[ne]=टीसीपी/आईपी सेटिङ कन्फिगर गर्नुहोस्
-GenericName[nl]=TCP/IP instellen
-GenericName[nn]=Set opp TCP/IP
-GenericName[pa]=TCP/IP ਸਥਾਪਨ ਸੰਰਚਨਾ
-GenericName[pl]=Konfiguracja ustawień TCP/IP
-GenericName[pt]=Configurar opções TCP/IP
-GenericName[pt_BR]=Configura os ajustes TCP/IP
-GenericName[ro]=Configurează setările TCP/IP
-GenericName[ru]=Конфигурация TCP/IP
-GenericName[se]=Heivet TCP/IP:a
-GenericName[sk]=Konfigurácia nastavení TCP/IP
-GenericName[sl]=Nastavite TCP/IP nastavitve
-GenericName[sr]=Подеси TCP/IP поставке
-GenericName[sr@Latn]=Podesi TCP/IP postavke
-GenericName[sv]=Anpassa TCP/IP-inställningar
-GenericName[th]=ปรับแต่งการตั้งค่า TCP/IP
-GenericName[tr]=TCP /IP Ayarları Yapılandırıcı
-GenericName[uk]=Налаштувати параметри TCP/IP
-GenericName[vi]=Cấu hình thiết lập TCP/IP
-GenericName[wa]=Apontiaedjes TCP/IP
-GenericName[zh_CN]=配置 TCP/IP 设置
-GenericName[zh_HK]=設定 TCP/IP 設置
-GenericName[zh_TW]=設定 TCP/IP
+Comment=Configure TCP/IP settings
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h
index 9daa2e5..990bef1 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -55,7 +55,7 @@
#include <kstandarddirs.h>
#include <tdeapplication.h>
-#include <dcopclient.h>
+#include <dcopobject.h>
#include "knetworkconfdlg.h"
#include "kadddnsserverdlg.h"
@@ -70,11 +70,10 @@
#include "kknownhostinfo.h"
#include "knetworkinterface.h"
#include "kadddevicedlgextension.h"
-#include "knetworkconfiface.h"
#include "kprofileslistviewtooltip.h"
/** KNetworkConf is the base class of the project */
-class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface
+class KNetworkConf : public KNetworkConfDlg, public DCOPObject
{
Q_OBJECT
diff --git a/knetworkconf/knetworkconf/knetworkconfiface.h b/knetworkconf/knetworkconf/knetworkconfiface.h
deleted file mode 100644
index 36dfb14..0000000
--- a/knetworkconf/knetworkconf/knetworkconfiface.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*-
- *
- * knetworkconfiface.h
- *
- * Copyright (C) 2004 Juan Luis Baptiste <juan.baptiste@kdemail.net>
- *
- * 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 (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef knetworkconf_iface_h
-#define knetworkconf_iface_h
-
-#include <dcopobject.h>
-
-class KNetworkConfIface: virtual public DCOPObject
-{
- K_DCOP
- k_dcop:
-};
-
-#endif
diff --git a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
index daa59b3..8dcb8d8 100644
--- a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
@@ -37,9 +37,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -54,9 +51,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>