Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim

11 files changed, 106 insertions, 106 deletions

diff --git a/akregator/src/akregator.desktop b/akregator/src/akregator.desktop
index eb8952d3f..79b5e8762 100644
--- a/akregator/src/akregator.desktop
+++ b/akregator/src/akregator.desktop
@@ -32,7 +32,7 @@ GenericName[kk]=RSS жаңалықтарын оқу
 GenericName[km]=កម្មវិធី​អាន​មតិព័ត៌មាន RSS
 GenericName[ko]=RSS 피드 리더
 GenericName[lt]=RSS kanalų skaitytuvė
-GenericName[ms]= Pembaca Suapan RSS 
+GenericName[ms]= Pembaca Suapan RSS
 GenericName[nb]=Leser for RSS-kanal
 GenericName[nds]=Kieker för RSS-Mellenströöm
 GenericName[ne]=आरएसएस फिड रिडर
@@ -55,53 +55,53 @@ GenericName[uk]=Програма для читання подач RSS
 GenericName[uz]=RSS янгиликларни ўқувчи
 GenericName[zh_CN]=RSS 种子阅读器
 GenericName[zh_TW]=RSS Feed 閱讀器
-Comment=An RSS Aggregator for KDE
-Comment[af]='n RSS leser vir KDE
+Comment=An RSS Aggregator for TDE
+Comment[af]='n RSS leser vir TDE
 Comment[bg]=Четец на новости във формат RSS
-Comment[ca]=Un lector RSS per KDE
-Comment[cs]=RSS agregátor pro KDE
-Comment[da]=En RSS Aggregator for KDE
-Comment[de]=Ein RSS-Nachrichtensammler für KDE
-Comment[el]=Ένας συσσωρευτής RSS για το KDE
-Comment[eo]=RSS-akumulilo por KDE
-Comment[es]=Un agregador de RSS para KDE
-Comment[et]=KDE RSS-uudistevoogude lugemisvahend
-Comment[eu]=KDE-ren RSS gehitzailea
-Comment[fa]=انبوهه‌ساز RSSای برای KDE
+Comment[ca]=Un lector RSS per TDE
+Comment[cs]=RSS agregátor pro TDE
+Comment[da]=En RSS Aggregator for TDE
+Comment[de]=Ein RSS-Nachrichtensammler für TDE
+Comment[el]=Ένας συσσωρευτής RSS για το TDE
+Comment[eo]=RSS-akumulilo por TDE
+Comment[es]=Un agregador de RSS para TDE
+Comment[et]=TDE RSS-uudistevoogude lugemisvahend
+Comment[eu]=TDE-ren RSS gehitzailea
+Comment[fa]=انبوهه‌ساز RSSای برای TDE
 Comment[fi]=RSS-syötelukija
-Comment[fr]=Un lecteur de flux RSS pour KDE
-Comment[fy]=In RSS-agregator foar KDE
-Comment[ga]=Comhbhailitheoir RSS le haghaidh KDE
-Comment[gl]=Un agregador de RSS para KDE
-Comment[hu]=KDE-s hírolvasó RSS hírcsatornákhoz
-Comment[is]=RSS fréttaforrit fyrir KDE
-Comment[it]=Un concentratore KDE per RSS
-Comment[ja]=KDE 用 RSS アグリゲータ
-Comment[kk]=KDE-нің RSS жаңалық агрегаторы
-Comment[km]=កម្មវិធី​អាន RSS សម្រាប់ KDE
-Comment[ko]=KDE용 RSS 리더
-Comment[ms]=Pengagregat RSS untuk KDE
-Comment[nb]=En RSS-oppsamler for KDE
-Comment[nds]=Tosamensteller för RSS-Mellenströöm vun KDE
+Comment[fr]=Un lecteur de flux RSS pour TDE
+Comment[fy]=In RSS-agregator foar TDE
+Comment[ga]=Comhbhailitheoir RSS le haghaidh TDE
+Comment[gl]=Un agregador de RSS para TDE
+Comment[hu]=TDE-s hírolvasó RSS hírcsatornákhoz
+Comment[is]=RSS fréttaforrit fyrir TDE
+Comment[it]=Un concentratore TDE per RSS
+Comment[ja]=TDE 用 RSS アグリゲータ
+Comment[kk]=TDE-нің RSS жаңалық агрегаторы
+Comment[km]=កម្មវិធី​អាន RSS សម្រាប់ TDE
+Comment[ko]=TDE용 RSS 리더
+Comment[ms]=Pengagregat RSS untuk TDE
+Comment[nb]=En RSS-oppsamler for TDE
+Comment[nds]=Tosamensteller för RSS-Mellenströöm vun TDE
 Comment[ne]=केडीई का लागि एउटा आरएसएस एक्रिगेटर
