Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 753 insertions, 0 deletions

diff --git a/kcontrol/smserver/Makefile.am b/kcontrol/smserver/Makefile.am
new file mode 100644
index 000000000..7cecaf66e
--- /dev/null
+++ b/kcontrol/smserver/Makefile.am
@@ -0,0 +1,17 @@
+kde_module_LTLIBRARIES = kcm_smserver.la
+
+kcm_smserver_la_SOURCES = kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp
+kcm_smserver_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+kcm_smserver_la_LIBADD = -lkdeui
+AM_CPPFLAGS= $(all_includes) 
+
+METASOURCES = AUTO
+
+noinst_HEADERS = kcmsmserver.h smserverconfigimpl.h
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/kcmsmserver.pot
+
+xdg_apps_DATA = kcmsmserver.desktop
+
+EXTRA_DIST = $(xdg_apps_DATA)
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
new file mode 100644
index 000000000..9de1334b0
--- /dev/null
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -0,0 +1,134 @@
+/*
+ *  kcmsmserver.cpp
+ *  Copyright (c) 2000,2002 Oswald Buddenhagen <[email protected]>
+ *
+ *  based on kcmtaskbar.cpp
+ *  Copyright (c) 2000 Kurt Granroth <[email protected]>
+ *
+ *  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
+ */
+#include <qbuttongroup.h>
+#include <qcheckbox.h>
+#include <qlayout.h>
+#include <qradiobutton.h>
+
+#include <dcopclient.h>
+
+#include <kapplication.h>
+#include <kconfig.h>
+#include <kgenericfactory.h>
+#include <klineedit.h>
+
+#include "kcmsmserver.h"
+#include "smserverconfigimpl.h"
+
+typedef KGenericFactory<SMServerConfig, QWidget > SMSFactory;
+K_EXPORT_COMPONENT_FACTORY (kcm_smserver, SMSFactory("kcmsmserver") )
+
+SMServerConfig::SMServerConfig( QWidget *parent, const char* name, const QStringList & )
+  : KCModule (SMSFactory::instance(), parent, name)
+{
+    setQuickHelp( i18n("<h1>Session Manager</h1>"
+    " You can configure the session manager here."
+    " This includes options such as whether or not the session exit (logout)"
+    " should be confirmed, whether the session should be restored again when logging in"
+    " and whether the computer should be automatically shut down after session"
+    " exit by default."));
+
+    QVBoxLayout *topLayout = new QVBoxLayout(this);
+    dialog = new SMServerConfigImpl(this);
+    connect(dialog, SIGNAL(changed()), SLOT(changed()));
+
+    dialog->show();
+    topLayout->add(dialog);
+    load();
+
+}
+
+void SMServerConfig::load()
+{
+	load( false );
+}
+
+void SMServerConfig::load(bool useDefaults )
+{
+  KConfig *c = new KConfig("ksmserverrc", false, false);
+  c->setReadDefaults( useDefaults );
+  c->setGroup("General");
+  dialog->confirmLogoutCheck->setChecked(c->readBoolEntry("confirmLogout", true));
+  bool en = c->readBoolEntry("offerShutdown", true);
+  dialog->offerShutdownCheck->setChecked(en);
+  dialog->sdGroup->setEnabled(en);
+
+  QString s = c->readEntry( "loginMode" );
+  if ( s == "default" )
+      dialog->emptySessionRadio->setChecked(true);
+  else if ( s == "restoreSavedSession" )
+      dialog->savedSessionRadio->setChecked(true);
+  else // "restorePreviousLogout"
+      dialog->previousSessionRadio->setChecked(true);
+
+  switch (c->readNumEntry("shutdownType", int(KApplication::ShutdownTypeNone))) {
+  case int(KApplication::ShutdownTypeHalt):
+    dialog->haltRadio->setChecked(true);
+    break;
+  case int(KApplication::ShutdownTypeReboot):
+    dialog->rebootRadio->setChecked(true);
+    break;
+  default:
+    dialog->logoutRadio->setChecked(true);
+    break;
+  }
+  dialog->excludeLineedit->setText( c->readEntry("excludeApps"));
+
+  delete c;
+
+  emit changed(useDefaults);
+}
+
+void SMServerConfig::save()
+{
+  KConfig *c = new KConfig("ksmserverrc", false, false);
+  c->setGroup("General");
+  c->writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked());
+  c->writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked());
+  QString s = "restorePreviousLogout";
+  if ( dialog->emptySessionRadio->isChecked() )
+      s = "default";
+  else if ( dialog->savedSessionRadio->isChecked() )
+      s = "restoreSavedSession";
+  c->writeEntry( "loginMode", s );
+
+  c->writeEntry( "shutdownType",
+                 dialog->haltRadio->isChecked() ?
+                   int(KApplication::ShutdownTypeHalt) :
+                   dialog->rebootRadio->isChecked() ?
+                     int(KApplication::ShutdownTypeReboot) :
+                     int(KApplication::ShutdownTypeNone));
+  c->writeEntry("excludeApps", dialog->excludeLineedit->text());
+  c->sync();
+  delete c;
+
+  // update the k menu if necessary
+  QByteArray data;
+  kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
+}
+
+void SMServerConfig::defaults()
+{
+	load( true );
+}
+
+#include "kcmsmserver.moc"
+
diff --git a/kcontrol/smserver/kcmsmserver.desktop b/kcontrol/smserver/kcmsmserver.desktop
new file mode 100644
index 000000000..1fbb6d77e
--- /dev/null
+++ b/kcontrol/smserver/kcmsmserver.desktop
@@ -0,0 +1,236 @@
+[Desktop Entry]
+Icon=exit
+Type=Application
+DocPath=kcontrol/kcmsmserver/index.html
+Exec=kcmshell kcmsmserver
+
+
+X-KDE-Library=smserver
+X-KDE-FactoryName=smserver
+X-KDE-ParentApp=kcontrol
+
+Name=Session Manager
+Name[af]=Sessie Bestuurder
+Name[ar]=مسيير الجلسات
+Name[az]=İclas İdarəcisi
+Name[be]=Кіраўнік сесіяў
+Name[bg]=Системни сесии
+Name[bn]=সেশন ম্যানেজার
+Name[br]=Merour an dalc'hioù
+Name[bs]=Upravljanje sesijama
+Name[ca]=Gestor de la sessió
+Name[cs]=Správce relace
+Name[csb]=Menedżer sesëji
+Name[cy]=Rheolydd Sesiwn
+Name[da]=Sessionshåndtering
+Name[de]=Sitzungsverwaltung
+Name[el]=Διαχειριστής συνεδρίας
+Name[eo]=Seancokonservilo
+Name[es]=Gestor de sesiones
+Name[et]=Seansihaldur
+Name[eu]=Saio kudeatzailea
+Name[fa]=مدیر نشست
+Name[fi]=Istunnonhallinta
+Name[fr]=Gestionnaire de session
+Name[fy]=Sesjebehear
+Name[ga]=Bainisteoir Seisiúin
+Name[gl]=Xestor de Sesións
+Name[he]=מנהל ההפעלה
+Name[hi]=सत्र प्रबंधक
+Name[hr]=Upravitelj sesijama
+Name[hu]=Munkafolyamatok
+Name[id]=Manajer Sesi
+Name[is]=Setustjóri
+Name[it]=Gestione della sessione
+Name[ja]=セッションマネージャ
+Name[ka]=სეანსების მენეჯერი
+Name[kk]=Сеанс менеджері
+Name[km]=កម្មវិធី​គ្រប់គ្រង​សម័យ
+Name[ko]=세션 관리자
+Name[lo]=ເຄື່ອງມືຈັດການເຊສຊັນ
+Name[lt]=Sesijos valdyklė
+Name[lv]=Sesiju Menedžeris
+Name[mk]=Менаџер на сесии
+Name[mn]=Суулт удирдлага
+Name[ms]=Pengurus Sesi
+Name[mt]=Manager tas-sessjoni
+Name[nb]=Øktbehandler
+Name[nds]=Törnpleger
+Name[ne]=सत्र प्रबन्धक
+Name[nl]=Sessiebeheer
+Name[nn]=Økthandsamar
+Name[nso]=Molaodi wa Tiragalo
+Name[pa]=ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ
+Name[pl]=Menedżer sesji
+Name[pt]=Gestor de Sessões
+Name[pt_BR]=Gerenciador de Sessão
+Name[ro]=Managerul de sesiune
+Name[ru]=Диспетчер сеансов
+Name[rw]=Mugenga Mukoro
+Name[se]=Bargovuorrogieđahalli
+Name[sk]=Správca relácie
+Name[sl]=Upravitelj sej
+Name[sr]=Менаџер сесија
+Name[sr@Latn]=Menadžer sesija
+Name[sv]=Sessionshanterare
+Name[ta]=அமர்வு மேலாளர்
+Name[tg]=Мудири нишаст
+Name[th]=ตัวจัดการวาระ
+Name[tr]=Oturum Yöneticisi
+Name[tt]=Sessi İdäräçe
+Name[uk]=Менеджер сеансів
+Name[uz]=Seans boshqaruvchisi
+Name[uz@cyrillic]=Сеанс бошқарувчиси
+Name[ven]=Mulanguli wa tshitenwa
+Name[vi]=Trình quản lí Phiên đăng nhập
+Name[wa]=Manaedjeu di sessions
+Name[xh]=Umphathi wesiqendu
+Name[zh_CN]=会话管理器
+Name[zh_TW]=工作階段管理程式
+Name[zu]=Imenenja yesiqendu
+
+Comment=Configure the session manager and logout settings
+Comment[af]=Konfigureer die sessie bestuurder en teken af instellings
+Comment[ar]=إعداد مسيير الجلسات و تعيينات تسجيل الخروج
+Comment[be]=Настаўленні кіраўніка сеансаў і параметраў выхаду
+Comment[bg]=Настройване сесиите на системата и поведението при изход
+Comment[bn]=সেশন ম্যানেজার এবং লগ-আউট সেটিংস কনফিগার করুন
+Comment[br]=Kefluniañ ar merour an dalc'hioù hag an doare mont kuit
+Comment[bs]=Podesite menadžer sesija i postavke odjave
+Comment[ca]=Aquí podeu configurar el gestor de la sessió i la sortida
+Comment[cs]=Nastavení správce relace a odhlašování
+Comment[csb]=Kònfigùracëjô menedżera sesëji ë nastôwów wëlogòwaniô
+Comment[cy]=Ffurfweddu'r rheolydd sesiwn a gosodiadau allgofnodi
+Comment[da]=Indstil sessionshåndterigen og opsætning for at logge af
+Comment[de]=Einstellungen für Sitzungsverwaltung und Abmeldung vornehmen
+Comment[el]=Ρυθμίστε το διαχειριστή συνεδρίας και τις επιλογές αποσύνδεσης
+Comment[eo]=Agordo de la seancokonservilo kaj la adiaŭa maniero
+Comment[es]=Configura el gestor de sesiones y las opciones de salida
+Comment[et]=Seansihalduri ja väljalogimise seadistamine
+Comment[eu]=Konfiguratu saio kudeatzailea eta saio amaieraren ezarpenak
+Comment[fa]=پیکربندی مدیر نشست و تنظیمات خروج
+Comment[fi]=Istunnonhallinnan ja uloskirjautumisen asetukset
+Comment[fr]=Configuration du gestionnaire de session et réglages de la sortie
+Comment[fy]=Hjir kinne jo it sesjebehear en ôfmeld-ynstellings fêststelle
+Comment[gl]=Configurar o xestor de sesións e as opcións de saída
+Comment[he]=שינוי הגדרות מנהל ההפעלה והיציאה מהמערכת
+Comment[hi]=सत्र प्रबंधक तथा लॉगआउट विन्यास कॉन्फ़िगर करें
+Comment[hr]=Konfiguriranje upravitelja sesijama i postavkama odjavljivanja
+Comment[hu]=A KDE munkafolyamat és a kijelentkezési mód beállításai
+Comment[is]=Stilla setustjóra og aðgerðir við útstimplun
+Comment[it]=Configura il gestore della sessione e le impostazioni di fine sessione
+Comment[ja]=セッションマネージャとログアウト時の設定
+Comment[ka]=სეანსების მენეჯერის და სისტემიდან გამოსვლის კონფიგურაცია
+Comment[kk]=Сеанс менеджерді және жүйеден шығу параметрлерін баптау
+Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​គ្រប់គ្រង​សម័យ និង​ការ​កំណត់​ពេល​ចេញ
+Comment[ko]=세션 관리자와 로그아웃 설정 관리
+Comment[lo]=ທ່ານສາມາດປັບແຕ່ງການທຳງານຂອງເຄື່ອງ ມືຈັດການເຊສຊັນໄດ້ທີ່ນີ້
+Comment[lt]=Čia galite konfigūruoti sesijos tvarkyklę ir išsiregistravimo nustatymus
+Comment[lv]=Šeit jūs varat konfigurēt sesiju menedžeri un pieteikšanās parametrus
+Comment[mk]=Конфигурирајте го менаџерот на сесии и поставувањата за одјавување
+Comment[mn]=Суулт удирдлага ба гаралтын тохиргоо хийх
+Comment[ms]=Konfigur seting pengurus sesi dan bentangan
+Comment[mt]=Ikkonfigura l-manager tas-sessjoni u tal-logout
+Comment[nb]=Her kan du tilpasse øktbehandleren og utlogginga
+Comment[nds]=Dat Afmellen un den Törnpleger instellen
+Comment[ne]=सत्र प्रबन्धक र लगआउट सेटिङ कन्फिगर गर्नुहोस्
+Comment[nl]=Hier kunt u het sessiebeheer en de afmeld-instellingen bepalen
+Comment[nn]=Oppsett av økthandsamar og utlogging
+Comment[nso]=Beakanya molaodi wa tiragalo le dipeakanyo tsa gotswa
+Comment[pa]=ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ ਅਤੇ ਲਾਗਆਉਟ ਸੈਟਿੰਗ ਦੀ ਸਥਾਪਨ
+Comment[pl]=Konfiguracja menedżera sesji i ustawień wylogowania
+Comment[pt]=Configuração do gestor de sessões e das opções de encerramento
+Comment[pt_BR]=Configura o gerenciador de sessão e definições de logout
+Comment[ro]=Configurează managerul de sesiune și setările de ieșire
+Comment[ru]=Настройка диспетчера сеансов
+Comment[rw]=Umukoro Muyobozi no Gufunga Igenamiterere 
+Comment[se]=Heivet bargovuorrogieđahalli ja olggosčáliheami
+Comment[sk]=Nastavenie správcu relácií a odhlásenia
+Comment[sl]=Tu lahko nastavite upravljalnik sej in nastavitve odjav
+Comment[sr]=Подешавање менаџера сесија и поставки одјављивања
+Comment[sr@Latn]=Podešavanje menadžera sesija i postavki odjavljivanja
+Comment[sv]=Anpassa sessionshanteraren och utloggningsinställningar
+Comment[ta]=அமர்வு மேளாலர் மற்றும் வெளிச்செல் அமைப்புகளை வடிவமை
+Comment[tg]= Метавонед мудири нишаст ва танзимоти хурӯҷро дар инҷо пахш кунед
+Comment[th]=ปรับแต่งการทำงานของเครื่องมือจัดการวาระและการล็อกเอาต์
+Comment[tr]=Oturum yöneticisi ve çıkış ayarlarını yapılandır
+Comment[tt]=Sessi idäräçen belän kerü/çığu tärtiben caylaw
+Comment[uk]=Налаштування менеджеру сеансів та параметри виходу з системи
+Comment[uz]=Seans boshqaruvchisini va chiqish moslamalarini moslash
+Comment[uz@cyrillic]=Сеанс бошқарувчисини ва чиқиш мосламаларини мослаш
+Comment[ven]=Dzudzanyani mulanguli wa ntshitenwa ni dovhe ni vale mavhekanyele
+Comment[vi]=Cấu hình trình quản lý phiên đăng nhập và các thiết lập đăng xuất
+Comment[wa]=Apontiaedje do manaedjeu si sessions eyet apontiaedjes do dislodjaedje
+Comment[xh]=Qwalasela umphathi wesiqendu nezicwangciso zokuphuma ngaphandle
+Comment[zh_CN]=配置会话管理器和注销设置
+Comment[zh_TW]=設定工作階段管理程式與登出設定值
+Comment[zu]=Hlanganisela imenenja yesiqendu kanye nezilungiselelo zokuphuma ngaphandle
+
+Keywords=ksmserver,session,logout,confirmation,save,restore
+Keywords[ar]=ksmserver,جلسة,خروج,تأكيد,حفظ,استعادة
+Keywords[az]=ksmserver,iclas,çıxış,qeyd et
+Keywords[be]=Сесія,Выхад,Канец сесіі,Пацверджанне,Захаванне,Захаваць,Аднавіць,Аднаўленне,ksmserver,session,logout,confirmation,save,restore
+Keywords[bg]=сесия, сесии, изход, запис, възстановяване, ksmserver, session, logout, confirmation, save, restore
+Keywords[ca]=ksmserver,sessió,sortida,confirmació,desa,restaura
+Keywords[cs]=Správce relace,Relace,Odhlášení,Potvrzení,Uložení,Obnovení
+Keywords[csb]=ksmserver,sesëjô,wëlogòwanié,pòcwierdzenié,zachòwanié stónu,òdtwòrzenié,kùńc robòtë,kùńc pracë
+Keywords[cy]=ksmserver,sesiwn,allgofnodi,cadarnhau,cadw,adfer
+Keywords[da]=ksmserver,session,log af,bekræftelse,gem,genopret
+Keywords[de]=Ksmserver,Sitzung,Abmelden,Logout,Bestätigung,Speichern,Wiederherstellen
+Keywords[el]=ksmserver,συνεδρία,αποσύνδεση,επιβεβαίωση,αποθήκευση,αποκατάσταση
+Keywords[eo]=seancokonservilo,seanco,adaiŭo,konfirmo,sekurigo,restarigo
+Keywords[es]=ksmserver,sesión,salida,confirmación,guardar,restaurar
+Keywords[et]=ksmserver,seanss,väljalogimine,kinnitus,salvestamine,taastamine
+Keywords[eu]=ksmserver,saioa,saio amaiera,berrespena,gorde,berrezarri
+Keywords[fa]=ksmserver، نشست، خروج، تأیید، ذخیره، بازنشانی
+Keywords[fi]=ksmserver,istunto,lopetus,vahvistus,tallenna,palauta
+Keywords[fr]=ksmserver,session,arrêt,logout,confirmation,enregistrement,enregistrer,restaurer,restauration,connexion,déconnexion
+Keywords[fy]=ksmserver,sesje,logout,ôfmelde,befêstiging,herstelle,opslaan,bewarje
+Keywords[ga]=ksmserver,seisiún,logáil amach,dearbhú,sábháil,athchóiriú
+Keywords[gl]=ksmserver,sesión,saída,confirmación,guardar,restaurar
+Keywords[he]=הפעלה,יציאה,אישור,שמירה,שיחזור,ksmserver, session,logout,confirmation,save,restore
+Keywords[hi]=केएसएम-सर्वर,सत्र,लॉगआउट,पुष्टि,सहेजें,बहाल करें
+Keywords[hr]=ksmserver,session,logout,confirmation,save,restore,sesija,odjava,potvrda,spremanje,obnavljanje
+Keywords[hu]=ksmserver,munkafolyamat,kijelentkezés,megerősítés,mentés,visszatöltés
+Keywords[is]=ksmserver,seta,stimpla út,innskráning,staðfesting,vista,endurheimta
+Keywords[it]=ksmserver,sessione,uscita,conferma,salva,ripristina
+Keywords[ja]=ksmserver,セッション,ログアウト,確認,保存,復旧
+Keywords[km]=ksmserver,សម័យ,ចេញ,ការ​អះអាង,រក្សាទុក,ស្ដារ​ឡើង​វិញ
+Keywords[lt]=ksmserver,sesija,išsiregistravimas,patvirtinimas,išsaugoti,atstatyti
+Keywords[lv]=ksmserveris,sesija,atteikšanās,apstiprinājums,saglabāt,atjaunot
+Keywords[mk]=ksmserver,session,logout,confirmation,save,restore, сесија,одјави се,потврда,сними,реконструирај
+Keywords[mn]=Ksmсервер,Суулт,Гарах,Logout,Бататгах,Хадгалах,Сэргээх
+Keywords[mt]=ksmserver,session,logout,temm is-sessjoni,confirmation,save,restore
+Keywords[nb]=ksmserver,økt,utlogging,lagre,gjenopprette
+Keywords[nds]=ksmserver,Törn,afmellen,nafragen,Nafraag,sekern,wedderherstellen
+Keywords[ne]=ksmserver,सत्र, लग आउट, यकीन, बचत गर्नुहोस्, पूर्वावस्थामा फर्काउनुहोस्
+Keywords[nl]=ksmserver,sessie,logout,uitloggen,afmelden,bevestiging,herstellen,opslaan
+Keywords[nn]=ksmserver,økt,utlogging,stadfesting,lagra,gjenopprett
+Keywords[nso]=ksmseabi,tiragalo,etswa,kgonthisiso,boloka,bolokaleswa
+Keywords[pa]=ksmserver,session,logout,confirmation,save,restore,ਸੰਭਾਲੋ,ਲਾਗਆਉਟ,ਪੁਸ਼ਟੀ
+Keywords[pl]=ksmserver,sesja,wylogowanie,potwierdzenie,zachowanie stanu,odtworzenie,kończenie pracy
+Keywords[pt]=ksmserver,sessão,terminar,confirmar,gravar,restaurar
+Keywords[pt_BR]=ksmserver,sessão,finalizar,sair,confirmação,salvar,restaurar
+Keywords[ro]=ksmserver,sesiune,ieșire,confirmare,salvare,refacere
+Keywords[rw]=ksm-seriveri,umukoro,gufunga,iyemeza,kubika,kugarura 
+Keywords[se]=ksmserver,bargovuorru,olggosčáliheapmi,nannen,vurket,máhcahit
+Keywords[sk]=ksmserver,relácia,odhlásenie,potvrdenie,uloženie,obnovenie
+Keywords[sl]=ksmserver,seja,odjava,potrditev,shrani,obnovi
+Keywords[sr]=ksmserver,session,logout,confirmation,save,restore,сесија,одјављивање, потврда,снимање,обнављање
+Keywords[sr@Latn]=ksmserver,session,logout,confirmation,save,restore,sesija,odjavljivanje, potvrda,snimanje,obnavljanje
+Keywords[sv]=ksmserver,session,logga ut,bekräftelse,spara,återställa
+Keywords[ta]=ksmசேவகன்,அமர்வு,வெளிசெல்,உறுதி செய்,சேமி,திரும்ப பெறு
+Keywords[th]=ksmserver,วาระ,ล็อกเอาต์,การยืนยัน,บันทึก,เรียกค่าคืน
+Keywords[tr]=ksmserver,oturum,çıkış,kaydet
+Keywords[uk]=ksmserver,сеанс,кінець сеансу,підтвердження,збереження,відновлення
+Keywords[uz]=ksmserver,seans,chiqish,tasdiqlash,saqlash,tiklash
+Keywords[uz@cyrillic]=ksmserver,сеанс,чиқиш,тасдиқлаш,сақлаш,тиклаш
+Keywords[ven]=siva ya ksm,tshitenwa,tsimani,khwathisedzani,vhulunga,vhekanyani hafhu
+Keywords[vi]=ksmserver,phiên đăng nhập,đăng xuất,xác nhận,sao lưu,phục hồi
+Keywords[wa]=ksmserver,session,dislodjî,acertiner,schaper,ristorer
+Keywords[xh]=ksmserver,isiqendu,phuma ngaphandle,uqinisekiso,gcina,gcina kwakhona
+Keywords[zh_CN]=ksmserver,会话,注消,确认,保存,恢复
+Keywords[zh_TW]=ksmserver,session,logout,confirmation,save,restore,工作階段,登出,確認,儲存,回復
+Keywords[zu]=ksmserver,isiqendu,ukuphuma ngaphandle,ukuqiniseka,gcina,vuselela
+
+Categories=Qt;KDE;X-KDE-settings-components;
diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h
new file mode 100644
index 000000000..4f51ab3d5
--- /dev/null
+++ b/kcontrol/smserver/kcmsmserver.h
@@ -0,0 +1,46 @@
+/*
+ *  kcmsmserver.h
+ *  Copyright (c) 2000 Oswald Buddenhagen <[email protected]>
+ *
+ *  based on kcmtaskbar.h
+ *  Copyright (c) 2000 Kurt Granroth <[email protected]>
+ *
+ *  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
+ */
+#ifndef __kcmsmserver_h__
+#define __kcmsmserver_h__
+
+#include <kcmodule.h>
+
+class SMServerConfigImpl;
+
+
+class SMServerConfig : public KCModule
+{
+  Q_OBJECT
+
+public:
+  SMServerConfig( QWidget *parent=0, const char* name=0, const QStringList &list=QStringList() );
+
+  void load();
+  void load(bool useDefaults);
+  void save();
+  void defaults();
+
+private:
+  SMServerConfigImpl* dialog;
+
+};
+
+#endif
diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui
new file mode 100644
index 000000000..518052675
--- /dev/null
+++ b/kcontrol/smserver/smserverconfigdlg.ui
@@ -0,0 +1,248 @@
+<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<class>SMServerConfigDlg</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>SMServerConfigDlg</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>325</width>
+            <height>366</height>
+        </rect>
+    </property>
+    <property name="caption">
+        <string>Session Manager</string>
+    </property>
+    <property name="layoutMargin" stdset="0">
+    </property>
+    <vbox>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <widget class="QGroupBox">
+            <property name="name">
+                <cstring>topBox</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="title">
+                <string>General</string>
+            </property>
+            <vbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QCheckBox">
+                    <property name="name">
+                        <cstring>confirmLogoutCheck</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Conf&amp;irm logout</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Check this option if you want the session manager to display a logout confirmation dialog box.</string>
+                    </property>
+                </widget>
+                <widget class="QCheckBox">
+                    <property name="name">
+                        <cstring>offerShutdownCheck</cstring>
+                    </property>
+                    <property name="text">
+                        <string>O&amp;ffer shutdown options</string>
+                    </property>
+                </widget>
+            </vbox>
+        </widget>
+        <widget class="QButtonGroup">
+            <property name="name">
+                <cstring>loginGroup</cstring>
+            </property>
+            <property name="title">
+                <string>On Login</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>&lt;ul&gt;
+&lt;li&gt;&lt;b&gt;Restore previous session:&lt;/b&gt; Will save all applications running on exit and restore them when they next start up&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;Restore manually saved session: &lt;/b&gt; Allows the session to be saved at any time via "Save Session" in the K-Menu. This means the currently started applications will reappear when they next start up.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;Start with an empty session:&lt;/b&gt; Do not save anything. Will come up with an empty desktop on next start.&lt;/li&gt;
+&lt;/ul&gt;</string>
+            </property>
+            <vbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>previousSessionRadio</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Restore &amp;previous session</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>savedSessionRadio</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Restore &amp;manually saved session</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>emptySessionRadio</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Start with an empty &amp;session</string>
+                    </property>
+                </widget>
+            </vbox>
+        </widget>
+        <widget class="QButtonGroup">
+            <property name="name">
+                <cstring>sdGroup</cstring>
+            </property>
+            <property name="title">
+                <string>Default Shutdown Option</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>Here you can choose what should happen by default when you log out. This only has meaning, if you logged in through KDM.</string>
+            </property>
+            <vbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>logoutRadio</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;End current session</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>haltRadio</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;Turn off computer</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>rebootRadio</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;Restart computer</string>
+                    </property>
+                </widget>
+            </vbox>
+        </widget>
+        <widget class="QButtonGroup">
+            <property name="name">
+                <cstring>advancedGroup</cstring>
+            </property>
+            <property name="title">
+                <string>Advanced</string>
+            </property>
+            <vbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QLabel">
+                    <property name="name">
+                        <cstring>textLabel1</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Applications to be e&amp;xcluded from sessions:</string>
+                    </property>
+                    <property name="buddy" stdset="0">
+                        <cstring>excludeLineedit</cstring>
+                    </property>
+                </widget>
+                <widget class="KLineEdit">
+                    <property name="name">
+                        <cstring>excludeLineedit</cstring>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Here you can enter a comma-separated list of applications that should not be saved in sessions, and therefore will not be started when restoring a session. For example 'xterm,xconsole'.</string>
+                    </property>
+                </widget>
+            </vbox>
+        </widget>
+        <spacer>
+            <property name="name">
+                <cstring>bottomSpacer</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>130</height>
+                </size>
+            </property>
+        </spacer>
+    </vbox>
+</widget>
+<connections>
+    <connection>
+        <sender>confirmLogoutCheck</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>SMServerConfigDlg</receiver>
+        <slot>configChanged()</slot>
+    </connection>
+    <connection>
+        <sender>loginGroup</sender>
+        <signal>clicked(int)</signal>
+        <receiver>SMServerConfigDlg</receiver>
+        <slot>configChanged()</slot>
+    </connection>
+    <connection>
+        <sender>sdGroup</sender>
+        <signal>clicked(int)</signal>
+        <receiver>SMServerConfigDlg</receiver>
+        <slot>configChanged()</slot>
+    </connection>
+    <connection>
+        <sender>excludeLineedit</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>SMServerConfigDlg</receiver>
+        <slot>configChanged()</slot>
+    </connection>
+    <connection>
+        <sender>offerShutdownCheck</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>sdGroup</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>offerShutdownCheck</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>SMServerConfigDlg</receiver>
+        <slot>configChanged()</slot>
+    </connection>
+</connections>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+</includes>
+<slots>
+    <slot>configChanged()</slot>
+</slots>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</UI>
diff --git a/kcontrol/smserver/smserverconfigimpl.cpp b/kcontrol/smserver/smserverconfigimpl.cpp
new file mode 100644
index 000000000..9a2afbd90
--- /dev/null
+++ b/kcontrol/smserver/smserverconfigimpl.cpp
@@ -0,0 +1,31 @@
+/***************************************************************************
+                          smserverconfigimpl.cpp  -  description
+                             -------------------
+    begin                : Thu May 17 2001
+    copyright            : (C) 2001 by stulle
+    email                : stulle@tux
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "smserverconfigimpl.h"
+#include "smserverconfigimpl.moc"
+
+SMServerConfigImpl::SMServerConfigImpl(QWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {
+
+}
+SMServerConfigImpl::~SMServerConfigImpl(){
+}
+/** No descriptions */
+void SMServerConfigImpl::configChanged(){
+
+ emit changed();
+
+}
diff --git a/kcontrol/smserver/smserverconfigimpl.h b/kcontrol/smserver/smserverconfigimpl.h
new file mode 100644
index 000000000..d928c48ec
--- /dev/null
+++ b/kcontrol/smserver/smserverconfigimpl.h
@@ -0,0 +1,41 @@
+/***************************************************************************
+                          smserverconfigimpl.h  -  description
+                             -------------------
+    begin                : Thu May 17 2001
+    copyright            : (C) 2001 by stulle
+    email                : stulle@tux
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef SMSERVERCONFIGIMPL_H
+#define SMSERVERCONFIGIMPL_H
+
+#include <qwidget.h>
+#include "smserverconfigdlg.h"
+
+/**
+  *@author stulle
+  */
+
+class SMServerConfigImpl : public SMServerConfigDlg  {
+   Q_OBJECT
+public:
+	SMServerConfigImpl(QWidget *parent=0, const char *name=0);
+	~SMServerConfigImpl();
+public slots: // Public slots
+  /** No descriptions */
+  void configChanged();
+signals: // Signals
+  /** No descriptions */
+  void changed();
+};
+
+#endif