summaryrefslogtreecommitdiffstats
path: root/tdescreensaver/kdesavers
diff options
context:
space:
mode:
Diffstat (limited to 'tdescreensaver/kdesavers')
-rw-r--r--tdescreensaver/kdesavers/CMakeLists.txt14
-rw-r--r--tdescreensaver/kdesavers/Euphoria.cpp14
-rw-r--r--tdescreensaver/kdesavers/Euphoria.h6
-rw-r--r--tdescreensaver/kdesavers/Flux.cpp14
-rw-r--r--tdescreensaver/kdesavers/Flux.h6
-rw-r--r--tdescreensaver/kdesavers/KBanner.desktop221
-rw-r--r--tdescreensaver/kdesavers/KBlob.desktop207
-rw-r--r--tdescreensaver/kdesavers/KClock.desktop232
-rw-r--r--tdescreensaver/kdesavers/KEuphoria.desktop212
-rw-r--r--tdescreensaver/kdesavers/KFiresaver.desktop212
-rw-r--r--tdescreensaver/kdesavers/KFlux.desktop203
-rw-r--r--tdescreensaver/kdesavers/KFountain.desktop228
-rw-r--r--tdescreensaver/kdesavers/KGravity.desktop232
-rw-r--r--tdescreensaver/kdesavers/KLines-saver.desktop232
-rw-r--r--tdescreensaver/kdesavers/KLorenz.desktop222
-rw-r--r--tdescreensaver/kdesavers/KPendulum.desktop200
-rw-r--r--tdescreensaver/kdesavers/KPolygon.desktop231
-rw-r--r--tdescreensaver/kdesavers/KRotation.desktop200
-rw-r--r--tdescreensaver/kdesavers/KScience.desktop231
-rw-r--r--tdescreensaver/kdesavers/KSlideshow.desktop229
-rw-r--r--tdescreensaver/kdesavers/KSolarWinds.desktop222
-rw-r--r--tdescreensaver/kdesavers/KVm.desktop231
-rw-r--r--tdescreensaver/kdesavers/KWave.desktop230
-rw-r--r--tdescreensaver/kdesavers/SolarWinds.cpp14
-rw-r--r--tdescreensaver/kdesavers/SolarWinds.h6
-rw-r--r--tdescreensaver/kdesavers/banner.cpp44
-rw-r--r--tdescreensaver/kdesavers/banner.h4
-rw-r--r--tdescreensaver/kdesavers/blob.cpp16
-rw-r--r--tdescreensaver/kdesavers/blob.h4
-rw-r--r--tdescreensaver/kdesavers/firesaver.cpp12
-rw-r--r--tdescreensaver/kdesavers/firesaversetup.ui4
-rw-r--r--tdescreensaver/kdesavers/fountain.cpp22
-rw-r--r--tdescreensaver/kdesavers/fountain.h6
-rw-r--r--tdescreensaver/kdesavers/gravity.cpp22
-rw-r--r--tdescreensaver/kdesavers/gravity.h6
-rw-r--r--tdescreensaver/kdesavers/kclock.cpp40
-rw-r--r--tdescreensaver/kdesavers/kclock.h4
-rw-r--r--tdescreensaver/kdesavers/kvm.cpp24
-rw-r--r--tdescreensaver/kdesavers/kvm.h4
-rw-r--r--tdescreensaver/kdesavers/lines.cpp32
-rw-r--r--tdescreensaver/kdesavers/lines.h4
-rw-r--r--tdescreensaver/kdesavers/lorenz.cpp36
-rw-r--r--tdescreensaver/kdesavers/lorenz.h4
-rw-r--r--tdescreensaver/kdesavers/pendulum.cpp16
-rw-r--r--tdescreensaver/kdesavers/pendulum.h6
-rw-r--r--tdescreensaver/kdesavers/pendulumcfg.ui4
-rw-r--r--tdescreensaver/kdesavers/polygon.cpp24
-rw-r--r--tdescreensaver/kdesavers/polygon.h4
-rw-r--r--tdescreensaver/kdesavers/rotation.cpp16
-rw-r--r--tdescreensaver/kdesavers/rotation.h6
-rw-r--r--tdescreensaver/kdesavers/rotationcfg.ui4
-rw-r--r--tdescreensaver/kdesavers/science.cpp68
-rw-r--r--tdescreensaver/kdesavers/science.h6
-rw-r--r--tdescreensaver/kdesavers/slideshow.cpp62
-rw-r--r--tdescreensaver/kdesavers/slideshow.h4
-rw-r--r--tdescreensaver/kdesavers/sspreviewarea.h2
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/AASaverConfig.kcfgc4
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/CMakeLists.txt42
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/COPYRIGHT26
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/Doxyfile1218
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/README1
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp1220
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/aasaver.h170
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/asciiquarium.kcfg13
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/doxygen-stylesheet.css309
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/frame.cpp175
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/frame.h121
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp222
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/screen.h142
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/settingswidget.ui50
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/sprite.cpp64
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/sprite.h178
-rw-r--r--tdescreensaver/kdesavers/tdeasciiquarium/tdeasciiquarium.desktop23
-rw-r--r--tdescreensaver/kdesavers/wave.cpp22
-rw-r--r--tdescreensaver/kdesavers/wave.h6
75 files changed, 4300 insertions, 4265 deletions
diff --git a/tdescreensaver/kdesavers/CMakeLists.txt b/tdescreensaver/kdesavers/CMakeLists.txt
index f08693ee..0246a974 100644
--- a/tdescreensaver/kdesavers/CMakeLists.txt
+++ b/tdescreensaver/kdesavers/CMakeLists.txt
@@ -9,6 +9,11 @@
#
#################################################
+if( BUILD_TDEASCIIQUARIUM AND BUILD_TDESCREENSAVER )
+ add_subdirectory( tdeasciiquarium )
+endif()
+
+
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
@@ -124,7 +129,7 @@ endif( WITH_OPENGL )
# this screensavers will work only in X
list( APPEND SCREENSAVERS ${X11_SCREENSAVERS} )
list( APPEND SCREENSAVERS ${NORMAL_SCREENSAVERS} )
-
+
##### create install/compile rules ##############
foreach( saver ${SCREENSAVERS} )
tde_add_executable( ${saver}.kss AUTOMOC
@@ -132,8 +137,11 @@ foreach( saver ${SCREENSAVERS} )
LINK tdescreensaver-shared tdeui-shared ${${saver}_LINK}
DESTINATION ${BIN_INSTALL_DIR}
)
- install( FILES ${${saver}_DESKTOP}
- DESTINATION ${APPS_INSTALL_DIR}/System/ScreenSavers )
+ tde_create_translated_desktop(
+ SOURCE ${${saver}_DESKTOP}
+ DESTINATION ${APPS_INSTALL_DIR}/System/ScreenSavers
+ PO_DIR tdescreensaver-desktops
+ )
endforeach( saver ${SCREENSAVERS} )
##### install various data ######################
diff --git a/tdescreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp
index 3237439c..4bc3c50b 100644
--- a/tdescreensaver/kdesavers/Euphoria.cpp
+++ b/tdescreensaver/kdesavers/Euphoria.cpp
@@ -465,7 +465,7 @@ EuphoriaWidget::EuphoriaWidget( TQWidget* parent, const char* name )
_frameTime = 1000 / 60;
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextFrame()) );
+ connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextFrame()) );
}
@@ -896,16 +896,16 @@ void EuphoriaWidget::setDefaults(int which)
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char* kss_applicationName = "keuphoria.kss";
- KDE_EXPORT const char* kss_description = I18N_NOOP( "Euphoria" );
- KDE_EXPORT const char* kss_version = "1.0";
+ TDE_EXPORT const char* kss_applicationName = "keuphoria.kss";
+ TDE_EXPORT const char* kss_description = I18N_NOOP( "Euphoria" );
+ TDE_EXPORT const char* kss_version = "1.0";
- KDE_EXPORT KScreenSaver* kss_create( WId id )
+ TDE_EXPORT KScreenSaver* kss_create( WId id )
{
return new KEuphoriaScreenSaver( id );
}
- KDE_EXPORT TQDialog* kss_setup()
+ TDE_EXPORT TQDialog* kss_setup()
{
return new KEuphoriaSetup;
}
@@ -1022,7 +1022,7 @@ KEuphoriaSetup::KEuphoriaSetup( TQWidget* parent, const char* name )
// Now that we have _saver...
modeW->setCurrentItem( _saver->mode() ); // set before we connect
- connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) );
+ connect( modeW, TQ_SIGNAL(activated(int)), _saver, TQ_SLOT(setMode(int)) );
setMinimumSize( sizeHint() );
}
diff --git a/tdescreensaver/kdesavers/Euphoria.h b/tdescreensaver/kdesavers/Euphoria.h
index 45ef3207..7180eb99 100644
--- a/tdescreensaver/kdesavers/Euphoria.h
+++ b/tdescreensaver/kdesavers/Euphoria.h
@@ -19,7 +19,7 @@ class TQTimer;
class EuphoriaWidget : public TQGLWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -111,7 +111,7 @@ private:
class KEuphoriaScreenSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -138,7 +138,7 @@ class TQComboBox;
class KEuphoriaSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdescreensaver/kdesavers/Flux.cpp b/tdescreensaver/kdesavers/Flux.cpp
index bdd358f2..91cf91b4 100644
--- a/tdescreensaver/kdesavers/Flux.cpp
+++ b/tdescreensaver/kdesavers/Flux.cpp
@@ -436,7 +436,7 @@ FluxWidget::FluxWidget( TQWidget* parent, const char* name )
_frameTime = 1000 / 60;
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextFrame()) );
+ connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextFrame()) );
}
@@ -780,16 +780,16 @@ void FluxWidget::updateParameters()
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char* kss_applicationName = "kflux.kss";
- KDE_EXPORT const char* kss_description = I18N_NOOP( "Flux" );
- KDE_EXPORT const char* kss_version = "1.0";
+ TDE_EXPORT const char* kss_applicationName = "kflux.kss";
+ TDE_EXPORT const char* kss_description = I18N_NOOP( "Flux" );
+ TDE_EXPORT const char* kss_version = "1.0";
- KDE_EXPORT KScreenSaver* kss_create( WId id )
+ TDE_EXPORT KScreenSaver* kss_create( WId id )
{
return new KFluxScreenSaver( id );
}
- KDE_EXPORT TQDialog* kss_setup()
+ TDE_EXPORT TQDialog* kss_setup()
{
return new KFluxSetup;
}
@@ -905,7 +905,7 @@ KFluxSetup::KFluxSetup( TQWidget* parent, const char* name )
// Now that we have _saver...
modeW->setCurrentItem( _saver->mode() ); // set before we connect
- connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) );
+ connect( modeW, TQ_SIGNAL(activated(int)), _saver, TQ_SLOT(setMode(int)) );
}
diff --git a/tdescreensaver/kdesavers/Flux.h b/tdescreensaver/kdesavers/Flux.h
index a48e85fa..10303d95 100644
--- a/tdescreensaver/kdesavers/Flux.h
+++ b/tdescreensaver/kdesavers/Flux.h
@@ -22,7 +22,7 @@ class TQTimer;
class FluxWidget : public TQGLWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -99,7 +99,7 @@ private:
class KFluxScreenSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -126,7 +126,7 @@ class TQComboBox;
class KFluxSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdescreensaver/kdesavers/KBanner.desktop b/tdescreensaver/kdesavers/KBanner.desktop
index afcc1d26..835d296a 100644
--- a/tdescreensaver/kdesavers/KBanner.desktop
+++ b/tdescreensaver/kdesavers/KBanner.desktop
@@ -5,239 +5,18 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=Banners & Pictures
Name=Banner
-Name[af]=Bannier
-Name[bg]=Банер
-Name[br]=Lugan
-Name[ca]=Rètol
-Name[cs]=Běžící text
-Name[cy]=Baner
-Name[de]=Lauftext
-Name[el]=Τίτλος
-Name[eo]=Standardo
-Name[es]=Pancarta
-Name[et]=Tekstiriba
-Name[eu]=Titularra
-Name[fa]=بنر
-Name[fi]=Viesti
-Name[fr]=Bannière
-Name[fy]=Ljochtkrante
-Name[ga]=Meirge
-Name[gl]=Pancarta
-Name[he]=כתובית
-Name[hi]=बैनर
-Name[hu]=Felirat
-Name[is]=Borði
-Name[it]=Testo scorrevole
-Name[ja]=バナー
-Name[ka]=აბრა
-Name[lt]=Plakatas
-Name[lv]=Banners
-Name[mk]=Транспарент
-Name[ms]=Kain Rentang
-Name[nds]=Looptext
-Name[ne]=ब्यानर
-Name[nl]=Lichtkrant
-Name[nn]=Fane
-Name[pa]=ਬੈਨਰ
-Name[pt]=Cartaz
-Name[ru]=Бегущая строка
-Name[sl]=Napis
-Name[sr]=Застава
-Name[sr@Latn]=Zastava
-Name[sv]=Rubrik
-Name[ta]=பேனர்
-Name[tg]=Давида истодаи рах
-Name[th]=แบนเนอร์
-Name[tr]=Afiş
-Name[uk]=Транспарант
-Name[ven]=Muvhala
-Name[vi]=Biểu ngữ
-Name[xh]=Isiqwentshu selaphu
-Name[zh_CN]=横幅
-Name[zh_TW]=標誌
-Name[zu]=Ibhodi elinomyalezo
[Desktop Action Setup]
Exec=kbanner.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kbanner.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kbanner.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KBlob.desktop b/tdescreensaver/kdesavers/KBlob.desktop
index e1343fef..1684be26 100644
--- a/tdescreensaver/kdesavers/KBlob.desktop
+++ b/tdescreensaver/kdesavers/KBlob.desktop
@@ -3,225 +3,20 @@ Exec=kblob.kss
Icon=tdescreensaver
Type=Application
Actions=Setup;InWindow;Root;
-X-TDE-Category=Visit to Flatland
+X-TDE-Category=Flying Things
Name=Blob
-Name[bg]=Петно
-Name[br]=Pokard
-Name[cs]=Kaňka
-Name[cy]=Smotyn
-Name[da]=Dråbe
-Name[de]=Blob 
-Name[eo]=Gutoj
-Name[et]=Piisk
-Name[eu]=Tanta
-Name[fi]=Kuplat
-Name[he]=כתמים
-Name[hi]=ब्लॉब
-Name[ja]=斑点
-Name[ka]=წვეთები
-Name[lt]=Rutuliukas
-Name[mk]=Дамка
-Name[nb]=Fargeflekk
-Name[ne]=ब्लब
-Name[nn]=Klattar
-Name[pl]=Bąbel
-Name[ro]=Bule
-Name[ru]=Геометрические построения
-Name[sl]=Kepica
-Name[sr]=Блоб
-Name[sv]=Färgfläck
-Name[ta]=தொழிற்பொருள்
-Name[tg]=Асос гузории геометрӣ
-Name[th]=รอยเปื้อน
-Name[tr]=Damlacık
-Name[uk]=Геометричні візерунки
-Name[ven]=Tshileme
-Name[vi]=Giọt nước
-Name[xh]=Ichaphaza elincinane
-Name[zh_CN]=光线
-Name[zh_TW]=斑點
[Desktop Action Setup]
Exec=kblob.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kblob.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kblob.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KClock.desktop b/tdescreensaver/kdesavers/KClock.desktop
index c22d68c9..5dd9279b 100644
--- a/tdescreensaver/kdesavers/KClock.desktop
+++ b/tdescreensaver/kdesavers/KClock.desktop
@@ -3,250 +3,20 @@ Exec=kclock.kss
Icon=tdescreensaver
Type=Application
Actions=Setup;InWindow;Root;
-X-TDE-Category=Miscellaneous
+X-TDE-Category=Gadgets & Simulations
Name=Clock
-Name[bg]=Часовник
-Name[br]=Eurier
-Name[bs]=Sat
-Name[ca]=Rellotge
-Name[cs]=Hodiny
-Name[cy]=Cloc
-Name[da]=Ur
-Name[de]=Uhr
-Name[el]=Ρολόι
-Name[eo]=Horloĝo
-Name[es]=Reloj
-Name[et]=Kell
-Name[eu]=Erlojua
-Name[fa]=ساعت
-Name[fi]=Kello
-Name[fr]=Horloge
-Name[fy]=Klok
-Name[ga]=Clog
-Name[gl]=Reloxio
-Name[he]=שעון
-Name[hi]=घड़ी
-Name[hu]=Óra
-Name[is]=Klukka
-Name[it]=Orologio
-Name[ja]=時計
-Name[ka]=საათი
-Name[lt]=Laikrodis
-Name[lv]=Pulkstenis
-Name[mk]=Часовник
-Name[ms]=Jam
-Name[nb]=Klokke
-Name[nds]=Klock
-Name[ne]=घडी
-Name[nl]=Klok
-Name[nn]=Klokke
-Name[pa]=ਘੜੀ
-Name[pl]=Zegar
-Name[pt]=Relógio
-Name[pt_BR]=Relógio
-Name[ro]=Ceas
-Name[ru]=Часы
-Name[rw]=Isaha
-Name[sk]=Hodiny
-Name[sl]=Ura
-Name[sr]=Часовник
-Name[sr@Latn]=Časovnik
-Name[sv]=Klocka
-Name[ta]=கடிகாரம்
-Name[tg]=Соат
-Name[th]=นาฬิกา
-Name[tr]=Saat
-Name[uk]=Годинник
-Name[uz]=Soat
-Name[uz@cyrillic]=Соат
-Name[ven]=Tshifhinga
-Name[vi]=Đồng hồ
-Name[xh]=Ikloko
-Name[zh_CN]=时钟
-Name[zh_TW]=時鐘
-Name[zu]=Iwashi
[Desktop Action Setup]
Exec=kclock.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kclock.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kclock.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KEuphoria.desktop b/tdescreensaver/kdesavers/KEuphoria.desktop
index 4be782b1..98ddb79a 100644
--- a/tdescreensaver/kdesavers/KEuphoria.desktop
+++ b/tdescreensaver/kdesavers/KEuphoria.desktop
@@ -5,229 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=OpenGL Screen Savers
X-TDE-Type=OpenGL
-Name=Euphoria (GL)
-Name[bg]=Еуфория
-Name[ca]=Eufòria (GL)
-Name[cy]=Iwfforia (GL)
-Name[da]=Eufori (GL)
-Name[de]=Euphorie
-Name[el]=Ευφορία (GL)
-Name[es]=Euforia (GL)
-Name[et]=Eufooria (GL)
-Name[eu]=Euforia (GL)
-Name[fa]=شادی (GL)
-Name[fr]=Euphorie (GL)
-Name[he]=אופוריה (GL)
-Name[hi]=परम आनंद (जीएल)
-Name[hu]=Euphoria (OpenGL)
-Name[it]=Euforia (GL)
-Name[ja]=幸福 (GL)
-Name[ka]=ეიფორია (GL)
-Name[mk]=Еуфорија (GL)
-Name[mt]=Ewforija (GL)
-Name[nb]=Eufori (GL)
-Name[nds]=Euphorie (GL)
-Name[ne]=यूफोरिया (GL)
-Name[nn]=Rom (GL)
-Name[pl]=Euforia (GL)
-Name[pt]=Euforia (GL)
-Name[pt_BR]=Euforia (GL)
-Name[ro]=Euforia (GL)
-Name[ru]=Эйфория (GL)
-Name[sl]=Evforija (GL)
-Name[sr]=Еуфорија (GL)
-Name[sr@Latn]=Euforija (GL)
-Name[sv]=Eufori (GL)
-Name[ta]=மகிழ்ச்சி(GL)
-Name[tg]=Кайфчоқӣ (GL)
-Name[th]=ยูโฟเรีย (GL)
-Name[uk]=Ейфорія (GL)
-Name[uz]=Eyforiya (GL)
-Name[uz@cyrillic]=Эйфория (GL)
-Name[vi]=Trạng thái phởn phơ (GL)
-Name[zh_CN]=陶醉(GL)
+Name=Euphoria
[Desktop Action Setup]
Exec=keuphoria.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=keuphoria.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=keuphoria.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KFiresaver.desktop b/tdescreensaver/kdesavers/KFiresaver.desktop
index f640ec4f..c8034f55 100644
--- a/tdescreensaver/kdesavers/KFiresaver.desktop
+++ b/tdescreensaver/kdesavers/KFiresaver.desktop
@@ -5,229 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=OpenGL Screen Savers
X-TDE-Type=OpenGL
-Name=Fireworks 3D (GL)
-Name[bg]=Фойерверки
-Name[ca]=Focs d'artifici 3D (GL)
-Name[cs]=Ohňostroj (GL)
-Name[de]=Feuerwerk
-Name[el]=Βεγγαλικά (GL)
-Name[es]=Fuegos artificiales 3D (GL)
-Name[et]=Tulevärk 3D (GL)
-Name[eu]=Su artifizialak 3D (GL)
-Name[fa]=آتش‌بازیهای سه بعدی (GL)
-Name[fi]=Ilotulitus 3D (GL)
-Name[fr]=Feux d'artifices 3D (GL)
-Name[fy]=Fjoerwurk 3D (GL)
-Name[ga]=Fireworks 3T (GL)
-Name[gl]=Fogos de artifício 3D (GL)
-Name[he]=זיקוקי דינור (GL)
-Name[hi]=आतिशबाज़ी 3डी (जीएल)
-Name[hu]=Tűzijáték 3D (OpenGL)
-Name[is]=Flugeldar 3D (GL)
-Name[it]=Fuochi d'artificio 3D (GL)
-Name[ja]=花火 3D (GL)
-Name[ka]=ფეიერვერკი (GL)
-Name[mk]=Огномет 3Д (GL)
-Name[nb]=Fyrverkeri 3D (GL)
-Name[nds]=Füerwark (GL)
-Name[ne]=त्रि-आयामिक फाएरवर्क्स (GL)
-Name[nn]=Fyrverkeri 3D (GL)
-Name[pl]=Sztuczne ognie 3D (GL)
-Name[pt]=Fogo de Artifício 3D (GL)
-Name[ro]=Focuri de artificii 3D (GL)
-Name[ru]=Фейерверк (GL)
-Name[sl]=Ognjemet 3D (GL)
-Name[sr]=Ватромети 3Д (GL)
-Name[sr@Latn]=Vatrometi 3D (GL)
-Name[sv]=Fyrverkeri 3D (GL)
-Name[tg]=Оташи тарф (GL)
-Name[tr]=3B Havai Fişekler (GL)
-Name[uk]=Феєрверк 3D (GL)
-Name[vi]=Pháo hoa 3 chiều (GL)
-Name[zh_CN]=三维烟花(GL)
-Name[zh_TW]=3D 煙火秀 (GL)
+Name=Fireworks
[Desktop Action Setup]
Exec=kfiresaver.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kfiresaver.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kfiresaver.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KFlux.desktop b/tdescreensaver/kdesavers/KFlux.desktop
index 9ba427d7..f10ada71 100644
--- a/tdescreensaver/kdesavers/KFlux.desktop
+++ b/tdescreensaver/kdesavers/KFlux.desktop
@@ -5,220 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=OpenGL Screen Savers
X-TDE-Type=OpenGL
-Name=Flux (GL)
-Name[bg]=Прилив
-Name[cy]=Dylif (GL)
-Name[de]=Flux
-Name[el]=Ροή (GL)
-Name[es]=Flujo (GL)
-Name[fa]=شار (GL)
-Name[fy]=Fluks (GL)
-Name[gl]=Fluxo (GL)
-Name[he]=שטף (GL)
-Name[hi]=लहर-लहर (जीएल)
-Name[hu]=Flux (OpenGL)
-Name[it]=Flusso (GL)
-Name[ja]=流れ (GL)
-Name[ka]=ფლუქტუაცია (GL)
-Name[mk]=Флукс (GL)
-Name[nb]=Fluks (GL)
-Name[ne]=फ्लक्स (GL)
-Name[nn]=Pulsar (GL)
-Name[pt]=Fluxo (GL)
-Name[pt_BR]=Fluxo (GL)
-Name[ru]=Флуктуации (GL)
-Name[sl]=Pretok (GL)
-Name[sr]=Флукс (GL)
-Name[sr@Latn]=Fluks (GL)
-Name[ta]=மாற்றம்(GL)
-Name[tg]=Флуктуатсияи (GL)
-Name[uk]=Флюксія (GL)
-Name[uz]=Oqim (GL)
-Name[uz@cyrillic]=Оқим (GL)
-Name[vi]=Dòng chảy (GL)
-Name[zh_CN]=流动(GL)
+Name=Flux
[Desktop Action Setup]
Exec=kflux.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kflux.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kflux.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KFountain.desktop b/tdescreensaver/kdesavers/KFountain.desktop
index 81d89a00..4bf0519f 100644
--- a/tdescreensaver/kdesavers/KFountain.desktop
+++ b/tdescreensaver/kdesavers/KFountain.desktop
@@ -5,245 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=OpenGL Screen Savers
X-TDE-Type=OpenGL
-Name=Particle Fountain (GL)
-Name[af]=Deeltjie Fontein (Gl)
-Name[bg]=Източник на частици
-Name[ca]=Font de partícules (GL)
-Name[cs]=Částicová fontána (GL)
-Name[cy]=Ffynnon Gronyn (GL)
-Name[da]=Partikelbrønd (GL)
-Name[de]=Partikelfontäne
-Name[el]=Σιντριβάνι σωματιδίων (GL)
-Name[eo]=Erofontano
-Name[es]=Fuente de partículas (GL)
-Name[et]=Osakeste Fontään (GL)
-Name[eu]=Partikula iturria (GL)
-Name[fa]=منشأ ذره (GL)
-Name[fi]=Hiukkaslähde (GL)
-Name[fr]=Fontaine de particules (GL)
-Name[fy]=Dieltsjesfontein (GL)
-Name[gl]=Fonte de partículas (GL)
-Name[he]=מזרקת חלקיקים (GL)
-Name[hi]=अणु निर्झर (जीएल)
-Name[hu]=Szökőkút (OpenGL)
-Name[is]=Eindagosbrunnur (GL)
-Name[it]=Fontana di particelle (GL)
-Name[ja]=粒子の泉 (GL)
-Name[ka]=შადრევანი (GL)
-Name[lt]=Dalelių fontanas (GL)
-Name[lv]=Kripatiņu Strūklaka (GL)
-Name[mk]=Фонтана од честички (GL)
-Name[mt]=Funtana ta' partiċelli (GL)
-Name[nb]=Partikkelfontene (GL)
-Name[nds]=Deeltjeblaser (GL)
-Name[ne]=पार्टिकल फाउन्टेन (GL)
-Name[nl]=Deeltjes-fontijn (GL)
-Name[nn]=Partikkelfontene (GL)
-Name[pl]=Fontanna cząstek (GL)
-Name[pt]=Fonte de Partículas (GL)
-Name[pt_BR]=Fonte de Partículas (GL)
-Name[ro]=Fîntînă de particule (GL)
-Name[ru]=Фонтан частиц (GL)
-Name[sk]=Fontána častíc (GL)
-Name[sl]=Vodnjak delcev (GL)
-Name[sr]=Фонтана честица (GL)
-Name[sr@Latn]=Fontana čestica (GL)
-Name[sv]=Partikelfontän (GL)
-Name[ta]=பொருள் ஊற்று (GL)
-Name[tg]=Қисми фаввораи (GL)
-Name[th]=ละอองน้ำ (GL)
-Name[tr]=Parçacık Şelalesi (GL)
-Name[uk]=Фонтан частинок (GL)
-Name[uz]=Zarrachalar favvorasi (GL)
-Name[uz@cyrillic]=Заррачалар фаввораси (GL)
-Name[ven]=Tshisima tsha Zwithu nyana (GL)
-Name[vi]=Đài phun Hạt (GL)
-Name[xh]=Umthombo Womhlaba (GL)
-Name[zh_CN]=粒子喷泉(GL)
-Name[zh_TW]=粒子噴泉 (GL)
-Name[zu]=Ingxenye encane yomfudlana (GL)
+Name=Particle Fountain
[Desktop Action Setup]
Exec=kfountain.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kfountain.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kfountain.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KGravity.desktop b/tdescreensaver/kdesavers/KGravity.desktop
index 312797d7..97a56836 100644
--- a/tdescreensaver/kdesavers/KGravity.desktop
+++ b/tdescreensaver/kdesavers/KGravity.desktop
@@ -5,249 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=OpenGL Screen Savers
X-TDE-Type=OpenGL
-Name=Gravity (GL)
-Name[af]=Gravitasie (Gl)
-Name[bg]=Гравитация
-Name[br]=Dedennerezh (GL)
-Name[ca]=Gravetat (GL)
-Name[cs]=Gravitace (GL)
-Name[cy]=Disgyrchiant (GL)
-Name[da]=Tyngdekraft (GL)
-Name[de]=Schwerkraft
-Name[el]=Βαρύτητα (GL)
-Name[eo]=Gravito
-Name[es]=Gravedad (GL)
-Name[et]=Raskusjõud (GL)
-Name[eu]=Grabitatea (GL)
-Name[fa]=جاذبه (GL)
-Name[fi]=Gravitaatio (GL)
-Name[fo]=Tyngd (GL)
-Name[fr]=Gravité (GL)
-Name[fy]=Swiertekrêft (GL)
-Name[gl]=Gravidade (GL)
-Name[he]=חלקיקים (GL)
-Name[hi]=गुरूत्व (जीएल)
-Name[hu]=Gravitáció (OpenGL)
-Name[is]=Þyngdarafl (GL)
-Name[it]=Gravità (GL)
-Name[ja]=重力 (GL)
-Name[ka]=მიზიდულობა (GL)
-Name[lt]=Trauka (GL)
-Name[lv]=Gravitācija (GL)
-Name[mk]=Гравитација (GL)
-Name[ms]=Graviti (GL)
-Name[mt]=Gravità (GL)
-Name[nb]=Gravitasjon (GL)
-Name[nds]=Swoorkraft (GL)
-Name[ne]=गुरुत्व (GL)
-Name[nl]=Zwaartekracht (GL)
-Name[nn]=Tyngdekraft (GL)
-Name[pl]=Grawitacja (GL)
-Name[pt]=Gravidade (GL)
-Name[pt_BR]=Gravidade (GL)
-Name[ro]=Gravitaţie (GL)
-Name[ru]=Гравитация (GL)
-Name[sk]=Gravitácia (GL)
-Name[sl]=Gravitacija (GL)
-Name[sr]=Гравитација (GL)
-Name[sr@Latn]=Gravitacija (GL)
-Name[sv]=Gravitation (GL)
-Name[ta]=புவியிர்ப்பு(GL)
-Name[tg]=Ҷозибаи (GL)
-Name[th]=แรงดึงดูด (GL)
-Name[tr]=Yerçekimi (GL)
-Name[uk]=Гравітація (GL)
-Name[uz]=Gravitatsiya (GL)
-Name[uz@cyrillic]=Гравитация (GL)
-Name[ven]=Fhasi Mavuni (GL)
-Name[vi]=Trọng trường (GL)
-Name[xh]=Umoya otsala izinto kumbindi womhlaba (GL)
-Name[zh_CN]=重力(GL)
-Name[zh_TW]=重力 (GL)
-Name[zu]=Amandla adonsela emhlabeni (GL)
-
+Name=Gravity
[Desktop Action Setup]
Exec=kgravity.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kgravity.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kgravity.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KLines-saver.desktop b/tdescreensaver/kdesavers/KLines-saver.desktop
index 581c23a6..d5d2b38d 100644
--- a/tdescreensaver/kdesavers/KLines-saver.desktop
+++ b/tdescreensaver/kdesavers/KLines-saver.desktop
@@ -5,251 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=Flying Things
Name=Lines
-Name[af]=Lyne
-Name[bg]=Линии
-Name[br]=Linennoù
-Name[ca]=Línies
-Name[cs]=Linie
-Name[cy]=Llinellau
-Name[da]=Linjer
-Name[de]=Linien
-Name[el]=Γραμμές
-Name[eo]=Linioj
-Name[es]=Líneas
-Name[et]=Jooned
-Name[eu]=Lerroak
-Name[fa]=خطوط
-Name[fi]=Viivat
-Name[fo]=Reglur
-Name[fr]=Lignes
-Name[fy]=Linen
-Name[ga]=Línte
-Name[gl]=Liñas
-Name[he]=קווים
-Name[hi]= लकीरें
-Name[hu]=Vonalak
-Name[is]=Línur
-Name[it]=Linee
-Name[ja]=線
-Name[ka]=წრფეები
-Name[lt]=Linijos
-Name[lv]=Līnijas
-Name[mk]=Прави
-Name[ms]=Baris
-Name[mt]=Linji
-Name[nb]=Linjer
-Name[nds]=Lienen
-Name[ne]=पङ्क्ति
-Name[nl]=Lijnen
-Name[nn]=Linjer
-Name[nso]=Methalo
-Name[pa]=ਰੇਖਾਵਾਂ
-Name[pl]=Linie
-Name[pt]=Linhas
-Name[pt_BR]=Linhas
-Name[ro]=Linii
-Name[ru]=Линии
-Name[sk]=Čiary
-Name[sl]=Črte
-Name[sr]=Линије
-Name[sr@Latn]=Linije
-Name[sv]=Linjer
-Name[ta]=கம்பிகள்
-Name[tg]=Рахҳо
-Name[th]=เส้น
-Name[tr]=Çizgiler
-Name[uk]=Лінії
-Name[uz]=Chiziqlar
-Name[uz@cyrillic]=Чизиқлар
-Name[ven]=Mitalo
-Name[vi]=Dòng kẻ
-Name[xh]=Iilayini
-Name[zh_CN]=线条
-Name[zh_TW]=線條
-Name[zu]=Olayini
[Desktop Action Setup]
Exec=klines.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=klines.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=klines.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
X-DCOP-ServiceType=Multi
diff --git a/tdescreensaver/kdesavers/KLorenz.desktop b/tdescreensaver/kdesavers/KLorenz.desktop
index 109b8d98..0263d7fc 100644
--- a/tdescreensaver/kdesavers/KLorenz.desktop
+++ b/tdescreensaver/kdesavers/KLorenz.desktop
@@ -5,240 +5,18 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=Gadgets & Simulations
Name=Lorenz Attractor
-Name[af]=Lorenz Aantrekker
-Name[bg]=Лоренцо
-Name[br]=Dedenner Lorenz
-Name[cs]=Lorenzův atraktor
-Name[cy]=Attynydd Lorenz
-Name[da]=Lorenz-attraktor
-Name[de]=Lorenz-Attraktor
-Name[el]=Ελκυστής Lorenz
-Name[eo]=Lorenza atraktoro
-Name[es]=Atractor de Lorenz
-Name[et]=Lorenzi atraktor
-Name[eu]=Lorenz erakarlea
-Name[fa]=ربایندۀ Lorenz
-Name[fi]=Lorentz attraktori
-Name[fo]=Lorenz attractor
-Name[fr]=Attracteur de Lorentz
-Name[fy]=Lorenz Oanlûker
-Name[gl]=Atractor Caótico de Lorenz
-Name[he]=מושך לורנץ
-Name[hi]=आठ एकम आठ
-Name[hu]=Lorenz-féle képernyővédő
-Name[is]=Lorenz aðdráttur
-Name[it]=Attrattore di Lorenz
-Name[ja]=ローレンツアトラクタ
-Name[ka]=ლორენცის მიზიდულობა
-Name[lv]=Lorensa Attraktors
-Name[mk]=Лоренцов атрактор
-Name[mt]=Attrattur Lorenz
-Name[nb]=Lorenz-attraktor
-Name[nds]=Lorenz-Antrecker
-Name[ne]=लरेन्ज आकर्षक
-Name[nn]=Lorenz-tiltrekking
-Name[pl]=Atraktor Lorenza
-Name[pt]=Força de Lorenz
-Name[pt_BR]=Atração Lorenz
-Name[ro]=Atracţie Lorenz
-Name[ru]=Странный аттрактор Лоренца
-Name[sl]=Lorenzov atraktor
-Name[sr]=Лоренцов атрактор
-Name[sr@Latn]=Lorencov atraktor
-Name[sv]=Lorenz attraktor
-Name[ta]=லோரன்ஸ் கவர்பவர்
-Name[tg]=Аттракти аҷоиби Лоренс
-Name[th]=สิ่งที่น่าดึงดูดของลอเรนซ์
-Name[tr]=Cazibe
-Name[uk]=Притягнення Лоренца
-Name[ven]=Tshikokodzi tsha Lorenz
-Name[vi]=Điểm hút Lorenz
-Name[xh]=Umtsali we Lorenz
-Name[zh_CN]=洛仑兹吸引子
-Name[zh_TW]=Lorenz 吸引者
-Name[zu]=Umhehi we-Lorenz
[Desktop Action Setup]
Exec=klorenz.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=klorenz.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=klorenz.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KPendulum.desktop b/tdescreensaver/kdesavers/KPendulum.desktop
index c53fd21b..a2c35cec 100644
--- a/tdescreensaver/kdesavers/KPendulum.desktop
+++ b/tdescreensaver/kdesavers/KPendulum.desktop
@@ -5,217 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=OpenGL Screen Savers
X-TDE-Type=OpenGL
-Name=KPendulum (GL)
-Name[bg]=Махало
-Name[cs]=Kyvadlo
-Name[de]=KPendulum
-Name[el]=Εκκρεμές (GL)
-Name[fr]=Pendule (GL)
-Name[hi]=के-पेंडुलम (जीएल)
-Name[hu]=KPendulum (OpenGL)
-Name[is]=Pendúlar (GL)
-Name[it]=KPendolo (GL)
-Name[ja]=振り子 (GL)
-Name[ka]=ქანქარა (GL)
-Name[mk]=КНишало (GL)
-Name[nb]=KPendel (GL)
-Name[nds]=Pennel (GL)
-Name[ne]=केडीई पेन्डुलम (GL)
-Name[nn]=KPendel (GL)
-Name[pt]=KPêndulo (GL)
-Name[ro]=Pendul (GL)
-Name[ru]=Маятник (GL)
-Name[sl]=KNihalo (GL)
-Name[sr]=К-клатно (GL)
-Name[sr@Latn]=K-klatno (GL)
-Name[sv]=Pendel (GL)
-Name[ta]=KPendulum(GL)
-Name[tg]=Раққосак (GL)
-Name[tr]=Sarkaç (GL)
-Name[uk]=Маятник (GL)
-Name[vi]=Con lắc (GL)
+Name=Pendulum
[Desktop Action Setup]
Exec=kpendulum.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kpendulum.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kpendulum.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KPolygon.desktop b/tdescreensaver/kdesavers/KPolygon.desktop
index 0c95f749..9d095426 100644
--- a/tdescreensaver/kdesavers/KPolygon.desktop
+++ b/tdescreensaver/kdesavers/KPolygon.desktop
@@ -3,249 +3,20 @@ Exec=kpolygon.kss
Icon=tdescreensaver
Type=Application
Actions=Setup;InWindow;Root;
-X-TDE-Category=Rapid Motion
+X-TDE-Category=Flying Things
Name=Polygons
-Name[af]=Poligone
-Name[bg]=Полигон
-Name[br]=Lieskognegoù
-Name[ca]=Polígons
-Name[cs]=Polygony
-Name[cy]=Polygonau
-Name[da]=Polygoner
-Name[de]=Polygon
-Name[el]=Πολύγωνα
-Name[eo]=Poligonoj
-Name[es]=Polígonos
-Name[et]=Polügoonid
-Name[eu]=Poligonoak
-Name[fa]=چند ضلعیها
-Name[fi]=Polygonit
-Name[fo]=Fleirhyrntir
-Name[fr]=Polygones
-Name[fy]=Polygoanen
-Name[ga]=Polagáin
-Name[gl]=Polígonos
-Name[he]=מצולעים
-Name[hi]=बहुभुज
-Name[hu]=Poligonok
-Name[is]=Marghyrningar
-Name[it]=Poligoni
-Name[ja]=ポリゴン
-Name[ka]=მრავალკუთხედები
-Name[lt]=Daugiakampiai
-Name[lv]=Poligoni
-Name[mk]=Полигони
-Name[ms]=Poligon
-Name[mt]=Poligoni
-Name[nb]=Polygoner
-Name[nds]=Veelecks
-Name[ne]=बहुभुज
-Name[nl]=Polygonen
-Name[nn]=Polygon
-Name[pa]=ਬਹੁਭੁਜ
-Name[pl]=Wielokąty
-Name[pt]=Polígonos
-Name[pt_BR]=Polígonos
-Name[ro]=Poligoane
-Name[ru]=Многоугольники
-Name[sk]=Polygóny
-Name[sl]=Mnogokotniki
-Name[sr]=Полигони
-Name[sr@Latn]=Poligoni
-Name[sv]=Polygoner
-Name[ta]=பலகோணவடிவங்கள்
-Name[tg]=Бисёркунҷа
-Name[th]=รูปหลายเหลี่ยม
-Name[tr]=Poligonlar
-Name[uk]=Багатокутники
-Name[uz]=Koʻpburchaklar
-Name[uz@cyrillic]=Кўпбурчаклар
-Name[vi]=Đa giác
-Name[xh]=Iziqu ezinekona namacala amaninzi
-Name[zh_CN]=多边形
-Name[zh_TW]=多邊形
[Desktop Action Setup]
Exec=kpolygon.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kpolygon.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kpolygon.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KRotation.desktop b/tdescreensaver/kdesavers/KRotation.desktop
index d4fa0d40..98c236d2 100644
--- a/tdescreensaver/kdesavers/KRotation.desktop
+++ b/tdescreensaver/kdesavers/KRotation.desktop
@@ -5,217 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=OpenGL Screen Savers
X-TDE-Type=OpenGL
-Name=KRotation (GL)
-Name[bg]=Ротация
-Name[cs]=Rotace
-Name[de]=KRotation
-Name[el]=Ατλαντίδα (GL)
-Name[fr]=Rotation (GL)
-Name[fy]=KRotaasje (GL)
-Name[he]= KRotation(GL)
-Name[hi]=के-रोटेशन (जीएल)
-Name[hu]=KRotation (OpenGL)
-Name[is]=Ksnúningur (GL)
-Name[it]=KRotazione (GL)
-Name[ja]=回転 (GL)
-Name[ka]=დატრიალება (GL)
-Name[mk]=КРотација (GL)
-Name[nb]=KRotasjon (GL)
-Name[ne]=केडीई परिक्रमण (GL)
-Name[nn]=KRotasjon (GL)
-Name[pt]=KRotação (GL)
-Name[ro]=Rotire (GL)
-Name[ru]=Вращение (GL)
-Name[sl]=KRotacija (GL)
-Name[sr]=К-ротација (GL)
-Name[sr@Latn]=K-rotacija (GL)
-Name[sv]=Rotation (GL)
-Name[tg]=Тобхурӣ (GL)
-Name[tr]=Döndürme (GL)
-Name[uk]=Обертання (GL)
-Name[vi]=Xoay (GL)
+Name=Rotation
[Desktop Action Setup]
Exec=krotation.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=krotation.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=krotation.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KScience.desktop b/tdescreensaver/kdesavers/KScience.desktop
index 7f25ee25..a5176eed 100644
--- a/tdescreensaver/kdesavers/KScience.desktop
+++ b/tdescreensaver/kdesavers/KScience.desktop
@@ -6,249 +6,18 @@ Actions=Setup;InWindow;Root;
X-TDE-Category=Desktop Distortions
X-TDE-Type=ManipulateScreen
Name=Science
-Name[af]=Wetenskap
-Name[bg]=Наука
-Name[br]=Skiantoù
-Name[ca]=Ciència
-Name[cs]=Věda
-Name[cy]=Gwyddoniaeth
-Name[da]=Videnskab
-Name[de]=Wissenschaft
-Name[el]=Επιστήμη
-Name[eo]=Scienco
-Name[es]=Ciencia
-Name[et]=Teadus
-Name[eu]=Zientzia
-Name[fa]=علم
-Name[fi]=Linssi
-Name[fo]=Náttúruvísind
-Name[fy]=Wittenskiplik
-Name[ga]=Eolaíocht
-Name[gl]=Ciéncia
-Name[he]=מדע
-Name[hi]=विज्ञान
-Name[hu]=Tudomány
-Name[is]=Vísindi
-Name[it]=Scienza
-Name[ja]=サイエンス
-Name[ka]=მეცნიერება
-Name[lt]=Mokslas
-Name[lv]=Zinātne
-Name[mk]=Наука
-Name[ms]=Sains
-Name[mt]=Xjenza
-Name[nb]=Vitenskap
-Name[nds]=Wetenschap
-Name[ne]=बिज्ञान
-Name[nl]=Wetenschappelijk
-Name[nn]=Vitskap
-Name[nso]=Mahlale
-Name[pa]=ਵਿਗਿਆਨ
-Name[pl]=Nauka
-Name[pt]=Ciência
-Name[pt_BR]=Ciência
-Name[ro]=Ştiinţă
-Name[ru]=Наука
-Name[sk]=Vedecký
-Name[sl]=Znanost
-Name[sr]=Наука
-Name[sr@Latn]=Nauka
-Name[sv]=Vetenskap
-Name[ta]=அறிவியல்
-Name[tg]=Илм
-Name[th]=วิทยาศาสตร์
-Name[tr]=Bilim
-Name[uk]=Наука
-Name[uz]=Fan
-Name[uz@cyrillic]=Фан
-Name[ven]=Vhutsila
-Name[vi]=Khoa học
-Name[xh]=Inzulu lwazi
-Name[zh_CN]=科学
-Name[zh_TW]=科學
-Name[zu]=Ubuchwepheshe bezesayensi
[Desktop Action Setup]
Exec=kscience.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kscience.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kscience.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KSlideshow.desktop b/tdescreensaver/kdesavers/KSlideshow.desktop
index 64e5c55e..6fac1a0d 100644
--- a/tdescreensaver/kdesavers/KSlideshow.desktop
+++ b/tdescreensaver/kdesavers/KSlideshow.desktop
@@ -5,247 +5,18 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=Banners & Pictures
Name=Slide Show
-Name[af]=Skuif Vertoon
-Name[bg]=Слайдшоу
-Name[br]=Diskouezadur skeudennoù
-Name[ca]=Diapositives
-Name[cs]=Promítání
-Name[cy]=Sioe Tryloywder
-Name[da]=Diasshow
-Name[de]=Dia-Schau
-Name[el]=Προβολή σλάιντς
-Name[eo]=Lumbildoj
-Name[es]=Presentación
-Name[et]=Slaidishow
-Name[eu]=Diapositiba erakusketa
-Name[fa]=نمایش اسلاید
-Name[fi]=Diaesitys
-Name[fo]=Framløga
-Name[fr]=Diaporama
-Name[fy]=Diafoarstelling
-Name[ga]=Taispeántas Sleamhnán
-Name[gl]=Apresentación
-Name[he]=מצגת שקופיות
-Name[hi]=झलक तमाशा
-Name[hu]=Diavetítés
-Name[is]=Skyggnusýning
-Name[it]=Immagini in sequenza
-Name[ja]=スライドショー
-Name[ka]=სლაიდების ჩვენება
-Name[lt]=Skaidrių šou
-Name[lv]=Slīdrāde
-Name[mk]=Слајд-шоу
-Name[ms]=Tayangan Slaid
-Name[nb]=Lysbildeshow
-Name[nds]=Diaschau
-Name[ne]=स्लाइड प्रदर्शन
-Name[nl]=Diavoorstelling
-Name[nn]=Framvising
-Name[pl]=Sekwencja slajdów
-Name[pt]=Slides
-Name[pt_BR]=Show de slides
-Name[ro]=Succesiune de imagini
-Name[ru]=Слайд-шоу
-Name[sl]=Diapozitivi
-Name[sr]=Слајд шоу
-Name[sr@Latn]=Slajd šou
-Name[sv]=Bildspel
-Name[ta]=ஸ்லைடு காட்சி
-Name[tg]=Намоиши слайд
-Name[th]=แสดงภาพนิ่ง
-Name[tr]=Saydam Gösterisi
-Name[uk]=Слайди
-Name[uz]=Slayd shou
-Name[uz@cyrillic]=Слайд шоу
-Name[ven]=Musumbedzo wo peamaho
-Name[vi]=Trình bày
-Name[xh]=Isiboniso esihamba thambileyo
-Name[zh_CN]=幻灯播放
-Name[zh_TW]=幻燈片放映
-Name[zu]=Isiboniso esihamba ngokuthambile
[Desktop Action Setup]
Exec=kslideshow.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kslideshow.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kslideshow.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
-
diff --git a/tdescreensaver/kdesavers/KSolarWinds.desktop b/tdescreensaver/kdesavers/KSolarWinds.desktop
index bf4484c0..6a0dbd2f 100644
--- a/tdescreensaver/kdesavers/KSolarWinds.desktop
+++ b/tdescreensaver/kdesavers/KSolarWinds.desktop
@@ -5,239 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=OpenGL Screen Savers
X-TDE-Type=OpenGL
-Name=Solar Winds (GL)
-Name[bg]=Слънчев вятър
-Name[br]=Avelioù an Heol (GL)
-Name[ca]=Vent solar (GL)
-Name[cy]=Gwyntoedd o'r Haul (GL)
-Name[da]=Solvinde (GL)
-Name[de]=Sonnenwind
-Name[el]=Αστρικοί Άνεμοι (GL)
-Name[es]=Viento solar (GL)
-Name[et]=Päikesetuul (GL)
-Name[eu]=Eguzki-haizeak (GL)
-Name[fa]=پیچشهای خورشیدی (GL)
-Name[fi]=Aurinkotuuli (GL)
-Name[fo]=Sólvind (GL)
-Name[fr]=Vents solaires (GL)
-Name[fy]=Sinnewyn (GL)
-Name[gl]=Vento solar (GL)
-Name[he]=רוחות סולאריות (GL)
-Name[hi]=सौर तूफ़ान (जीएल)
-Name[hu]=Napszél (OpenGL)
-Name[is]=Sólvindar (GL)
-Name[it]=Venti Solari (GL)
-Name[ja]=太陽風 (GL)
-Name[ka]=მზის ქარი (GL)
-Name[mk]=Соларни ветрови (GL)
-Name[mt]=Irjieħ solari (GL)
-Name[nb]=Solvind (GL)
-Name[nds]=Sünnwind
-Name[ne]=सौर्य हावा (GL)
-Name[nl]=Zonnewind (GL)
-Name[nn]=Solvind (GL)
-Name[pl]=Wiatry słoneczne (GL)
-Name[pt]=Ventos Solares (GL)
-Name[pt_BR]=Ventos Solares (GL)
-Name[ro]=Vînturi solare (GL)
-Name[ru]=Солнечный ветер (GL)
-Name[sl]=Solarni vetrovi (GL)
-Name[sr]=Соларни ветрови (GL)
-Name[sr@Latn]=Solarni vetrovi (GL)
-Name[sv]=Solvindar (GL)
-Name[ta]=சூரிய காற்றுக்கள்(GL)
-Name[tg]=Шамоли офтобӣ (GL)
-Name[th]=สายลมสุริยะ (GL)
-Name[tr]=Güneş Rüzgarı (GL)
-Name[uk]=Сонячні вітри (GL)
-Name[uz]=Quyosh shamollari (GL)
-Name[uz@cyrillic]=Қуёш шамоллари (GL)
-Name[ven]=Mimuya yau solar (GL)
-Name[vi]=Gió Mặt Trời (GL)
-Name[zh_CN]=太阳风(GL)
-Name[zu]=Imimoya Yelanga (GL)
+Name=Solar Winds
[Desktop Action Setup]
Exec=ksolarwinds.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=ksolarwinds.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=ksolarwinds.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KVm.desktop b/tdescreensaver/kdesavers/KVm.desktop
index c359d28a..4514b8e5 100644
--- a/tdescreensaver/kdesavers/KVm.desktop
+++ b/tdescreensaver/kdesavers/KVm.desktop
@@ -5,249 +5,18 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=Gadgets & Simulations
Name=Virtual Machine
-Name[af]=Virtuele Masjien
-Name[bg]=Виртуална машина
-Name[br]=Ardivink galloudel
-Name[ca]=Màquina virtual
-Name[cs]=Virtuální stroj
-Name[cy]=Peiriant Rhith
-Name[da]=Virtuel maskine
-Name[de]=Virtuelle Maschine
-Name[el]=Εικονική μηχανή
-Name[eo]=Virtuala Maŝino
-Name[es]=Máquina virtual
-Name[et]=Virtuaalne Masin
-Name[eu]=Makina birtuala
-Name[fa]=ماشین مجازی
-Name[fi]=Virtuaalikone
-Name[fo]=Tyknismaskina
-Name[fr]=Machine virtuelle
-Name[fy]=Firtuele masine
-Name[ga]=Meaisín Fíorúil
-Name[gl]=Máquina virtual
-Name[he]=מכונה וירטואלית
-Name[hi]=आभासी यंत्र
-Name[hu]=Virtuális gép
-Name[is]=Sýndarvél
-Name[it]=Macchina virtuale
-Name[ja]=仮想マシン
-Name[ka]=ვირტუალური მანქანა
-Name[lt]=Virtuali Mašina
-Name[lv]=Virtuālā mašīna
-Name[mk]=Виртуелна машина
-Name[ms]=Mesin Maya
-Name[mt]=Magna Virtwali
-Name[nb]=Virtuell maskin
-Name[nds]=Virtuell Maschien
-Name[ne]=अवास्तविक मेशिन
-Name[nl]=Virtuele machine
-Name[nn]=Virtuell maskin
-Name[nso]=Motshene o Maatla
-Name[pl]=Maszyna wirtualna
-Name[pt]=Máquina Virtual
-Name[pt_BR]=Máquina virtual
-Name[ro]=Maşină virtuală
-Name[ru]=Виртуальная машина
-Name[sk]=Virtuálny stroj
-Name[sl]=Navidezni stroj
-Name[sr]=Виртуелна машина
-Name[sr@Latn]=Virtuelna mašina
-Name[sv]=Virtuell maskin
-Name[ta]=கற்பனை வாகனம்
-Name[tg]=Мошини уфуқӣ
-Name[th]=เครื่องจำลอง
-Name[tr]=Sanal Makine
-Name[uk]=Віртуальна машина
-Name[uz]=Virtual kompyuter
-Name[uz@cyrillic]=Виртуал компьютер
-Name[ven]=Mutshini usa vhonali
-Name[vi]=Máy Ảo
-Name[xh]=Umatshini onesiqhamo
-Name[zh_CN]=虚拟机
-Name[zh_TW]=虛擬機器
-Name[zu]=Ushini Obonakalayo
[Desktop Action Setup]
Exec=kvm.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kvm.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kvm.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/KWave.desktop b/tdescreensaver/kdesavers/KWave.desktop
index 85c5ec05..295e2e9e 100644
--- a/tdescreensaver/kdesavers/KWave.desktop
+++ b/tdescreensaver/kdesavers/KWave.desktop
@@ -5,247 +5,19 @@ Type=Application
Actions=Setup;InWindow;Root;
X-TDE-Category=OpenGL Screen Savers
X-TDE-Type=OpenGL
-Name=Bitmap Flag (GL)
-Name[af]=Biskaart Vlag (Gl)
-Name[bg]=Развяващ се флаг
-Name[ca]=Bandera de mapa de bits (GL)
-Name[cs]=Vlajka (GL)
-Name[cy]=Baner Didfap (GL)
-Name[da]=Bitmapflag (GL)
-Name[de]=Bildflagge
-Name[el]=Σημαία bitmap (GL)
-Name[eo]=Bildflago
-Name[es]=Bandera de mapa de bits (GL)
-Name[et]=Pildilipp (GL)
-Name[eu]=Bitmap Bandera (GL)
-Name[fa]=پرچم نگاشت بیت(GL)
-Name[fi]=Bittikarttalippu (GL)
-Name[fo]=Flagg (GL)
-Name[fr]=Drapeau (GL)
-Name[fy]=Bitmap flagge (GL)
-Name[gl]=Bandeira de mapa de bits (GL)
-Name[he]=דגל (GL)
-Name[hi]=झंडियाँ (जीएल)
-Name[hu]=Zászló (OpenGL)
-Name[is]=Myndafáni (GL)
-Name[it]=Bandiera bitmap (GL)
-Name[ja]=ビットマップフラッグ (GL)
-Name[ka]=რასტრული ალამი (GL)
-Name[lt]=Taškinės grafikos (bitmap) vėliava (GL)
-Name[lv]=Bitmapa Karogs (GL)
-Name[mk]=Битмапирано знаме (GL)
-Name[mt]=Bandiera bi stampa (GL)
-Name[nb]=Bittmap-flagg (GL)
-Name[nds]=Weihen Flagg (GL)
-Name[ne]=बिटम्याप झण्डा(GL)
-Name[nl]=Bitmap vlag (GL)
-Name[nn]=Flagg (GL)
-Name[pl]=Bitmapowa flaga (GL)
-Name[pt]=Imagem Ondulante (GL)
-Name[pt_BR]=Bitmap (GL)
-Name[ro]=Steag imagine (GL)
-Name[ru]=Растровый флаг (GL)
-Name[sk]=alajka (GL)
-Name[sl]=Bitna zastava (GL)
-Name[sr]=Битмапирана застава (GL)
-Name[sr@Latn]=Bitmapirana zastava (GL)
-Name[sv]=Bitmappsflagga (GL)
-Name[ta]=பிட்வரைப்பட குறி
-Name[tg]=Байрақи растрӣ (GL)
-Name[th]=ธงภาพบิตแมพ (GL)
-Name[tr]=Bayrak (GL)
-Name[uk]=Растровий прапор (GL)
-Name[uz]=Bayroq (GL)
-Name[uz@cyrillic]=Байроқ (GL)
-Name[ven]=Fulaga ya Bitmap (GL)
-Name[vi]=Cờ Mảng ảnh (GL)
-Name[xh]=Indwe ye Bitmap (GL)
-Name[zh_CN]=位图旗帜(GL)
-Name[zh_TW]=點陣圖旗幟 (GL)
-Name[zu]=Bitmap Flap (GL)
-
+Name=Bitmap Flag
[Desktop Action Setup]
Exec=kwave.kss -setup
Name=Setup...
-Name[af]=Opstelling...
-Name[bg]=Настройки...
-Name[br]=Kefluniadur ...
-Name[bs]=Postavke...
-Name[ca]=Arranjament...
-Name[cs]=Nastavení...
-Name[cy]=Gosod ...
-Name[da]=Opsætning...
-Name[de]=Einrichtung ...
-Name[el]=Ρύθμιση...
-Name[eo]=Agordo...
-Name[es]=Configuración...
-Name[et]=Seadistamine...
-Name[eu]=Konfiguratu...
-Name[fa]=برپایی...
-Name[fi]=Asetukset...
-Name[fo]=Uppseting...
-Name[fr]=Configuration...
-Name[fy]=Opset...
-Name[ga]=Cumraigh...
-Name[gl]=Configuración...
-Name[he]=הגדרות...
-Name[hi]=सेटअप...
-Name[hu]=Beállítás...
-Name[is]=Stillingar...
-Name[it]=Impostazioni...
-Name[ja]=設定...
-Name[ka]=გამართვა...
-Name[lt]=Sąranka ...
-Name[lv]=Uzstādīšana...
-Name[mk]=Поставување...
-Name[ms]=Setkan...
-Name[mt]=Konfigurazzjoni...
-Name[nb]=Innstillinger …
-Name[nds]=Instellen...
-Name[ne]=सेटअप...
-Name[nl]=Instellingen...
-Name[nn]=Oppsett …
-Name[nso]=Beakanya...
-Name[pa]=ਸੈਟਅੱਪ...
-Name[pl]=Ustawienia...
-Name[pt]=Configurar...
-Name[pt_BR]=Configurar...
-Name[ro]=Setează...
-Name[ru]=Настройка...
-Name[rw]=Iboneza...
-Name[sk]=Nastavenie...
-Name[sl]=Nastavi ...
-Name[sr]=Подеси...
-Name[sr@Latn]=Podesi...
-Name[sv]=Inställningar...
-Name[ta]=அமைப்பு...
-Name[tg]=Барпосозӣ...
-Name[th]=ติดตั้ง...
-Name[tr]=Kurulum...
-Name[uk]=Встановити...
-Name[uz]=Oʻrnatish
-Name[uz@cyrillic]=Ўрнатиш
-Name[ven]=Vhekanya...
-Name[vi]=Thiết lập...
-Name[xh]=Iyacwangciswa...
-Name[zh_CN]=设置...
-Name[zh_TW]=設定...
-Name[zu]=Iyalungiselela...
Icon=tdescreensaver
[Desktop Action InWindow]
Exec=kwave.kss -window-id %w
Name=Display in Specified Window
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn Ffenestr Benodol
-Name[da]=Visning i angivet vindue
-Name[de]=In bestimmten Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montri en indikita fenestro
-Name[es]=Mostrar en la ventana especificada
-Name[et]=Määratud aknas näitamine
-Name[eu]=Bistaratu zehaztutako lehioan
-Name[fa]=نمایش در پنجرۀ مشخص‌شده
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[fy]=Werjefte yn in definiearre finster
-Name[ga]=Taispeáin san Fhuinneog Sonraithe
-Name[gl]=Mostrar na fiestra indicada
-Name[he]=הצג בחלון המצוין
-Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[ka]=ჩვენება მითითებულ ფანჯარაში
-Name[lt]=Rodyti nurodytame lange
-Name[mk]=Прикажи во наведениот прозорец
-Name[ms]=Papar dalam Tetingkap Yang Dinyatakan
-Name[nb]=Vis i angitt vindu
-Name[nds]=In utsöcht Finster wiesen
-Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in een opgegeven venster
-Name[nn]=Vis i oppgjeve vindauge
-Name[pa]=ਦੱਸੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na Janela Indicada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Показывать в указанном окне
-Name[rw]=Kwerekana mu Idirishya Ryihariye
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у наведеном прозору
-Name[sr@Latn]=Prikaži u navedenom prozoru
-Name[sv]=Visa i angivet fönster
-Name[ta]=குறித்த சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи нишондода намоиш намоед
-Name[tr]=Belirtilen Pencerede Göster
-Name[uk]=Відобразити у вказаному вікні
-Name[vi]=Hiển thị trong Cửa sổ Đã định
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
NoDisplay=true
[Desktop Action Root]
Exec=kwave.kss -root
Name=Display in Root Window
-Name[bg]=Стартиране в главния прозорец
-Name[br]=Diskwel er prenestr gwrizienn
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn Ffenestr Wraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montri en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[eu]=Bistaratu erro lehioan
-Name[fa]=نمایش در پنجرۀ ریشه
-Name[fi]=Näytä juuri-ikkunassa
-Name[fr]=Affichage dans la fenêtre racine
-Name[fy]=Werjefte yn haadfinster
-Name[ga]=Taispeáin sa bhFréamhfhuinneog
-Name[gl]=Mostrar na fiestra raiz
-Name[he]=הצג בחלון השורש
-Name[hi]=रूट विंडो में प्रदर्शित करें
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í rótarglugganum
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[ka]=ჩვენება ძირითად ფანჯარაში
-Name[lt]=Rodyti root lange
-Name[mk]=Прикажи во коренскиот прозорец
-Name[ms]=Papar dalam Tetingkap Root
-Name[nb]=Vis i root-vindu
-Name[nds]=In Hööftfinster wiesen
-Name[ne]=मूल सञ्झ्यालमा प्रदर्शन
-Name[nl]=Weergeven in hoofdvenster
-Name[nn]=Vis i rotvindauget
-Name[pa]=Root ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ
-Name[pl]=Wyświetl w oknie głównym
-Name[pt]=Mostrar na Janela de Fundo
-Name[pt_BR]=Mostrar na janela raiz
-Name[ro]=Afişează în fereastra rădăcină
-Name[ru]=Показывать в корневом окне
-Name[rw]=Kwerekana mu Idirishya Umuzi
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sr@Latn]=Prikaži u glavnom (root) prozoru
-Name[sv]=Visa i rotfönstret
-Name[ta]=ஆரம்ப சாளரத்தில் காட்டு
-Name[tg]=Дар тирезаи решагӣ намоиш намоед
-Name[tr]=Kök Pencerede Göster
-Name[uk]=Відобразити в кореневому вікні
-Name[vi]=Hiển thị trong Cửa sổ Gốc
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
NoDisplay=true
diff --git a/tdescreensaver/kdesavers/SolarWinds.cpp b/tdescreensaver/kdesavers/SolarWinds.cpp
index a52affbc..01a0aa01 100644
--- a/tdescreensaver/kdesavers/SolarWinds.cpp
+++ b/tdescreensaver/kdesavers/SolarWinds.cpp
@@ -317,7 +317,7 @@ SWindsWidget::SWindsWidget( TQWidget* parent, const char* name )
_frameTime = 1000 / 60;
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextFrame()) );
+ connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextFrame()) );
}
@@ -594,16 +594,16 @@ void SWindsWidget::setDefaults(int which)
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char* kss_applicationName = "ksolarwinds.kss";
- KDE_EXPORT const char* kss_description = I18N_NOOP( "Solar Winds" );
- KDE_EXPORT const char* kss_version = "1.0";
+ TDE_EXPORT const char* kss_applicationName = "ksolarwinds.kss";
+ TDE_EXPORT const char* kss_description = I18N_NOOP( "Solar Winds" );
+ TDE_EXPORT const char* kss_version = "1.0";
- KDE_EXPORT KScreenSaver* kss_create( WId id )
+ TDE_EXPORT KScreenSaver* kss_create( WId id )
{
return new KSWindsScreenSaver( id );
}
- KDE_EXPORT TQDialog* kss_setup()
+ TDE_EXPORT TQDialog* kss_setup()
{
return new KSWindsSetup;
}
@@ -717,7 +717,7 @@ KSWindsSetup::KSWindsSetup( TQWidget* parent, const char* name )
// Now that we have _saver...
modeW->setCurrentItem( _saver->mode() ); // set before we connect
- connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) );
+ connect( modeW, TQ_SIGNAL(activated(int)), _saver, TQ_SLOT(setMode(int)) );
}
diff --git a/tdescreensaver/kdesavers/SolarWinds.h b/tdescreensaver/kdesavers/SolarWinds.h
index 6b5bb65d..f82e775d 100644
--- a/tdescreensaver/kdesavers/SolarWinds.h
+++ b/tdescreensaver/kdesavers/SolarWinds.h
@@ -21,7 +21,7 @@ class TQTimer;
class SWindsWidget : public TQGLWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -90,7 +90,7 @@ private:
class KSWindsScreenSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -117,7 +117,7 @@ class TQComboBox;
class KSWindsSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdescreensaver/kdesavers/banner.cpp b/tdescreensaver/kdesavers/banner.cpp
index 9004bdd5..3e23c0e7 100644
--- a/tdescreensaver/kdesavers/banner.cpp
+++ b/tdescreensaver/kdesavers/banner.cpp
@@ -40,16 +40,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kbanner.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "KBanner" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "kbanner.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "KBanner" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new KBannerSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new KBannerSetup();
}
@@ -74,7 +74,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
TQVBoxLayout *tl11 = new TQVBoxLayout( 0, 0, spacingHint() );
tl1->addLayout(tl11);
- TQGroupBox *group = new TQGroupBox( 0,Qt::Vertical, i18n("Font"), main );
+ TQGroupBox *group = new TQGroupBox( 0,TQt::Vertical, i18n("Font"), main );
TQGridLayout *gl = new TQGridLayout(group->layout(), 6, 2, spacingHint() );
label = new TQLabel( i18n("Family:"), group );
@@ -83,8 +83,8 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
TDEFontCombo* comboFonts = new TDEFontCombo( TQFontDatabase().families(), group );
comboFonts->setCurrentFont( fontFamily );
gl->addWidget(comboFonts, 1, 1);
- connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ),
- TQT_SLOT( slotFamily( const TQString& ) ) );
+ connect( comboFonts, TQ_SIGNAL( activated( const TQString& ) ),
+ TQ_SLOT( slotFamily( const TQString& ) ) );
label = new TQLabel( i18n("Size:"), group );
gl->addWidget(label, 2, 0);
@@ -92,33 +92,33 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
comboSizes = new TQComboBox( TRUE, group );
fillFontSizes();
gl->addWidget(comboSizes, 2, 1);
- connect( comboSizes, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSize( int ) ) );
- connect( comboSizes, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( slotSizeEdit( const TQString & ) ) );
+ connect( comboSizes, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotSize( int ) ) );
+ connect( comboSizes, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( slotSizeEdit( const TQString & ) ) );
TQCheckBox *cb = new TQCheckBox( i18n("Bold"),
group );
cb->setChecked( bold );
- connect( cb, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotBold( bool ) ) );
+ connect( cb, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotBold( bool ) ) );
gl->addWidget(cb, 3, 0);
cb = new TQCheckBox( i18n("Italic"), group );
cb->setChecked( italic );
gl->addWidget(cb, 3, 1);
- connect( cb, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotItalic( bool ) ) );
+ connect( cb, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotItalic( bool ) ) );
label = new TQLabel( i18n("Color:"), group );
gl->addWidget(label, 4, 0);
colorPush = new KColorButton( fontColor, group );
gl->addWidget(colorPush, 4, 1);
- connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ),
- TQT_SLOT( slotColor(const TQColor &) ) );
+ connect( colorPush, TQ_SIGNAL( changed(const TQColor &) ),
+ TQ_SLOT( slotColor(const TQColor &) ) );
TQCheckBox *cyclingColorCb=new TQCheckBox(i18n("Cycling color"),group);
cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint());
gl->addMultiCellWidget(cyclingColorCb,5,5,0,1);
- connect(cyclingColorCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotCyclingColor(bool)));
+ connect(cyclingColorCb,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotCyclingColor(bool)));
cyclingColorCb->setChecked(cyclingColor);
preview = new TQWidget( main );
@@ -134,13 +134,13 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
tl11->addStretch(1);
tl11->addWidget(label);
- TQSlider *sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main );
+ TQSlider *sb = new TQSlider(0, 100, 10, speed, TQt::Horizontal, main );
sb->setMinimumWidth( 180);
sb->setFixedHeight(20);
sb->setTickmarks(TQSlider::Below);
sb->setTickInterval(10);
tl11->addWidget(sb);
- connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) );
+ connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) );
TQHBoxLayout *tl2 = new TQHBoxLayout;
tl->addLayout(tl2);
@@ -151,13 +151,13 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
ed = new TQLineEdit( main );
tl2->addWidget(ed);
ed->setText( message );
- connect( ed, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( slotMessage( const TQString & ) ) );
+ connect( ed, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( slotMessage( const TQString & ) ) );
TQCheckBox *timeCb=new TQCheckBox( i18n("Show current time"), main);
timeCb->setFixedSize(timeCb->sizeHint());
tl->addWidget(timeCb,0,TQt::AlignLeft);
- connect(timeCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotTimeToggled(bool)));
+ connect(timeCb,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotTimeToggled(bool)));
timeCb->setChecked(showTime);
tl->addStretch();
@@ -353,7 +353,7 @@ KBannerSaver::KBannerSaver( WId id ) : KScreenSaver( id )
colorContext = TQColor::enterAllocContext();
needBlank = TRUE;
timer.start( speed );
- connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+ connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
}
KBannerSaver::~KBannerSaver()
diff --git a/tdescreensaver/kdesavers/banner.h b/tdescreensaver/kdesavers/banner.h
index 140acfed..04212c7e 100644
--- a/tdescreensaver/kdesavers/banner.h
+++ b/tdescreensaver/kdesavers/banner.h
@@ -22,7 +22,7 @@ class KRandomSequence;
class KBannerSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
KBannerSaver( WId id );
@@ -68,7 +68,7 @@ protected:
class KBannerSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KBannerSetup( TQWidget *parent = NULL, const char *name = NULL );
diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp
index 106628b0..e6fb6c23 100644
--- a/tdescreensaver/kdesavers/blob.cpp
+++ b/tdescreensaver/kdesavers/blob.cpp
@@ -47,16 +47,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kblob.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "KBlob" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "kblob.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "KBlob" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new KBlobSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new KBlobSetup();
}
@@ -169,7 +169,7 @@ KBlobSaver::KBlobSaver ( WId id)
// start timer which will update blob painter
timer.start(SPEED);
- connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+ connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
}
KBlobSaver::~KBlobSaver()
@@ -485,8 +485,8 @@ KBlobSetup::KBlobSetup
tl->addStretch();
// so selecting an algorithm will start previewing that alg
- connect(algs, TQT_SIGNAL(highlighted(int)), saver,
- TQT_SLOT(setAlgorithm(int)));
+ connect(algs, TQ_SIGNAL(highlighted(int)), saver,
+ TQ_SLOT(setAlgorithm(int)));
}
void KBlobSetup::readSettings()
diff --git a/tdescreensaver/kdesavers/blob.h b/tdescreensaver/kdesavers/blob.h
index 3c471408..b28a3275 100644
--- a/tdescreensaver/kdesavers/blob.h
+++ b/tdescreensaver/kdesavers/blob.h
@@ -27,7 +27,7 @@ enum blob_alg {
class KBlobSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -93,7 +93,7 @@ class KIntNumInput;
class KBlobSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
int showtime;
diff --git a/tdescreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp
index ca53482d..0bbd14c3 100644
--- a/tdescreensaver/kdesavers/firesaver.cpp
+++ b/tdescreensaver/kdesavers/firesaver.cpp
@@ -96,16 +96,16 @@ class KFireSaverSetupKDB : public KDialogBase
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kfiresaver.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "Fireworks 3D (GL)" );
- KDE_EXPORT const char *kss_version = "0.7";
+ TDE_EXPORT const char *kss_applicationName = "kfiresaver.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "Fireworks 3D (GL)" );
+ TDE_EXPORT const char *kss_version = "0.7";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new KFireSaverKSS( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new KFireSaverSetupKDB;
}
@@ -1107,7 +1107,7 @@ void KFireSaver :: readConfig ()
}
if (config.readBoolEntry( "LogosTDEIcons", true)) {
const TQString icons[] = {
- "media-floppy-3_5", "media-optical-cdrom", "drive-harddisk-mounted", "kmix",
+ "media-floppy-3_5-unmounted", "media-optical-cdrom-unmounted", "drive-harddisk-mounted", "kmix",
"network", "my-computer", "folder_home", "konqueror",
"kmail", "penguin", "preferences-desktop-personal" };
for (int i = 0; i < 11; i++) {
diff --git a/tdescreensaver/kdesavers/firesaversetup.ui b/tdescreensaver/kdesavers/firesaversetup.ui
index 5b859810..18e1f0e8 100644
--- a/tdescreensaver/kdesavers/firesaversetup.ui
+++ b/tdescreensaver/kdesavers/firesaversetup.ui
@@ -1837,13 +1837,13 @@
<variables>
<variable access="private">KFireSaver * fireSaverWidget;</variable>
</variables>
-<Q_SLOTS>
+<slots>
<slot>applyButton_clicked()</slot>
<slot>updatePreview()</slot>
<slot>writeConfig()</slot>
<slot>readConfig()</slot>
<slot>useButton_clicked()</slot>
-</Q_SLOTS>
+</slots>
<functions>
<function access="private" specifier="non virtual">init()</function>
<function access="private">destroy()</function>
diff --git a/tdescreensaver/kdesavers/fountain.cpp b/tdescreensaver/kdesavers/fountain.cpp
index 07b1311a..e022f384 100644
--- a/tdescreensaver/kdesavers/fountain.cpp
+++ b/tdescreensaver/kdesavers/fountain.cpp
@@ -37,16 +37,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kfountain.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "Particle Fountain Screen Saver" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "kfountain.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "Particle Fountain Screen Saver" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new KFountainSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new KFountainSetup();
}
@@ -85,11 +85,11 @@ KFountainSetup::KFountainSetup( TQWidget *parent, const char *name )
//KButtonBox *bbox = new KButtonBox(this);
//bbox->addStretch(1);
;
- connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOkPressed() ) );
- connect( PushButton2, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
- connect( PushButton3, TQT_SIGNAL( clicked() ), TQT_SLOT( aboutPressed() ) );
- connect( SpinBox1, TQT_SIGNAL( valueChanged(int)), saver, TQT_SLOT( updateSize(int)));
- connect( RadioButton1, TQT_SIGNAL( toggled(bool)), saver, TQT_SLOT( doStars(bool)));
+ connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOkPressed() ) );
+ connect( PushButton2, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) );
+ connect( PushButton3, TQ_SIGNAL( clicked() ), TQ_SLOT( aboutPressed() ) );
+ connect( SpinBox1, TQ_SIGNAL( valueChanged(int)), saver, TQ_SLOT( updateSize(int)));
+ connect( RadioButton1, TQ_SIGNAL( toggled(bool)), saver, TQ_SLOT( doStars(bool)));
}
@@ -158,7 +158,7 @@ KFountainSaver::KFountainSaver( WId id ) : KScreenSaver( id )
fountain = new Fountain();
embed(fountain);
fountain->show();
- connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) );
+ connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blank()) );
}
KFountainSaver::~KFountainSaver()
diff --git a/tdescreensaver/kdesavers/fountain.h b/tdescreensaver/kdesavers/fountain.h
index 289d3649..42fe04fe 100644
--- a/tdescreensaver/kdesavers/fountain.h
+++ b/tdescreensaver/kdesavers/fountain.h
@@ -36,7 +36,7 @@
class Fountain : public TQGLWidget
{
-Q_OBJECT
+TQ_OBJECT
class particles // Create A Structure For Particle
{
@@ -103,7 +103,7 @@ private:
class KFountainSaver : public KScreenSaver
{
-Q_OBJECT
+TQ_OBJECT
public:
KFountainSaver( WId drawable );
@@ -121,7 +121,7 @@ private:
class KFountainSetup : public SetupUi
{
- Q_OBJECT
+ TQ_OBJECT
public:
KFountainSetup( TQWidget *parent = NULL, const char *name = NULL );
diff --git a/tdescreensaver/kdesavers/gravity.cpp b/tdescreensaver/kdesavers/gravity.cpp
index 411d90c6..9e0355b7 100644
--- a/tdescreensaver/kdesavers/gravity.cpp
+++ b/tdescreensaver/kdesavers/gravity.cpp
@@ -36,16 +36,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kgravity.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "Particle Gravity Screen Saver" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "kgravity.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "Particle Gravity Screen Saver" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new KGravitySaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new KGravitySetup();
}
@@ -66,11 +66,11 @@ KGravitySetup::KGravitySetup( TQWidget *parent, const char *name )
#endif
saver = new KGravitySaver( preview->winId() );
;
- connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOkPressed() ) );
- connect( PushButton2, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
- connect( PushButton3, TQT_SIGNAL( clicked() ), TQT_SLOT( aboutPressed() ) );
- connect( SpinBox1, TQT_SIGNAL( valueChanged(int)), saver, TQT_SLOT( updateSize(int)));
- connect( RadioButton1, TQT_SIGNAL( toggled(bool)), saver, TQT_SLOT( doStars(bool)));
+ connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOkPressed() ) );
+ connect( PushButton2, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) );
+ connect( PushButton3, TQ_SIGNAL( clicked() ), TQ_SLOT( aboutPressed() ) );
+ connect( SpinBox1, TQ_SIGNAL( valueChanged(int)), saver, TQ_SLOT( updateSize(int)));
+ connect( RadioButton1, TQ_SIGNAL( toggled(bool)), saver, TQ_SLOT( doStars(bool)));
}
@@ -146,7 +146,7 @@ KGravitySaver::KGravitySaver( WId id ) : KScreenSaver( id )
#ifdef TQ_WS_X11
gravity->show();
#endif
- connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) );
+ connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blank()) );
}
KGravitySaver::~KGravitySaver()
diff --git a/tdescreensaver/kdesavers/gravity.h b/tdescreensaver/kdesavers/gravity.h
index 687894c9..9981e9bc 100644
--- a/tdescreensaver/kdesavers/gravity.h
+++ b/tdescreensaver/kdesavers/gravity.h
@@ -36,7 +36,7 @@
class Gravity : public TQGLWidget
{
-Q_OBJECT
+TQ_OBJECT
class particles // Create A Structure For Particle
{
@@ -101,7 +101,7 @@ private:
class KGravitySaver : public KScreenSaver
{
-Q_OBJECT
+TQ_OBJECT
public:
KGravitySaver( WId drawable );
@@ -119,7 +119,7 @@ private:
class KGravitySetup : public SetupUi
{
- Q_OBJECT
+ TQ_OBJECT
public:
KGravitySetup( TQWidget *parent = NULL, const char *name = NULL );
diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp
index 7de25947..44614a51 100644
--- a/tdescreensaver/kdesavers/kclock.cpp
+++ b/tdescreensaver/kdesavers/kclock.cpp
@@ -50,15 +50,15 @@ const bool DEFAULT_KEEP_CENTERED = false;
extern "C" {
- KDE_EXPORT const char *kss_applicationName = "kclock.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP("Clock");
- KDE_EXPORT const char *kss_version = "1.0";
+ TDE_EXPORT const char *kss_applicationName = "kclock.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP("Clock");
+ TDE_EXPORT const char *kss_version = "1.0";
- KDE_EXPORT KScreenSaver *kss_create(WId id) {
+ TDE_EXPORT KScreenSaver *kss_create(WId id) {
return new KClockSaver(id);
}
- KDE_EXPORT TQDialog *kss_setup() {
+ TDE_EXPORT TQDialog *kss_setup() {
return new KClockSetup();
}
}
@@ -84,7 +84,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
top->addLayout( hbox );
TQGroupBox *colgroup = new TQGroupBox(i18n("Colors"), main);
- colgroup->setColumnLayout( 0,Qt::Horizontal );
+ colgroup->setColumnLayout( 0,TQt::Horizontal );
TQGridLayout *grid = new TQGridLayout( colgroup->layout(),
5, 2, spacingHint() );
@@ -92,8 +92,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
KColorButton *colorButton = new KColorButton(m_hourColor, colgroup);
colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
label->setBuddy(colorButton);
- connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotHourColor(const TQColor &)));
+ connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotHourColor(const TQColor &)));
grid->addWidget( label, 1, 1 );
grid->addWidget( colorButton, 1, 2 );
@@ -101,8 +101,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
colorButton = new KColorButton(m_minColor, colgroup);
colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
label->setBuddy(colorButton);
- connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotMinColor(const TQColor &)));
+ connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotMinColor(const TQColor &)));
grid->addWidget( label, 2, 1 );
grid->addWidget( colorButton, 2, 2 );
@@ -110,8 +110,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
colorButton = new KColorButton(m_secColor, colgroup);
colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
label->setBuddy(colorButton);
- connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotSecColor(const TQColor &)));
+ connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotSecColor(const TQColor &)));
grid->addWidget( label, 3, 1 );
grid->addWidget( colorButton, 3, 2 );
@@ -119,8 +119,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
colorButton = new KColorButton(m_scaleColor, colgroup);
colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
label->setBuddy(colorButton);
- connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotScaleColor(const TQColor &)));
+ connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotScaleColor(const TQColor &)));
grid->addWidget( label, 4, 1 );
grid->addWidget( colorButton, 4, 2 );
@@ -128,8 +128,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
colorButton = new KColorButton(m_bgndColor, colgroup);
colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
label->setBuddy(colorButton);
- connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotBgndColor(const TQColor &)));
+ connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotBgndColor(const TQColor &)));
grid->addWidget( label, 5, 1 );
grid->addWidget( colorButton, 5, 2 );
@@ -143,11 +143,11 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
label = new TQLabel( i18n( "Si&ze:" ), main );
top->addWidget( label );
- TQSlider *qs = new TQSlider(0, MAX_CLOCK_SIZE, 1, m_size,Qt::Horizontal, main);
+ TQSlider *qs = new TQSlider(0, MAX_CLOCK_SIZE, 1, m_size,TQt::Horizontal, main);
label->setBuddy( qs );
qs->setTickInterval(1);
qs->setTickmarks(TQSlider::Below);
- connect(qs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSliderMoved(int)));
+ connect(qs, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSliderMoved(int)));
top->addWidget( qs );
bool rtl = kapp->reverseLayout();
@@ -162,7 +162,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
TQCheckBox *keepCentered = new TQCheckBox(i18n("&Keep clock centered"), main);
keepCentered->setChecked(m_keepCentered);
- connect(keepCentered, TQT_SIGNAL(stateChanged(int)), TQT_SLOT(slotKeepCenteredChanged(int)));
+ connect(keepCentered, TQ_SIGNAL(stateChanged(int)), TQ_SLOT(slotKeepCenteredChanged(int)));
top->addWidget(keepCentered);
top->addStretch();
}
@@ -426,7 +426,7 @@ KClockSaver::KClockSaver(WId id)
{
readSettings();
setBackgroundColor(m_bgndColor);
- connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+ connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
start(m_size);
m_timer.start(TIMER_INTERVALL);
}
diff --git a/tdescreensaver/kdesavers/kclock.h b/tdescreensaver/kdesavers/kclock.h
index 159adeaf..af0846da 100644
--- a/tdescreensaver/kdesavers/kclock.h
+++ b/tdescreensaver/kdesavers/kclock.h
@@ -44,7 +44,7 @@ class KClockPainter
class KClockSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
KClockSaver(WId id);
@@ -94,7 +94,7 @@ class KClockSaver : public KScreenSaver
class KClockSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KClockSetup(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp
index afc132ed..90155b3d 100644
--- a/tdescreensaver/kdesavers/kvm.cpp
+++ b/tdescreensaver/kdesavers/kvm.cpp
@@ -61,16 +61,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kvm.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "Virtual Machine" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "kvm.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "Virtual Machine" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new kVmSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new kVmSetup();
}
@@ -194,7 +194,7 @@ kVmSaver::kVmSaver( WId id ) : KScreenSaver( id )
pool_state = init_pool( this );
vm_default_initstate( time(0), &(pool_state->pool->vm_random_data) );
- connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+ connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
timer.start( 100 - speed );
}
@@ -289,29 +289,29 @@ kVmSetup::kVmSetup( TQWidget *parent, const char *name )
TQLabel *label = new TQLabel( i18n("Virtual machine speed:"), main );
tl1->addWidget(label);
- TQSlider *slider = new TQSlider( Qt::Horizontal, main );
+ TQSlider *slider = new TQSlider( TQt::Horizontal, main );
slider->setMinimumSize( 120, 20 );
slider->setRange( 0, 100 );
slider->setSteps( 10, 20 );
slider->setTickmarks( TQSlider::Below );
slider->setTickInterval( 10 );
slider->setValue( speed );
- connect( slider, TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( slotSpeed( int ) ) );
+ connect( slider, TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( slotSpeed( int ) ) );
tl1->addWidget(slider);
label = new TQLabel( i18n("Display update speed:"), main );
tl1->addWidget(label);
- slider = new TQSlider( Qt::Horizontal, main );
+ slider = new TQSlider( TQt::Horizontal, main );
slider->setMinimumSize( 120, 20 );
slider->setRange( 0, MAX_REFRESH_TIMEOUT );
slider->setSteps( MAX_REFRESH_TIMEOUT/10, MAX_REFRESH_TIMEOUT/5 );
slider->setTickmarks( TQSlider::Below );
slider->setTickInterval( MAX_REFRESH_TIMEOUT/10 );
slider->setValue( MAX_REFRESH_TIMEOUT - refreshTimeout );
- connect( slider, TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( slotRefreshTimeout( int ) ) );
+ connect( slider, TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( slotRefreshTimeout( int ) ) );
tl1->addWidget(slider);
tl1->addStretch();
diff --git a/tdescreensaver/kdesavers/kvm.h b/tdescreensaver/kdesavers/kvm.h
index eb68d3a4..cc293eab 100644
--- a/tdescreensaver/kdesavers/kvm.h
+++ b/tdescreensaver/kdesavers/kvm.h
@@ -43,7 +43,7 @@ typedef struct {
class kVmSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
kVmSaver( WId id );
@@ -74,7 +74,7 @@ protected:
class kVmSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
kVmSetup( TQWidget *parent = NULL, const char *name = NULL );
diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp
index b7c5bdd9..de09e8c4 100644
--- a/tdescreensaver/kdesavers/lines.cpp
+++ b/tdescreensaver/kdesavers/lines.cpp
@@ -33,16 +33,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "klines.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "KLines" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "klines.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "KLines" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new kLinesSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new kLinesSetup();
}
@@ -128,46 +128,46 @@ kLinesSetup::kLinesSetup(TQWidget *parent, const char *name)
TQLabel *label=new TQLabel(i18n("Length:"), main);
tl1->addWidget(label);
- TQSlider *sb= new TQSlider(1, MAXLENGTH+1, 16, length, Qt::Horizontal,
+ TQSlider *sb= new TQSlider(1, MAXLENGTH+1, 16, length, TQt::Horizontal,
main);
sb->setMinimumSize(120, 20);
sb->setTickmarks(TQSlider::Below);
sb->setTickInterval(32);
- connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotLength(int)));
+ connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotLength(int)));
tl1->addWidget(sb);
label=new TQLabel(i18n("Speed:"), main);
tl1->addWidget(label);
- sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main);
+ sb = new TQSlider(0, 100, 10, speed, TQt::Horizontal, main);
sb->setMinimumSize(120, 20);
sb->setTickmarks(TQSlider::Below);
sb->setTickInterval(10);
- connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) );
+ connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) );
tl1->addWidget(sb);
label=new TQLabel(i18n("Beginning:"), main);
tl1->addWidget(label);
colorPush0=new KColorButton(colstart, main);
- connect(colorPush0, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotColstart(const TQColor &)));
+ connect(colorPush0, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotColstart(const TQColor &)));
tl1->addWidget(colorPush0);
label=new TQLabel(i18n("Middle:"), main);
tl1->addWidget(label);
colorPush1=new KColorButton(colmid, main);
- connect(colorPush1, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotColmid(const TQColor &)));
+ connect(colorPush1, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotColmid(const TQColor &)));
tl1->addWidget(colorPush1);
label=new TQLabel(i18n("End:"), main);
tl1->addWidget(label);
colorPush2=new KColorButton(colend, main);
- connect(colorPush2, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotColend(const TQColor &)));
+ connect(colorPush2, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotColend(const TQColor &)));
tl1->addWidget(colorPush2);
tl1->addStretch();
@@ -283,7 +283,7 @@ kLinesSaver::kLinesSaver( WId id ) : KScreenSaver( id ){
initialiseColor();
initialiseLines();
timer.start(speed);
- connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+ connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
}
kLinesSaver::~kLinesSaver(){
diff --git a/tdescreensaver/kdesavers/lines.h b/tdescreensaver/kdesavers/lines.h
index 0d820c0e..3f9da6a2 100644
--- a/tdescreensaver/kdesavers/lines.h
+++ b/tdescreensaver/kdesavers/lines.h
@@ -37,7 +37,7 @@ class Lines{
};
class kLinesSaver:public KScreenSaver{
- Q_OBJECT
+ TQ_OBJECT
public:
kLinesSaver( WId id );
@@ -68,7 +68,7 @@ class kLinesSaver:public KScreenSaver{
};
class kLinesSetup : public KDialogBase{
- Q_OBJECT
+ TQ_OBJECT
public:
kLinesSetup(TQWidget *parent=NULL, const char *name=NULL);
diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp
index 2d521583..0825ecd2 100644
--- a/tdescreensaver/kdesavers/lorenz.cpp
+++ b/tdescreensaver/kdesavers/lorenz.cpp
@@ -29,16 +29,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "klorenz.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "KLorenz" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "klorenz.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "KLorenz" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new KLorenzSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new KLorenzSetup();
}
@@ -82,61 +82,61 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name )
TQLabel *label = new TQLabel( i18n("Speed:"), main );
tl1->addWidget(label);
- sps = new TQSlider(MINSPEED, MAXSPEED, 10, speed, Qt::Horizontal, main);
+ sps = new TQSlider(MINSPEED, MAXSPEED, 10, speed, TQt::Horizontal, main);
sps->setMinimumSize( 120, 20 );
sps->setTickmarks(TQSlider::Below);
sps->setTickInterval(150);
- connect( sps, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) );
+ connect( sps, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) );
tl1->addWidget(sps);
label = new TQLabel( i18n("Epoch:"), main );
tl1->addWidget(label);
- eps = new TQSlider(MINEPOCH, MAXEPOCH, 100, epoch, Qt::Horizontal, main);
+ eps = new TQSlider(MINEPOCH, MAXEPOCH, 100, epoch, TQt::Horizontal, main);
eps->setMinimumSize( 120, 20 );
eps->setTickmarks(TQSlider::Below);
eps->setTickInterval(3000);
- connect( eps, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEpoch( int ) ) );
+ connect( eps, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEpoch( int ) ) );
tl1->addWidget(eps);
label = new TQLabel( i18n("Color rate:"), main );
tl1->addWidget(label);
- crs = new TQSlider(MINCOLOR, MAXCOLOR, 5, crate, Qt::Horizontal, main);
+ crs = new TQSlider(MINCOLOR, MAXCOLOR, 5, crate, TQt::Horizontal, main);
crs->setMinimumSize( 120, 20 );
crs->setTickmarks(TQSlider::Below);
crs->setTickInterval(10);
- connect( crs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotCRate( int ) ) );
+ connect( crs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotCRate( int ) ) );
tl1->addWidget(crs);
label = new TQLabel( i18n("Rotation Z:"), main );
tl1->addWidget(label);
- zrs = new TQSlider(MINZROT, MAXZROT, 18, zrot, Qt::Horizontal, main);
+ zrs = new TQSlider(MINZROT, MAXZROT, 18, zrot, TQt::Horizontal, main);
zrs->setMinimumSize( 120, 20 );
zrs->setTickmarks(TQSlider::Below);
zrs->setTickInterval(36);
- connect( zrs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotZRot( int ) ) );
+ connect( zrs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotZRot( int ) ) );
tl1->addWidget(zrs);
label = new TQLabel( i18n("Rotation Y:"), main );
tl1->addWidget(label);
- yrs = new TQSlider(MINYROT, MAXYROT, 18, yrot, Qt::Horizontal, main);
+ yrs = new TQSlider(MINYROT, MAXYROT, 18, yrot, TQt::Horizontal, main);
yrs->setMinimumSize( 120, 20 );
yrs->setTickmarks(TQSlider::Below);
yrs->setTickInterval(36);
- connect( yrs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotYRot( int ) ) );
+ connect( yrs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotYRot( int ) ) );
tl1->addWidget(yrs);
label = new TQLabel( i18n("Rotation X:"), main );
tl1->addWidget(label);
- xrs = new TQSlider(MINXROT, MAXXROT, 18, xrot, Qt::Horizontal, main);
+ xrs = new TQSlider(MINXROT, MAXXROT, 18, xrot, TQt::Horizontal, main);
xrs->setMinimumSize( 120, 20 );
xrs->setTickmarks(TQSlider::Below);
xrs->setTickInterval(36);
- connect( xrs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotXRot( int ) ) );
+ connect( xrs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotXRot( int ) ) );
tl1->addWidget(xrs);
preview = new TQWidget( main );
@@ -446,7 +446,7 @@ KLorenzSaver::KLorenzSaver( WId id ) : KScreenSaver( id )
newEpoch();
timer.start( 10 );
- connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( drawOnce() ) );
+ connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( drawOnce() ) );
}
KLorenzSaver::~KLorenzSaver()
diff --git a/tdescreensaver/kdesavers/lorenz.h b/tdescreensaver/kdesavers/lorenz.h
index e0b43b31..07b00798 100644
--- a/tdescreensaver/kdesavers/lorenz.h
+++ b/tdescreensaver/kdesavers/lorenz.h
@@ -21,7 +21,7 @@ class Matrix3D;
class KLorenzSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
KLorenzSaver( WId id );
@@ -56,7 +56,7 @@ class TQSlider;
class KLorenzSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KLorenzSetup(TQWidget *parent = 0, const char *name = 0 );
diff --git a/tdescreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp
index 83f77d70..5027fdc8 100644
--- a/tdescreensaver/kdesavers/pendulum.cpp
+++ b/tdescreensaver/kdesavers/pendulum.cpp
@@ -53,21 +53,21 @@
extern "C"
{
/// application name for libtdescreensaver interface
- KDE_EXPORT const char *kss_applicationName = "kpendulum.kss";
+ TDE_EXPORT const char *kss_applicationName = "kpendulum.kss";
/// application description for libtdescreensaver interface
- KDE_EXPORT const char *kss_description = I18N_NOOP("Simulation of\
+ TDE_EXPORT const char *kss_description = I18N_NOOP("Simulation of\
a two-part pendulum");
/// application version for libtdescreensaver interface
- KDE_EXPORT const char *kss_version = KPENDULUM_VERSION;
+ TDE_EXPORT const char *kss_version = KPENDULUM_VERSION;
/// function to create screen saver object
- KDE_EXPORT KScreenSaver* kss_create(WId id)
+ TDE_EXPORT KScreenSaver* kss_create(WId id)
{
return new KPendulumSaver(id);
}
/// function to create setup dialog for screen saver
- KDE_EXPORT TQDialog* kss_setup()
+ TDE_EXPORT TQDialog* kss_setup()
{
return new KPendulumSetup();
}
@@ -379,7 +379,7 @@ KPendulumSaver::KPendulumSaver(WId id) :
// set up and start cyclic timer
timer = new TQTimer(this);
timer->start(deltaT, TRUE);
- connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimeStep()));
+ connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doTimeStep()));
}
KPendulumSaver::~KPendulumSaver()
@@ -754,8 +754,8 @@ KPendulumSetup::KPendulumSetup(TQWidget* parent, const char* name)
// if the preview area is resized it emmits the resized() event which is
// caught by the saver. The embedded GlArea is resized to fit into the
// preview area.
- connect(preview, TQT_SIGNAL(resized(TQResizeEvent*)),
- saver, TQT_SLOT(resizeGlArea(TQResizeEvent*)));
+ connect(preview, TQ_SIGNAL(resized(TQResizeEvent*)),
+ saver, TQ_SLOT(resizeGlArea(TQResizeEvent*)));
}
KPendulumSetup::~KPendulumSetup()
diff --git a/tdescreensaver/kdesavers/pendulum.h b/tdescreensaver/kdesavers/pendulum.h
index ee8fa452..753aff09 100644
--- a/tdescreensaver/kdesavers/pendulum.h
+++ b/tdescreensaver/kdesavers/pendulum.h
@@ -81,7 +81,7 @@ class PendulumOdeSolver : public RkOdeSolver<double>
* Class implements TQGLWidget to display the KPendulum screen saver. */
class PendulumGLWidget : public TQGLWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -184,7 +184,7 @@ class PendulumGLWidget : public TQGLWidget
* This class implements KScreenSaver for the KPendulum screen saver. */
class KPendulumSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -333,7 +333,7 @@ class KPendulumSaver : public KScreenSaver
* This class handles the KPendulum screen saver setup dialog. */
class KPendulumSetup : public KPendulumSetupUi
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdescreensaver/kdesavers/pendulumcfg.ui b/tdescreensaver/kdesavers/pendulumcfg.ui
index 3edd3246..41ea128e 100644
--- a/tdescreensaver/kdesavers/pendulumcfg.ui
+++ b/tdescreensaver/kdesavers/pendulumcfg.ui
@@ -547,7 +547,7 @@ Change [s]</string>
<slot>m2ColorButtonClickedSlot()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>okButtonClickedSlot()</slot>
<slot>aboutButtonClickedSlot()</slot>
<slot>mEditLostFocusSlot(void)</slot>
@@ -558,7 +558,7 @@ Change [s]</string>
<slot>barColorButtonClickedSlot(void)</slot>
<slot>m1ColorButtonClickedSlot(void)</slot>
<slot>m2ColorButtonClickedSlot(void)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">sspreviewarea.h</include>
diff --git a/tdescreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp
index 1979dfe8..b62c8b61 100644
--- a/tdescreensaver/kdesavers/polygon.cpp
+++ b/tdescreensaver/kdesavers/polygon.cpp
@@ -31,16 +31,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kpolygon.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "KPolygon" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "kpolygon.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "KPolygon" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new kPolygonSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new kPolygonSetup();
}
@@ -66,32 +66,32 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name )
TQLabel *label = new TQLabel( i18n("Length:"), main );
tl1->addWidget(label);
- TQSlider *sb = new TQSlider(1, MAXLENGTH, 10, length, Qt::Horizontal,
+ TQSlider *sb = new TQSlider(1, MAXLENGTH, 10, length, TQt::Horizontal,
main );
sb->setMinimumSize( 90, 20 );
sb->setTickmarks(TQSlider::Below);
sb->setTickInterval(10);
- connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotLength( int ) ) );
+ connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotLength( int ) ) );
tl1->addWidget(sb);
label = new TQLabel( i18n("Vertices:"), main );
tl1->addWidget(label);
- sb = new TQSlider(3, MAXVERTICES, 2, vertices, Qt::Horizontal, main);
+ sb = new TQSlider(3, MAXVERTICES, 2, vertices, TQt::Horizontal, main);
sb->setMinimumSize( 90, 20 );
sb->setTickmarks(TQSlider::Below);
sb->setTickInterval(2);
- connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotVertices( int ) ) );
+ connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotVertices( int ) ) );
tl1->addWidget(sb);
label = new TQLabel( i18n("Speed:"), main );
tl1->addWidget(label);
- sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main);
+ sb = new TQSlider(0, 100, 10, speed, TQt::Horizontal, main);
sb->setMinimumSize( 90, 20 );
sb->setTickmarks(TQSlider::Below);
sb->setTickInterval(10);
- connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) );
+ connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) );
tl1->addWidget(sb);
tl1->addStretch();
@@ -205,7 +205,7 @@ kPolygonSaver::kPolygonSaver( WId id ) : KScreenSaver( id )
initialisePolygons();
timer.start( speed );
- connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+ connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
}
kPolygonSaver::~kPolygonSaver()
diff --git a/tdescreensaver/kdesavers/polygon.h b/tdescreensaver/kdesavers/polygon.h
index c0bc71a6..f3a50c17 100644
--- a/tdescreensaver/kdesavers/polygon.h
+++ b/tdescreensaver/kdesavers/polygon.h
@@ -17,7 +17,7 @@
class kPolygonSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
kPolygonSaver( WId id );
@@ -52,7 +52,7 @@ protected:
class kPolygonSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
kPolygonSetup( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tdescreensaver/kdesavers/rotation.cpp b/tdescreensaver/kdesavers/rotation.cpp
index a00f7bbc..a51cfb19 100644
--- a/tdescreensaver/kdesavers/rotation.cpp
+++ b/tdescreensaver/kdesavers/rotation.cpp
@@ -54,21 +54,21 @@
extern "C"
{
/** application name for the libtdescreensaver interface */
- KDE_EXPORT const char *kss_applicationName = "krotation.kss";
+ TDE_EXPORT const char *kss_applicationName = "krotation.kss";
/** application description for the libtdescreensaver interface */
- KDE_EXPORT const char *kss_description =
+ TDE_EXPORT const char *kss_description =
I18N_NOOP("Simulation of a force free rotating asymmetric body");
/** application version for the libtdescreensaver interface */
- KDE_EXPORT const char *kss_version = KROTATION_VERSION;
+ TDE_EXPORT const char *kss_version = KROTATION_VERSION;
/** function to create screen saver object */
- KDE_EXPORT KScreenSaver* kss_create(WId id)
+ TDE_EXPORT KScreenSaver* kss_create(WId id)
{
return new KRotationSaver(id);
}
/** function to create setup dialog for screen saver */
- KDE_EXPORT TQDialog* kss_setup()
+ TDE_EXPORT TQDialog* kss_setup()
{
return new KRotationSetup();
}
@@ -491,7 +491,7 @@ KRotationSaver::KRotationSaver(WId id)
timer = new TQTimer(this);
timer->start(deltaT, TRUE);
- connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimeStep()));
+ connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doTimeStep()));
}
KRotationSaver::~KRotationSaver()
@@ -754,8 +754,8 @@ KRotationSetup::KRotationSetup(TQWidget* parent, const char* name)
// if the preview area is resized it emmits the resized() event which is
// caught by the saver. The embedded GlArea is resized to fit into the
// preview area.
- connect(preview, TQT_SIGNAL(resized(TQResizeEvent*)),
- saver, TQT_SLOT(resizeGlArea(TQResizeEvent*)));
+ connect(preview, TQ_SIGNAL(resized(TQResizeEvent*)),
+ saver, TQ_SLOT(resizeGlArea(TQResizeEvent*)));
}
KRotationSetup::~KRotationSetup()
diff --git a/tdescreensaver/kdesavers/rotation.h b/tdescreensaver/kdesavers/rotation.h
index d8754194..c1546d29 100644
--- a/tdescreensaver/kdesavers/rotation.h
+++ b/tdescreensaver/kdesavers/rotation.h
@@ -81,7 +81,7 @@ class EulerOdeSolver : public RkOdeSolver<double>
* Class implements TQGLWidget to display the KRotation screen saver. */
class RotationGLWidget : public TQGLWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -172,7 +172,7 @@ class RotationGLWidget : public TQGLWidget
* This class implements KScreenSaver for the KRotation screen saver. */
class KRotationSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -300,7 +300,7 @@ class KRotationSaver : public KScreenSaver
* This class handles the KRotation screen saver setup dialog. */
class KRotationSetup : public KRotationSetupUi
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdescreensaver/kdesavers/rotationcfg.ui b/tdescreensaver/kdesavers/rotationcfg.ui
index f7714d86..37b77b48 100644
--- a/tdescreensaver/kdesavers/rotationcfg.ui
+++ b/tdescreensaver/kdesavers/rotationcfg.ui
@@ -470,7 +470,7 @@
<slot>thetaEnteredSlot(const TQString&amp;)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>okButtonClickedSlot()</slot>
<slot>aboutButtonClickedSlot()</slot>
<slot>randomTracesToggled(bool)</slot>
@@ -480,7 +480,7 @@
<slot>lengthEnteredSlot(const TQString&amp;)</slot>
<slot>LzEnteredSlot(const TQString&amp;)</slot>
<slot>thetaEnteredSlot(const TQString&amp;)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">sspreviewarea.h</include>
diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp
index bd3ee4ad..a63733c8 100644
--- a/tdescreensaver/kdesavers/science.cpp
+++ b/tdescreensaver/kdesavers/science.cpp
@@ -31,7 +31,7 @@
#include "science.h"
#include "science.moc"
-#if defined Q_WS_X11 && !defined K_WS_TQTONLY
+#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#endif
@@ -54,16 +54,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kscience.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "Science Screen Saver" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "kscience.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "Science Screen Saver" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new KScienceSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new KScienceSetup();
}
@@ -149,7 +149,7 @@ KScienceSaver::KScienceSaver( WId id, bool s, bool gP )
do_refresh( TQRect ( 0, 0, width(), height() ) );
}
- connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+ connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
timer.start( SCI_MAX_SPEED - speed[mode] );
}
@@ -870,26 +870,26 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name )
c->insertItem( modeInfo[i].name );
c->setCurrentItem( mode );
c->setFixedHeight( 5 * c->fontMetrics().height() );
- connect( c, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( slotMode( int ) ) );
+ connect( c, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( slotMode( int ) ) );
ltm->addWidget( c );
// inverse
TQCheckBox *cbox = checkInverse = new TQCheckBox( i18n("Inverse"), main );
cbox->setEnabled( modeInfo[mode].inverseEnable );
cbox->setChecked( inverse[mode] );
- connect( cbox, TQT_SIGNAL( clicked() ), TQT_SLOT( slotInverse() ) );
+ connect( cbox, TQ_SIGNAL( clicked() ), TQ_SLOT( slotInverse() ) );
ltm->addWidget( cbox );
// gravity
cbox = checkGravity = new TQCheckBox( i18n("Gravity"), main );
cbox->setChecked( gravity[mode] );
- connect( cbox, TQT_SIGNAL( clicked() ), TQT_SLOT( slotGravity() ) );
+ connect( cbox, TQ_SIGNAL( clicked() ), TQ_SLOT( slotGravity() ) );
ltm->addWidget( cbox );
// hide background
cbox = checkHideBG = new TQCheckBox( i18n("Hide background"), main );
cbox->setChecked( hideBG[mode] );
- connect( cbox, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHideBG() ) );
+ connect( cbox, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHideBG() ) );
ltm->addWidget( cbox );
ltm->addStretch();
@@ -897,17 +897,17 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name )
label = new TQLabel( i18n("Size:"), main );
ltc->addWidget( label );
- slideSize = new TQSlider(9, 50, 5, size[mode], Qt::Horizontal,
+ slideSize = new TQSlider(9, 50, 5, size[mode], TQt::Horizontal,
main );
slideSize->setMinimumSize( 90, 20 );
slideSize->setTickmarks(TQSlider::Below);
slideSize->setTickInterval(5);
- connect( slideSize, TQT_SIGNAL( sliderMoved( int ) ),
- TQT_SLOT( slotSize( int ) ) );
- connect( slideSize, TQT_SIGNAL( sliderPressed() ),
- TQT_SLOT( slotSliderPressed() ) );
- connect( slideSize, TQT_SIGNAL( sliderReleased() ),
- TQT_SLOT( slotSliderReleased() ) );
+ connect( slideSize, TQ_SIGNAL( sliderMoved( int ) ),
+ TQ_SLOT( slotSize( int ) ) );
+ connect( slideSize, TQ_SIGNAL( sliderPressed() ),
+ TQ_SLOT( slotSliderPressed() ) );
+ connect( slideSize, TQ_SIGNAL( sliderReleased() ),
+ TQ_SLOT( slotSliderReleased() ) );
ltc->addWidget( slideSize );
@@ -916,16 +916,16 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name )
ltc->addWidget( label );
slideIntensity = new TQSlider(0, 10, 1, intensity[mode],
- Qt::Horizontal, main );
+ TQt::Horizontal, main );
slideIntensity->setMinimumSize( 90, 20 );
slideIntensity->setTickmarks(TQSlider::Below);
slideIntensity->setTickInterval(1);
- connect( slideIntensity, TQT_SIGNAL( sliderMoved( int ) ),
- TQT_SLOT( slotIntensity( int )) );
- connect( slideIntensity, TQT_SIGNAL( sliderPressed() ),
- TQT_SLOT( slotSliderPressed() ) );
- connect( slideIntensity, TQT_SIGNAL( sliderReleased() ),
- TQT_SLOT( slotSliderReleased() ) );
+ connect( slideIntensity, TQ_SIGNAL( sliderMoved( int ) ),
+ TQ_SLOT( slotIntensity( int )) );
+ connect( slideIntensity, TQ_SIGNAL( sliderPressed() ),
+ TQ_SLOT( slotSliderPressed() ) );
+ connect( slideIntensity, TQ_SIGNAL( sliderReleased() ),
+ TQ_SLOT( slotSliderReleased() ) );
ltc->addWidget( slideIntensity );
// speed
@@ -933,12 +933,12 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name )
ltc->addWidget( label );
slideSpeed = new TQSlider(0, SCI_MAX_SPEED, 10, speed[mode],
- Qt::Horizontal, main );
+ TQt::Horizontal, main );
slideSpeed->setMinimumSize( 90, 20 );
slideSpeed->setTickmarks(TQSlider::Below);
slideSpeed->setTickInterval(10);
- connect( slideSpeed, TQT_SIGNAL( sliderMoved( int ) ),
- TQT_SLOT( slotSpeed( int ) ) );
+ connect( slideSpeed, TQ_SIGNAL( sliderMoved( int ) ),
+ TQ_SLOT( slotSpeed( int ) ) );
ltc->addWidget( slideSpeed );
// motion
@@ -949,21 +949,21 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name )
ltc->addLayout( ltcm );
slideMoveX = new TQSlider(0, SCI_MAX_MOVE, 5, moveX[mode],
- Qt::Horizontal, main );
+ TQt::Horizontal, main );
slideMoveX->setMinimumSize( 40, 20 );
slideMoveX->setTickmarks(TQSlider::Below);
slideMoveX->setTickInterval(5);
- connect( slideMoveX, TQT_SIGNAL( sliderMoved( int ) ),
- TQT_SLOT( slotMoveX( int ) ) );
+ connect( slideMoveX, TQ_SIGNAL( sliderMoved( int ) ),
+ TQ_SLOT( slotMoveX( int ) ) );
ltcm->addWidget( slideMoveX );
slideMoveY = new TQSlider(0, SCI_MAX_MOVE, 5, moveY[mode],
- Qt::Horizontal, main );
+ TQt::Horizontal, main );
slideMoveY->setMinimumSize( 40, 20 );
slideMoveY->setTickmarks(TQSlider::Below);
slideMoveY->setTickInterval(5);
- connect( slideMoveY, TQT_SIGNAL( sliderMoved( int ) ),
- TQT_SLOT( slotMoveY( int ) ) );
+ connect( slideMoveY, TQ_SIGNAL( sliderMoved( int ) ),
+ TQ_SLOT( slotMoveY( int ) ) );
ltcm->addWidget( slideMoveY );
ltc->addStretch();
diff --git a/tdescreensaver/kdesavers/science.h b/tdescreensaver/kdesavers/science.h
index d35788b8..887230b7 100644
--- a/tdescreensaver/kdesavers/science.h
+++ b/tdescreensaver/kdesavers/science.h
@@ -24,7 +24,7 @@ class KScienceSaver;
class KPreviewWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KPreviewWidget( TQWidget *parent );
@@ -38,7 +38,7 @@ struct KScienceData;
class KScienceSaver : public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
KScienceSaver( WId id, bool setup=false, bool gP=false);
@@ -107,7 +107,7 @@ protected:
class KScienceSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KScienceSetup(TQWidget *parent=0, const char *name=0);
diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp
index 800075ca..e41db52d 100644
--- a/tdescreensaver/kdesavers/slideshow.cpp
+++ b/tdescreensaver/kdesavers/slideshow.cpp
@@ -53,16 +53,16 @@ static const char description[] = I18N_NOOP("KSlideshow");
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kslideshow.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "KSlideshow" );
- KDE_EXPORT const char *kss_version = SLIDESHOW_VERSION;
+ TDE_EXPORT const char *kss_applicationName = "kslideshow.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "KSlideshow" );
+ TDE_EXPORT const char *kss_version = SLIDESHOW_VERSION;
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new kSlideShowSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new kSlideShowSetup();
}
@@ -92,7 +92,7 @@ kSlideShowSaver::kSlideShowSaver( WId id ): KScreenSaver(id)
mEffectRunning = false;
mTimer.start(10, true);
- connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+ connect(&mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
TQDesktopWidget *d = TQApplication::desktop();
if( geometry() == d->geometry() && d->numScreens() > 1)
@@ -285,7 +285,7 @@ int kSlideShowSaver::effectSpiralIn(bool aInit)
my0 += miy;
}
- bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my, mix, miy, CopyROP, true);
+ bitBlt(this, mx, my, &mNextScreen, mx, my, mix, miy, CopyROP, true);
mx += mdx;
my += mdy;
@@ -321,8 +321,8 @@ int kSlideShowSaver::effectMeltdown(bool aInit)
if (y >= mh) continue;
done = false;
if ((TDEApplication::random()&15) < 6) continue;
- bitBlt(TQT_TQPAINTDEVICE(this), x, y+mdy, TQT_TQPAINTDEVICE(this), x, y, mdx, mh-y-mdy, CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, mdx, mdy, CopyROP, true);
+ bitBlt(this, x, y+mdy, this, x, y, mdx, mh-y-mdy, CopyROP, true);
+ bitBlt(this, x, y, &mNextScreen, x, y, mdx, mdy, CopyROP, true);
mIntArray[i] += mdy;
}
@@ -407,7 +407,7 @@ int kSlideShowSaver::effectSweep(bool aInit)
}
for (w=2,i=4,x=mx; i>0; i--, w<<=1, x-=mdx)
{
- bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, w, mh, CopyROP, true);
+ bitBlt(this, x, 0, &mNextScreen, x, 0, w, mh, CopyROP, true);
}
mx += mdx;
}
@@ -421,7 +421,7 @@ int kSlideShowSaver::effectSweep(bool aInit)
}
for (h=2,i=4,y=my; i>0; i--, h<<=1, y-=mdy)
{
- bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, h, CopyROP, true);
+ bitBlt(this, 0, y, &mNextScreen, 0, y, mw, h, CopyROP, true);
}
my += mdy;
}
@@ -477,7 +477,7 @@ int kSlideShowSaver::effectRandom(bool /*aInit*/)
{
x = (TDEApplication::random() % w) << fact;
y = (TDEApplication::random() % h) << fact;
- bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, sz, sz, CopyROP, true);
+ bitBlt(this, x, y, &mNextScreen, x, y, sz, sz, CopyROP, true);
}
showNextScreen();
@@ -509,7 +509,7 @@ int kSlideShowSaver::effectGrowing(bool aInit)
return -1;
}
- bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my,
+ bitBlt(this, mx, my, &mNextScreen, mx, my,
mw - (mx<<1), mh - (my<<1), CopyROP, true);
return 20;
@@ -548,9 +548,9 @@ int kSlideShowSaver::effectChessboard(bool aInit)
for (y=0; y<mw; y+=(mdy<<1))
{
- bitBlt(TQT_TQPAINTDEVICE(this), mix, y+miy, TQT_TQPAINTDEVICE(&mNextScreen), mix, y+miy,
+ bitBlt(this, mix, y+miy, &mNextScreen, mix, y+miy,
mdx, mdy, CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(this), mx, y+my, TQT_TQPAINTDEVICE(&mNextScreen), mx, y+my,
+ bitBlt(this, mx, y+my, &mNextScreen, mx, y+my,
mdx, mdy, CopyROP, true);
}
@@ -591,18 +591,18 @@ int kSlideShowSaver::effectIncomingEdges(bool aInit)
if (mSubType)
{
// moving image edges
- bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy-my, mx, my, CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(this), x1, 0, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy-my, mx, my, CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(this), 0, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy, mx, my, CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy, mx, my, CopyROP, true);
+ bitBlt(this, 0, 0, &mNextScreen, mix-mx, miy-my, mx, my, CopyROP, true);
+ bitBlt(this, x1, 0, &mNextScreen, mix, miy-my, mx, my, CopyROP, true);
+ bitBlt(this, 0, y1, &mNextScreen, mix-mx, miy, mx, my, CopyROP, true);
+ bitBlt(this, x1, y1, &mNextScreen, mix, miy, mx, my, CopyROP, true);
}
else
{
// fixed image edges
- bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), 0, 0, mx, my, CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(this), x1, 0, TQT_TQPAINTDEVICE(&mNextScreen), x1, 0, mx, my, CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(this), 0, y1, TQT_TQPAINTDEVICE(&mNextScreen), 0, y1, mx, my, CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), x1, y1, mx, my, CopyROP, true);
+ bitBlt(this, 0, 0, &mNextScreen, 0, 0, mx, my, CopyROP, true);
+ bitBlt(this, x1, 0, &mNextScreen, x1, 0, mx, my, CopyROP, true);
+ bitBlt(this, 0, y1, &mNextScreen, 0, y1, mx, my, CopyROP, true);
+ bitBlt(this, x1, y1, &mNextScreen, x1, y1, mx, my, CopyROP, true);
}
return 20;
}
@@ -625,7 +625,7 @@ int kSlideShowSaver::effectHorizLines(bool aInit)
for (y=iyPos[mi]; y<mh; y+=8)
{
- bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, 1, CopyROP, true);
+ bitBlt(this, 0, y, &mNextScreen, 0, y, mw, 1, CopyROP, true);
}
mi++;
@@ -651,7 +651,7 @@ int kSlideShowSaver::effectVertLines(bool aInit)
for (x=ixPos[mi]; x<mw; x+=8)
{
- bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, 1, mh, CopyROP, true);
+ bitBlt(this, x, 0, &mNextScreen, x, 0, 1, mh, CopyROP, true);
}
mi++;
@@ -716,7 +716,7 @@ void kSlideShowSaver::slotTimeout()
//----------------------------------------------------------------------------
void kSlideShowSaver::showNextScreen()
{
- bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), 0, 0,
+ bitBlt(this, 0, 0, &mNextScreen, 0, 0,
mNextScreen.width(), mNextScreen.height(), CopyROP, true);
}
@@ -798,7 +798,7 @@ void kSlideShowSaver::createNextScreen()
y = ((wh - ih) >> 1) + geoptr->mYorg;
}
- // bitBlt(TQT_TQPAINTDEVICE(&mNextScreen), x, y, TQT_TQPAINTDEVICE(&mImage), 0, 0, iw, ih, CopyROP, false);
+ // bitBlt(&mNextScreen, x, y, &mImage, 0, 0, iw, ih, CopyROP, false);
p.drawImage(x, y, mImage);
}
}
@@ -939,10 +939,10 @@ kSlideShowSetup::kSlideShowSetup(TQWidget *aParent, const char *aName)
mSaver = new kSlideShowSaver(cfg->mPreview->winId());
cfg->mDirChooser->setMode(KFile::Directory | KFile::ExistingOnly);
- connect(cfg->mDirChooser, TQT_SIGNAL(returnPressed(const TQString &)),
- TQT_SLOT(slotDirSelected(const TQString &)));
- connect(cfg->mDirChooser, TQT_SIGNAL(urlSelected(const TQString &)),
- TQT_SLOT(slotDirSelected(const TQString &)));
+ connect(cfg->mDirChooser, TQ_SIGNAL(returnPressed(const TQString &)),
+ TQ_SLOT(slotDirSelected(const TQString &)));
+ connect(cfg->mDirChooser, TQ_SIGNAL(urlSelected(const TQString &)),
+ TQ_SLOT(slotDirSelected(const TQString &)));
readSettings();
}
diff --git a/tdescreensaver/kdesavers/slideshow.h b/tdescreensaver/kdesavers/slideshow.h
index 6d20315b..ee76cbfb 100644
--- a/tdescreensaver/kdesavers/slideshow.h
+++ b/tdescreensaver/kdesavers/slideshow.h
@@ -24,7 +24,7 @@ class SlideShowCfg;
//-----------------------------------------------------------------------------
class kSlideShowSaver: public KScreenSaver
{
- Q_OBJECT
+ TQ_OBJECT
public:
kSlideShowSaver( WId id );
@@ -128,7 +128,7 @@ protected:
//-----------------------------------------------------------------------------
class kSlideShowSetup : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
kSlideShowSetup(TQWidget *parent=NULL, const char *name=NULL);
diff --git a/tdescreensaver/kdesavers/sspreviewarea.h b/tdescreensaver/kdesavers/sspreviewarea.h
index 0db07cb9..339d54d5 100644
--- a/tdescreensaver/kdesavers/sspreviewarea.h
+++ b/tdescreensaver/kdesavers/sspreviewarea.h
@@ -27,7 +27,7 @@
* really resizes the GL scenery. */
class SsPreviewArea : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/AASaverConfig.kcfgc b/tdescreensaver/kdesavers/tdeasciiquarium/AASaverConfig.kcfgc
new file mode 100644
index 00000000..f709650b
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/AASaverConfig.kcfgc
@@ -0,0 +1,4 @@
+File=asciiquarium.kcfg
+ClassName=AASaverConfig
+Singleton=true
+Mutators=true
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/CMakeLists.txt b/tdescreensaver/kdesavers/tdeasciiquarium/CMakeLists.txt
new file mode 100644
index 00000000..701b26e1
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/CMakeLists.txt
@@ -0,0 +1,42 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### tdeasciiquarium (executable)
+
+tde_add_executable( tdeasciiquarium.kss AUTOMOC
+
+ SOURCES
+ aasaver.cpp
+ screen.cpp
+ frame.cpp
+ sprite.cpp
+ AASaverConfig.kcfgc
+ settingswidget.ui
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdescreensaver-shared
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+set_source_files_properties( aasaver.cpp PROPERTIES COMPILE_FLAGS -Wno-trigraphs )
+
+
+##### other data
+
+tde_create_translated_desktop(
+ SOURCE tdeasciiquarium.desktop
+ DESTINATION ${APPS_INSTALL_DIR}/System/ScreenSavers
+ PO_DIR tdescreensaver-desktops
+)
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/COPYRIGHT b/tdescreensaver/kdesavers/tdeasciiquarium/COPYRIGHT
new file mode 100644
index 00000000..295d84d2
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/COPYRIGHT
@@ -0,0 +1,26 @@
+/*
+ * Asciiquarium - Native KDE Screensaver based on the Asciiquarium program
+ * (c) Kirk Baucom <kbaucom@schizoid.com>, which you can find at
+ * http://www.robobunny.com/projects/asciiquarium/
+ *
+ * Ported to KDE by Maksim Orlovich <maksim@kde.org> and
+ * Michael Pyne <michael.pyne@kdemail.net>.
+ *
+ * Copyright (c) 2003 Kirk Baucom <kbaucom@schizoid.com>
+ * Copyright (c) 2005 Maksim Orlovich <maksim@kde.org>
+ * Copyright (c) 2005 Michael Pyne <michael.pyne@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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/Doxyfile b/tdescreensaver/kdesavers/tdeasciiquarium/Doxyfile
new file mode 100644
index 00000000..9588f8b2
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/Doxyfile
@@ -0,0 +1,1218 @@
+# Doxyfile 1.4.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME = Asciiquarium
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER = 0.3.2
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = doc
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE = English
+
+# This tag can be used to specify the encoding used in the generated output.
+# The encoding is not always determined by the language that is chosen,
+# but also whether or not the output is meant for Windows or non-Windows users.
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+# forces the Windows encoding (this is the default for the Windows binary),
+# whereas setting the tag to NO uses a Unix-style encoding (the default for
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like the Qt-style comments (thus requiring an
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member
+# documentation.
+
+DETAILS_AT_TOP = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+# only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation.
+
+SHOW_DIRECTORIES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from the
+# version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the progam writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT =
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+
+FILE_PATTERNS =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+
+EXCLUDE_PATTERNS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output. If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = YES
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET = doxygen-stylesheet.css
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW = YES
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = YES
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = letter
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader. This is useful
+# if you want to understand what is going on. On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = YES
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
+# generate a call dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS =
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_WIDTH = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that a graph may be further truncated if the graph's
+# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH
+# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default),
+# the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, which results in a white background.
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+
+DOT_TRANSPARENT = YES
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE = NO
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/README b/tdescreensaver/kdesavers/tdeasciiquarium/README
new file mode 100644
index 00000000..266dd5f9
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/README
@@ -0,0 +1 @@
+TDEAsciiquarium gets registered as Miscellaneous from the Trinity Control Center - Screen Saver option
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp b/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp
new file mode 100644
index 00000000..fa3862d5
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp
@@ -0,0 +1,1220 @@
+//Stub stolen from:
+// klines 0.1.1 - Basic screen saver for KDE
+// by Dirk Staneker 1997
+
+#include <kdebug.h>
+#include <tdelocale.h>
+#include <tdeconfigdialog.h>
+
+#include <tqdesktopwidget.h>
+#include <tqpainter.h>
+#include <tqbrush.h>
+
+#include "screen.h"
+#include "frame.h"
+#include "sprite.h"
+#include "aasaver.h"
+
+#include "AASaverConfig.h"
+#include "settingswidget.h"
+
+#define ARRAY_SIZE(arr) sizeof(arr)/sizeof(arr[0])
+
+AASaver::AASaver( WId id ): KScreenSaver(id)
+{
+ screen = new Screen(this);
+ addEnvironment();
+ addCastle();
+ addAllSeaweed();
+ addAllFish();
+ addRandom(screen);
+
+ setBackgroundMode(NoBackground);
+ setWFlags(WNoAutoErase);
+ update(rect());
+}
+
+
+TQString AASaver::randColor(TQString color_mask)
+{
+ char colors[] = {'c','C','r','R','y','Y','b','B','g','G','m','M'};
+ for (int i = 1; i <= 9; ++i)
+ {
+ char color = colors[intRand(ARRAY_SIZE(colors))];
+ color_mask.replace('0' + i, color);
+ }
+ return color_mask;
+}
+
+void AASaver::addCastle()
+{
+ TQString castle_image =
+ " T~~\n"
+ " |\n"
+ " /^\\\n"
+ " / \\\n"
+ " _ _ _ / \\ _ _ _\n"
+ "[ ]_[ ]_[ ]/ _ _ \\[ ]_[ ]_[ ]\n"
+ "|_=__-_ =_|_[ ]_[ ]_|_=-___-__|\n"
+ " | _- = | =_ = _ |= _= |\n"
+ " |= -[] |- = _ = |_-=_[] |\n"
+ " | =_ |= - ___ | =_ = |\n"
+ " |= []- |- /| |\\ |=_ =[] |\n"
+ " |- =_ | =| | | | |- = - |\n"
+ " |_______|__|_|_|_|__|_______|\n";
+
+
+ TQString castle_mask =
+ " RR\n"
+ "\n"
+ " yyy\n"
+ " y y\n"
+ " y y\n"
+ " y y\n"
+ "\n"
+ "\n"
+ "\n"
+ " yyy\n"
+ " yy yy\n"
+ " y y y y\n"
+ " yyyyyyy\n";
+
+ Frame f(castle_image, castle_mask, 0x686868/* XXX: why grey? */ );
+
+ Sprite* castle = new Sprite(screen,
+ screen->width() - 32, screen->height() - 13, 22);
+ castle->addFrame(f);
+ screen->addSprite(castle);
+}
+
+void AASaver::addEnvironment()
+{
+ TQString water_line_segment[] = {
+ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
+ "^^^^ ^^^ ^^^ ^^^ ^^^^ ",
+ "^^^^ ^^^^ ^^^ ^^ ",
+ "^^ ^^^^ ^^^ ^^^^^^ "
+ };
+
+ // tile the segments so they stretch across the screen
+ int segment_size = water_line_segment[0].length();
+ int segment_repeat = int(screen->width()/segment_size) + 1;
+
+ for (unsigned i = 0; i < ARRAY_SIZE(water_line_segment); ++i) {
+ //do the tiling
+ TQString out;
+ for (int r = 0; r < segment_repeat; ++r)
+ out += water_line_segment[i];
+
+ //create a sprite.
+ Sprite* s = new Sprite(screen, 0, i + 5, 22);
+ s->addFrame(Frame(out, TQString::null, 0x149494));
+ screen->addSprite(s);
+ }
+}
+
+void AASaver::addAllSeaweed()
+{
+ // figure out how many seaweed to add by the width of the screen
+ int seaweed_count = int(screen->width() / 15.0);
+ for (int i = 1; i <= seaweed_count; ++i)
+ addSeaweed(screen);
+}
+
+/**
+ * Special class to represent seaweed. Seaweed can disappear over time, and
+ * when this happens, this class will automatically spawn another one.
+ */
+class Seaweed: public Sprite
+{
+ int m_ticks; ///< Number of animation ticks elapsed.
+ int m_lifeTimeMS; ///< Life time of seaweed in milliseconds.
+
+public:
+ /**
+ * Constructor. The \p x, \p y, and \p z coordinates are all in logical
+ * coordinates.
+ *
+ * @param s The Screen to be created in.
+ * @param x The x coordinate to place the seaweed at.
+ * @param y The y coordinate to place the seaweed at.
+ * @param life The length of time in milliseconds the seaweed will live for.
+ */
+ Seaweed(Screen* s, int x, int y, int life): Sprite(s, x, y, 21),
+ m_ticks(0), m_lifeTimeMS(life)
+ {
+ }
+
+ /**
+ * Reimplemented from Sprite::tickUpdate() to handle keeping track of
+ * Seaweed lifetime. Calls the inherited tickUpdate() as well.
+ */
+ virtual bool tickUpdate()
+ {
+ ++m_ticks;
+ if (m_ticks * m_screen->msPerTick() > m_lifeTimeMS)
+ {
+ kill();
+ AASaver::addSeaweed(m_screen);
+ }
+
+ return Sprite::tickUpdate();
+ }
+};
+
+void AASaver::addSeaweed(Screen* screen)
+{
+ TQString seaweed_image[] = {"", ""};
+ int height = intRand(5) + 3;
+ for (int i = 1; i <= height; ++i)
+ {
+ int left_side = i % 2;
+ int right_side = !left_side;
+ seaweed_image[left_side] += "(\n";
+ seaweed_image[right_side] += " )\n";
+ }
+
+ int x = intRand(screen->width() - 2) + 1;
+ int y = screen->height() - height;
+
+ Seaweed* s = new Seaweed(screen, x, y,
+ intRand(4*60000) + (8*60000)); // seaweed lives for 8 to 12 minutes
+ s->addFrame(Frame(seaweed_image[0], TQString::null, 0x18AF18));
+ s->addFrame(Frame(seaweed_image[1], TQString::null, 0x18AF18));
+ s->setFrameDelay(intRand(50) + 250);
+ screen->addSprite(s);
+}
+
+/**
+ * Class to represent an AirBubble. The bubble will automatically float up,
+ * even though it is not descended from MovingSprite.
+ */
+class AirBubble : public Sprite
+{
+ const int m_startY; ///< Y coordinate we started at, needed to choose a frame.
+
+public:
+ /**
+ * Constructor. The \p x, \p y, and \p z coordinates are all in logical
+ * coordinates.
+ *
+ * @param screen The Screen to be created in.
+ * @param x The x coordinate to start at.
+ * @param y The y coordinate to start at.
+ * @param z The depth to start at.
+ */
+ AirBubble(Screen *screen, int x, int y, int z) :
+ Sprite(screen, x, y, z), m_startY(y)
+ {
+ addFrame(Frame(".", TQString(), 0x18B2B2));
+ addFrame(Frame("o", TQString(), 0x18B2B2));
+ addFrame(Frame("O", TQString(), 0x18B2B2));
+
+ setFrameDelay(100);
+ }
+
+ /**
+ * Reimplemented from Sprite::tickUpdate() to handle moving the sprite and
+ * updating the current frame. The inherited tickUpdate() is not called.
+ */
+ virtual bool tickUpdate()
+ {
+ if (!timerTick())
+ return false;
+
+ erase();
+
+ m_currentFrame = 0;
+ if(m_startY - m_y > 5)
+ m_currentFrame = 1;
+ if(m_startY - m_y > 11)
+ m_currentFrame = 2;
+
+ m_y--;
+ if(m_y < 9)
+ kill();
+
+ return true;
+ }
+};
+
+/**
+ * Moving sprite, will be killed when it moves off of the screen.
+ */
+class MovingSprite: public Sprite
+{
+protected:
+ int m_direct; ///< Direction to move in, -1 == left, 1 == right.
+ double m_speed; ///< Speed to move at (Currently m_speed per tick).
+ double m_realX; ///< Used for accuracy, holds fractional x position.
+ int m_ticksSinceLastChange; ///< Number of timer ticks since last frame change.
+ int m_frameTime; ///< Amount of time in milliseconds to show each frame.
+
+public:
+ /**
+ * Constructor. The \p x, \p y, and \p z coordinates are all in logical
+ * coordinates.
+ *
+ * @param screen The Screen to be created in.
+ * @param direct The direction to move the sprite in along the X axis, either
+ * -1 for the left direction, or 1 for the right direction.
+ * @param speed The speed to move the sprite in along the X axis, in
+ * character cells per tick. Use Screen::msPerTick() to find
+ * out how long a tick takes. The speed can be fractional
+ * (e.g. 1.5 cells per tick).
+ * @param x The x coordinate to start at.
+ * @param y The y coordinate to start at.
+ * @param z The depth to start at.
+ */
+ MovingSprite(Screen* screen, int direct, double speed, int x, int y, int z):
+ Sprite(screen, x, y, z), m_direct(direct), m_speed(speed), m_realX(x),
+ m_ticksSinceLastChange(0), m_frameTime(250)
+ {
+ }
+
+ /**
+ * Sets the amount of time a frame is shown. Use this function for
+ * MovingSprites that are also animated.
+ *
+ * @param milliseconds Amount of time to show a frame for in milliseconds.
+ */
+ void setFrameTime(int milliseconds)
+ {
+ m_frameTime = milliseconds;
+ }
+
+ /// Returns the amount of time a frame lasts in milliseconds.
+ int frameTime() const { return m_frameTime; }
+
+ /// Returns the direction the sprite travels in.
+ int direction() const
+ {
+ return m_direct;
+ }
+
+ /// Returns the fractional speed of the sprite.
+ double realSpeed() const
+ {
+ return m_speed;
+ }
+
+ /// Returns the real (fractional) X position of the sprite.
+ double realX() const
+ {
+ return m_realX;
+ }
+
+ /**
+ * Reimplemented from Sprite::tickUpdate() to handle motion and frame
+ * animation. This function will automatically kill() this sprite when
+ * it moves off screen. The inherited tickUpdate() is not called.
+ */
+ virtual bool tickUpdate()
+ {
+ if (!timerTick())
+ return false;
+
+ erase();
+ m_realX += (m_direct * m_speed);
+ m_x = (int) m_realX;
+
+ ++m_ticksSinceLastChange;
+ if(m_ticksSinceLastChange * m_screen->msPerTick() > m_frameTime)
+ {
+ m_ticksSinceLastChange = 0;
+
+ ++m_currentFrame;
+ if(m_currentFrame == m_frames.size())
+ m_currentFrame = 0;
+ }
+
+ if((m_x + m_frames[m_currentFrame].width() < 0) || (m_x > m_screen->width()))
+ kill();
+
+ return true;
+ }
+};
+
+/**
+ * Will spawn a random sprite when killed, otherwise behaves just like
+ * MovingSprite.
+ */
+class RandomMovingSprite : public MovingSprite
+{
+public:
+ RandomMovingSprite(Screen *screen, int direct, double speed, int x, int y, int z):
+ MovingSprite(screen, direct, speed, x, y, z)
+ {
+ }
+
+ /// Spawns another RandomMovingSprite before dying.
+ virtual void kill()
+ {
+ MovingSprite::kill();
+ AASaver::addRandom(m_screen);
+ }
+};
+
+/**
+ * Special subclass that represents a fish. Used so TeethSprite knows when it
+ * has caused a collision, and also to handle air bubble generation.
+ */
+class FishSprite : public MovingSprite
+{
+ double m_spacesPerBubble; ///< Amount of spaces a fish moves for each bubble.
+ double m_lastBubbleRelease; ///< Amount of space traveled since the last bubble.
+
+public:
+ FishSprite(Screen* screen, int direct, double speed, int x, int y, int z):
+ MovingSprite(screen, direct, speed, x, y, z), m_lastBubbleRelease(x)
+ {
+ m_spacesPerBubble = AASaver::doubleRand(screen->width()) + 12.0;
+ }
+
+ /// Spawns another fish before dying.
+ virtual void kill()
+ {
+ MovingSprite::kill();
+ AASaver::addFish(m_screen);
+ }
+
+ /**
+ * Reimplemented from MovingSprite::tickUpdate() to handle creating air
+ * bubbles. Inherited tickUpdate() is still called.
+ */
+ virtual bool tickUpdate()
+ {
+ if(!MovingSprite::tickUpdate())
+ return false;
+
+ if(isKilled())
+ return true;
+
+ if(TQABS(realX() - m_lastBubbleRelease) >= m_spacesPerBubble)
+ {
+ m_lastBubbleRelease = realX();
+
+ int bubbleX = m_x;
+ TQRect geometry = geom();
+
+ if(m_direct > 0) // Moving right
+ bubbleX += geometry.width();
+
+ AASaver::addBubble(m_screen, bubbleX, m_y + geometry.height() / 2 - 1, m_z - 1);
+ }
+
+ return true;
+ }
+};
+
+void AASaver::addAllFish()
+{
+ // Determine how many logical pixels we are dealing with, and find out how
+ // many we'd be dealing with in full screen, and then scale the user's
+ // number down to adjust so that we look about the same in a window as we
+ // do fullscreen. TODO: Xinerama issues?
+ TQRect fullScreenGeometry = kapp->desktop()->screenGeometry();
+
+ int full_width = fullScreenGeometry.width() / screen->cellWidth();
+ int full_height = fullScreenGeometry.height() / screen->cellHeight() - 9;
+ int full_size = full_width * full_height;
+ int screen_size = (screen->height() - 9) * screen->width();
+
+ int fish_count = AASaverConfig::fishCount() * screen_size / full_size;
+ if(fish_count < 5)
+ fish_count = 5;
+
+ for (int i = 1; i <= fish_count; ++ i)
+ addFish(screen);
+}
+
+Sprite *AASaver::newFish(Screen *screen)
+{
+ TQString fish_image[] = {
+" \\\n"
+" ...\\..,\n"
+"\\" "??" "/' \\\n" // trigraphs suck
+" >= ( ' >\n"
+"/??\\ / /\n"
+" `\"'\"'/''\n",
+
+" 2\n"
+" 1112111\n"
+"6 11 1\n"
+" 66 7 4 5\n"
+"6 1 3 1\n"
+" 11111311\n",
+
+//////////////////////////////
+" /\n"
+" ,../...\n"
+" / '\\" "??" "/\n" // trigraphs suck
+"< ' ) =<\n"
+" \\ \\ /??\\\n"
+" `'\\'\"'\"'\n",
+
+" 2\n"
+" 1112111\n"
+" 1 11 6\n"
+"5 4 7 66\n"
+" 1 3 1 6\n"
+" 11311111\n",
+//////////////////////////////
+" \\\n"
+"\\?/--\\\n"
+">= (o>\n"
+"/?\\__/\n"
+" /\n",
+
+" 2\n"
+"6 1111\n"
+"66 745\n"
+"6 1111\n"
+" 3\n",
+
+//////////////////////////////
+" /\n"
+" /--\\?/\n"
+"<o) =<\n"
+" \\__/?\\\n"
+" \\\n",
+
+" 2\n"
+" 1111 6\n"
+"547 66\n"
+" 1111 6\n"
+" 3\n",
+
+//////////////////////////////
+" \\:.\n"
+"\\;,???,;\\\\\\\\\\,,\n"
+" \\\\\\\\\\;;:::::o\n"
+" ///;;::::::::<\n"
+" /;`?``/////``\n",
+
+" 222\n"
+"666 1122211\n"
+" 6661111111114\n"
+" 66611111111115\n"
+" 666 113333311\n",
+
+//////////////////////////////
+" .:/\n"
+" ,,///;,???,;/\n"
+" o:::::::;;///\n"
+">::::::::;;\\\\\\\n"
+" ''\\\\\\\\\\''?';\\\n",
+
+" 222\n"
+" 1122211 666\n"
+" 4111111111666\n"
+"51111111111666\n"
+" 113333311 666\n",
+
+//////////////////////////////
+" __\n"
+"><_'>\n"
+" '\n",
+
+" 11\n"
+"61145\n"
+" 3\n",
+
+//////////////////////////////
+" __\n"
+"<'_><\n"
+" `\n",
+
+" 11\n"
+"54116\n"
+" 3\n",
+
+//////////////////////////////
+" ..\\,\n"
+">=' ('>\n"
+" '''/''\n",
+
+" 1121\n"
+"661 745\n"
+" 111311\n",
+
+//////////////////////////////
+" ,/..\n"
+"<') `=<\n"
+" ``\\```\n",
+
+" 1211\n"
+"547 166\n"
+" 113111\n",
+
+//////////////////////////////
+" \\\n"
+" / \\\n"
+">=_('>\n"
+" \\_/\n"
+" /\n",
+
+" 2\n"
+" 1 1\n"
+"661745\n"
+" 111\n"
+" 3\n",
+
+//////////////////////////////
+" /\n"
+" / \\\n"
+"<')_=<\n"
+" \\_/\n"
+" \\\n",
+
+" 2\n"
+" 1 1\n"
+"547166\n"
+" 111\n"
+" 3\n",
+
+//////////////////////////////
+" ,\\\n"
+">=('>\n"
+" '/\n",
+
+" 12\n"
+"66745\n"
+" 13\n",
+
+//////////////////////////////
+" /,\n"
+"<')=<\n"
+" \\`\n",
+
+" 21\n"
+"54766\n"
+" 31\n",
+
+//////////////////////////////
+" __\n"
+"\\/ o\\\n"
+"/\\__/\n",
+
+" 11\n"
+"61 41\n"
+"61111\n",
+
+//////////////////////////////
+" __\n"
+"/o \\/\n"
+"\\__/\\\n",
+
+" 11\n"
+"14 16\n"
+"11116\n"
+};
+
+ // # 1: body
+ // # 2: dorsal fin
+ // # 3: flippers
+ // # 4: eye
+ // # 5: mouth
+ // # 6: tailfin
+ // # 7: gills*
+ int fish_num = intRand(ARRAY_SIZE(fish_image)/2);
+ int fish_index = fish_num * 2;
+
+ double speed = doubleRand(2) + 0.25;
+ int depth = 3 + intRand(18);
+
+ TQString color_mask = fish_image[fish_index+1];
+ color_mask.replace('4', 'W');
+
+ color_mask = randColor(color_mask);
+
+ Frame fishFrame(fish_image[fish_index], color_mask, 0);
+ int max_height = 9;
+ int min_height = screen->height() - fishFrame.height();
+
+ int x, y, dir;
+ y = max_height + intRand(min_height - max_height);
+ if (fish_num % 2)
+ {
+ x = screen->width() - 2;
+ dir = -1;
+ }
+ else
+ {
+ x = 1 - fishFrame.width();
+ dir = 1;
+ }
+
+ Sprite* fish = new FishSprite(screen, dir, speed, x, y, depth);
+ fish->addFrame(fishFrame);
+
+ return fish;
+}
+
+void AASaver::addFish(Screen* screen)
+{
+ screen->addSprite(newFish(screen));
+}
+
+/**
+ * Sprite that represents a blood "splat" in the water.
+ */
+class Splat : public Sprite
+{
+public:
+ /**
+ * Constructor.
+ *
+ * @param screen The Screen to create the splat in.
+ * @param center The point to center the splat around.
+ * @param depth The depth to create the splat at.
+ */
+ Splat(Screen *screen, TQPoint center, int depth) :
+ Sprite(screen, 0, 0, depth, 450 /* frame Delay */)
+ {
+ TQString splats[] = {
+"\n"
+" .\n"
+" ***\n"
+" '\n"
+""
+,
+
+"\n"
+" \",*;`\n"
+" \"*,**\n"
+" *\"'~'\n"
+""
+,
+" , ,\n"
+" \" \",\"'\n"
+" *\" *'\"\n"
+" \" ; .\n"
+""
+,
+"* ' , ' `\n"
+"' ` * . '\n"
+" ' `' \",'\n"
+"* ' \" * .\n"
+"\" * ', '"
+ };
+
+ for(unsigned i = 0; i < ARRAY_SIZE(splats); ++i)
+ addFrame(Frame(splats[i], TQString(), 0xB21818, ' '));
+
+ TQRect r(center, TQSize(9, 5));
+ r.moveCenter(center);
+ m_x = r.x();
+ m_y = r.y();
+
+ setDieAfterLastFrame(true);
+ }
+};
+
+/**
+ * Invisible sprite which are created on a shark's teeth, to handle collisions
+ * with fish, creating splats and kill()'ing the fish.
+ */
+class TeethSprite : public MovingSprite
+{
+public:
+ /**
+ * Constructor. Copied parameters as appropriate from \p shark.
+ *
+ * @param shark The shark to create the teeth over.
+ */
+ TeethSprite(MovingSprite *shark) : MovingSprite(shark->screen(), shark->direction(),
+ shark->realSpeed(), 2 + shark->geom().left(), shark->geom().top(), shark->depth())
+ {
+ m_y += 7;
+ m_z -= 1;
+ m_realX = 2 + shark->realX();
+
+ if(m_direct > 0) // Moving to right.
+ m_realX = -10;
+
+ addFrame(Frame("????????", TQString(), 0));
+ }
+
+ /// Returns true since we can collide.
+ bool canCollide() const { return true; }
+
+ /**
+ * Reimplemented in order to handle collisions. When colliding with a
+ * FishSprite, the fish is kill()'ed and a splat is created in its place.
+ * Otherwise, nothing is done.
+ *
+ * @param sprite The Sprite we collided with.
+ */
+ void collision(Sprite *sprite)
+ {
+ if(dynamic_cast<FishSprite *>(sprite)) {
+ kdDebug() << "A fish just got killinated!\n";
+
+ sprite->erase();
+ sprite->kill();
+
+ screen()->addSprite(new Splat(screen(), sprite->geom().center(), depth() - 1));
+ }
+ }
+};
+
+void AASaver::addShark(Screen* screen)
+{
+ TQString shark_image[] = {
+" __\n"
+" ( `\\\n"
+" ,??????????????????????????" ") `\\\n" // trigraphs suck
+";' `.????????????????????????" "( `\\__\n" // trigraphs suck
+" ; `.?????????????__..---'' `~~~~-._\n"
+" `. `.____...--'' (b `--._\n"
+" > _.-' .(( ._ )\n"
+" .`.-`--...__ .-' -.___.....-(|/|/|/|/'\n"
+" ;.'?????????`. ...----`.___.',,,_______......---'\n"
+" '???????????" "'-'\n", // trigraphs suck
+
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" cR \n"
+" \n"
+" cWWWWWWWW \n"
+" \n"
+" \n",
+
+" __\n"
+" /' )\n"
+" /' (??????????????????????????,\n"
+" __/' )????????????????????????.' `;\n"
+" _.-~~~~' ``---..__?????????????.' ;\n"
+" _.--' b) ``--...____.' .'\n"
+"( _. )). `-._ <\n"
+" `\\|\\|\\|\\|)-.....___.- `-. __...--'-.'.\n"
+" `---......_______,,,`.___.'----... .'?????????`.;\n"
+" `-`???????????`\n",
+
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Rc \n"
+" \n"
+" WWWWWWWWc \n"
+" \n"
+" \n"
+ };
+
+ int shark_num = intRand(ARRAY_SIZE(shark_image)/2);
+ int shark_index = shark_num * 2;
+ TQString color_mask = randColor(shark_image[shark_index+1]);
+ Frame sharkFrame(shark_image[shark_index], color_mask, 0x18B2B2);
+
+ int x = -53;
+ int y = 9 + intRand(screen->height() - (10 + 9));
+ int dir = (shark_num % 2) ? -1 : 1;
+
+ if(dir < 0)
+ x = screen->width() - 2;
+
+ RandomMovingSprite* shark = new RandomMovingSprite(screen, dir, 2, x, y, 2 /* Always at 2 */);
+ shark->addFrame(sharkFrame);
+ screen->addSprite(shark);
+
+ TeethSprite *teeth = new TeethSprite(shark);
+ screen->addSprite(teeth);
+}
+
+void AASaver::addBubble(Screen *screen, int x, int y, int z)
+{
+ screen->addSprite(new AirBubble(screen, x, y, z));
+}
+
+void AASaver::addShip(Screen* screen)
+{
+ TQString ship_image[] = {
+" | | |\n"
+" )_) )_) )_)\n"
+" )___))___))___)\\\n"
+" )____)____)_____)\\\\\n"
+"_____|____|____|____\\\\\\__\n"
+"\\ /",
+
+" y y y\n"
+" \n"
+" w\n"
+" ww\n"
+"yyyyyyyyyyyyyyyyyyyywwwyy\n"
+"y y",
+
+" | | |\n"
+" (_( (_( (_(\n"
+" /(___((___((___(\n"
+" //(_____(____(____(\n"
+"__///____|____|____|_____\n"
+" \\ /",
+
+" y y y\n"
+" \n"
+" w \n"
+" ww \n"
+"yywwwyyyyyyyyyyyyyyyyyyyy\n"
+" y y"
+ };
+
+ int ship_num = intRand(17) % 2; // right == 0, left == 1
+ int x = -24, dir = 1;
+
+ if(ship_num == 1) {
+ x = screen->width() - 2;
+ dir = -1;
+ }
+
+ RandomMovingSprite *ship = new RandomMovingSprite(screen, dir, 1.0, x, 0, 2);
+ ship->addFrame(Frame(ship_image[2 * ship_num], ship_image[2 * ship_num + 1], 0xFFFFFF));
+ screen->addSprite(ship);
+}
+
+void AASaver::addWhale(Screen* screen)
+{
+ TQString whale_image[] = {
+" .-----:\n"
+" .' `.\n"
+",????/ (o) \\\n"
+"\\`._/ ,__)",
+
+" C C\n"
+" CCCCCCC\n"
+" C C C\n"
+" BBBBBBB\n"
+" BB BB\n"
+"B B BWB B\n"
+"BBBBB BBBB",
+
+" :-----.\n"
+" .' `.\n"
+" / (o) \\????,\n"
+"(__, \\_.'/",
+
+" C C\n"
+" CCCCCCC\n"
+" C C C\n"
+" BBBBBBB\n"
+" BB BB\n"
+" B BWB B B\n"
+"BBBB BBBBB"
+ };
+
+ TQString spouty[] = {
+"\n"
+"\n"
+" :",
+
+"\n"
+" :\n"
+" :",
+
+" . .\n"
+" -:-\n"
+" :",
+
+" . .\n"
+" .-:-.\n"
+" :",
+
+" . .\n"
+"'.-:-.`\n"
+"' : '",
+
+"\n"
+" .- -.\n"
+"; : ;",
+
+"\n"
+"\n"
+"; ;"
+ };
+
+ int whale_num = intRand(2); // 0 = right, 1 = left
+ int x = -18, spout_align = 11, dir = 1;
+
+ if (whale_num == 1)
+ {
+ x = screen->width() - 2;
+ spout_align = 1; // Waterspout closer to left side now.
+ dir = -1;
+ }
+
+ TQString mask = whale_image[2 * whale_num + 1];
+
+ RandomMovingSprite *whale = new RandomMovingSprite(screen, dir, 1.0, x, 0, 2);
+ whale->setFrameDelay(80);
+ whale->setFrameTime(40);
+
+ // We have to add some frames now. The first five will have no water spout.
+ TQString blankWhaleFrame = TQString("\n\n\n") + whale_image[2 * whale_num];
+
+ for(unsigned i = 0; i < 5; ++i)
+ whale->addFrame(Frame(blankWhaleFrame, mask, 0xFFFFFF));
+
+ // Now add frames for the animated water spout.
+ TQString whaleFrame = whale_image[2 * whale_num];
+ for (unsigned i = 0; i < ARRAY_SIZE(spouty); ++i)
+ {
+ TQStringList spoutLines = TQStringList::split("\n", spouty[i], true);
+ TQString spout;
+ TQString padding;
+
+ padding.fill(' ', spout_align);
+
+ // Move spout over an appropriate distance to line up right.
+ for(TQStringList::ConstIterator it = spoutLines.begin(); it != spoutLines.end(); ++it)
+ {
+ spout += padding;
+ spout += *it;
+ spout += "\n";
+ }
+
+ // Add spout to whale frame.
+ whale->addFrame(Frame(spout + whaleFrame, mask, 0xFFFFFF));
+ }
+
+ screen->addSprite(whale);
+}
+
+void AASaver::addBigFish(Screen* screen)
+{
+ TQString big_fish_image[] = {
+" ______\n"
+"`\"\"-. `````-----.....__\n"
+" `. . . `-.\n"
+" : . . `.\n"
+" ,?????: . . _ :\n"
+": `.???: (@) `._\n"
+" `. `..' . =`-. .__)\n"
+" ; . = ~ : .-\"\n"
+" .' .'`. . . =.-' `._ .'\n"
+": .'???: . .'\n"
+" '???.' . . . .-'\n"
+" .'____....----''.'=.'\n"
+" \"\"?????????????.'.'\n"
+" ''\"'`",
+
+" 111111\n"
+"11111 11111111111111111\n"
+" 11 2 2 111\n"
+" 1 2 2 11\n"
+" 1 1 2 2 1 1\n"
+"1 11 1 1W1 111\n"
+" 11 1111 2 1111 1111\n"
+" 1 2 1 1 1 111\n"
+" 11 1111 2 2 1111 111 11\n"
+"1 11 1 2 11\n"
+" 1 11 2 2 2 111\n"
+" 111111111111111111111\n"
+" 11 1111\n"
+" 11111",
+
+" ______\n"
+" __.....-----''''' .-\"\"'\n"
+" .-' . . .'\n"
+" .' . . :\n"
+" : _ . . :?????,\n"
+" _.' (@) :???.' :\n"
+"(__. .-'= . `..' .'\n"
+" \"-. : ~ = . ;\n"
+" `. _.' `-.= . . .'`. `.\n"
+" `. . :???`. :\n"
+" `-. . . . `.???`\n"
+" `.=`.``----....____`.\n"
+" `.`.?????????????\"\"\n"
+" '`\"``",
+
+" 111111\n"
+" 11111111111111111 11111\n"
+" 111 2 2 11\n"
+" 11 2 2 1\n"
+" 1 1 2 2 1 1\n"
+" 111 1W1 1 11 1\n"
+"1111 1111 2 1111 11\n"
+" 111 1 1 1 2 1\n"
+" 11 111 1111 2 2 1111 11\n"
+" 11 2 1 11 1\n"
+" 111 2 2 2 11 1\n"
+" 111111111111111111111\n"
+" 1111 11\n"
+" 11111"
+ };
+
+ int big_fish_num = intRand(2); // right = 0, left = 1
+
+ int maxHeight = 9, minHeight = screen->height() - 15;
+ int y = intRand(minHeight - maxHeight) + maxHeight;
+ int x = -34, dir = 1;
+
+ if(big_fish_num == 1)
+ {
+ x = screen->width() - 1;
+ dir = -1;
+ }
+
+ TQString colors = randColor(big_fish_image[2 * big_fish_num + 1]);
+ RandomMovingSprite *bigFish = new RandomMovingSprite(screen, dir, 3.0, x, y, 2);
+ bigFish->addFrame(Frame(big_fish_image[2 * big_fish_num], colors, 0xFFFF54));
+
+ screen->addSprite(bigFish);
+}
+
+void AASaver::addNessie(Screen* screen)
+{
+ TQString nessie_image[] = {
+" ____\n"
+" __??????????????????????????????????????????/ o \\\n"
+" / \\????????_?????????????????????_???????/ ____ >\n"
+" _??????| __ |?????/ \\????????_????????/ \\????| |\n"
+" | \\?????| || |????| |?????/ \\?????| |???| |",
+
+" ____\n"
+" __?????????/ o \\\n"
+" _?????????????????????_???????/ \\?????/ ____ >\n"
+" _???????/ \\????????_????????/ \\????| __ |???| |\n"
+" | \\?????| |?????/ \\?????| |???| || |???| |\n",
+
+" ____\n"
+" __????????????????????/ o \\\n"
+" _??????????????????????_???????/ \\????????_???????/ ____ >\n"
+"| \\??????????_????????/ \\????| __ |?????/ \\????| |\n"
+" \\ \\???????/ \\?????| |???| || |????| |???| |",
+
+" ____\n"
+" __???????????????????????????????/ o \\\n"
+" _??????????_???????/ \\????????_??????????????????/ ____ >\n"
+" | \\???????/ \\????| __ |?????/ \\????????_??????| |\n"
+" \\ \\?????| |???| || |????| |?????/ \\????| |",
+
+" ____\n"
+" / o \\??????????????????????????????????????????__\n"
+"< ____ \\???????_?????????????????????_????????/ \\\n"
+" | |????/ \\????????_????????/ \\?????| __ |??????_\n"
+" | |???| |?????/ \\?????| |????| || |?????/ |",
+
+" ____\n"
+" / o \\?????????__\n"
+"< ____ \\?????/ \\???????_?????????????????????_\n"
+" | |???| __ |????/ \\????????_????????/ \\???????_\n"
+" | |???| || |???| |?????/ \\?????| |?????/ |",
+
+" ____\n"
+" / o \\????????????????????__\n"
+"< ____ \\???????_????????/ \\???????_??????????????????????_\n"
+" | |????/ \\?????| __ |????/ \\????????_??????????/ |\n"
+" | |???| |????| || |???| |?????/ \\???????/ /",
+
+" ____\n"
+" / o \\???????????????????????????????__\n"
+"< ____ \\??????????????????_????????/ \\???????_??????????_\n"
+" | |??????_????????/ \\?????| __ |????/ \\???????/ |\n"
+" | |????/ \\?????| |????| || |???| |?????/ /"
+ };
+
+ TQString nessie_mask[] = {
+"\n"
+" W\n"
+"\n"
+"\n"
+"\n"
+"",
+
+"\n"
+" W\n"
+"\n"
+"\n"
+"\n"
+""
+ };
+
+ int nessie_num = intRand(2); // 0 = right, 1 = left.
+ int x = -64, dir = 1;
+
+ if(nessie_num == 1) {
+ x = screen->width() - 2;
+ dir = -1;
+ }
+
+ RandomMovingSprite *nessie = new RandomMovingSprite(screen, dir, 1.4, x, 2, 2);
+ nessie->setFrameDelay(75);
+ nessie->setFrameTime(400);
+
+ for(unsigned i = 0; i < 4; ++i)
+ nessie->addFrame(Frame(nessie_image[nessie_num * 4 + i], nessie_mask[nessie_num], 0x18B218));
+
+ screen->addSprite(nessie);
+}
+
+void AASaver::addRandom(Screen* screen)
+{
+ const char *const cute_messages[] = {
+ "Quick, someone cue the ominous music!",
+ "Her continuing mission... to explore strange new seas...",
+ "I caught one that big once, but it got away. :(",
+ "Nessie, an Earthbound hero's best friend...",
+ "Thar be WHALES, Cap'n!!"
+ };
+ int choice = intRand(5);
+
+ if(intRand(45) < 7 && choice < ARRAY_SIZE(cute_messages))
+ kdDebug() << cute_messages[choice] << endl;
+
+ switch(choice)
+ {
+ case 0:
+ addShark(screen);
+ break;
+ case 1:
+ addShip(screen);
+ break;
+ case 2:
+ addBigFish(screen);
+ break;
+ case 3:
+ addNessie(screen);
+ break;
+ case 4:
+ addWhale(screen);
+ break;
+ }
+}
+
+void AASaver::paintEvent(TQPaintEvent* pe)
+{
+ screen->paint(pe->region());
+}
+
+// libkscreensaver interface
+extern "C"
+{
+ TDE_EXPORT const char *kss_applicationName = "tdeasciiquarium.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "TDEAsciiquarium" );
+ TDE_EXPORT const char *kss_version = "0.3.2";
+
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
+ {
+ return new AASaver( id );
+ }
+
+ TDE_EXPORT TQDialog *kss_setup()
+ {
+ TDEConfigDialog *dialog = TDEConfigDialog::exists("settings");
+ if(dialog)
+ return dialog;
+
+ dialog = new TDEConfigDialog(0, "settings", AASaverConfig::self());
+ SettingsWidget *settings = new SettingsWidget(0, "settings_widget");
+
+ dialog->addPage(settings, i18n("TDEAsciiquarium Settings"), "tdescreensaver");
+
+ return dialog;
+ }
+}
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.h b/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.h
new file mode 100644
index 00000000..ce0d3faa
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.h
@@ -0,0 +1,170 @@
+#ifndef AA_AASAVER_H
+#define AA_AASAVER_H
+
+#include <tdescreensaver.h>
+#include <tdeapplication.h>
+
+#include <stdlib.h>
+
+class Screen;
+class Sprite;
+
+/**
+ * \mainpage Asciiquarium.
+ *
+ * \section intro Introduction
+ *
+ * Asciiquarium is a KDE screensaver to draw an ASCII art aquarium. This is the
+ * documentation of the API used in the program to generate the effect. It should
+ * be fairly simple, but basically:
+ *
+ * class AASaver is the main class, which handles outside events. All of the
+ * processing happens in the Screen class however, which manages a list of
+ * Sprites, updating them and drawing them as needed. When AASaver receives a
+ * paintEvent(), it forwards it on to Screen to handle it.
+ *
+ * Each Sprite is composed of 1 or more Frames. When a Screen wants a Sprite
+ * to draw itself, the Sprite forwards the request to its currently shown Frame.
+ *
+ * The Frame is rectangular, and created from textual ASCII art, with a ASCII
+ * art shape and color mask. The mask is optional. See aasaver.cpp for
+ * examples for creating a Frame.
+ *
+ * The Frame supports transparency and colors, and will convert the textual data
+ * into a TQPixmap representation on demand in order to reduce CPU load (at the
+ * expense of a slight memory usage increase for each sprite).
+ *
+ * Screen handles the timing for the project, and at each timeout will call
+ * Sprite::tickUpdate() from Screen::doAnimate().
+ *
+ * This whole program was inspired/copied from Kirk Baucom's asciiquarium
+ * program, from http://www.robobunny.com/projects/asciiquarium/
+ */
+
+/**
+ * The main class for the Asciiquarium screensaver.
+ */
+class AASaver: public KScreenSaver
+{
+ /// Handles the animation and drawing.
+ Screen* screen;
+
+public:
+ /// Construct the screensaver with window id \p id.
+ AASaver( WId id );
+
+ /// Returns a random double between [0.0, limit).
+ static double doubleRand(double limit)
+ {
+ return (limit * (static_cast<double>(TDEApplication::random()) / RAND_MAX));
+ }
+
+ /// Returns a random integer between [0, limit)
+ static int intRand(int limit)
+ {
+ return TDEApplication::random() % limit;
+ }
+
+ /**
+ * Returns a TQString holding a color mask, created by choosing random colors
+ * to replace numbers in \p color_mask.
+ */
+ static TQString randColor(TQString color_mask);
+
+ /// Adds the castle sprite to the screen.
+ void addCastle();
+
+ /// Adds the environment (sea, etc.) to the screen.
+ void addEnvironment();
+
+ /// Adds the seaweed to the screen.
+ void addAllSeaweed();
+
+ /// Adds the initial layout of fish to the sea, scaling the number of fish
+ /// based on the current screen size.
+ void addAllFish();
+
+ /**
+ * Adds a seaweed to a random position of the sea bottom.
+ *
+ * @param screen The Screen to add into.
+ */
+ static void addSeaweed(Screen* screen);
+
+ /**
+ * Returns a new fish sprite, which has not yet been added to a screen.
+ *
+ * @param screen The Screen to use when constructing the Sprite.
+ * @todo Combine with addFish().
+ */
+ static Sprite *newFish(Screen *screen);
+
+ /**
+ * Adds a new fish sprite to \p screen.
+ *
+ * @param screen The Screen to add a fish to.
+ */
+ static void addFish(Screen *screen);
+
+ /**
+ * Adds a new air bubble sprite to \p screen. The \p x, \p y, and \p z
+ * coordinates are all in logical coordinates.
+ *
+ * @param screen The Screen to add the bubble to.
+ * @param x The x position to start the bubble at.
+ * @param y The y position to start the bubble at.
+ * @param z The z position to start the bubble at.
+ */
+ static void addBubble(Screen* screen, int x, int y, int z);
+
+ /**
+ * Adds a Nessie, the Loch Ness Monster sprite to \p screen.
+ *
+ * @param screen The Screen to add Nessie to.
+ */
+ static void addNessie(Screen* screen);
+
+ /**
+ * Adds a big fish sprite to \p screen.
+ *
+ * @param screen The Screen to add the big fish to.
+ */
+ static void addBigFish(Screen* screen);
+
+ /**
+ * Adds a whale sprite to \p screen.
+ *
+ * @param screen The Screen to add the whale to.
+ */
+ static void addWhale(Screen* screen);
+
+ /**
+ * Adds a shark sprite to \p screen. The shark can kill() fish it comes in
+ * contact with (they will spawn more fish automatically).
+ *
+ * @param screen The Screen to add the shark to.
+ */
+ static void addShark(Screen* screen);
+
+ /**
+ * Adds a ship sprite to \p screen.
+ *
+ * @param screen The Screen to add the ship to.
+ */
+ static void addShip(Screen* screen);
+
+ /**
+ * Adds a random object from the set (Shark, Big Fish, Nessie, Whale, Ship)
+ * to the sea.
+ *
+ * @param screen The Screen to add to.
+ */
+ static void addRandom(Screen* screen);
+
+ /**
+ * Reimplemented to update the widget when it gets dirty.
+ */
+ virtual void paintEvent(TQPaintEvent* pe);
+};
+
+#endif /* AA_AASAVER_H */
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/asciiquarium.kcfg b/tdescreensaver/kdesavers/tdeasciiquarium/asciiquarium.kcfg
new file mode 100644
index 00000000..b07777d1
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/asciiquarium.kcfg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
+<kcfg>
+ <kcfgfile name="tdeasciiquariumrc"/>
+ <group name="Settings">
+ <entry name="fishCount" type="Int">
+ <label>Amount of fish to have in the sea.</label>
+ <default>20</default>
+ <whatsthis>You can use this value to select the number of fish that will be
+ on screen at a given time.</whatsthis>
+ </entry>
+ </group>
+</kcfg>
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/doxygen-stylesheet.css b/tdescreensaver/kdesavers/tdeasciiquarium/doxygen-stylesheet.css
new file mode 100644
index 00000000..b42407b6
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/doxygen-stylesheet.css
@@ -0,0 +1,309 @@
+BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
+ font-family: sans-serif, Geneva, Arial, Helvetica;
+}
+BODY,TD {
+ font-size: 100%;
+}
+H1 {
+ text-align: center;
+ font-size: 160%;
+}
+H2 {
+ font-size: 120%;
+}
+H3 {
+ font-size: 110%;
+}
+CAPTION { font-weight: bold }
+DIV.qindex {
+ width: 100%;
+ background-color: #eeeeff;
+ border: 1px solid #b0b0b0;
+ text-align: center;
+ margin: 2px;
+ padding: 2px;
+ line-height: 140%;
+}
+DIV.nav {
+ width: 100%;
+ background-color: #eeeeff;
+ border: 1px solid #b0b0b0;
+ text-align: center;
+ margin: 2px;
+ padding: 2px;
+ line-height: 140%;
+}
+DIV.navtab {
+ background-color: #eeeeff;
+ border: 1px solid #b0b0b0;
+ text-align: center;
+ margin: 2px;
+ margin-right: 15px;
+ padding: 2px;
+}
+TD.navtab {
+ font-size: 80%;
+}
+A.qindex {
+ text-decoration: none;
+ font-weight: bold;
+ color: #1A419D;
+}
+A.qindex:visited {
+ text-decoration: none;
+ font-weight: bold;
+ color: #1A419D
+}
+A.qindex:hover {
+ text-decoration: none;
+ background-color: #ddddff;
+}
+A.qindexHL {
+ text-decoration: none;
+ font-weight: bold;
+ background-color: #6666cc;
+ color: #ffffff;
+ border: 1px double #9295C2;
+}
+A.qindexHL:hover {
+ text-decoration: none;
+ background-color: #6666cc;
+ color: #ffffff;
+}
+A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }
+A.el { text-decoration: none; font-weight: bold }
+A.elRef { font-weight: bold }
+A.code:link { text-decoration: none; font-weight: normal; color: #0000FF}
+A.code:visited { text-decoration: none; font-weight: normal; color: #0000FF}
+A.codeRef:link { font-weight: normal; color: #0000FF}
+A.codeRef:visited { font-weight: normal; color: #0000FF}
+A:hover { text-decoration: none; background-color: #f2f2ff }
+DL.el { margin-left: -1cm }
+.fragment {
+ font-family: monospace;
+ font-size: 105%;
+}
+PRE.fragment {
+ border: 1px solid #CCCCCC;
+ background-color: #f5f5f5;
+ margin-top: 4px;
+ margin-bottom: 4px;
+ margin-left: 2px;
+ margin-right: 8px;
+ padding-left: 6px;
+ padding-right: 6px;
+ padding-top: 4px;
+ padding-bottom: 4px;
+}
+DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
+TD.md { background-color: #F4F4FB; font-weight: bold; }
+TD.mdPrefix {
+ background-color: #F4F4FB;
+ color: #606060;
+ font-size: 90%;
+}
+TD.mdname1 { background-color: #F4F4FB; font-weight: bold; color: #602020; }
+TD.mdname { background-color: #F4F4FB; font-weight: bold; color: #602020; width: 600px; }
+DIV.groupHeader {
+ margin-left: 16px;
+ margin-top: 12px;
+ margin-bottom: 6px;
+ font-weight: bold;
+}
+DIV.groupText { margin-left: 16px; font-style: italic; font-size: 95% }
+BODY {
+ background: white;
+ color: black;
+ margin-right: 20px;
+ margin-left: 20px;
+}
+TD.indexkey {
+ background-color: #eeeeff;
+ font-weight: bold;
+ padding-right : 10px;
+ padding-top : 2px;
+ padding-left : 10px;
+ padding-bottom : 2px;
+ margin-left : 0px;
+ margin-right : 0px;
+ margin-top : 2px;
+ margin-bottom : 2px;
+ border: 1px solid #CCCCCC;
+}
+TD.indexvalue {
+ background-color: #eeeeff;
+ font-style: italic;
+ padding-right : 10px;
+ padding-top : 2px;
+ padding-left : 10px;
+ padding-bottom : 2px;
+ margin-left : 0px;
+ margin-right : 0px;
+ margin-top : 2px;
+ margin-bottom : 2px;
+ border: 1px solid #CCCCCC;
+}
+TR.memlist {
+ background-color: #f0f0f0;
+}
+P.formulaDsp { text-align: center; }
+IMG.formulaDsp { }
+IMG.formulaInl { vertical-align: middle; }
+SPAN.keyword { color: #008000 }
+SPAN.keywordtype { color: #604020 }
+SPAN.keywordflow { color: #e08000 }
+SPAN.comment { color: #800000 }
+SPAN.preprocessor { color: #806020 }
+SPAN.stringliteral { color: #002080 }
+SPAN.charliteral { color: #008080 }
+.mdTable {
+ border: 1px solid #868686;
+ background-color: #F4F4FB;
+}
+.mdRow {
+ padding: 8px 10px;
+}
+.mdescLeft {
+ padding: 0px 8px 4px 8px;
+ font-size: 80%;
+ font-style: italic;
+ background-color: #FAFAFA;
+ border-top: 1px none #E0E0E0;
+ border-right: 1px none #E0E0E0;
+ border-bottom: 1px none #E0E0E0;
+ border-left: 1px none #E0E0E0;
+ margin: 0px;
+}
+.mdescRight {
+ padding: 0px 8px 4px 8px;
+ font-size: 80%;
+ font-style: italic;
+ background-color: #FAFAFA;
+ border-top: 1px none #E0E0E0;
+ border-right: 1px none #E0E0E0;
+ border-bottom: 1px none #E0E0E0;
+ border-left: 1px none #E0E0E0;
+ margin: 0px;
+}
+.memItemLeft {
+ padding: 1px 0px 0px 8px;
+ margin: 4px;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-color: #E0E0E0;
+ border-right-color: #E0E0E0;
+ border-bottom-color: #E0E0E0;
+ border-left-color: #E0E0E0;
+ border-top-style: solid;
+ border-right-style: none;
+ border-bottom-style: none;
+ border-left-style: none;
+ background-color: #FAFAFA;
+ font-size: 80%;
+}
+.memItemRight {
+ padding: 1px 8px 0px 8px;
+ margin: 4px;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-color: #E0E0E0;
+ border-right-color: #E0E0E0;
+ border-bottom-color: #E0E0E0;
+ border-left-color: #E0E0E0;
+ border-top-style: solid;
+ border-right-style: none;
+ border-bottom-style: none;
+ border-left-style: none;
+ background-color: #FAFAFA;
+ font-size: 80%;
+}
+.memTemplItemLeft {
+ padding: 1px 0px 0px 8px;
+ margin: 4px;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-color: #E0E0E0;
+ border-right-color: #E0E0E0;
+ border-bottom-color: #E0E0E0;
+ border-left-color: #E0E0E0;
+ border-top-style: none;
+ border-right-style: none;
+ border-bottom-style: none;
+ border-left-style: none;
+ background-color: #FAFAFA;
+ font-size: 80%;
+}
+.memTemplItemRight {
+ padding: 1px 8px 0px 8px;
+ margin: 4px;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-color: #E0E0E0;
+ border-right-color: #E0E0E0;
+ border-bottom-color: #E0E0E0;
+ border-left-color: #E0E0E0;
+ border-top-style: none;
+ border-right-style: none;
+ border-bottom-style: none;
+ border-left-style: none;
+ background-color: #FAFAFA;
+ font-size: 80%;
+}
+.memTemplParams {
+ padding: 1px 0px 0px 8px;
+ margin: 4px;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-color: #E0E0E0;
+ border-right-color: #E0E0E0;
+ border-bottom-color: #E0E0E0;
+ border-left-color: #E0E0E0;
+ border-top-style: solid;
+ border-right-style: none;
+ border-bottom-style: none;
+ border-left-style: none;
+ color: #606060;
+ background-color: #FAFAFA;
+ font-size: 80%;
+}
+.search { color: #003399;
+ font-weight: bold;
+}
+FORM.search {
+ margin-bottom: 0px;
+ margin-top: 0px;
+}
+INPUT.search { font-size: 75%;
+ color: #000080;
+ font-weight: normal;
+ background-color: #eeeeff;
+}
+TD.tiny { font-size: 75%;
+}
+a {
+ color: #252E78;
+}
+a:visited {
+ color: #3D2185;
+}
+.dirtab { padding: 4px;
+ border-collapse: collapse;
+ border: 1px solid #b0b0b0;
+}
+TH.dirtab { background: #eeeeff;
+ font-weight: bold;
+}
+HR { height: 1px;
+ border: none;
+ border-top: 1px solid black;
+}
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/frame.cpp b/tdescreensaver/kdesavers/tdeasciiquarium/frame.cpp
new file mode 100644
index 00000000..65d77de0
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/frame.cpp
@@ -0,0 +1,175 @@
+#include <tdeglobalsettings.h>
+#include <kdebug.h>
+
+#include <tqvaluevector.h>
+#include <tqstringlist.h>
+#include <tqimage.h>
+#include <tqfontmetrics.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
+
+#include "frame.h"
+
+void Frame::convertDataToPixmap(const Screen *screen)
+{
+ if(!height() || !width()) {
+ // Assume we're not ready to go.
+ return;
+ }
+
+ int w = screen->cellWidth(), h = screen->cellHeight();
+ TQPixmap pix(width() * w, height() * h);
+ pix.fill();
+
+ TQBitmap mask(pix.size(), true);
+
+ TQPainter p, p2;
+
+ p.begin(&pix, true);
+ p2.begin(&mask, true);
+
+ p.setFont(TDEGlobalSettings::fixedFont());
+ TQFontMetrics fm(p.font());
+ int leadHeight = fm.leading() + fm.descent();
+
+ for(unsigned j = 0; j < m_data.count(); ++j) {
+ TQValueVector<Screen::Pixel> row = m_data[j];
+ if(row.isEmpty())
+ continue;
+
+ unsigned first, last;
+ for (first = 0; first < row.count() && row[first].letter == ' '; ++first)
+ ;
+
+ last = row.count() - 1; // Assume the end is already stripped.
+
+ for(unsigned i = first; i <= last; ++i) {
+ if(row[i].letter == m_transparentChar)
+ continue;
+
+ p2.fillRect(i * w, j * h, w, h, TQt::color1);
+
+ p.setPen(row[i].color);
+ p.fillRect(i * w, j * h, w, h, TQt::black);
+ p.drawText(i * w, j * h + (h - 1 - leadHeight), TQChar(row[i].letter));
+ }
+ }
+
+ pix.setMask(mask);
+
+ TQPixmap erase(pix);
+ erase.fill(TQt::black);
+ erase.setMask(mask);
+
+ m_pixmap = pix;
+ m_erasePixmap = erase;
+
+ // Clear m_data to save a wee bit of memory.
+ m_data.clear();
+}
+
+Frame::Frame (TQString text, TQString mask, TQRgb defaultColor, TQChar transparent)
+{
+ //First, process the pixels.
+
+ TQStringList rows = TQStringList::split('\n', text, true);
+ m_height = rows.size();
+ m_width = 0;
+ m_transparentChar = transparent;
+
+ for (TQStringList::iterator i = rows.begin(); i != rows.end(); ++i)
+ {
+ TQValueVector<Screen::Pixel> row;
+ for (int pos = 0; pos < (*i).length(); ++pos)
+ {
+ Screen::Pixel p;
+ p.letter = (*i).at(pos).unicode();
+ p.color = defaultColor;
+ row.append(p);
+ }
+
+ m_width = TQMAX(m_width, row.size());
+ m_data.append(row);
+ }
+
+ //Now, the colors.
+ TQStringList cols = TQStringList::split('\n', mask, true);
+ int y = 0;
+ for (TQStringList::iterator i = cols.begin(); i != cols.end(); ++i)
+ {
+ if (y >= m_data.size())
+ break;
+
+ for (int pos = 0; pos < (*i).length() && pos < m_data[y].size(); ++pos)
+ {
+ switch ((*i).at(pos).unicode())
+ {
+ //Colors stolen from konsole, TEWidget.cpp
+ case 'R':
+ m_data[y][pos].color = 0xFF5454;
+ break;
+ case 'r':
+ m_data[y][pos].color = 0xB21818;
+ break;
+ case 'C':
+ m_data[y][pos].color = 0x54FFFF;
+ break;
+ case 'c':
+ m_data[y][pos].color = 0x18B2B2;
+ break;
+ case 'Y':
+ m_data[y][pos].color = 0xFFFF54;
+ break;
+ case 'y':
+ m_data[y][pos].color = 0xB26818;
+ break;
+ case 'G':
+ m_data[y][pos].color = 0x54FF54;
+ break;
+ case 'g':
+ m_data[y][pos].color = 0x18B218;
+ break;
+ case 'B':
+ m_data[y][pos].color = 0x5454FF;
+ break;
+ case 'b':
+ m_data[y][pos].color = 0x1818B2;
+ break;
+ case 'M':
+ m_data[y][pos].color = 0xFF54FF;
+ break;
+ case 'm':
+ m_data[y][pos].color = 0xB218B2;
+ break;
+ case 'W':
+ m_data[y][pos].color = 0xFFFFFF;
+ break;
+ case 'w':
+ m_data[y][pos].color = 0xB2B2B2;
+ break;
+ case ' ':
+ break;
+ default:
+ tqDebug("dunno about color code:'%c'", (*i).at(pos).unicode());
+ m_data[y][pos].color = 0xFFFFFF;
+ }
+ }
+ ++y;
+ }
+}
+
+void Frame::paint(Screen* scr, int x, int y)
+{
+ if(m_pixmap.isNull())
+ convertDataToPixmap(scr);
+
+ scr->updateSpan(x, y, m_pixmap);
+}
+
+void Frame::erase(Screen* scr, int x, int y)
+{
+ if(m_erasePixmap.isNull())
+ convertDataToPixmap(scr);
+
+ scr->clearSpan(x, y, m_erasePixmap);
+}
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/frame.h b/tdescreensaver/kdesavers/tdeasciiquarium/frame.h
new file mode 100644
index 00000000..ca62bbab
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/frame.h
@@ -0,0 +1,121 @@
+#ifndef AA_FRAME_H
+#define AA_FRAME_H
+
+#include <tqstring.h>
+#include <tqvaluevector.h>
+#include <tqpixmap.h>
+#include "screen.h"
+
+/**
+ * Represents a single frame of a sprite's animation.
+ *
+ * @see Sprite
+ */
+class Frame
+{
+ /**
+ * Two-dimensional array of Pixels, which represent the appearance of this
+ * frame. This is used to create m_pixmap and m_erasePixmap when they are
+ * needed.
+ *
+ * @see Pixel
+ */
+ TQValueVector<TQValueVector<Screen::Pixel> > m_data;
+
+ /// Masked pixmap of the animation frame. Created by convertDataToPixmap().
+ TQPixmap m_pixmap;
+
+ /// Masked pixmap used to clear frame. Created by convertDataToPixmap().
+ TQPixmap m_erasePixmap;
+
+ /// Height of this frame of animation in logical coordinates.
+ int m_height;
+
+ /// Width of this frame of animation in logical coordinates.
+ int m_width;
+
+ /// Character to be used as a special 'transparent' character. Normally is
+ /// the '?' character.
+ TQChar m_transparentChar;
+
+public:
+
+ /**
+ * Constructs an empty animation Frame. Do not insert this into a Sprite.
+ */
+ Frame() : m_height(0), m_width(0)
+ {
+ }
+
+ /**
+ * Constructs an animation frame.
+ *
+ * @param text Newline-separated text used to construct the Pixel arrays.
+ * The lines do not have to be equal length, any extra needed
+ * characters will automatically be filled with transparency.
+ * Any whitespace at the beginning of a line is converted to
+ * transparency as well.
+ *
+ * @param mask Newline-separated text used to mask \p text's colors. This
+ * can be empty or null in which case no masking is performed.
+ * However, if present, there should be the same number of
+ * lines in \p mask as in \p text, although individual lines
+ * can be shorter or empty as convienient. You can use letters
+ * to stand for colors, e.g. 'r' will make the letter in \p
+ * text at the same position dark red.
+ *
+ * @param defaultColor The default color to apply to characters. This
+ * color is used for all characters in \p text that are
+ * not altered by \p mask.
+ *
+ * @param transparent The character to use to represent transparent areas
+ * in \p text. This can be useful when the
+ * auto-transparency feature can't detect transparent
+ * areas.
+ */
+ Frame(TQString text, TQString mask, TQRgb defaultColor, TQChar transparent = '?');
+
+ /**
+ * Paints this Frame into the given screen.
+ *
+ * @param scr The Screen to draw into.
+ * @param x The logical x coordinate of the left edge of the update region.
+ * @param y The logical y coordinate of the top edge of the update region.
+ */
+ void paint(Screen* scr, int x, int y);
+
+ /**
+ * Erases this Frame from the given screen.
+ *
+ * @param scr The Screen to draw into.
+ * @param x The logical x coordinate of the left edge of the update region.
+ * @param y The logical y coordinate of the top edge of the update region.
+ */
+ void erase(Screen* scr, int x, int y);
+
+ /// Returns the logical width of this frame.
+ int width() const
+ {
+ return m_width;
+ }
+
+ /// Returns the logical height of this frame.
+ int height() const
+ {
+ return m_height;
+ }
+
+protected:
+
+ /**
+ * This function converts the Pixel data in m_data to setup m_pixmap
+ * and m_erasePixmap, which are not setup until this function is called.
+ *
+ * m_data is not valid after this call is performed to save memory.
+ *
+ * @param screen The Screen we will be drawing into later.
+ */
+ void convertDataToPixmap(const Screen *screen);
+};
+
+#endif
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp b/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp
new file mode 100644
index 00000000..f14e5c63
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp
@@ -0,0 +1,222 @@
+#include <tqcolor.h>
+#include <tqfontmetrics.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqtimer.h>
+#include <tqwidget.h>
+
+#include <tdeglobalsettings.h>
+
+#include "screen.h"
+#include "sprite.h"
+#include "aasaver.h"
+
+Screen::Screen(AASaver* widget): m_widget(widget)
+{
+ TQFontMetrics fm(TDEGlobalSettings::fixedFont());
+
+ // Compute cell geometries.
+ m_cellW = fm.maxWidth();
+ m_cellH = fm.lineSpacing();
+
+ // Computer number of full cells that will fit.
+ m_width = widget->width() / m_cellW;
+ m_height = widget->height() / m_cellH;
+
+ // Calculate offset needed to evenly distribute excess screen space.
+ m_offX = (widget->width() - m_width * m_cellW) / 2;
+ m_offY = (widget->height() - m_height * m_cellH) / 2;
+
+ // Create double buffer.
+ m_backBuffer = TQPixmap(m_widget->size());
+ m_backBuffer.fill(black);
+
+ // FIXME: handle resizing!
+
+ // Setup animation timer.
+ TQTimer* timer = new TQTimer(this);
+ connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(doAnimate()));
+
+ timer->start(msPerTick());
+}
+
+int Screen::msPerTick() const
+{
+ return 50;
+}
+
+Screen::~Screen()
+{
+}
+
+void Screen::updateSpan(int x, int y, const TQPixmap &updatePixmap)
+{
+ if (y < 0 || y >= m_height) return;
+
+ TQPoint upperLeft(m_offX + x * m_cellW, m_offY + y * m_cellH);
+ bitBlt(&m_backBuffer, upperLeft, &updatePixmap, updatePixmap.rect(), TQt::CopyROP);
+ m_widget->update(TQRect(upperLeft, updatePixmap.size()));
+}
+
+void Screen::clearSpan(int x, int y, const TQPixmap &clearPixmap)
+{
+ if (y < 0 || y >= m_height) return;
+
+ TQPoint upperLeft(m_offX + x * m_cellW, m_offY + y * m_cellH);
+ bitBlt(&m_backBuffer, upperLeft, &clearPixmap, clearPixmap.rect(), TQt::CopyROP);
+ m_widget->update(TQRect(upperLeft, clearPixmap.size()));
+}
+
+//Actually paints the region on the widget.
+void Screen::paint(TQRegion r)
+{
+ TQPainter p(m_widget);
+ TQMemArray<TQRect> rects = r.rects();
+
+ for (int r = 0; r < rects.size(); ++r)
+ {
+ //Determine the grid locations described by the rect
+ TQRect bound = rects[r];
+
+ bitBlt(m_widget, bound.topLeft(), &m_backBuffer, bound, TQt::CopyROP);
+ } //for rect in region
+};
+
+/**
+ * Utility type used to faciliate sorting of the Sprite list in order to
+ * implement the Painter's Algorithm when painting the back buffer.
+ */
+struct ZKey
+{
+ /**
+ * Logical depth of sprite. Now 0 is farthest away from the eyes, unlike
+ * with Sprite::depth().
+ */
+ int z;
+
+ Sprite* addr;
+
+ ZKey(): z(0), addr(0)
+ {}
+
+ ZKey(Sprite* spr): z(1000 - spr->depth()), addr(spr)
+ {}
+
+ bool operator<(const ZKey& other) const
+ {
+ if (z < other.z) return true;
+ if (z > other.z) return false;
+
+ return addr < other.addr;
+ }
+};
+
+void Screen::doAnimate()
+{
+ //First, rebuild a new list of sprites, and build a dirty region
+ TQRegion dirtyRegion;
+
+ TQValueVector<Sprite*> sprites;
+ TQValueVector<Sprite*> colliders;
+
+ // Look for sprites that can suffer a collision.
+ for (unsigned pos = 0; pos < m_sprites.size(); ++pos)
+ {
+ if(m_sprites[pos]->canCollide())
+ colliders.append(m_sprites[pos]);
+ }
+
+ // Find collisions.
+ // FIXME: Use transparent regions for accuracy.
+ for (unsigned pos = 0; pos < colliders.size(); ++pos)
+ for (unsigned sprite = 0; sprite < m_sprites.size(); ++sprite)
+ {
+ if(m_sprites[sprite] == colliders[pos])
+ continue;
+
+ if(colliders[pos]->geom().intersects(m_sprites[sprite]->geom()))
+ colliders[pos]->collision(m_sprites[sprite]);
+ }
+
+ //Retain all live existing sprites
+ for (int pos = 0; pos < m_sprites.size(); ++pos)
+ {
+ Sprite* sprite = m_sprites[pos];
+ TQRect oldRect = sprite->geom();
+ if (!sprite->isKilled()) {
+ bool dirty = sprite->tickUpdate();
+
+ if (dirty)
+ dirtyRegion |= oldRect | sprite->geom();
+
+ if (!sprite->isKilled())
+ sprites.append(sprite);
+ }
+
+ if (sprite->isKilled()) //note:may be made true by updateTick!
+ {
+ dirtyRegion |= oldRect;
+ delete sprite;
+ }
+ }
+
+ //Add new sprites.
+ for (int pos = 0; pos < m_addedSprites.size(); ++pos)
+ {
+ dirtyRegion |= m_addedSprites[pos]->geom();
+ sprites.append(m_addedSprites[pos]);
+ }
+
+ m_addedSprites.clear();
+ m_sprites = sprites;
+
+ //Compute the list of sprites affected. Note that this is
+ //done iteratively until fixed point.
+ TQValueVector<Sprite*> paintSprites;
+ TQValueVector<Sprite*> remSprites;
+
+ bool changed;
+ do
+ {
+ changed = false;
+ remSprites.clear();
+
+ for (int c = 0; c < sprites.size(); ++c)
+ {
+ Sprite* sprite = sprites[c];
+
+ if (dirtyRegion.intersect(sprite->geom()).isEmpty())
+ remSprites.append(sprite); //not to be painted thus far
+ else
+ {
+ //This sprite is to be painted
+ paintSprites.append(sprite);
+
+ //make sure we repaint everything overlapping it
+ dirtyRegion |= sprite->geom();
+ changed = true;
+ }
+ }
+ sprites = remSprites;
+ }
+ while (changed);
+
+ //Z-sort the items.
+ TQMap<ZKey, Sprite* > sorted;
+ for (int pos = 0; pos < paintSprites.size(); ++pos)
+ sorted[ZKey(paintSprites[pos])] = paintSprites[pos];
+
+ //Paint, in Z-order
+ for (TQMapIterator<ZKey, Sprite*> i = sorted.begin();
+ i != sorted.end(); ++i)
+ i.data()->paint();
+
+ // Make sure black strip at edge is still present.
+ if(!paintSprites.isEmpty())
+ {
+ TQPainter p(&m_backBuffer);
+ p.fillRect(m_backBuffer.width() - m_offX, 0, m_offX, m_backBuffer.height(), TQt::black);
+ }
+}
+
+#include "screen.moc"
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/screen.h b/tdescreensaver/kdesavers/tdeasciiquarium/screen.h
new file mode 100644
index 00000000..a0ea4f63
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/screen.h
@@ -0,0 +1,142 @@
+#ifndef AA_SCREEN_H
+#define AA_SCREEN_H
+
+#include <tqcolor.h>
+#include <tqfont.h>
+#include <tqobject.h>
+#include <tqvaluevector.h>
+#include <tqpixmap.h>
+
+class Sprite;
+class AASaver;
+
+/**
+ * This is the main display class of Asciiquarium. We use a pseudo-terminal-ish
+ * type coordinate system, where although this is a full fledged GUI application,
+ * Sprites and most external functions deal with logical text position
+ * coordinates instead of GUI coordinates. (x, y) starts in the upper-left of
+ * the real screen at (0, 0), and continues on to (width - 1, height - 1).
+ *
+ * Use addSprite() to add new Sprites to the Screen after you have created them
+ * and added their Frames.
+ */
+class Screen: public TQObject
+{
+ TQ_OBJECT
+
+public:
+ /**
+ * Represents a logical character on the Screen.
+ */
+ struct Pixel {
+ char letter; ///< Character to display in the cell.
+ TQRgb color; ///< Color to use for the cell.
+
+ /// Default constructor.
+ Pixel(): letter(' '), color(0)
+ {
+ }
+ };
+
+private:
+ AASaver* m_widget; ///< Widget that we should paint on.
+ int m_width; ///< Number of logical columns in the screen.
+ int m_height; ///< Number of logical rows on the screen.
+ int m_offX; ///< Number of pixels on left side needed to center image.
+ int m_offY; ///< Number of pixels on top side needed to center image.
+
+ /** Pixmap cache of the image used to speed up rendering. All paints happen
+ * to the pixmap, which is then bitBlt()'ed to m_widget when the time comes
+ * to paint.
+ */
+ TQPixmap m_backBuffer;
+
+ int m_cellW; ///< The GUI width of a character cell.
+ int m_cellH; ///< The GUI height of a character cell.
+
+ TQValueVector<Sprite*> m_sprites; ///< List of Sprites on screen.
+ TQValueVector<Sprite*> m_addedSprites; ///< List of Sprites to be added next frame.
+
+private slots:
+ /**
+ * Handles updating the screen buffer to draw the next frame.
+ */
+ void doAnimate();
+
+public:
+ /**
+ * Constructor.
+ *
+ * @param widget The widget to draw on.
+ */
+ Screen(AASaver* widget);
+ ~Screen();
+
+ /// Returns the logical width of the screen.
+ int width() const
+ {
+ return m_width;
+ }
+
+ /// Returns the logical height of the screen.
+ int height() const
+ {
+ return m_height;
+ }
+
+ /// Returns the GUI width of a character cell.
+ int cellWidth() const
+ {
+ return m_cellW;
+ }
+
+ /// Returns the GUI height of a character cell.
+ int cellHeight() const
+ {
+ return m_cellH;
+ }
+
+ /**
+ * Adds a sprite to the internal sprite list.
+ *
+ * @param sprite The Sprite to add. It will show up in the next frame.
+ */
+ void addSprite(Sprite* sprite)
+ {
+ m_addedSprites.append(sprite);
+ }
+
+ /// Returns the number of milliseconds separating each animation tick.
+ int msPerTick() const;
+
+ /**
+ * Updates the backbuffer, and asks the portion of the widget to be
+ * repainted.
+ *
+ * @param x The logical x coordinate of the left edge of the update area.
+ * @param y The logical y coordinate of the top edge of the update area.
+ * @param updatePixmap The pixmap to draw into the buffer, which should be
+ * masked to only draw non-transparent regions.
+ */
+ void updateSpan(int x, int y, const TQPixmap &updatePixmap);
+
+ /**
+ * Clear the given portion of the backbuffer, asks for a repaint.
+ *
+ * @param x The logical x coordinate of the left edge of the update region.
+ * @param y The logical y coordinate of the top edge of the update region.
+ * @param clearPixmap the pixmap to use to clear the span, which should be
+ * the background color of the Screen, and masked to
+ * only draw the area that needs cleared.
+ */
+ void clearSpan(int x, int y, const TQPixmap &clearPixmap);
+
+ /**
+ * Actually paints the region on the widget.
+ *
+ * @param r The region of the widget to update.
+ */
+ void paint(TQRegion r);
+};
+
+#endif
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/settingswidget.ui b/tdescreensaver/kdesavers/tdeasciiquarium/settingswidget.ui
new file mode 100644
index 00000000..16ead9a2
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/settingswidget.ui
@@ -0,0 +1,50 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>SettingsWidget</class>
+<widget class="TQWidget">
+ <property name="name">
+ <cstring>SettingsWidget</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>399</width>
+ <height>45</height>
+ </rect>
+ </property>
+ <property name="caption">
+ <string>Asciiquarium Settings</string>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQLabel">
+ <property name="name">
+ <cstring>textLabel1</cstring>
+ </property>
+ <property name="text">
+ <string>Number of Fish:</string>
+ </property>
+ </widget>
+ <widget class="TQSpinBox">
+ <property name="name">
+ <cstring>kcfg_fishCount</cstring>
+ </property>
+ <property name="maxValue">
+ <number>50</number>
+ </property>
+ <property name="minValue">
+ <number>1</number>
+ </property>
+ <property name="lineStep">
+ <number>5</number>
+ </property>
+ <property name="value">
+ <number>15</number>
+ </property>
+ </widget>
+ </hbox>
+</widget>
+<layoutdefaults spacing="6" margin="0"/>
+</UI>
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/sprite.cpp b/tdescreensaver/kdesavers/tdeasciiquarium/sprite.cpp
new file mode 100644
index 00000000..11d7d360
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/sprite.cpp
@@ -0,0 +1,64 @@
+#include "sprite.h"
+
+Sprite::Sprite(Screen* screen, int x, int y, int z, int frameDelay):
+ m_screen(screen), m_currentFrame(0), m_x(x), m_y(y), m_z(z),
+ m_isKilled(false), m_killAfterLastFrame(false),
+ m_ticksSinceFrameChange(0), m_frameDelay(frameDelay)
+{
+}
+
+void Sprite::addFrame(const Frame& frame)
+{
+ m_frames.append(frame);
+}
+
+void Sprite::erase()
+{
+ m_frames[m_currentFrame].erase(m_screen, m_x, m_y);
+}
+
+void Sprite::paint()
+{
+ m_frames[m_currentFrame].paint(m_screen, m_x, m_y);
+}
+
+bool Sprite::timerTick()
+{
+ ++m_ticksSinceFrameChange;
+ if (m_ticksSinceFrameChange * m_screen->msPerTick() < m_frameDelay)
+ return false;
+
+ //Ring! Ring!
+ m_ticksSinceFrameChange = 0;
+ return true;
+}
+
+bool Sprite::tickUpdate()
+{
+ if (m_frames.size() == 1)
+ return false;
+
+ if (!timerTick())
+ return false;
+
+ erase();
+
+ ++m_currentFrame;
+ if (m_currentFrame == m_frames.size())
+ {
+ m_currentFrame = 0;
+
+ if(m_killAfterLastFrame)
+ {
+ erase();
+ kill();
+ }
+ }
+
+ return true;
+}
+
+TQRect Sprite::geom() const
+{
+ return TQRect(m_x, m_y, m_frames[0].width(), m_frames[0].height());
+}
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/sprite.h b/tdescreensaver/kdesavers/tdeasciiquarium/sprite.h
new file mode 100644
index 00000000..0eb3a0a7
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/sprite.h
@@ -0,0 +1,178 @@
+#ifndef AA_SPRITE_H
+#define AA_SPRITE_H
+
+#include <tqvaluevector.h>
+#include "frame.h"
+
+/**
+ * This class represents a on-screen character of some sort. These make up
+ * the building blocks of the animation.
+ *
+ * You can use multiple frames of animation, but movement is not supported in
+ * this class, try MovingSprite. If you use multiple frames, use
+ * setFrameDelay to control the interval between frames, and use
+ * setDieAfterLastFrame to set whether the animation should loop or cause
+ * the Sprite to go away.
+ *
+ * Use kill() to get rid of a Sprite, do not delete it by yourself, as Screen
+ * will do that as needed.
+ */
+class Sprite
+{
+protected:
+ Screen* m_screen; ///< The Screen that we belong to.
+ int m_currentFrame; ///< The current frame of animation.
+ int m_x; ///< Our current logical x position.
+ int m_y; ///< Our current logical y position.
+ int m_z; ///< Our current depth.
+
+ TQValueVector<Frame> m_frames; ///< Array of animation frames.
+ bool m_isKilled; ///< True if we've been killed.
+ bool m_killAfterLastFrame; ///< True if we should auto-kill after the last frame.
+ int m_ticksSinceFrameChange; ///< Number of timer ticks since we last changed frame.
+ int m_frameDelay; ///< Number of milliseconds to show a frame for.
+
+ /**
+ * Increments the animation timer.
+ *
+ * @return true if time has elapsed past m_frameDelay since the last frame
+ * change.
+ */
+ bool timerTick();
+
+public:
+ /**
+ * Construct a sprite without automatically adding it to \p screen.
+ *
+ * @param screen The Screen that the sprite belongs to.
+ * @param x The x column position for the left edge of this sprite.
+ * @param y The y row position for the upper line of this sprite.
+ * @param z The depth of the sprite (0 is closest to screen).
+ * @param frameDelay Amount of milliseconds to elapse between animation
+ * frames.
+ */
+ Sprite(Screen* screen, int x, int y, int z, int frameDelay = 100);
+
+ /**
+ * Destuctor. Does nothing at this point, present to ensure a continuous
+ * line of virtual destructors.
+ */
+ virtual ~Sprite()
+ {
+ }
+
+ /**
+ * @return true if this sprite can be involved in a collision with another
+ * Sprite. The other sprite doesn't necessarily have to have this
+ * also set to true.
+ */
+ virtual bool canCollide() const { return false; }
+
+ /**
+ * Called when a collision occurs with *any* Sprite on-screen if canCollide()
+ * returns true.
+ *
+ * @param sprite The Sprite that a collision happened with. It is safe to
+ * kill() the Sprite, move it, etc.
+ */
+ virtual void collision (Sprite *sprite)
+ {
+ }
+
+ /**
+ * Appends a frame of animation to the end of the current list.
+ *
+ * @param frame Frame of animation to add. It should be the same size as
+ * the other frames already in the list.
+ */
+ void addFrame(const Frame& frame);
+
+ /**
+ * Sets the amount of time to show a frame for.
+ *
+ * @param delay The frame delay, in milliseconds of time.
+ */
+ void setFrameDelay(int delay)
+ {
+ m_frameDelay = delay;
+ }
+
+ /**
+ * Sets whether this Sprite should automatically call kill() after the
+ * last frame of animation has run.
+ *
+ * @param dieAfterLast If true, this Sprite will automatically call kill()
+ * after its last frame has elapsed.
+ */
+ void setDieAfterLastFrame(bool dieAfterLast)
+ {
+ m_killAfterLastFrame = dieAfterLast;
+ }
+
+ /**
+ * @return The Screen this Sprite belongs to.
+ */
+ Screen *screen() const
+ {
+ return m_screen;
+ }
+
+ /**
+ * @return true if this Sprite is dead. If true, it will probably soon be
+ * deleted by its Screen.
+ */
+ bool isKilled() const
+ {
+ return m_isKilled;
+ }
+
+ /**
+ * @return The depth of the Sprite. 0 is closest to the screen.
+ */
+ int depth() const
+ {
+ return m_z;
+ }
+
+ /**
+ * @return The rectangular geometry of this object in the Pixel coordinate
+ * system.
+ */
+ TQRect geom() const;
+
+ /**
+ * Erases this Sprite from its Screen, using the current animation frame to
+ * form the clear mask. This should be called *before* any change which
+ * will change the on-screen display of the object, such as motion or
+ * animation changes.
+ */
+ void erase();
+
+ /**
+ * Draws this Sprite onto the Screen.
+ */
+ void paint();
+
+ /**
+ * Kills this Sprite. The parent Screen will delete this Sprite on the next
+ * animation cycle.
+ */
+ virtual void kill()
+ {
+ m_isKilled = true;
+ }
+
+ //main animation hook. Should return true + erase if something changed
+ /**
+ * Called when the current frame expires. This function needs to perform
+ * any actions necessary to make sure that it is ready to be painted,
+ * including calling erase(). You do not need to call paint() from this
+ * function.
+ *
+ * @return true if the on-screen representation of this Sprite changed,
+ * false, otherwise.
+ */
+ virtual bool tickUpdate();
+};
+
+#endif
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/tdeasciiquarium.desktop b/tdescreensaver/kdesavers/tdeasciiquarium/tdeasciiquarium.desktop
new file mode 100644
index 00000000..65a4e90e
--- /dev/null
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/tdeasciiquarium.desktop
@@ -0,0 +1,23 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=tdeasciiquarium.kss
+Icon=tdescreensaver
+Type=Application
+Actions=InWindow;Root;Setup
+Name=TDEAsciiquarium
+X-TDE-Category=Miscellaneous
+
+[Desktop Action InWindow]
+Exec=tdeasciiquarium.kss -window-id %w
+Name=Display in specified window
+NoDisplay=true
+
+[Desktop Action Root]
+Exec=tdeasciiquarium.kss -root
+Name=Display in root window
+NoDisplay=true
+
+[Desktop Action Setup]
+Exec=tdeasciiquarium.kss -setup
+Name=Display setup dialog
+NoDisplay=true
diff --git a/tdescreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp
index edc3be93..4d65bfe3 100644
--- a/tdescreensaver/kdesavers/wave.cpp
+++ b/tdescreensaver/kdesavers/wave.cpp
@@ -38,16 +38,16 @@
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "kwave.kss";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "Bitmap Wave Screen Saver" );
- KDE_EXPORT const char *kss_version = "2.2.0";
+ TDE_EXPORT const char *kss_applicationName = "kwave.kss";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "Bitmap Wave Screen Saver" );
+ TDE_EXPORT const char *kss_version = "2.2.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new KWaveSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new KWaveSetup();
}
@@ -66,11 +66,11 @@ KWaveSetup::KWaveSetup( TQWidget *parent, const char *name )
preview->show(); // otherwise saver does not get correct size
saver = new KWaveSaver( preview->winId() );
- connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOkPressed() ) );
- connect( PushButton2, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
- connect( PushButton3, TQT_SIGNAL( clicked() ), TQT_SLOT( aboutPressed() ) );
- connect( SpinBox1, TQT_SIGNAL( valueChanged(int)), saver, TQT_SLOT( updateSize(int)));
- connect( RadioButton1, TQT_SIGNAL( toggled(bool)), saver, TQT_SLOT( doStars(bool)));
+ connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOkPressed() ) );
+ connect( PushButton2, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) );
+ connect( PushButton3, TQ_SIGNAL( clicked() ), TQ_SLOT( aboutPressed() ) );
+ connect( SpinBox1, TQ_SIGNAL( valueChanged(int)), saver, TQ_SLOT( updateSize(int)));
+ connect( RadioButton1, TQ_SIGNAL( toggled(bool)), saver, TQ_SLOT( doStars(bool)));
}
@@ -122,7 +122,7 @@ KWaveSaver::KWaveSaver( WId id ) : KScreenSaver( id )
wave = new Wave();
embed(wave);
wave->show();
- connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) );;
+ connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blank()) );;
}
KWaveSaver::~KWaveSaver()
diff --git a/tdescreensaver/kdesavers/wave.h b/tdescreensaver/kdesavers/wave.h
index 3fd9c843..3e3073db 100644
--- a/tdescreensaver/kdesavers/wave.h
+++ b/tdescreensaver/kdesavers/wave.h
@@ -31,7 +31,7 @@
class Wave : public TQGLWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
@@ -62,7 +62,7 @@ private:
class KWaveSaver : public KScreenSaver
{
-Q_OBJECT
+TQ_OBJECT
public:
KWaveSaver( WId drawable );
@@ -78,7 +78,7 @@ private:
class KWaveSetup : public SetupUi
{
- Q_OBJECT
+ TQ_OBJECT
public:
KWaveSetup( TQWidget *parent = NULL, const char *name = NULL );