-Comment[nl]=Een RSS-agregator voor KDE
-Comment[nn]=Ein RSS-lesar for KDE
-Comment[pl]=Program podsumowujący kanały RSS dla KDE
-Comment[pt]=Um Agregador RSS do KDE
-Comment[pt_BR]=Um Agregador RSS para o KDE
+Comment[nl]=Een RSS-agregator voor TDE
+Comment[nn]=Ein RSS-lesar for TDE
+Comment[pl]=Program podsumowujący kanały RSS dla TDE
+Comment[pt]=Um Agregador RSS do TDE
+Comment[pt_BR]=Um Agregador RSS para o TDE
 Comment[ru]=Чтение лент новостей RSS
-Comment[se]=KDE:a RSS-logan
-Comment[sk]=Zhromažďovač RSS pre KDE
-Comment[sl]=Zbiralnik RSS za KDE
-Comment[sr]=Сакупљач RSS довода за KDE
-Comment[sr@Latn]=Sakupljač RSS dovoda za KDE
-Comment[sv]=En RSS-samlare för KDE
+Comment[se]=TDE:a RSS-logan
+Comment[sk]=Zhromažďovač RSS pre TDE
+Comment[sl]=Zbiralnik RSS za TDE
+Comment[sr]=Сакупљач RSS довода за TDE
+Comment[sr@Latn]=Sakupljač RSS dovoda za TDE
+Comment[sv]=En RSS-samlare för TDE
 Comment[ta]=கேடியிக்கான ஒரு RSS சேர்ப்பான்
-Comment[tr]=Bir KDE RSS Okuyucusu
-Comment[uk]=Агрегатор RSS для KDE
-Comment[uz]=KDE учун RSS янгиликларни ўқувчи
-Comment[zh_CN]=KDE RSS 新闻收集器
-Comment[zh_TW]=KDE 的 RSS 收集器
+Comment[tr]=Bir TDE RSS Okuyucusu
+Comment[uk]=Агрегатор RSS для TDE
+Comment[uz]=TDE учун RSS янгиликларни ўқувчи
+Comment[zh_CN]=TDE RSS 新闻收集器
+Comment[zh_TW]=TDE 的 RSS 收集器
 Terminal=false
 Categories=Qt;KDE;Network;News;
 X-DCOP-ServiceType=Unique
diff --git a/certmanager/lib/tests/Makefile.am b/certmanager/lib/tests/Makefile.am
index 331d4d8e9..3e8b7c367 100644
--- a/certmanager/lib/tests/Makefile.am
+++ b/certmanager/lib/tests/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/certmanager/lib \
 	-I$(top_srcdir)/libtdenetwork \
-	$(GPGME_CFLAGS) $(all_includes) -DKDESRCDIR=\"$(srcdir)\"
+	$(GPGME_CFLAGS) $(all_includes) -DTDESRCDIR=\"$(srcdir)\"
 
 check_PROGRAMS = test_keylister test_keygen test_keyselectiondialog \
 		test_cryptoconfig test_gnupgprocessbase test_jobs test_verify
diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp
index 331d3759e..72ce9b2f8 100644
--- a/certmanager/lib/tests/test_verify.cpp
+++ b/certmanager/lib/tests/test_verify.cpp
@@ -49,7 +49,7 @@
 
 int main( int argc, char **argv )
 {
-  setenv("GNUPGHOME", KDESRCDIR "/gnupg_home", 1 );
+  setenv("GNUPGHOME", TDESRCDIR "/gnupg_home", 1 );
   setenv("LC_ALL", "C", 1);
   setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-unit-test" ), 1);
 
@@ -57,8 +57,8 @@ int main( int argc, char **argv )
   KCmdLineArgs::init( argc, argv, &aboutData );
   KApplication app( false, false );
 
-  const TQString sigFileName = KDESRCDIR "/test.data.sig";
-  const TQString dataFileName = KDESRCDIR "/test.data";
+  const TQString sigFileName = TDESRCDIR "/test.data.sig";
+  const TQString dataFileName = TDESRCDIR "/test.data";
 
   TQFile sigFile( sigFileName );
   assert( sigFile.open( IO_ReadOnly ) );
@@ -77,7 +77,7 @@ int main( int argc, char **argv )
   assert( sig.creationTime() == 1189650248L );
   assert( sig.validity() == GpgME::Signature::Full );
 
-  const TQString opaqueFileName = KDESRCDIR "/test.data.gpg";
+  const TQString opaqueFileName = TDESRCDIR "/test.data.gpg";
   TQFile opaqueFile( opaqueFileName );
   assert( opaqueFile.open( IO_ReadOnly ) );
   TQByteArray clearText;
diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp
index 71113f79b..6bf9f03e9 100644
--- a/karm/test/locking.cpp
+++ b/karm/test/locking.cpp
@@ -133,7 +133,7 @@ int main( int argc, char *argv[] )
   setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true );
 
   // Copied from Till's test in libkcal.  Not sure what this is for.
-  setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
+  setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
   // Copied from Till's test in libkcal.  Not sure what this is for.
   KApplication::disableAutoDcopRegistration();
diff --git a/kmail/tests/Makefile.am b/kmail/tests/Makefile.am
index f8bc6ce49..2d492283b 100644
--- a/kmail/tests/Makefile.am
+++ b/kmail/tests/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/kmail -I$(top_srcdir)/mimelib $(all_includes)
-AM_CPPFLAGS = -DKDESRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -DTDESRCDIR=\"$(srcdir)\"
 METASOURCES = AUTO
 
 check_LTLIBRARIES = kunittest_storagelayermodule.la \
diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp
index b152fdcf6..6f4cf1896 100644
--- a/kmail/tests/mimelibtests.cpp
+++ b/kmail/tests/mimelibtests.cpp
@@ -73,10 +73,10 @@ void MimeLibTester::setUp()
 {
   // This multipart-mixed mail has a part that starts without headers;
   // the newline after the (empty) headers must be preserved.
-  mMultipartMixedMail = readFile( KDESRCDIR "/multipartmixed.mbox" );
+  mMultipartMixedMail = readFile( TDESRCDIR "/multipartmixed.mbox" );
   // This is the full signed mail which was simplified to above.
   // Kept around in case we want to do anything else with a signed mail later :)
-  mSignedMail = readFile( KDESRCDIR "/signedmail.mbox" );
+  mSignedMail = readFile( TDESRCDIR "/signedmail.mbox" );
 }
 
 void MimeLibTester::tearDown()
diff --git a/kmobile/kmobile.desktop b/kmobile/kmobile.desktop
index aac1904ab..9d3ad2b8b 100644
--- a/kmobile/kmobile.desktop
+++ b/kmobile/kmobile.desktop
@@ -71,59 +71,59 @@ GenericName[uk]=Робота з мобільними пристроями
 GenericName[zh_CN]=管理移动设备
 GenericName[zh_TW]=管理行動裝置
 
-Comment=A KDE Mobile Devices Manager
-Comment[af]='n KDE draagbare toestel bestuurder
-Comment[be]=Кіраванне мабільнымі прыладамі KDE
+Comment=A TDE Mobile Devices Manager
+Comment[af]='n TDE draagbare toestel bestuurder
+Comment[be]=Кіраванне мабільнымі прыладамі TDE
 Comment[bg]=Управление на мобилни устройства
-Comment[bs]=KDE upravitelj mobilnim uređajima
-Comment[ca]=Un gestor de KDE per a dispositius mòbils
-Comment[cs]=Správce mobilních zařízení KDE
-Comment[cy]=Rheolydd Dyfeisiau Symudol KDE
-Comment[da]=En KDE-håndtering af mobil-enheder
+Comment[bs]=TDE upravitelj mobilnim uređajima
+Comment[ca]=Un gestor de TDE per a dispositius mòbils
+Comment[cs]=Správce mobilních zařízení TDE
+Comment[cy]=Rheolydd Dyfeisiau Symudol TDE
+Comment[da]=En TDE-håndtering af mobil-enheder
 Comment[de]=Verwaltung für mobile Geräte
-Comment[el]=Ένας διαχειριστής φορητών συσκευών του KDE
-Comment[eo]=KDE-mobilaparat-administrilo
-Comment[es]=A gestor de dispositivos móviles para KDE
-Comment[et]=KDE mobiilihaldur
-Comment[eu]=KDE-ren dispositibo mugikorren kudeatzailea
-Comment[fa]=مدیر دستگاههای تلفن همراه KDE
-Comment[fi]=KDE:n matkapuhelinlaitteiden hallinta
-Comment[fr]=Un gestionnaire de périphériques mobiles pour KDE
-Comment[fy]=Behear fan mobile apparaten yn KDE
-Comment[ga]=Bainisteoir Gléasanna Móibíleacha KDE
-Comment[gl]=O Xestor de Móbiles de KDE
-Comment[he]=מנהל התקנים ניידים עבור KDE
+Comment[el]=Ένας διαχειριστής φορητών συσκευών του TDE
+Comment[eo]=TDE-mobilaparat-administrilo
+Comment[es]=A gestor de dispositivos móviles para TDE
+Comment[et]=TDE mobiilihaldur
+Comment[eu]=TDE-ren dispositibo mugikorren kudeatzailea
+Comment[fa]=مدیر دستگاههای تلفن همراه TDE
+Comment[fi]=TDE:n matkapuhelinlaitteiden hallinta
+Comment[fr]=Un gestionnaire de périphériques mobiles pour TDE
+Comment[fy]=Behear fan mobile apparaten yn TDE
+Comment[ga]=Bainisteoir Gléasanna Móibíleacha TDE
+Comment[gl]=O Xestor de Móbiles de TDE
+Comment[he]=מנהל התקנים ניידים עבור TDE
 Comment[hi]=एक केडीई मोबाइल उपकरण प्रबंधक
-Comment[hu]=KDE-alapú mobiltelefon-kezelő
-Comment[is]=KDE stjórnforrit fyrir lófatölvur og farsíma
-Comment[it]=Un gestore di dispositivi portatili di KDE
-Comment[ja]=KDE モバイル機器マネージャ
-Comment[kk]=KDE-нің қалта құрылғылар менеджері
-Comment[km]=កម្មវិធី​គ្រប់គ្រង​ឧបករណ៍​ចល័ត KDE
-Comment[lt]=KDE mobiliųjų įrenginių tvarkyklė
-Comment[mk]=Менаџер на мобилни уреди во KDE
-Comment[ms]=Pengurus Peranti Mudah Alih   KDE 
-Comment[nb]=En KDE-håndterer for mobile enheter
+Comment[hu]=TDE-alapú mobiltelefon-kezelő
+Comment[is]=TDE stjórnforrit fyrir lófatölvur og farsíma
+Comment[it]=Un gestore di dispositivi portatili di TDE
+Comment[ja]=TDE モバイル機器マネージャ
+Comment[kk]=TDE-нің қалта құрылғылар менеджері
+Comment[km]=កម្មវិធី​គ្រប់គ្រង​ឧបករណ៍​ចល័ត TDE
+Comment[lt]=TDE mobiliųjų įrenginių tvarkyklė
+Comment[mk]=Менаџер на мобилни уреди во TDE
+Comment[ms]=Pengurus Peranti Mudah Alih   TDE
+Comment[nb]=En TDE-håndterer for mobile enheter
 Comment[nds]=En Pleger för Mobilreedschappen
 Comment[ne]=केडीई मोबाइल यन्त्र प्रबन्धक
-Comment[nl]=Beheer van mobiele apparaten in KDE
-Comment[nn]=Ein einingshandterar for mobiltelefon i KDE
-Comment[pl]=Program obsługujący urządzenia przenośne dla KDE
-Comment[pt]=Um Gestor de Dispositivos Móveis do KDE
-Comment[pt_BR]=Um Gerenciador de Dispositivos Móveis para o KDE
-Comment[ro]=Un manager KDE pentru dispozitive mobile
-Comment[ru]=Менеджер мобильных устройств KDE
-Comment[sk]=KDE správca prenosných zariadení
-Comment[sl]=Upravitelj prenosnih naprav v KDE
-Comment[sr]=KDE-ов менаџер мобилних уређаја
-Comment[sr@Latn]=KDE-ov menadžer mobilnih uređaja
-Comment[sv]=KDE:s hantering av mobilenheter
-Comment[ta]=ஒரு கேடிஇ நடமாடும் சாதனத்தின் மேலாளர் 
-Comment[tg]=Мудири дастгоҳи мобилии KDE
-Comment[tr]=KDE Taşınabilir Aygıtlar Yöneticisi
-Comment[uk]=Менеджер мобільних пристроїв KDE
-Comment[zh_CN]=KDE 移动设备管理器
-Comment[zh_TW]=KDE 行動裝置管理員
+Comment[nl]=Beheer van mobiele apparaten in TDE
+Comment[nn]=Ein einingshandterar for mobiltelefon i TDE
+Comment[pl]=Program obsługujący urządzenia przenośne dla TDE
+Comment[pt]=Um Gestor de Dispositivos Móveis do TDE
+Comment[pt_BR]=Um Gerenciador de Dispositivos Móveis para o TDE
+Comment[ro]=Un manager TDE pentru dispozitive mobile
+Comment[ru]=Менеджер мобильных устройств TDE
+Comment[sk]=TDE správca prenosných zariadení
+Comment[sl]=Upravitelj prenosnih naprav v TDE
+Comment[sr]=TDE-ов менаџер мобилних уређаја
+Comment[sr@Latn]=TDE-ov menadžer mobilnih uređaja
+Comment[sv]=TDE:s hantering av mobilenheter
+Comment[ta]=ஒரு கேடிஇ நடமாடும் சாதனத்தின் மேலாளர்
+Comment[tg]=Мудири дастгоҳи мобилии TDE
+Comment[tr]=TDE Taşınabilir Aygıtlar Yöneticisi
+Comment[uk]=Менеджер мобільних пристроїв TDE
+Comment[zh_CN]=TDE 移动设备管理器
+Comment[zh_TW]=TDE 行動裝置管理員
 
 X-KDE-StartupNotify=false
 X-DCOP-ServiceType=Unique
diff --git a/ktnef/tests/Makefile.am b/ktnef/tests/Makefile.am
index 678497789..15ef50764 100644
--- a/ktnef/tests/Makefile.am
+++ b/ktnef/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/ktnef $(all_includes) -DKDESRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/ktnef $(all_includes) -DTDESRCDIR=\"$(srcdir)\"
 LDADD = ../lib/libktnef.la $(LIB_TDECORE)
 
 check_PROGRAMS = parsertest
diff --git a/ktnef/tests/parsertest.cpp b/ktnef/tests/parsertest.cpp
index 9cbce6d52..6e3d3af3d 100644
--- a/ktnef/tests/parsertest.cpp
+++ b/ktnef/tests/parsertest.cpp
@@ -28,7 +28,7 @@
 void ParserTest::testSingleAttachment()
 {
   KTNEFParser parser;
-  assert( parser.openFile( KDESRCDIR "/one-file.tnef" ) == true );
+  assert( parser.openFile( TDESRCDIR "/one-file.tnef" ) == true );
 
   KTNEFMessage *msg = parser.message();
   assert( msg != 0 );
@@ -45,7 +45,7 @@ void ParserTest::testSingleAttachment()
 void ParserTest::testTwoAttachments()
 {
   KTNEFParser parser;
-  assert( parser.openFile( KDESRCDIR "/two-files.tnef" ) == true );
+  assert( parser.openFile( TDESRCDIR "/two-files.tnef" ) == true );
 
   KTNEFMessage *msg = parser.message();
   assert( msg != 0 );
@@ -67,7 +67,7 @@ void ParserTest::testTwoAttachments()
 void ParserTest::testMAPIAttachments()
 {
   KTNEFParser parser;
-  assert( parser.openFile( KDESRCDIR "/mapi_attach_data_obj.tnef" ) == true );
+  assert( parser.openFile( TDESRCDIR "/mapi_attach_data_obj.tnef" ) == true );
 
   KTNEFMessage *msg = parser.message();
   assert( msg != 0 );
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index 5779c47b5..63dd27fc1 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     // Use another directory than the real one, just to keep things clean
     // TDEHOME needs to be writable though, for a ksycoca database
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true );
-    setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
+    setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
     KApplication::disableAutoDcopRegistration();
     KCmdLineArgs::init(argc,argv,"testresource", 0, 0, 0, 0);
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index c171c6cec..3ee85283c 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     // Use another directory than the real one, just to keep things clean
     // TDEHOME needs to be writable though, for a ksycoca database
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testdistrlist" ), true );
-    setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
+    setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
     KApplication::disableAutoDcopRegistration();
     KCmdLineArgs::init(argc,argv,"testdistrlist", 0, 0, 0, 0);