SVN_SILENT made messages (.desktop file)

svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=518767
2026-07-01 23:41:18 -07:00 · 2006-03-15 07:37:13 +00:00 · 2006-03-14 07:36:32 +00:00 · 2006-03-11 07:35:13 +00:00 · 2006-03-10 07:30:29 +00:00 · 2006-01-25 23:22:55 +00:00
40 changed files with 1426 additions and 1418 deletions
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
--- a/doc/index.docbook
+++ b/doc/index.docbook
--- a/kcm_krfb/Makefile.am
+++ b/kcm_krfb/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_krfb.la

 kcm_krfb_la_SOURCES = configurationwidget.ui kcm_krfb.cpp
 kcm_krfb_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module
-kcm_krfb_la_LIBADD   = ../krfb/libkrfbconfig.la $(LIB_KDEUI)
+kcm_krfb_la_LIBADD   = ../krfb/libkrfbconfig.la $(LIB_KDEUI) -lkio

 # Services
 xdg_apps_DATA = kcmkrfb.desktop
--- a/kcm_krfb/configurationwidget.ui
+++ b/kcm_krfb/configurationwidget.ui
@@ -50,12 +50,6 @@
                        <property name="name">
                            <cstring>GroupBox1</cstring>
                        </property>
-                        <property name="frameShape">
-                            <enum>Box</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
                        <property name="title">
                            <string>Invitations</string>
                        </property>
--- a/kcm_krfb/kcm_krfb.cpp
+++ b/kcm_krfb/kcm_krfb.cpp
@@ -45,7 +45,7 @@ typedef KGenericFactory<KcmKRfb, QWidget> KcmKRfbFactory;

 // Can't use K_EXPORT_COMPONENT_FACTORY, since insertCatalogue necessary
 extern "C" {
-  void *init_kcm_krfb() {
+  KDE_EXPORT void *init_kcm_krfb() {
    KGlobal::locale()->insertCatalogue("krfb"); // For invitation translations
    return new KcmKRfbFactory("kcm_krfb"); 
  }
@@ -151,6 +151,7 @@ void KcmKRfb::save() {
 		m_configuration.setPreferredPort(m_confWidget->portInput->value());
 	m_configuration.setDisableBackground(m_confWidget->disableBackgroundCB->isChecked());
 	m_configuration.save();
+	kapp->dcopClient()->emitDCOPSignal("KRFB::ConfigChanged", "KRFB_ConfigChanged()", QByteArray());
 	emit changed(false);
 }

--- a/kcm_krfb/kcmkrfb.desktop
+++ b/kcm_krfb/kcmkrfb.desktop
@@ -12,7 +12,8 @@ X-KDE-ParentApp=kcontrol
 Name=Desktop Sharing
 Name[af]=Werkskerm Deeling
 Name[ar]=مشاركة سطح المكتب
-Name[bg]=Споделяне на работно място
+Name[bn]=ডেস্কটপ ভাগাভাগি
+Name[br]=Rannañ ar vurev
 Name[bs]=Dijeljenje desktopa
 Name[ca]=Compartició de l'escriptori
 Name[cs]=Sdílení pracovní plochy
@@ -21,10 +22,12 @@ Name[da]=Desktopdeling
 Name[de]=Arbeitsfläche freigeben
 Name[el]=Κοινή χρήση επιφάνειας εργασίας
 Name[eo]=Tabuloj komunaj
-Name[es]=Compartición de escritorio
+Name[es]=Escritorio compartido
 Name[et]=Töölaua jagamine
+Name[eu]=Mahaigain partekatzea
 Name[fi]=Työpöydän jakaminen
 Name[fr]=Partage de bureau
+Name[ga]=Roinnt Deisce
 Name[gl]=Compartición do escritorio
 Name[he]=שיתוף שולחנות עבודה
 Name[hi]=डेस्कटॉप साझेदारी
@@ -33,13 +36,14 @@ Name[hu]=Munkaasztal-megosztás
 Name[is]=Skjáborðamiðlun
 Name[it]=Condivisione Desktop
 Name[ja]=デスクトップ共有
+Name[km]=ការចែករំលែកផ្ទៃតុ
 Name[lt]=Dalinimasis darbastaliu
 Name[mk]=Делење на работната површина
 Name[mn]=Ажлын байрыг хамтран эзэмших
 Name[ms]=Perkongsian Ruang Kerja
 Name[mt]=Qsim tad-desktop
 Name[nb]=Delte skrivebord
-Name[nl]=Bureaubladvrijgave
+Name[nl]=Bureaublad delen
 Name[nn]=Skrivebordsdeling
 Name[nso]=Kabagano ya Desktop
 Name[pl]=Współdzielenie pulpitu
@@ -47,8 +51,9 @@ Name[pt]=Partilha do Ambiente de Trabalho
 Name[pt_BR]=Compartilhamento do Desktop
 Name[ro]=Partajare ecran
 Name[ru]=Общий рабочий стол
+Name[se]=Čállinbeavdejuohkkin
 Name[sk]=Zdieľanie pracovnej plochy
-Name[sl]=Souporaba namizja
+Name[sl]=Deljenje namizja
 Name[sr]=Дељење радне површине
 Name[sr@Latn]=Deljenje radne površine
 Name[sv]=Dela ut skrivbordet
@@ -60,6 +65,7 @@ Name[uk]=Спільні стільниці
 Name[ven]=U kovhekana ha Desikithopo
 Name[xh]=Ukwehlulelana kwe Desktop
 Name[zh_CN]=桌面共享
+Name[zh_HK]=桌面分享
 Name[zh_TW]=桌面分享
 Name[zu]=Ukwahlulelana kwe-Desktop

@@ -67,18 +73,21 @@ Comment=Configure Desktop Sharing
 Comment[af]=Konfigureer Werkskerm Deeling
 Comment[ar]=تعديل مشاركة سطح المكتب
 Comment[bg]=Настройки на споделянето на работно място
+Comment[bn]=ডেস্কটপ ভাগাভাগি কনফিগার করুন
 Comment[bs]=Podesite dijeljenje desktopa
 Comment[ca]=Lupa de l'escriptori
 Comment[cs]=Nastavit sdílení pracovní plochy
 Comment[cy]=Ffurfweddu Rhannu Penbwrdd
 Comment[da]=Indstil desktopdeling
 Comment[de]=Freigabe der Arbeitsfläche einrichten
-Comment[el]=Ρύθμιση του μοιράσματος της επιφάνειας εργασίας
+Comment[el]=Ρύθμιση της κοινής χρήσης της επιφάνειας εργασίας
 Comment[eo]=Agordu fordonadon de viaj tabuloj
-Comment[es]=Compartición de escritorio
+Comment[es]=Configure su escritorio compartido
 Comment[et]=Töölaua jagamise seadistamine
-Comment[fi]=Aseta työpöydän jakamista
+Comment[eu]=Konfiguratu mahaigain partekatzea
+Comment[fi]=Aseta työpöydän jakaminen
 Comment[fr]=Configuration du partage du bureau
+Comment[ga]=Cumraigh Roinnt Deisce
 Comment[gl]=Configura-la compartición do escritorio
 Comment[he]=שינוי הגדרות שיתוף שולחנות העבודה
 Comment[hi]=कॉन्फ़िगर डेस्कटॉप साझेदारी
@@ -87,18 +96,20 @@ Comment[hu]=A munkaasztal-megosztás beállításai
 Comment[is]=Stilla skjáborðsmiðlun
 Comment[it]=Configura condivisione desktop
 Comment[ja]=デスクトップ共有の設定
-Comment[lt]=Konfigūruoti dalinimąsi darbastaliu
+Comment[km]=កំណត់រចនាសម្ព័ន្ធការចែករំលែកផ្ទៃតុ
+Comment[lt]=Derinti dalinimąsi darbastaliu
 Comment[mk]=Конфигурирајте делење на површината
 Comment[mn]=Ажлын байрны хамтран эзэмших тохируулга
 Comment[ms]= Selaraskan Perkongsian Desktop
 Comment[nb]=Tilpass delte skrivebord
-Comment[nl]=Bureaubladvrijgave instellen
+Comment[nl]=Bureaublad delen instellen
 Comment[nn]=Set opp skrivebordsdeling
 Comment[nso]=Beakanya Kabagano ya Desktop
 Comment[pl]=Konfiguracja współdzielenia pulpitu
 Comment[pt]=Configura a Partilha do Ecrã
 Comment[pt_BR]=Configurar Compartilhamento do Desktop
 Comment[ru]=Параметры общего рабочего стола
+Comment[se]=Heivet čállinbeavdejuohkkima
 Comment[sk]=Nastavenie zdieľania pracovnej plochy
 Comment[sl]=Nastavi deljenje namizja
 Comment[sr]=Подешавање дељења радне површине
@@ -111,6 +122,7 @@ Comment[uk]=Налаштувати спільні стільниці
 Comment[ven]=Dzudzanyani u kovhekana ha desikithopo
 Comment[xh]=Qwalasela Ukusebenzisa ngokuhlangeneyo kwe Desktop 
 Comment[zh_CN]=配置桌面共享
+Comment[zh_HK]=設定桌面分享
 Comment[zh_TW]=設定桌面分享
 Comment[zu]=Hlela kahle Ukwahlulelana kwe-Desktop
 Keywords=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
@@ -123,21 +135,24 @@ Keywords[cy]=rhannu penbwrdd,krfb,vnc,rhannu,rdp,krdc,cysylltiad penbwrdd pell,g
 Keywords[da]=desktopdeling,krfb,vnc,deling,krdc,ekstern desktopforbindelse,invitation,port,slp,ikke inviteret
 Keywords[de]=Arbeitsfläche freigeben,krfb,VNC,freigeben,krdc,Entfernte Arbeitsfläche,Einladung,Port,slp,uneingeladen
 Keywords[el]=κοινή χρήση επιφάνειας εργασίας,krfb,vnc,κοινή χρήση,krdc,σύνδεση σε απομακρυσμένη επιφάνεια εργασίας,πρόσκληση,θύρα,slp,απρόσκλητο
-Keywords[es]=compartición de escritorio,krfb,vnc,compartir,rdp,krdc, conexión escritorio remoto,invitación,puerto,slp,no invitado
+Keywords[es]=escritorio compartido,krfb,vnc,compartir,rdp,krdc, conexión escritorio remoto,invitación,puerto,slp,no invitado
 Keywords[et]=töölaua jagamine,krfb,vnc,jagamine,rdp,krdc,kaugtöölaua ühendus,rdp,kutse,port,slp,kutsumata
-Keywords[fi]=työpöydän jakaminen,krfb,vnc,jakaminen,krdc,etätyöpöytäyhteys, kutsu,portti,slp,kutsumaton
+Keywords[eu]=mahaigain partekatzea,krfb,vnc,partekatzea,krdc,urruneko mahaigain konexioa,gonbidapena,ataka,slp,gonbidapen gabea
+Keywords[fi]=työpöydän jakaminen,krfb,vnc,jakaminen,krdc,etätyöpöytäyhteys, kutsu,portti,slp,kutsumaton, työpöytä
 Keywords[fr]=partage de bureau,krfb,vnc,partage,rdp,krdc,connexion à un bureau distant,invitation,port,slp,non invité
 Keywords[gl]=compartición de escritorio, vnc, compartir, krdc, conexión escritorio remoto, invitación, porto, slt
-Keywords[he]=שיתוף שולחן עבודה,krfb,vnc,שיתוף,rdp,krdc,חיבור לשולחן עבודה מרוחק,rdp
+Keywords[he]=שיתוף שולחן עבודה,שיתוף,חיבור לשולחן עבודה מרוחק,desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection, invitation, port, slp, uninvited
 Keywords[hi]=डेस्कटॉप साझेदारी, केआरएफबी,वीएनसी,साझेदारी,केआरडीसी,रिमोट डेस्कटॉप कनेक्शन,निमंत्रण,पोर्ट,एसएलपी,बिन बुलाए
 Keywords[hu]=munkaasztal-megosztás,krfb,vnc,megosztás,krdc,csatlakozás távoli munkaasztalhoz,meghívás,port,slp,meghívás nélkül
 Keywords[is]=skjáborðsmiðlun,miðlun,krfb,vnc,rdp,krdc,fjarvinnsla,remote desktop connection,rdp
 Keywords[it]=condivisione desktop,krfb,vnc,condivisione,krdc,connessione desktop remoto,invito,porta,slp,non invitato
 Keywords[ja]=デスクトップ共有,krfb,vnc,共有,rdp,krdc,リモートデスクトップ接続,invitation,port,slp,uninvited
+Keywords[km]=ការចែករំលែកផ្ទៃតុ,krfb,vnc,ការចែករំលែក,krdc,ការតភ្ជាប់ផ្ទៃតុពីចម្ងាយ,អញ្ជើញ,ច្រក,slp,មិនបានអញ្ជើញ
+Keywords[lt]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,dalinimasis darbastaliu,nutolusio darbastalio prijungimas,kvietimas,ryšys,nekviestas,jungtis,prievadas,dalintis,pasidalinti,jungimasis,prisijungti,kviesti
 Keywords[mk]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,делење на површината,krfb,vnc,делење,krdc,поврзување со оддалечена  површина,покана,порта,slp,непоканет
 Keywords[ms]= perkongsian ruang kerja, sambungan, liang, desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
 Keywords[nb]=skrivebordsdeling,krfb,vnc,deling,krdc,tilkobling til fjernt skrivebord,invitasjon,port,slp,ikke invitert
-Keywords[nl]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,uitnodiging,slp,rdp,verbinding,bureaubladvrijgave,bureaublad op afstand
+Keywords[nl]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,uitnodiging,slp,rdp,verbinding, bureaublad delen,bureaublad op afstand
 Keywords[nn]=skrivebordsdeling,krfb,vnc,deling,krdc,nettverksskrivebord,invitasjon,port,slp,ikkje invitert
 Keywords[pl]=współdzielenie pulpitu,krfb,vnc,współdzielenie,rdp,krdc,zdalne połączenie, zdalne biurko, zdalny pulpit, zaproszenie,port,slp
 Keywords[pt]=partilha do ecrã,krfb,vnc,partilha,krdc,ligação a um ecrã remoto,convite,porto,slp,sem convite
@@ -152,4 +167,4 @@ Keywords[tr]=masaüstü paylaşımı,krfb,vnc,paylaşım,krdc,uzak masaüstü ba
 Keywords[uk]=спільні стільниці,krfb,vnc,спільний,rdp,krdc,з'єднання віддаленої стільниці,запрошення,rdp,slp,без запрошення
 Keywords[zh_CN]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,桌面共享,共享,远程桌面连接,邀请,端口,未邀请

-Categories=Qt;KDE;X-KDE-settings-network
+Categories=Qt;KDE;X-KDE-settings-network;
--- a/kinetd/Makefile.am
+++ b/kinetd/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kded_kinetd.la

 kded_kinetd_la_SOURCES = kinetd.cpp kinetd.skel
 kded_kinetd_la_LDFLAGS  = $(all_libraries) -module -avoid-version
-kded_kinetd_la_LIBADD   = ../srvloc/libsrvloc.la $(LIB_KIO) 
+kded_kinetd_la_LIBADD   = ../srvloc/libsrvloc.la $(LIB_KIO) $(LIB_KDNSSD)

 # Services
 kde_servicetypes_DATA = kinetdmodule.desktop
@@ -17,8 +17,6 @@ EXTRA_DIST = $(kded_kinetd_la_SOURCES)\
             $(kde_servicetypes_DATA) \
 	     eventsrc README.debugging

-KDE_ICON = kinetd
-
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kinetd
 	$(INSTALL_DATA) $(srcdir)/eventsrc $(DESTDIR)$(kde_datadir)/kinetd/eventsrc
--- a/kinetd/eventsrc
+++ b/kinetd/eventsrc
@@ -1,6 +1,7 @@
 [!Global!]
 IconName=kinetd
 Comment=KInetD
+Comment[bn]=কে-আইনেট-ডি
 Comment[hi]=के-इनिट-डी
 Comment[sv]=Kinetd

@@ -8,6 +9,8 @@ Comment[sv]=Kinetd
 Name=IncomingConnection
 Name[ar]=اتصال وارد
 Name[bg]=Получена е входяща връзка
+Name[bn]=অন্তর্মুখী সংযোগ
+Name[br]=Kevreadenn resev
 Name[ca]=Connexió entrant
 Name[cs]=Příchozí spojení
 Name[cy]=CysylltiadCyrraedd
@@ -17,8 +20,10 @@ Name[el]=Εισερχόμενη σύνδεση
 Name[eo]=EnvenantaKonekto
 Name[es]=Conexión entrante
 Name[et]=Sissetulev ühendus
+Name[eu]=Sarrerako konexioa
 Name[fi]=Saapuva yhteys
 Name[fr]=Connexion entrante
+Name[ga]=CeangalIsteach
 Name[gl]=Conexión Entrante
 Name[he]=חיבור נכנס
 Name[hi]=आवक-कनेक्शन
@@ -26,7 +31,8 @@ Name[hr]=DolaznaVeza
 Name[hu]=Bejövő kapcsolat
 Name[it]=Connessioni in entrata
 Name[ja]=外部からの接続
-Name[lt]=Ateinantis prisijungimas
+Name[km]=ការតភ្ជាប់ចូល
+Name[lt]=Gautas kvietimas ryšiui
 Name[mk]=Дојдовно поврзување
 Name[mn]=Орж ирсэн Холболт
 Name[ms]=Sambungan Masuk
@@ -53,12 +59,14 @@ Name[uk]=ВхіднеЗ'єднання
 Name[ven]=Vhukwamanihanga ngomu
 Name[xh]=Uxhumaniso Olungenayo
 Name[zh_CN]=进入的连接
+Name[zh_HK]=進入連線
 Name[zh_TW]=進來的連接
 Name[zu]=UkuxhumanaOkuzayo
 Comment=Received incoming connection
 Comment[af]=Ontvang inkomende verbinding
 Comment[ar]=تم استلام اتصال وارد
 Comment[bg]=Получена е входяща връзка
+Comment[bn]=অন্তর্মুখী সংযোগ গ্রহণ করল
 Comment[bs]=Primio dolaznu konekciju
 Comment[ca]=Rebuda connexió entrant
 Comment[cs]=Obdrženo příchozí spojení
@@ -69,6 +77,7 @@ Comment[el]=Λήψη εισερχόμενης σύνδεσης
 Comment[eo]=Ricevantaj envenantaj konektoj
 Comment[es]=Recibida conexión entrante
 Comment[et]=Saadi sissetulev ühendus
+Comment[eu]=Konexio bat jaso da
 Comment[fi]=Vastaanotettiin saapuva yhteys
 Comment[fr]=Reçu une connexion entrante
 Comment[gl]=Recibíuse unha conexión entrante
@@ -79,7 +88,8 @@ Comment[hu]=Csatlakozási kérés érkezett
 Comment[is]=Tók á móti uppkalli
 Comment[it]=Connessione in entrata stabilita
 Comment[ja]=着信した外部からの接続
-Comment[lt]=Gautas įeinantis prisijungimas
+Comment[km]=បានទទួលការតភ្ជាប់ចូល
+Comment[lt]=Gautas kvietimas ryšiui
 Comment[mk]=Примено е дојдовно поврзување
 Comment[mn]=Орж ирсэн Холболтыг хүлээн авав
 Comment[ms]=Menerima sambungan masuk
@@ -93,6 +103,7 @@ Comment[pt]=Foi recebida uma ligação
 Comment[pt_BR]=Recebendo conexão de entrada
 Comment[ro]=Conexiune de intrare recepţionată
 Comment[ru]=Входящее соединение завершилось успешно
+Comment[se]=Oaččui boahtti oktavuođa
 Comment[sk]=Prijaté príchodzie spojenia
 Comment[sl]=Prejeta je prihajajoča povezava
 Comment[sr]=Примљена је долазећа веза
@@ -105,6 +116,7 @@ Comment[uk]=Отримано вхідне з'єднання
 Comment[ven]=Vhukwamani hau dzhena ho tanganedzhwaho
 Comment[xh]=Uxhulumano olungenayo olufunyenweyo
 Comment[zh_CN]=收到进入的连接
+Comment[zh_HK]=已接收的進入連線
 Comment[zh_TW]=已接收的進來的連線
 Comment[zu]=Ukuxhumanisa okungenayo okutholakele
 default_presentation=4
@@ -113,6 +125,7 @@ default_presentation=4
 Name=ProcessFailed
 Name[ar]=فشلت العملية
 Name[bg]=Процесът за обработка връзки не може да бъде стартиран
+Name[bn]=প্রসেস ব্যর্থ
 Name[ca]=Procés fallit
 Name[cs]=Proces selhal
 Name[cy]=MethoddProses
@@ -122,8 +135,10 @@ Name[el]=Η επεξεργασία απέτυχε
 Name[eo]=ProcezoFiaskis
 Name[es]=Proceso fallido
 Name[et]=Protsess ebaõnnestus
+Name[eu]=Prozesuak huts egin du
 Name[fi]=Prosessi epäonnistui
 Name[fr]=Échec du processus
+Name[ga]=PróiseasTeipthe
 Name[gl]=Proceso fallido
 Name[he]=תהליך נכשל
 Name[hi]=प्रक्रिया-असफल
@@ -131,6 +146,7 @@ Name[hr]=ProcesNeuspješan
 Name[hu]=Hibás folyamat
 Name[it]=Processo fallito
 Name[ja]=プロセス失敗
+Name[km]=ដំណើរការបានបរាជ័យ
 Name[lt]=Procesas nepavyko
 Name[mk]=Процесот не успеа
 Name[mn]=Ажиллагаа сүйрэв
@@ -153,16 +169,19 @@ Name[sv]=Process misslyckades
 Name[ta]=செயல் தோல்வியுற்றது
 Name[tg]=Ҷараён бо Нокомӣ анҷомид
 Name[th]=โปรเซสล้มเหลว
+Name[tr]=Başarısız İşlemler
 Name[uk]=ПомилкаПроцесу
 Name[ven]=Tshitenwa tsho bala
 Name[xh]=Inkqubo Yahlulekile
 Name[zh_CN]=处理失败
+Name[zh_HK]=程序失敗
 Name[zh_TW]=程序失敗
 Name[zu]=UkwenzekaKuhlulekile
 Comment=Could not call process to handle connection
 Comment[af]=Kon nie roep proses na handvatsel verbinding
 Comment[ar]=لم أستطع استحضار العملية لحمل المكالمة
 Comment[bg]=Процесът за обработка връзки не може да бъде стартиран
+Comment[bn]=সংযোগ পরিচালনা করতে প্রসেস শুরু করতে পারল না
 Comment[bs]=Ne mogu pokrenuti proces koji upravlja konekcijom
 Comment[ca]=No es pot cridar al procés per a manejar la connexió
 Comment[cs]=Nelze spustit proces k obsluze spojení
@@ -173,6 +192,7 @@ Comment[el]=Δεν ήταν δυνατή η κλήση της διεργασία
 Comment[eo]=Ne eblis lanĉi instancon por prizorgi la konekton
 Comment[es]=Imposible lanzar proceso para manejar conexión
 Comment[et]=Ei suuda käivitada protsessi ühenduse käsitsemiseks
+Comment[eu]=Ezin izan da konexioa kudeatzeko prozesua deitu
 Comment[fi]=Ei voitu kutsua prosessia yhteyden hoitamiseksi
 Comment[fr]=Impossible d'appeler le processus pour gérer la connexion
 Comment[gl]=Non se puidcho chamar ó proceso para que atendese á conexión
@@ -183,7 +203,8 @@ Comment[hu]=A kapcsolat kezelése nem sikerült
 Comment[is]=Gat ekki kallað á forrit til að höndla tengingu
 Comment[it]=Impossibile richiamare il processo per gestire la connessione
 Comment[ja]=接続を扱うプロセスを呼び出せません
-Comment[lt]=Negaliu iškviesti proceso prisijungimui apdoroti
+Comment[km]=មិនអាចហៅដំណើរការ ដើម្បីដោះស្រាយការតភ្ជាប់បានឡើយ
+Comment[lt]=Nepavyko iškviesti proceso prisijungimui apdoroti
 Comment[mk]=Не може да се повика процесот за ракување со поврзувањето
 Comment[mn]=Холболтыг заах ажиллагаагдуудаж чадаагүй
 Comment[ms]=Tidak dapat memanggil proses untuk mengendalikan sambungan
@@ -195,7 +216,7 @@ Comment[nso]=Ebe ekase bitse tiragalo go swara kopantsho
 Comment[pl]=Nie można było uruchomić procesu obsługi połączenia
 Comment[pt]=Não foi possível chamar o processo de tratamento da ligação
 Comment[pt_BR]=Não foi possível chamar o processo de controle da conexão
-Comment[ru]=Не удается запустить процесс обработки соединения
+Comment[ru]=Не удаётся запустить процесс обработки соединения
 Comment[sk]=Nemohol som zavolať proces pre spracovanie spojenia
 Comment[sl]=Ni možno poklicati procesa za upravljanje s povezavo
 Comment[sr]=Нисам могао да позовем процес да опслужи везу
@@ -204,10 +225,12 @@ Comment[sv]=Kunde inte anropa process för att hantera anslutning
 Comment[ta]=இணைப்பை கையாள செயற்பாட்டை அழைக்க முடியவில்லை
 Comment[tg]=Барои даскории пайвастшавӣ ҷараён бозхонда нашуд
 Comment[th]=ไม่สามารถเรียกโปรเซสเพื่อรับการเชื่อมต่อได้
+Comment[tr]=Elle bağlantıda başarısız çağrı işlemleri
 Comment[uk]=Неможливо викликати процес для обробки з'єднання
 Comment[ven]=Ingasi vhidze tshitenwa uitela u fara vhukwamani
 Comment[xh]=Ayikwazanga ukubiza inkqubo ezakuphatha uxhulumano
 Comment[zh_CN]=无法调用进程处理连接
+Comment[zh_HK]=無法呼叫處理連線的程序
 Comment[zh_TW]=無法呼叫處理連線的程序
 Comment[zu]=Ayikwazanga ukubiza umsebenzi ukuzophatha ukuxhumanisa
 default_presentation=4
--- a/kinetd/kinetd.cpp
+++ b/kinetd/kinetd.cpp
@@ -42,7 +42,8 @@ PortListener::PortListener(KService::Ptr s,
 	m_serviceRegistered(false),
 	m_socket(0),
 	m_config(config),
-	m_srvreg(srvreg)
+	m_srvreg(srvreg),
+	m_dnssdreg(0)
 {
 	m_uuid = createUUID();
 	loadConfig(s);
@@ -78,8 +79,11 @@ bool PortListener::acquirePort() {
 		SLOT(accepted(KSocket*)));

 	bool s = m_registerService;
+	bool sd =m_dnssdRegister;
 	setServiceRegistrationEnabledInternal(false);
+	dnssdRegister(false);
 	setServiceRegistrationEnabledInternal(s);
+	dnssdRegister(sd);
 	return true;
 }

@@ -89,6 +93,7 @@ void PortListener::freePort() {
 		delete m_socket;
 	m_socket = 0;
 	setServiceRegistrationEnabledInternal(m_registerService);
+	dnssdRegister(false);
 }

 void PortListener::loadConfig(KService::Ptr s) {
@@ -99,7 +104,7 @@ void PortListener::loadConfig(KService::Ptr s) {
 	m_multiInstance = false;

 	QVariant vid, vport, vautoport, venabled, vargument, vmultiInstance, vurl,
-	  vsattributes, vslifetime;
+	  vsattributes, vslifetime, vdname, vdtype, vddata;

 	m_execPath = s->exec().utf8();
 	vid = s->property("X-KDE-KINETD-id");
@@ -111,6 +116,9 @@ void PortListener::loadConfig(KService::Ptr s) {
 	vurl = s->property("X-KDE-KINETD-serviceURL");
 	vsattributes = s->property("X-KDE-KINETD-serviceAttributes");
 	vslifetime = s->property("X-KDE-KINETD-serviceLifetime");
+	vdname = s->property("X-KDE-KINETD-DNSSD-Name");
+	vdtype = s->property("X-KDE-KINETD-DNSSD-Type");
+	vddata = s->property("X-KDE-KINETD-DNSSD-Properties");

 	if (!vid.isValid()) {
 		kdDebug() << "Kinetd cannot load service "<<m_serviceName
@@ -152,6 +160,24 @@ void PortListener::loadConfig(KService::Ptr s) {
 	}
 	else
 		m_serviceAttributes = "";
+	if (vddata.isValid()) {
+		QStringList attrs = vddata.toStringList();
+		for (QStringList::iterator it=attrs.begin();
+		it!=attrs.end();it++) {
+		    QString key = (*it).section('=',0,0);
+		    QString value =  processServiceTemplate((*it).section('=',1))[0];
+		    if (!key.isEmpty()) m_dnssdData[key]=value;
+		    }
+	}
+	if (vdname.isValid() && vdtype.isValid()) {
+		m_dnssdName = processServiceTemplate(vdname.toString())[0];
+		m_dnssdType = vdtype.toString();
+		m_dnssdRegister = true;
+		kdDebug() << "DNS-SD register is enabled\n";
+	}
+	else 
+	        m_dnssdRegister = false;
+		

 	m_slpLifetimeEnd = QDateTime::currentDateTime().addSecs(m_serviceLifetime);
 	m_defaultPortBase = m_portBase;
@@ -281,6 +307,7 @@ void PortListener::setEnabledInternal(bool e, const QDateTime &ex) {
 		if (m_port < 0)
 			acquirePort();
 		m_enabled = m_port >= 0;
+
 	}
 	else {
 		freePort();
@@ -298,6 +325,7 @@ bool PortListener::isServiceRegistrationEnabled() {

 void PortListener::setServiceRegistrationEnabled(bool e) {
 	setServiceRegistrationEnabledInternal(e);
+	dnssdRegister(e && m_enabled);
 	m_config->setGroup("ListenerConfig");
 	m_config->writeEntry("enable_srvreg_" + m_serviceName, e);
 	m_config->sync();
@@ -335,6 +363,23 @@ void PortListener::setServiceRegistrationEnabledInternal(bool e) {
 	}
 }

+void PortListener::dnssdRegister(bool e) {
+	if (m_dnssdName.isNull() || m_dnssdType.isNull())
+		return;
+	if (m_dnssdRegistered ==  e)
+		return;
+	if (e) {
+		m_dnssdRegistered=true;
+		m_dnssdreg = new DNSSD::PublicService(m_dnssdName,m_dnssdType,m_port);
+		m_dnssdreg->setTextData(m_dnssdData);
+		m_dnssdreg->publishAsync();
+	} else {
+		m_dnssdRegistered=false;
+		delete m_dnssdreg;
+		m_dnssdreg=0;
+	}
+}
+
 void PortListener::refreshRegistration() {
 	if (m_serviceRegistered && (m_slpLifetimeEnd.addSecs(-90) < QDateTime::currentDateTime())) {
 		setServiceRegistrationEnabledInternal(false);
@@ -603,7 +648,7 @@ KInetD::~KInetD() {
 }

 extern "C" {
-	KDEDModule *create_kinetd(QCString &name)
+	KDE_EXPORT KDEDModule *create_kinetd(QCString &name)
 	{
        KGlobal::locale()->insertCatalogue("kinetd");
 		return new KInetD(name);
--- a/kinetd/kinetd.desktop
+++ b/kinetd/kinetd.desktop
@@ -12,6 +12,8 @@ Name=KDE Internet Daemon
 Name[af]=Kde Internet Bediener
 Name[ar]=مراقب انترنت كيدي
 Name[bg]=Интернет демон
+Name[bn]=কে-ডি-ই ইন্টারনেট ডিমন
+Name[br]=Diaoul kenrouedad KDE
 Name[ca]=Dimoni d'Internet per al KDE
 Name[cs]=KDE Internet démon
 Name[cy]=Daemon Rhyngrwyd KDE
@@ -21,8 +23,10 @@ Name[el]=Δαίμονας διαδικτύου για το KDE
 Name[eo]=Retodemono
 Name[es]=Demonio de Internet de KDE
 Name[et]=KDE internetideemon
-Name[fi]=KDE Internet palvelin
+Name[eu]=KDE internet deabrua
+Name[fi]=KDE Internet-palvelin
 Name[fr]=Démon Internet de KDE
+Name[ga]=Deamhan Idirlín KDE
 Name[gl]=O demo de Internet de KDE
 Name[he]=תהליך הרקע האינטרנטי של KDE
 Name[hi]=केडीई इंटरनेट डेमन
@@ -30,7 +34,8 @@ Name[hu]=KDE internetes szolgáltatás
 Name[is]=KDE Internetþjónn
 Name[it]=Demone internet di KDE
 Name[ja]=KDE インターネットデーモン
-Name[lt]=KDE Interneto tarnyba
+Name[km]=ដេមិនអ៊ីនធឺណិតរបស់ KDE
+Name[lt]=KDE interneto tarnyba
 Name[mk]=Даемон за Интернет на KDE 
 Name[mn]=KDE Интернет-демон
 Name[ms]=Daemon Internet KDE
@@ -40,9 +45,9 @@ Name[nn]=KDE-Internett-nisse
 Name[nso]=Daemon ya Internet ya KDE
 Name[pl]=Internet/sieć
 Name[pt]=Servidor de Internet do KDE
-Name[pt_BR]=Servidor Internet do do KDE
+Name[pt_BR]=Servidor Internet do KDE
 Name[ro]=Demon internet KDE
-Name[ru]=Интернет-демон KDE
+Name[ru]=Доступ к Интернету
 Name[se]=KDE-Interneahtta-duogášprográmma
 Name[sk]=KDE Internet démon
 Name[sl]=Internetni strežnik za KDE
@@ -56,23 +61,27 @@ Name[tr]=KDE İnternet Programı
 Name[uk]=Демон Інтернет KDE
 Name[uz]=KDE Интернет демони
 Name[zh_CN]=KDE Internet 守护进程
+Name[zh_HK]=KDE 互聯網系統程式
 Name[zh_TW]=KDE Internet 伺服程式
 Name[zu]=KDE Internet ye-Daemon
 Comment=An Internet daemon that starts network services on demand
 Comment[ar]=مراقب انترنت يقوم ببدء خدمات الشبكة عند الطلب
 Comment[bg]=Интернет демон, който служи за стартиране на мрежови услуги при поискване
+Comment[bn]=একটি ইন্টারনেট ডিমন যে চাহিদা ভিত্তিক নেটওয়ার্ক সার্ভিস আরম্ভ করে
 Comment[bs]=Internet daemon koji pokreće mrežne servise po potrebi
 Comment[ca]=Un dimoni d'Internet que arrenca els serveis de xarxa sota demanda
 Comment[cs]=Internetový démon spouštějící síťové služby na požádání
 Comment[cy]=Daemon Rhyngrwyd sy'n cychwyn gwasanaethau rhwydwaith ar alw
 Comment[da]=En internet-dæmon der starter netværkstjenester efter forespørgsel
 Comment[de]=Ein Internet-Dämon, der Netzwerkdienste bei Bedarf startet
-Comment[el]=Ένας δαίμονας για το διαδίκτυο ο οποίος ξεκινάει τις υπηρεσίες δικτύου βάση αίτησης
+Comment[el]=Ένας δαίμονας για το διαδίκτυο ο οποίος ξεκινάει τις υπηρεσίες δικτύου όταν απαιτείται
 Comment[eo]=retdemono kiu lanĉas retajn servojn laŭ bezono
 Comment[es]=Un demonio de Internet que inicia los servicios de red a demanda
 Comment[et]=Internetideemon, mis käivitab nõudmisel võrguteenused
-Comment[fi]=Internet palvelin, joka käynnistää verkkopalveluita
+Comment[eu]=Sare zerbitzuak eskatzean abiarazten dituen deabrua
+Comment[fi]=Internet-palvelin, joka käynnistää verkkopalveluita
 Comment[fr]=Un démon Internet qui démarre le service réseau à la demande
+Comment[ga]=Deamhan Idirlín a thosaíonn seirbhísí gréasáin ar éileamh
 Comment[gl]=Un demo de Internet que comenza servicios de rede según demanda
 Comment[he]=תהליך רקע של אינטרנט שמתחיל שירותי רשת לפי דרישה
 Comment[hi]=एक इंटरनेट डेमन जो मांग पर नेटवर्क सेवा प्रारंभ करता है
@@ -81,6 +90,7 @@ Comment[hu]=A hálózati szolgáltatások vezérlését biztosító program
 Comment[is]=Internetþjónn sem ræsir tengingar við Internetið eftir þörfum
 Comment[it]=Un demone internet che avvia i servizi di rete a richiesta
 Comment[ja]=要求時にネットワークサービスを起動するインターネットデーモン
+Comment[km]=ដេមិនអ៊ីនធឺណិតដែលចាប់ផ្ដើមសេវាបណ្ដាញនៅពេលត្រូវការ
 Comment[lt]=Interneto tarnyba, paleidžianti tinklo tarnybas esant poreikiui
 Comment[mk]=Даемон за Интернет кој ги вклучува мрежните сервиси на барање
 Comment[mn]=Сүлжээ-үйлчилгээний эрэлтээр ассан Сүлжээний демон
@@ -94,7 +104,7 @@ Comment[pl]=Uruchamianie usług na żądanie
 Comment[pt]=Um servidor da Internet que inicia os serviços de rede a pedido
 Comment[pt_BR]=Um servidor Internet que inicia os serviços de rede por demanda
 Comment[ro]=Un demon de internet care porneşte serviciile de reţea la cerere
-Comment[ru]=Сетевой демон, запускающий серверы по запросу из сети
+Comment[ru]=Служба установления подключения при запросе сетевых ресурсов
 Comment[se]=Interneahtta-duogášprográmma mii álggaha fierpmádatbálvalusaid go dárbbašuvvo
 Comment[sk]=Internetový démon ktorý spúšťa sieťové služby na požiadanie
 Comment[sl]=Internetni strežnik, ki zažene omrežne storitve na zahtevo
@@ -104,10 +114,12 @@ Comment[sv]=Internetdemon som startar nätverkstjänster vid behov
 Comment[ta]=ஒரு இணைய டேமொன், டேமொன் பிணைய சேவையை ஆரம்பிக்கிறது
 Comment[tg]=Азозили шабакавие, ки хидматрасони шабакавиро бо дархост сар медиҳад
 Comment[th]=เดมอนอินเตอร์เน็ตซึ่งจะเริ่มทำงานบริการเครือข่ายเมื่อมีความต้องการ
+Comment[tr]=Başlangıçta ağ servisleri tarafından istenen internet hayalet programı
 Comment[uk]=Демон Інтернет, що запускає служби мережі при запиті
 Comment[uz]=Талаб қилинганда тармоқ хизматларини ишга тушурувчи Интернет демони
 Comment[ven]=Internet daemon ine ya thoma tshumelo ya vhukwamani kha muthetho
 Comment[xh]=Internet daemon eqala iinkonzo zomsebenzi wonatha xa zifunwa
 Comment[zh_CN]=按需启动网络服务的守护进程
+Comment[zh_HK]=自動依需求起動網絡服務的互聯網系統程式
 Comment[zh_TW]=依要求起動網路服務的 Internet 伺服程式
 Comment[zu]=I-Internet ye-daemon eqala ama-sevisi we-network adingekayo
--- a/kinetd/kinetd.h
+++ b/kinetd/kinetd.h
@@ -27,6 +27,7 @@
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qtimer.h>
+#include <dnssd/publicservice.h>

 #include "kserviceregistry.h"

@@ -37,6 +38,8 @@ private:
 	QString m_serviceName;
 	QString m_serviceURL, m_serviceAttributes;
 	QStringList m_registeredServiceURLs;
+	QString m_dnssdName, m_dnssdType;
+	QMap<QString,QString> m_dnssdData;
 	int m_serviceLifetime;
 	int m_port;
 	int m_portBase, m_autoPortRange;
@@ -46,6 +49,7 @@ private:
 	QString m_argument;
 	bool m_enabled;
 	bool m_serviceRegistered, m_registerService;
+	bool m_dnssdRegister, m_dnssdRegistered;
 	QDateTime m_expirationTime;
 	QDateTime m_slpLifetimeEnd;
 	QString m_uuid;
@@ -55,10 +59,12 @@ private:

 	KConfig *m_config;
 	KServiceRegistry *m_srvreg;
+	DNSSD::PublicService *m_dnssdreg;

 	void freePort();
 	void loadConfig(KService::Ptr s);
 	void setEnabledInternal(bool e, const QDateTime &ex);
+	void dnssdRegister(bool enabled);
 	void setServiceRegistrationEnabledInternal(bool enabled);

 public:
--- a/kinetd/kinetdmodule.desktop
+++ b/kinetd/kinetdmodule.desktop
@@ -6,17 +6,22 @@ X-KDE-ServiceType=KInetDModule
 Name=KInetD Module Type
 Name[ar]=KInetD نوع وحدة
 Name[bg]=Модул на KInetD
+Name[bn]=কে-আইনেট-ডি মডিউল ধরন
+Name[br]=Seurt ar mollad KInetD
 Name[bs]=KInetD tip modula
 Name[ca]=Tipus de mòdul del KInetD
 Name[cs]=Typ modulu KInetD
 Name[cy]=Math Modiwl KInetD
 Name[da]=KInetD-modultype
 Name[de]=KInetD Modultyp
+Name[el]=Τύπος αρθρώματος KInetD
 Name[eo]=KInetD-modulotipo
 Name[es]=Tipo de módulo KInetD
 Name[et]=KInetD mooduli tüüp
-Name[fi]=KInetD moduulityyppi
+Name[eu]=KInetD modulu mota
+Name[fi]=KInetD-moduulityyppi
 Name[fr]=Type de module de KInetD
+Name[ga]=Cineál Modúil KInetD
 Name[gl]=Tipo de módulo KInetD
 Name[he]=סוג מודול של KInetD
 Name[hi]=के-इनिट-डी मॉड्यूल प्रकार
@@ -25,6 +30,7 @@ Name[hu]=KInetD modultípus
 Name[is]=KInetD Module tegund
 Name[it]=Tipo modulo KInetD
 Name[ja]=KInetD モジュールタイプ
+Name[km]=ប្រភេទម៉ូលឌុល KInetD
 Name[lt]=KInetD modulio tipas
 Name[mk]=Тип на модул за KInetD 
 Name[mn]=Модуль KInetD
@@ -52,6 +58,7 @@ Name[uk]=Тип модулю KinetD
 Name[ven]=Lushaka lwa Modulu ya KInetD
 Name[xh]=Udidi Lomqongo womlinganiselo we KInetD
 Name[zh_CN]=KInetD 模块类型
+Name[zh_HK]=KInetD 模組類型
 Name[zh_TW]=KInetD 模組類型
 Name[zu]=KInetD Uhlobo Lokwenza

@@ -82,7 +89,7 @@ Type=QString
 [PropertyDef::X-KDE-KINETD-multiInstance]
 Type=bool

-# if set, kinetd will register the given URL at the local SLP SA while 
+# if set, kinetd will register the given URL at the local SLP SA while
 # the port is open. It will register one URL for each IP address of the
 # host.
 # The following strings will be substituted:
@@ -104,9 +111,31 @@ Type=QString
 [PropertyDef::X-KDE-KINETD-serviceAttributes]
 Type=QString

-# the lifetime of a service in seconds. kinets will renew the service 
+# the lifetime of a service in seconds. kinets will renew the service
 # automatically. Max 65535, never use anything under 2 min. Something like
 # 5-20 minutes is a sane value for most desktop applications.
 [PropertyDef::X-KDE-KINETD-serviceLifetime]
 Type=int

+# if set, kinetd will announce service with given name on local network while
+# the port is open.
+# The following strings will be substituted:
+# %h with the local IP address
+# %f with the user's full name
+# %p with the port number
+
+[PropertyDef::X-KDE-KINETD-DNSSD-Name]
+Type=QString
+
+# if kinetd announces service on network using DNS-SD, this string will be used as service
+# type. It must be in form _yourservice._udp or _yourservice._tcp
+# it uses the same substitution rules as X-KDE-KINETD-DNSSD-Name
+
+[PropertyDef::X-KDE-KINETD-DNSSD-Type]
+Type=QString
+
+# defines list of text properties for service announced via DNS-SD
+# it uses the same substitution rules as X-KDE-KINETD-DNSSD-Name
+[PropertyDef::X-KDE-KINETD-DNSSD-Properties]
+Type=QStringList
+
--- a/krfb/Makefile.am
+++ b/krfb/Makefile.am
@@ -3,21 +3,17 @@ KDE_CXXFLAGS = $(USE_THREADS)
 METASOURCES = AUTO

 noinst_LTLIBRARIES = libkrfbconfig.la
-libkrfbconfig_la_SOURCES = configuration.cc manageinvitations.ui \
-                           personalinvitation.ui invite.ui invitation.cc
+libkrfbconfig_la_SOURCES = configuration.cc configuration.skel invitedialog.cc invitation.cc \
+                           manageinvitations.ui personalinvitewidget.ui \
+                           invitewidget.ui personalinvitedialog.cc
 libkrfbconfig_la_LIBADD = ../srvloc/libsrvloc.la $(LIB_KDEUI)

 bin_PROGRAMS = krfb
 krfb_SOURCES = rfbcontroller.cc xupdatescanner.cc main.cpp \
-               newconnectiondialog.ui krfbifaceimpl.cc krfbiface.skel \
-               trayicon.cpp
-krfb_LDADD   = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_KDEUI) $(LIBJPEG) 
+               connectionwidget.ui krfbifaceimpl.cc krfbiface.skel \
+               trayicon.cpp connectiondialog.cc
+krfb_LDADD   = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_KDEUI) $(LIBJPEG) -lkio 
 krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-krfb_COMPILE_FIRST = manageinvitations.h personalinvitation.h invite.h 
-
-noinst_HEADERS = configuration.h invitation.h invite.h krfbiface.h \
-                krfbifaceimpl.h rfbcontroller.h trayicon.h xupdatescanner.h
-

 appdatadir = $(kde_datadir)/krfb/pics
 appdata_DATA = eyes-open24.png eyes-closed24.png connection-side-image.png
--- a/krfb/configuration.cc
+++ b/krfb/configuration.cc
@@ -35,6 +35,8 @@
 #include <qlineedit.h>
 #include <qcheckbox.h>

+#include <krun.h>
+
 /**
 * Note that this class is used and provides GUI in every mode:
 * - for the invitation dialogs
@@ -44,8 +46,8 @@
 Configuration::Configuration(krfb_mode mode) :
 	m_mode(mode),
 	invMngDlg(0, 0, true),
-	invDlg(0, 0, true),
-	persInvDlg(0, 0, true),
+	invDlg(0, "InviteDialog"),
+	persInvDlg(0, "PersonalInviteDialog"),
 	portNum(-1),
 	kinetdRef("kded", "kinetd")
 {
@@ -54,6 +56,8 @@ Configuration::Configuration(krfb_mode mode) :
 	saveToDialogs();
 	doKinetdConf();

+    connectDCOPSignal( 0, "KRFB::ConfigChanged", "KRFB_ConfigChanged()",
+						"updateKConfig()", false );
 	connect(invMngDlg.newPersonalInvitationButton, SIGNAL(clicked()),
 		SLOT(showPersonalInvitationDialog()));
 	connect(invMngDlg.newEmailInvitationButton, SIGNAL(clicked()), SLOT(inviteEmail()));
@@ -62,15 +66,16 @@ Configuration::Configuration(krfb_mode mode) :
 	invMngDlg.listView->setSelectionMode(QListView::Extended);
 	invMngDlg.listView->setMinimumSize(QSize(400, 100)); // QTs size is much to small

-	connect(invDlg.createInvitationButton, SIGNAL(clicked()),
+	connect(&invDlg, SIGNAL(createInviteClicked()),
 		SLOT(showPersonalInvitationDialog()));
-	connect(invDlg.createInvitationEMailButton, SIGNAL(clicked()),
+	connect(&invDlg, SIGNAL(emailInviteClicked()),
 		SLOT(inviteEmail()));
-	connect(invDlg.manageInvitationsButton, SIGNAL(clicked()),
+	connect(&invDlg, SIGNAL(manageInviteClicked()),
 		SLOT(showManageInvitationsDialog()));
-	connect(invDlg.configurationButton, SIGNAL(clicked()),
+	connect(&invDlg, SIGNAL(configureClicked()),
 		SLOT(showConfigurationModule()));
-	connect(this, SIGNAL(invitationNumChanged(int)), this, SLOT(changeInvDlgNum(int)));
+	connect(this, SIGNAL(invitationNumChanged(int)),
+		&invDlg, SLOT(setInviteCount(int)));
 	connect(this, SIGNAL(invitationNumChanged(int)),
 		&invMngDlg, SLOT(listSizeChanged(int)));
        emit invitationNumChanged(invitationList.size());
@@ -83,6 +88,11 @@ Configuration::~Configuration() {
        save();
 }

+void Configuration::updateKConfig()
+{
+    loadFromKConfig();
+}
+
 void Configuration::setKInetdEnabled(bool enabled) {
 	kinetdRef.send("setEnabled", QString("krfb"), enabled);
 	kinetdRef.send("setEnabled", QString("krfb_httpd"), enabled);
@@ -388,10 +398,6 @@ void Configuration::showInvitationDialog() {
 	saveToKConfig();
 }

-void Configuration::changeInvDlgNum(int newNum) {
-	invDlg.manageInvitationsButton->setText( i18n("&Manage Invitations (%1)...").arg(newNum) );
-}
-
 ////////////// personal invitation dialog //////////////////////////

 void Configuration::showPersonalInvitationDialog() {
@@ -400,16 +406,15 @@ void Configuration::showPersonalInvitationDialog() {
 	save();
 	emit invitationNumChanged(invitationList.size());

-	invDlg.createInvitationButton->setEnabled(false);
+	invDlg.enableInviteButton(false);
 	invMngDlg.newPersonalInvitationButton->setEnabled(false);

-	persInvDlg.hostLabel->setText(QString("%1:%2").arg(hostname()).arg(port()));
-	persInvDlg.passwordLabel->setText(inv.password());
-	persInvDlg.expirationLabel->setText(
-		inv.expirationTime().toString(Qt::LocalDate));
+	persInvDlg.setHost(hostname(), port());
+	persInvDlg.setPassword(inv.password());
+	persInvDlg.setExpiration(inv.expirationTime());

 	persInvDlg.exec();
-	invDlg.createInvitationButton->setEnabled(true);
+	invDlg.enableInviteButton(true);
 	invMngDlg.newPersonalInvitationButton->setEnabled(true);
 }

@@ -419,7 +424,7 @@ void Configuration::inviteEmail() {
 	int r = KMessageBox::warningContinueCancel(0,
 	   i18n("When sending an invitation by email, note that everybody who reads this email "
 		"will be able to connect to your computer for one hour, or until the first "
-		"successful connection took place, whatever comes first. \n"
+		"successful connection took place, whichever comes first. \n"
 		"You should either encrypt the email or at least send it only in a "
 		"secure network, but not over the Internet."),
 						   i18n("Send Invitation via Email"),
@@ -462,9 +467,7 @@ void Configuration::inviteEmail() {
 ////////////// invoke kcontrol module //////////////////////////

 void Configuration::showConfigurationModule() {
-	KProcess p;
-	p << "kcmshell" << "Network/kcmkrfb";
-	p.start(KProcess::DontCare);
+		KRun::run( "kcmshell kcmkrfb", KURL::List() );
 }


--- a/krfb/configuration.h
+++ b/krfb/configuration.h
@@ -21,8 +21,8 @@
 #include "invitation.h"

 #include "manageinvitations.h"
-#include "personalinvitation.h"
-#include "invite.h"
+#include "personalinvitedialog.h"
+#include "invitedialog.h"

 #include <dcopref.h>
 #include <kconfig.h>
@@ -31,6 +31,8 @@
 #include <qvalidator.h>
 #include <qstring.h>

+#include <dcopobject.h>
+
 enum krfb_mode {
 	KRFB_UNKNOWN_MODE = 0,
 	KRFB_KINETD_MODE,
@@ -44,11 +46,12 @@ enum krfb_mode {
 * standalone-config-dialog and all the invitation dialogs
 * @author Tim Jansen
 */
-class Configuration : public QObject {
+class Configuration : public QObject, public DCOPObject {
+		K_DCOP
   	Q_OBJECT
 public:
 	Configuration(krfb_mode mode);
-	~Configuration();
+	virtual ~Configuration();

 	krfb_mode mode() const;
 	bool askOnConnect() const;
@@ -104,8 +107,8 @@ private:
 	krfb_mode m_mode;

 	ManageInvitationsDialog invMngDlg;
-	InvitationDialog invDlg;
-	PersonalInvitationDialog persInvDlg;
+	InviteDialog invDlg;
+	PersonalInviteDialog persInvDlg;
 	QTimer refreshTimer;

 	bool askOnConnectFlag;
@@ -122,13 +125,15 @@ private:

 	bool disableBackgroundFlag;
 	bool disableXShmFlag;
+
+k_dcop:
+    // Connected to the DCOP signal
+    void updateKConfig();	
 private slots:
        void refreshTimeout();

 	void invMngDlgDeleteOnePressed();
 	void invMngDlgDeleteAllPressed();
-
-	void changeInvDlgNum(int newNum);
 };

 #endif
--- a/krfb/connectiondialog.cc
+++ b/krfb/connectiondialog.cc
@@ -0,0 +1,63 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include "connectiondialog.h"
+#include "connectionwidget.h"
+
+#include <qcheckbox.h>
+#include <qlabel.h>
+
+#include <kiconloader.h>
+#include <klocale.h>
+
+ConnectionDialog::ConnectionDialog( QWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n( "New Connection" ),
+                   Ok|Cancel, Cancel, true )
+{
+  m_connectWidget = new ConnectionWidget( this, "ConnectWidget" );
+  m_connectWidget->pixmapLabel->setPixmap(
+      UserIcon( "connection-side-image.png" ) );
+
+  KGuiItem accept = KStdGuiItem::ok();
+  accept.setText( i18n( "Accept Connection" ) );
+  setButtonOK( accept );
+
+  KGuiItem refuse = KStdGuiItem::cancel();
+  refuse.setText( i18n( "Refuse Connection" ) );
+  setButtonCancel( refuse );
+
+  setMainWidget( m_connectWidget );
+}
+
+void ConnectionDialog::setRemoteHost( const QString &host )
+{
+  m_connectWidget->remoteHost->setText( host );
+}
+
+void ConnectionDialog::setAllowRemoteControl( bool b )
+{
+  m_connectWidget->cbAllowRemoteControl->setChecked( b );
+}
+
+bool ConnectionDialog::allowRemoteControl()
+{
+  return m_connectWidget->cbAllowRemoteControl->isChecked();
+}
+
+#include "connectiondialog.moc"
--- a/krfb/connectiondialog.h
+++ b/krfb/connectiondialog.h
@@ -0,0 +1,44 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#ifndef CONNECTIONDIALOG_H
+#define CONNECTIONDIALOG_H
+
+#include <kdialogbase.h>
+
+class ConnectionWidget;
+
+class ConnectionDialog : public KDialogBase
+{
+  Q_OBJECT
+
+  public:
+    ConnectionDialog( QWidget *parent, const char *name );
+    ~ConnectionDialog() {};
+
+    void setRemoteHost( const QString &host );
+    void setAllowRemoteControl( bool b );
+    bool allowRemoteControl();
+
+  protected:
+    ConnectionWidget *m_connectWidget;
+};
+
+#endif // CONNECTIONDIALOG_H
+
--- a/krfb/connectionwidget.ui
+++ b/krfb/connectionwidget.ui
@@ -0,0 +1,208 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>ConnectionWidget</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>NewConnectWidget</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>521</width>
+            <height>328</height>
+        </rect>
+    </property>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>TextLabel5</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>1</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="font">
+                <font>
+                    <pointsize>13</pointsize>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property name="text">
+                <string>Attention</string>
+            </property>
+            <property name="indent">
+                <number>0</number>
+            </property>
+        </widget>
+        <widget class="QLabel" row="1" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>mainTextLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="lineWidth">
+                <number>-1</number>
+            </property>
+            <property name="margin">
+                <number>0</number>
+            </property>
+            <property name="midLineWidth">
+                <number>5</number>
+            </property>
+            <property name="text">
+                <string>Somebody is requesting a connection to your computer. Granting this will allow the remote user to watch your desktop. </string>
+            </property>
+            <property name="textFormat">
+                <enum>AutoText</enum>
+            </property>
+            <property name="alignment">
+                <set>WordBreak|AlignVCenter|AlignLeft</set>
+            </property>
+            <property name="indent">
+                <number>0</number>
+            </property>
+            <property name="wordwrap" stdset="0">
+            </property>
+        </widget>
+        <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1">
+            <property name="name">
+                <cstring>pixmapLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>0</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="maximumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="frameShape">
+                <enum>WinPanel</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Sunken</enum>
+            </property>
+            <property name="lineWidth">
+                <number>0</number>
+            </property>
+            <property name="margin">
+                <number>0</number>
+            </property>
+            <property name="scaledContents">
+                <bool>true</bool>
+            </property>
+            <property name="indent">
+                <number>0</number>
+            </property>
+        </widget>
+        <widget class="QLabel" row="3" column="2">
+            <property name="name">
+                <cstring>remoteHost</cstring>
+            </property>
+            <property name="font">
+                <font>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property name="text">
+                <string>123.234.123.234</string>
+            </property>
+        </widget>
+        <widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>cbAllowRemoteControl</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>1</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>Allow remote user to &amp;control keyboard and mouse</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>If you turn this option on, the remote user can enter keystrokes and use your mouse pointer. This gives them full control over your computer, so be careful. When the option is disabled the remote user can only watch your screen.</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="3" column="1">
+            <property name="name">
+                <cstring>TextLabel1</cstring>
+            </property>
+            <property name="font">
+                <font>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property name="text">
+                <string>Remote system:</string>
+            </property>
+        </widget>
+        <spacer row="4" column="1">
+            <property name="name">
+                <cstring>spacer23</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Minimum</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>84</height>
+                </size>
+            </property>
+        </spacer>
+        <spacer row="2" column="1">
+            <property name="name">
+                <cstring>spacer22</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Minimum</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>80</height>
+                </size>
+            </property>
+        </spacer>
+    </grid>
+</widget>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>
--- a/krfb/cr16-app-krfb.png
+++ b/krfb/cr16-app-krfb.png
--- a/krfb/eventsrc
+++ b/krfb/eventsrc
@@ -4,6 +4,8 @@ Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب
 Comment[bg]=Споделяне на работно място
+Comment[bn]=ডেস্কটপ ভাগাভাগি
+Comment[br]=Rannañ ar vurev
 Comment[bs]=Dijeljenje desktopa
 Comment[ca]=Compartició de l'escriptori
 Comment[cs]=Sdílení pracovní plochy
@@ -12,10 +14,12 @@ Comment[da]=Desktopdeling
 Comment[de]=Arbeitsfläche freigeben
 Comment[el]=Κοινή χρήση επιφάνειας εργασίας
 Comment[eo]=Tabula fordonado
-Comment[es]=Compartición de escritorio
+Comment[es]=Escritorio compartido
 Comment[et]=Töölaua jagamine
+Comment[eu]=Mahaigain partekatzea
 Comment[fi]=Työpöydän jakaminen
 Comment[fr]=Partage du bureau
+Comment[ga]=Roinnt Deisce
 Comment[gl]=Compartición do escritorio
 Comment[he]=שיתוף שולחנות עבודה
 Comment[hi]=डेस्कटॉप साझेदारी
@@ -24,13 +28,14 @@ Comment[hu]=Munkaasztal-megosztás
 Comment[is]=Skjáborðamiðlun
 Comment[it]=Condivisione desktop
 Comment[ja]=デスクトップ共有
+Comment[km]=ការចែករំលែកផ្ទែតុ
 Comment[lt]=Dalinimasis darbastaliu
 Comment[mk]=Делење на работната површина
 Comment[mn]=Ажлын байрыг хамтран эзэмших
 Comment[ms]=Perkongsian Ruang Kerja
 Comment[mt]=Qsim tad-desktop
 Comment[nb]=Skrivebordsdeling
-Comment[nl]=Bureaubladvrijgave
+Comment[nl]=Bureaublad delen
 Comment[nn]=Skrivebordsdeling
 Comment[nso]=Kabagano ya Desktop
 Comment[pl]=Współdzielenie pulpitu
@@ -38,6 +43,7 @@ Comment[pt]=Partilha do Ecrã
 Comment[pt_BR]=Compartilhamento do Ambiente de Trabalho
 Comment[ro]=Partajare ecran
 Comment[ru]=Параметры общего рабочего стола
+Comment[se]=Čállinbeavdejuogadeapmi
 Comment[sk]=Zdieľanie pracovnej plochy
 Comment[sl]=Deljenje namizja
 Comment[sr]=Дељење радне површине
@@ -51,6 +57,7 @@ Comment[uk]=Спільні стільниці
 Comment[ven]=U kovhekana ha desikithopo
 Comment[xh]=Ulwahlulelano lwe Desktop
 Comment[zh_CN]=桌面共享
+Comment[zh_HK]=桌面分享
 Comment[zh_TW]=桌面分享
 Comment[zu]=Ukuhlukaniselana kwe-Desktop

@@ -58,16 +65,19 @@ Comment[zu]=Ukuhlukaniselana kwe-Desktop
 Name=UserAcceptsConnection
 Name[ar]=المستخدم قبل الاتصال
 Name[bg]=Приета е връзка от потребител
+Name[bn]=ব্যবহারকারী সংযোগ গ্রহণ করে
 Name[ca]=L'usuari accepta la connexió
 Name[cs]=Uživatel přijímá spojení
 Name[cy]=DefnyddiwrDerbynCysylltiad
 Name[da]=BrugerAcceptererForbindelse
 Name[de]=BenutzerBestätigtVerbindung
-Name[el]=Ο χρήστης δέχεται σύνδεση
+Name[el]=Ο χρήστης αποδέχεται σύνδεση
 Name[eo]=UzantoAkceptasKonektojn
 Name[es]=El usuario acepta la conexión
 Name[et]=Kasutaja ühendusega nõus
+Name[eu]=Erabiltzaileak konexioa onartu du
 Name[fr]=L'utilisateur accepte les connexions
+Name[ga]=GlacannÚsáideoirLeCeangal
 Name[gl]=O usuario acepta a conexión
 Name[he]=משתמש מקבל חיבור
 Name[hi]=उपयोक्ता-कनेक्शन-स्वीकारा
@@ -76,7 +86,8 @@ Name[hu]=KapcsolatElfogadva
 Name[is]=NotandiSamþykkirTengingar
 Name[it]=L'utente accetta la connessione
 Name[ja]=ユーザが許可した接続
-Name[lt]=Vartotojas priima prisijungima
+Name[km]=អ្នកប្រើទទួលយកការតភ្ជាប់
+Name[lt]=Naudotojas priima kvietimą
 Name[mk]=Корисникот го прифаќа поврзувањето
 Name[mn]=Хэрэглэгч зөвшөөрсөн холболт
 Name[ms]=Pengguna Menerima Sambungan
@@ -91,35 +102,40 @@ Name[ro]=Conexiune acceptată de utilizator
 Name[ru]=Пользователь принимает соединения
 Name[se]=Geavaheaddji dohkkeha oktavuođa
 Name[sk]=Užívateľ akceptoval spojenie
-Name[sl]=Uporabnik sprejema povezavo
+Name[sl]=Uporabnik sprejel povezavo
 Name[sr]=Корисник прихвата везе
 Name[sr@Latn]=Korisnik prihvata veze
 Name[sv]=Användare accepterar anslutning
 Name[ta]=பயனர் இணைப்பு ஏற்றுக்கொள்ளப்பட்டது
 Name[tg]=Корванд Пайвастшавиро Қабул мекунад
 Name[th]=ผู้ใช้ยอมรับการเชื่อมต่อ
+Name[tr]=Kullanıcı Kabul Eden Bağlantı
 Name[uk]=КористувачПриймаєЗ'єднання
 Name[ven]=Mushumisi o tanganedza vhukwamani
 Name[xh]=Umsebenzisi Wamkela Uxhulumaniso
 Name[zh_CN]=用户接受连接
+Name[zh_HK]=用戶接受連線
 Name[zh_TW]=使用者接受連線
 Name[zu]=UmsebenziUvumelaUkuxhumana
 Comment=User accepts connection
 Comment[af]=Gebruiker aanvaar verbinding
 Comment[ar]=المستخدم قبل الإتصال
 Comment[bg]=Приета е връзка от потребител
+Comment[bn]=ব্যবহারকারী সংযোগ গ্রহণ করে
 Comment[bs]=Korisnik prihvata konekciju
 Comment[ca]=L'usuari accepta la connexió
 Comment[cs]=Uživatel přijímá spojení
 Comment[cy]=Mae'r defnyddiwr yn derbyn y cysylltiad
 Comment[da]=Bruger accepterer forbindelse
 Comment[de]=Der Benutzer bestätigt die Verbindung
-Comment[el]=Ο χρήστης δέχεται σύνδεση
+Comment[el]=Ο χρήστης αποδέχεται σύνδεση
 Comment[eo]=Uzanto akceptas konektojn
 Comment[es]=El usuario acepta la conexión
 Comment[et]=Kasutaja nõustub ühendusega
+Comment[eu]=Erabiltzaileak konexioa onartu du
 Comment[fi]=Käyttäjä hyväksyy yhteyden
 Comment[fr]=l'utilisateur accepte les connexions
+Comment[ga]=Glacann úsáideoir le ceangal
 Comment[gl]=O usuario aceptou a conexión
 Comment[he]=המשתמש מקבל את החיבור
 Comment[hi]=उपयोक्ता कनेक्शन स्वीकारा
@@ -128,7 +144,8 @@ Comment[hu]=A felhasználó elfogadja a csatlakozási kérést
 Comment[is]=Notandi samþykkir tengingu
 Comment[it]=L'utente accetta la connessione
 Comment[ja]=ユーザが接続を許可
-Comment[lt]=Vartotojas priima prisijungimą
+Comment[km]=អ្នកប្រើទទួលយកការតភ្ជាប់
+Comment[lt]=Naudotojas priima kvietimą
 Comment[mk]=Корисникот прифаќа поврзување
 Comment[mn]=Хэрэглэгч зөвшөөрсөн холболт
 Comment[ms]= Pengguna menerima sambungan
@@ -144,7 +161,7 @@ Comment[ro]=Utilizatorul acceptă conexiunea
 Comment[ru]=Пользователь принимает соединения
 Comment[se]=Geavaheaddji dohkkeha oktavuođa
 Comment[sk]=Užívateľ akceptoval spojenie
-Comment[sl]=Uporabnik sprejema povezavo
+Comment[sl]=Uporabnik sprejel povezavo
 Comment[sr]=Корисник прихвата везу
 Comment[sr@Latn]=Korisnik prihvata vezu
 Comment[sv]=Användaren accepterar anslutning
@@ -156,6 +173,7 @@ Comment[uk]=Користувач приймає з'єднання
 Comment[ven]=Mushumisi o tanganedza vhukwamani
 Comment[xh]=Umsebenzisi wamkela uxhulumaniso
 Comment[zh_CN]=用户接受连接
+Comment[zh_HK]=用戶接受連線
 Comment[zh_TW]=使用者接受的連線
 Comment[zu]=Umsebenzi uyakuvumela ukuxhumana
 default_presentation=4
@@ -164,6 +182,7 @@ default_presentation=4
 Name=UserRefusesConnection
 Name[ar]=المستخدم رفض الاتصال
 Name[bg]=Отказана връзка от потребител
+Name[bn]=ব্যবহারকারী সংযোগ অস্বীকার করে
 Name[ca]=L'usuari refusa la connexió
 Name[cs]=Uživatel odmítá spojení
 Name[cy]=DefnyddiwrGwrthodCysylltiad
@@ -173,7 +192,9 @@ Name[el]=Ο χρήστης απορρίπτει σύνδεση
 Name[eo]=UzantoRifuzasKonektojn
 Name[es]=El usuario rechaza la conexión
 Name[et]=Kasutaja keeldub ühendusest
+Name[eu]=Erabiltzaileak konexioa ukatu du
 Name[fr]=L'utilisateur refuse les connexions
+Name[ga]=DiúltíonnÚsáideoirLeCeangal
 Name[gl]=O usuario rexeita a conexión
 Name[he]=משתמש דוחה חיבור
 Name[hi]=उपयोक्ता-कनेक्शन-अस्वीकारा
@@ -182,7 +203,8 @@ Name[hu]=KapcsolatVisszautasítva
 Name[is]=NotandiHafnarTengingum
 Name[it]=L'utente rifiuta la connessione
 Name[ja]=ユーザが拒否した接続
-Name[lt]=Vartotojas atmeta prisijungimą
+Name[km]=អ្នកប្រើបដិសេធការតភ្ជាប់
+Name[lt]=Naudotojas atmeta kvietimą
 Name[mk]=Корисникот го одбива поврзувањето
 Name[mn]=Хэрэглэгч зөвшөөрөөгүй холболт
 Name[ms]=Pengguna Menolak Sambungan
@@ -197,7 +219,7 @@ Name[ro]=Conexiune respinsă de utilizator
 Name[ru]=Пользователь не принимает соединения
 Name[se]=Geavaheaddji hilgo oktavuođa
 Name[sk]=Užívateľ zamietol spojenie
-Name[sl]=Uporabnik zavrača povezavo
+Name[sl]=Uporabnik zavrnil povezavo
 Name[sr]=Корисник одбија везе
 Name[sr@Latn]=Korisnik odbija veze
 Name[sv]=Användaren vägrar anslutning
@@ -209,12 +231,14 @@ Name[uk]=КористувачВідмовляєУЗ'єднанні
 Name[ven]=Mushumisi o hana Vhukwamani
 Name[xh]=Umsebenzisi Uyalwala Uxhulumaniso
 Name[zh_CN]=用户拒绝连接
+Name[zh_HK]=用戶拒絕連線
 Name[zh_TW]=使用者拒絕連線
 Name[zu]=UmsebenzisiWalaUxhumaniso
 Comment=User refuses connection
 Comment[af]=Gebruiker weier verbinding
 Comment[ar]=المستخدم رفض الاتصال
 Comment[bg]=Отказана връзка от потребител
+Comment[bn]=ব্যবহারকারী সংযোগ অস্বীকার করে
 Comment[bs]=Korisnik odbija konekciju
 Comment[ca]=L'usuari refusa la connexió
 Comment[cs]=Uživatel odmítá spojení
@@ -225,8 +249,10 @@ Comment[el]=Ο χρήστης απορρίπτει σύνδεση
 Comment[eo]=Uzanto rifuzas konektojn
 Comment[es]=El usuario rechaza la conexión
 Comment[et]=Kasutaja keeldub ühendusest
+Comment[eu]=Erabiltzaileak konexioa ukatu du
 Comment[fi]=Käyttäjä hylkää yhteyden
 Comment[fr]=L'utilisateur refuse les connexions
+Comment[ga]=Diúltaíonn úsáideoir ceangal
 Comment[gl]=O usuario rexeitou a conexión
 Comment[he]=המשתמש מסרב לחיבור
 Comment[hi]=उपयोक्ता कनेक्शन अस्वीकारा
@@ -235,7 +261,8 @@ Comment[hu]=A felhasználó visszautasítja a csatlakozási kérést
 Comment[is]=Notandi hafnar tengingu
 Comment[it]=L'utente rifiuta la connessione
 Comment[ja]=ユーザが接続を拒否
-Comment[lt]=Vartotojas atmeta prisijungimą
+Comment[km]=អ្នកប្រើបដិសេធការតភ្ជាប់
+Comment[lt]=Naudotojas atmeta kvietimą
 Comment[mk]=Корисникот одбива поврзување
 Comment[mn]=Хэрэглэгч зөвшөөрөөгүй холболт
 Comment[ms]=Pengguna menolak sambungan
@@ -263,6 +290,7 @@ Comment[uk]=Користувач відмовляє у з'єднанні
 Comment[ven]=Mushumisi o hana vhukwamani
 Comment[xh]=Umsebenzisi wala uxhulumaniso
 Comment[zh_CN]=用户拒绝连接
+Comment[zh_HK]=用戶拒絕連線
 Comment[zh_TW]=使用者拒絕的連線
 Comment[zu]=Umsebenzi awukuvumeli ukuxhumana
 default_presentation=4
@@ -271,16 +299,20 @@ default_presentation=4
 Name=ConnectionClosed
 Name[ar]=اتصال مغلق
 Name[bg]=Връзката е прекъсната
+Name[bn]=সংযোগ বন্ধ করা হল
+Name[br]=Kevreadur serret
 Name[ca]=Connexió tancada
 Name[cs]=Spojení ukončeno
 Name[cy]=CysylltiadArGau
 Name[da]=ForbindelseLukket
 Name[de]=VerbindungGeschlossen
-Name[el]=Σύνδεση έκλεισε
+Name[el]=Η σύνδεση έκλεισε
 Name[eo]=KonektoFermita
 Name[es]=Conexión cerrada
 Name[et]=Ühendus suletud
+Name[eu]=Konexioa itxi da
 Name[fr]=Connexion fermée
+Name[ga]=CeangalDúnta
 Name[gl]=Conexión pechada
 Name[he]=חיבור נסגר
 Name[hi]=कनेक्शन-बन्द
@@ -289,7 +321,8 @@ Name[hu]=KapcsolatBezárva
 Name[is]=TenginguLokað
 Name[it]=Connessione chiusa
 Name[ja]=接続切断
-Name[lt]=Prisijungimas uždarytas
+Name[km]=បានបិទការតភ្ជាប់
+Name[lt]=Ryšys baigtas
 Name[mk]=Поврзувањето е затворено
 Name[mn]=Холболт хаагдав
 Name[ms]=Sambungan Ditutup
@@ -316,12 +349,14 @@ Name[uk]=З'єднанняЗакрито
 Name[ven]=Vhukwamani ho valwa
 Name[xh]=Uxhulumaniso Luvaliwe
 Name[zh_CN]=连接关闭
+Name[zh_HK]=連線已關閉
 Name[zh_TW]=連線已關閉
 Name[zu]=UkuxhumanisaKuvaliwe
 Comment=Connection closed
 Comment[af]=Verbinding gesluit
 Comment[ar]=الاتصال قُطع
 Comment[bg]=Връзката е прекъсната
+Comment[bn]=সংযোগ বন্ধ করা হল
 Comment[br]=Serret eo ar gevreadenn
 Comment[bs]=Konekcija prekinuta
 Comment[ca]=Connexió tancada
@@ -329,12 +364,14 @@ Comment[cs]=Spojení ukončeno
 Comment[cy]=Mae'r cysylltiad ar gau
 Comment[da]=Forbindelse lukket
 Comment[de]=Verbindung geschlossen
-Comment[el]=Σύνδεση έκλεισε
+Comment[el]=Η σύνδεση έκλεισε
 Comment[eo]=Konekto fermita
 Comment[es]=Conexión rechazada
 Comment[et]=Ühendus suletud
+Comment[eu]=Konexioa itxi da
 Comment[fi]=Yhteys suljettu
 Comment[fr]=Connexion coupée
+Comment[ga]=Ceangal dúnta
 Comment[gl]=Conexión pechada
 Comment[he]=החיבור נסגר
 Comment[hi]=कनेक्शन बन्द
@@ -343,7 +380,8 @@ Comment[hu]=A kapcsolat bezárva
 Comment[is]=Tengingu lokað
 Comment[it]=Connessione chiusa
 Comment[ja]=接続が閉じられました
-Comment[lt]=Prisijungimas uždarytas
+Comment[km]=បានបិទការតភ្ជាប់
+Comment[lt]=Ryšys baigtas
 Comment[mk]=Поврзувањето е затворено
 Comment[mn]=Холболт хаагдав
 Comment[ms]=Sambungan ditutup
@@ -372,6 +410,7 @@ Comment[uz]=Алоқа узилди
 Comment[ven]=Vhukwamani ho valwa
 Comment[xh]=Uxhulumaniso luvaliwe
 Comment[zh_CN]=连接关闭
+Comment[zh_HK]=連線已關閉
 Comment[zh_TW]=連線已關閉
 Comment[zu]=Ukuxhumana kuvaliwe
 default_presentation=4
@@ -381,24 +420,28 @@ Name=InvalidPassword
 Name[ar]=كلمة مرور غير صالحة
 Name[be]=Некарэктны пароль
 Name[bg]=Невалидна парола
+Name[bn]=অবৈধ পাসওয়ার্ড
 Name[ca]=Contrasenya no vàlida
 Name[cs]=Neplatné heslo
 Name[cy]=CyfrinairAnnilys
 Name[da]=UgyldigtKodeord
 Name[de]=UngültigesPasswort
-Name[el]=Λάθος κωδικός πρόσβασης
+Name[el]=Μη έγκυρος κωδικός πρόσβασης
 Name[eo]=NevalidaPasvorto
 Name[es]=Contraseña errónea
 Name[et]=Vale parool
+Name[eu]=Baliogabeko pasahitza
 Name[fr]=Mots de passe non valable
+Name[ga]=FocalFaireNeamhbhailí
 Name[gl]=Contraseña inválida
-Name[he]=סיסמה לא תקפה
+Name[he]=סיסמה שגויה
 Name[hi]=अवैध-पासवर्ड
 Name[hr]=NevažećaLozinka
 Name[hu]=ÉrvénytelenJelszó
 Name[is]=ÓgiltLykilorð
 Name[it]=Password non valida
 Name[ja]=不正なパスワード
+Name[km]=ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
 Name[lt]=Neteisingas slaptažodžis
 Name[mk]=Невалидна лозинка
 Name[mn]=Буруу нууц үг
@@ -414,7 +457,7 @@ Name[ro]=Parolă eronată
 Name[ru]=Неверный пароль
 Name[se]=Gustomeahttun beassansátni
 Name[sk]=Zlé heslo
-Name[sl]=Nepravilno geslo
+Name[sl]=Neveljavno geslo
 Name[sr]=Погрешна лозинка
 Name[sr@Latn]=Pogrešna lozinka
 Name[sv]=Ogiltigt lösenord
@@ -426,6 +469,7 @@ Name[uk]=НеправильнийПароль
 Name[ven]=Phasiwede asi yone
 Name[xh]=Igama lokugqitha Elingasebenziyo
 Name[zh_CN]=无效密码
+Name[zh_HK]=無效的密碼
 Name[zh_TW]=無效的密碼
 Name[zu]=IgamaEliyimfihloLokudlulaOkungasiyilona
 Comment=Invalid password
@@ -433,26 +477,31 @@ Comment[af]=Ongeldige wagwoord
 Comment[ar]=كلمة مرور غير صالحة
 Comment[be]=Некарэктны пароль
 Comment[bg]=Невалидна парола
+Comment[bn]=অবৈধ পাসওয়ার্ড
+Comment[br]=Tremenger siek 
 Comment[bs]=Neispravna šifra
 Comment[ca]=Contrasenya no vàlida
 Comment[cs]=Neplatné heslo
 Comment[cy]=Cyfrinair annilys
 Comment[da]=Ugyldigt kodeord
 Comment[de]=Ungültiges Passwort
-Comment[el]=Λάθος κωδικός πρόσβασης
+Comment[el]=Μη έγκυρος κωδικός πρόσβασης
 Comment[eo]=nevalida pasvorto
 Comment[es]=Contraseña errónea
 Comment[et]=Vale parool
+Comment[eu]=Baliogabeko pasahitza
 Comment[fi]=Virheellinen salasana
 Comment[fr]=Mot de passe non valable
+Comment[ga]=Focal faire neamhbhailí
 Comment[gl]=Contraseña errónea
-Comment[he]=הסיסמה אינה תקפה
+Comment[he]=הסיסמה שגויה
 Comment[hi]=अवैध पासवर्ड
 Comment[hr]=Nevažeća šifra
 Comment[hu]=Érvénytelen jelszó
 Comment[is]=Lykilorð ógilt
 Comment[it]=Password non valida
 Comment[ja]=不正なパスワード
+Comment[km]=ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
 Comment[lt]=Neteisingas slaptažodis
 Comment[mk]=Невалидна лозинка
 Comment[mn]=Буруу нууц үг
@@ -469,7 +518,7 @@ Comment[ro]=Parolă eronată
 Comment[ru]=Неверный пароль
 Comment[se]=Gustomeahttun beassansátni
 Comment[sk]=Zlé heslo
-Comment[sl]=Nepravilno geslo
+Comment[sl]=Neveljavno geslo
 Comment[sr]=Погрешна лозинка
 Comment[sr@Latn]=Pogrešna lozinka
 Comment[sv]=Ogiltigt lösenord
@@ -483,6 +532,7 @@ Comment[ven]=Phasiwede isa shumi
 Comment[wa]=Sicret nén valide
 Comment[xh]=Igama lokugqitha elingasebenziyo
 Comment[zh_CN]=无效密码
+Comment[zh_HK]=無效的密碼
 Comment[zh_TW]=無效的密碼
 Comment[zu]=Igama elifihlikeli
 default_presentation=4
@@ -491,23 +541,27 @@ default_presentation=4
 Name=InvalidPasswordInvitations
 Name[ar]=دعوات كلمات مرور غير صالحة
 Name[bg]=Получи се покана с невалидна парола
+Name[bn]=অবৈধ পাসওয়ার্ড আমন্ত্রণ
 Name[ca]=Contrasenya convidats no vàlides
 Name[cs]=Neplatné hesla výzev
 Name[cy]=GwahoddiadauCyfrinairAnnilys
 Name[da]=UgyldigtKodeordInvitationer
 Name[de]=UngültigePasswortAnfragen
+Name[el]=Μη έγκυρες προσκλήσεις κωδικού πρόσβασης
 Name[eo]=NevalidaPasvortoInvito
 Name[es]=Invitación de contraseñas erróneas
 Name[et]=Vale parool kutsed
+Name[eu]=Baliogabeko pasahitz gonbidapena
 Name[fr]=Invitations de mot de passe non valable
 Name[gl]=Invitación  de Contraseñas inválidas
-Name[he]=סיסמת לא תקפה - הזמנות
+Name[he]=סיסמת הזמנות שגויה
 Name[hi]=अवैध-पासवर्ड-निमंत्रण
 Name[hr]=KrivePizovniceŠifri
 Name[hu]=ÉrvénytelenJelszóMeghívások
 Name[is]=ÓgildLykilorðsBoð
 Name[it]=Invito password non valida
 Name[ja]=不正なパスワードの招待
+Name[km]=ពាក្យសម្ងាត់អញ្ជើញមិនត្រឹមត្រូវ
 Name[lt]=Neteisingo slaptažodžio kvietimai
 Name[mk]=Невалидна лозинка на поканите
 Name[mn]=Буруу нууц үгээр орох
@@ -522,43 +576,48 @@ Name[pt_BR]=Aviso de senha inválida
 Name[ru]=Неверный запрос пароля
 Name[se]=Gustomeahttun beassansátnebovdehusat
 Name[sk]=Zlé heslo pozvánky
-Name[sl]=Povabila z nepravilnimi gesli
+Name[sl]=Povabila z neveljavnimi gesli
 Name[sr]=Погрешни позиви са лозинкама
 Name[sr@Latn]=Pogrešni pozivi sa lozinkama
 Name[sv]=Ogiltigt lösenord vid inbjudan
 Name[ta]=செல்லாத அழைப்பிதழ் கடவுச்சொல் 
 Name[tg]=Дархости Нодурусти Гузарвожа
+Name[tr]=Geçersiz Parola İsteği
 Name[uk]=ЗапрошенняЗНевірнимПаролем
 Name[ven]=Mbidzo ya phasiwede isi yone
 Name[xh]=IzimemoZegamalokugqithaEzingasebebenziyo
 Name[zh_CN]=无效密码邀请
+Name[zh_HK]=無效的密碼邀請函
 Name[zh_TW]=無效的密碼邀請函
 Name[zu]=IsimemoSegamaEliyimfihloLokudlulaOkungasiyilona
 Comment=The invited party sent an invalid password. Connection refused.
 Comment[af]=Die uitgenooi party gestuur 'n ongeldige wagwoord. Verbinding geweier.
 Comment[ar]=الجهة المدعوة أرسلت كلمة مرور غير صالحة. الاتصال رُفض
 Comment[bg]=Получи се покана с невалидна парола
+Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল।
 Comment[bs]=Pozvana strana je poslala neispravnu šifru. Konekcija je odbijena.
 Comment[ca]=La part invitada ha enviat una contrasenya no vàlida. Connexió refusada.
 Comment[cs]=Pozvaná strana poslala neplatné heslo. Spojení odmítnuto.
 Comment[cy]=Anfonodd y person gwahodd cyfrinair annilys.  Gwrthodwyd y cysylltiad.
 Comment[da]=Den inviterede part sendte et ugyldigt kodeord. Forbindelse afslået.
 Comment[de]=Die eingeladene Partei hat ein ungültiges Passwort gesendet: Verbindung abgelehnt.
-Comment[el]=Η προσκαλεσμένη ομάδα έστειλε άκυρο κωδικό πρόσβασης. Η σύνδεση απορρίφθηκε.
+Comment[el]=Η πλευρά που προσκλήθηκε έστειλε μη έγκυρο κωδικό πρόσβασης. Η σύνδεση απορρίφθηκε.
 Comment[eo]=La invitita kliento sendis nevalidan pasvorton. Konekto rifuzita.
-Comment[es]=La parte invitada envió una contraseña incorrecta. Conexión rechazada
+Comment[es]=La parte invitada envió una contraseña incorrecta. Conexión rechazada.
 Comment[et]=Kutsutu saatis vigase parooli. Ühendusest keelduti.
+Comment[eu]=Gonbidatutako parekoak baliogabeko pasahitza bidali du. Konexioa ukatu da.
 Comment[fi]=Kutsuttu taho lähetti virheellisen salasanan. Yhteys hylättiin.
 Comment[fr]=La partie invitée a envoyé un mot de passe non valable. Connexion refusée.
 Comment[gl]=O invitado mandou unha contraseña inválida. A conexión foi rexeitada
-Comment[he]=הצד המוזמן שלח סיסמה לא תקפה. החיבור נדחה.
+Comment[he]=הצד המוזמן שלח סיסמה שגויה. החיבור נדחה.
 Comment[hi]=निमंत्रित पार्टी ने अवैध पासवर्ड भेजा. कनेक्शन अस्वीकृत.
 Comment[hr]=Stranka koju ste pozvali je poslala nevažeću šifru. Veza odbijena.
 Comment[hu]=A meghívott fél érvénytelen jelszót küldött. A csatlakozás nem sikerült.
 Comment[is]=Boðinn aðili sendi ógilt lykilorð. Tengingu hafnað
 Comment[it]=La parte invitata ha inviato una password non valida. Connessione rifiutata.
 Comment[ja]=招待された人が不正なパスワードを送ってきました。接続は拒否されました。
-Comment[lt]=Kviečiančioji pusė atsiuntė blogą slaptažodį.  Prisijungimas atmestas.
+Comment[km]=ភាគីដែលបានអញ្ជើញ បានផ្ញើពាក្យសម្ងាត់មិនត្រឹមត្រូវ ។ ការតភ្ជាប់ត្រូវបានបដិសេធ ។
+Comment[lt]=Pakviestoji pusė atsiuntė neteisingą slaptažodį. Ryšys nutrauktas.
 Comment[mk]=Поканетата страна испрати невалидна лозинка. Поврзувањето е одбиено.
 Comment[mn]=Буруу нууц үгийг уригдсан хэсэг илгээв. Холболт зөвшөөрөгдсөнгүй
 Comment[ms]=Pihak yang dijemput telah menghantar kata laluan yang salah. Sambungan ditolak.
@@ -573,17 +632,19 @@ Comment[pt_BR]=A parte "convidada" enviou uma senha inválida. Conexão recusada
 Comment[ru]=Удалённый пользователь ввёл неверный пароль. В доступе отказано.
 Comment[se]=Bovdejuvvon bealli sáddii gustomeahttun beassansáni. Oktavuohta hilgojuvui.
 Comment[sk]=Pozvaný účastnik poslal zlé heslo. Spojenie zamietnuté.
-Comment[sl]=Povabljena stranka je poslala nepravilno geslo. Povezava zavrnjena.
+Comment[sl]=Povabljena stranka je poslala neveljavno geslo. Povezava zavrnjena.
 Comment[sr]=Позвана странка је послала погрешну лозинку. Веза је одбијена.
 Comment[sr@Latn]=Pozvana stranka je poslala pogrešnu lozinku. Veza je odbijena.
 Comment[sv]=Den inbjudna personen skickade ett ogiltigt lösenord. Anslutning vägrades.
 Comment[ta]=அழைத்த நபர் தவறான கடவுச்சொல்லை அனுப்பியுள்ளார். இணைப்பு நிராகரிக்கப்பட்டது.
 Comment[tg]=Корванди дурдаст гузарвожаи нодурустро фиристод. Пайвастшавӣ манъ шудааст.
 Comment[th]=ผู้เข้าร่วมการเชิญชวนส่งรหัสผ่านมาไม่ถูกต้อง ทำการปฏิเสธการเชื่อมต่อ
+Comment[tr]=Davet edilenden gönderilmiş geçersiz parola. Bağlantı rededildi.
 Comment[uk]=Запрошена сторона надіслала невірний пароль. У з'єднанні відмовлено.
 Comment[ven]=Murado o rambiwaho o rumela phasiwede isa shumi. Vhukwamani ho hanwa.
 Comment[xh]=Umhlangano omenyiweyo uthumele igama lokugqitha elisebenzayo. Uxhulumano lwa liwe.
 Comment[zh_CN]=受邀请方发送的密码不对。连接被拒绝。
+Comment[zh_HK]=被邀請的一方送出無效的密碼。已拒絕連線。
 Comment[zh_TW]=被邀請的一方送出無效的密碼。已拒絕連線。
 Comment[zu]=Ingxenye emenyiwe ithumele igama lokungena alivunyelwanga. Ukuxhumana kwaliwe.
 default_presentation=2
@@ -592,6 +653,7 @@ default_presentation=2
 Name=NewConnectionOnHold
 Name[ar]=اتصال جديد على الانتظار
 Name[bg]=Получи се нова заявка за връзка
+Name[bn]=নতুন সংযোগ ধরে রাখা
 Name[ca]=Nova connexió en espera
 Name[cs]=Nové spojení pozdrženo
 Name[cy]=CysylltiadNewyddArArfael
@@ -601,7 +663,9 @@ Name[el]=Νέα σύνδεση σε αναμονή
 Name[eo]=NovaKonektoAtendante
 Name[es]=Nueva conexión en espera
 Name[et]=Uus ühendus ootel
+Name[eu]=Konexio berria itxarote moduan
 Name[fr]=Nouvelle connexion au raccroché
+Name[ga]=CeangalNuaAgFanacht
 Name[gl]=Conexión en espera
 Name[he]=חיבור חדש בהמתנה
 Name[hi]=नया-कनेक्शन-आन-होल्ड
@@ -610,7 +674,8 @@ Name[hu]=ÚjKapcsolatTartva
 Name[is]=NýTengingÁBið
 Name[it]=Nuova connessione da tenere
 Name[ja]=維持中の新規接続
-Name[lt]=Naujas prisijungimas sulaikytas
+Name[km]=ការតភ្ជាប់ថ្មី កំពុងស្ថិតនៅក្នុងការរង់ចាំ
+Name[lt]=Naujas kvietimas ryšiui sulaikytas
 Name[mk]=Нова врска на чекање
 Name[mn]=Шинэ холболт тогтоов
 Name[ms]=Sambungan Baru Menunggu
@@ -631,28 +696,33 @@ Name[sr@Latn]=Nova veza je na čekanju
 Name[sv]=Ny anslutning väntar
 Name[ta]=புதிய இணைப்பு வைக்கப்பட்டது
 Name[tg]=Пайвастшавии Нав Нигоҳ дошта мешавад
+Name[tr]=Açık Yeni Bağlantı
 Name[uk]=ОчікуютьНовіЗ'єднання
 Name[ven]=Vhukwamani vhuswa ho imiswa
 Name[xh]=Uxhulumano Olutsha Lumisiwe
 Name[zh_CN]=新连接暂时搁置
+Name[zh_HK]=保持的新連線
 Name[zh_TW]=保持的新連線
 Name[zu]=UkuxhumanisaOkushaKubanjiwe
 Comment=Connection requested, user must accept
 Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
 Comment[ar]=طلب اتصال, يجب أن يقبل المستخدم
 Comment[bg]=Получи се нова заявка за връзка
+Comment[bn]=সংযোগ অনুরোধ করা হল, ব্যবহারকারীকে অবশ্যই স্বীকার করতে হবে
 Comment[bs]=Zatražena konekcija, korisnik mora prihvatiti
 Comment[ca]=Connexió sol·licitada, l'usuari ha d'acceptar-la
 Comment[cs]=Vyžadováno spojení, uživatel musí přijmout
 Comment[cy]=Cais wedi'i wneud am gysylltiad,rhaid i'r ddefnyddiwr ei dderbyn
 Comment[da]=Forbindelse forespurgt, bruger skal acceptere
 Comment[de]=Verbindungsanfrage, Benutzer muss bestätigen
-Comment[el]=Ζητήθηκε σύνδεση, ο χρήστης πρέπει να αποδεχθεί
+Comment[el]=Αιτήθηκε σύνδεση, ο χρήστης πρέπει να αποδεχθεί
 Comment[eo]=Konekto pridemandita, uzanto devas akcepti
 Comment[es]=Conexión solicitada, el usuario debe aceptar
 Comment[et]=Nõutakse ühendust, kasutaja peab seda lubama
-Comment[fi]=Yhteyttä pyydettiin, käyttäjän tulee hyväksyä
+Comment[eu]=Konexioa eskatu da, erabiltzaileak onartu behar du
+Comment[fi]=Pyydettiin yhteyttä, käyttäjän tulee hyväksyä
 Comment[fr]=Connexion demandée, l'utilisateur doit accepter
+Comment[ga]=Ceangal iarrtha; ní mór leis an úsáideoir glacadh leis
 Comment[gl]=Petición de conexión en curo. O usuario ten que aceptar
 Comment[he]=נתבקש חיבור, על המשתמש לקבלו
 Comment[hi]=कनेक्शन निवेदित. उपयोक्ता को स्वीकार होना चाहिए
@@ -661,12 +731,13 @@ Comment[hu]=Csatlakozási kérés, megerősítés szükséges
 Comment[is]=Beiðni um tengingu, notandi verður að samþykkja
 Comment[it]=Connessione richiesta, l'utente deve accettare
 Comment[ja]=接続が要求されています。ユーザは受け入れなければなりません。
-Comment[lt]=Paprašyta prisijungimo, vartotojas turėtų priimti prašymą
+Comment[km]=បានស្នើការតភ្ជាប់, អ្នកប្រើត្រូវតែទទួលយក
+Comment[lt]=Kvietimas ryšiui išsiųstas, naudotojas turi priimti kvietimą
 Comment[mk]=Побарано е поврзување, корисникот мора да прифати
 Comment[mn]=Холболт хүсэж байна, хэрэглэгч зөвшөөрөх ёстой
 Comment[ms]=Sambungan diminta, pengguna mesti menerima
 Comment[mt]=Konnessjoni mitluba, user irid jaċċetta
-Comment[nb]=Oppkobling ønskes, bruker må akseptere.
+Comment[nb]=Oppkobling ønskes, bruker må akseptere
 Comment[nl]=Verbinding verzocht, gebruiker dient te accepteren
 Comment[nn]=Samband førespurd, brukar må godta
 Comment[nso]=Kgokagano e kgopetswe, modirisi o swanetse go dumela
@@ -677,17 +748,19 @@ Comment[ro]=Cerere de conectare; utilizatorul trebuie să accepte
 Comment[ru]=Запрос на соединение, требуется подтверждение пользователя
 Comment[se]=Oktavuohta jearahuvui, geavaheaddji ferte dohkkehit
 Comment[sk]=Vyžiadané spojenie, užívateľ musí akceptovať
-Comment[sl]=Povezava vzpostavljena, uporabnik mora sprejeti
+Comment[sl]=Povezava zahtevana, uporabnik mora sprejeti
 Comment[sr]=Захтевана је веза, корисник мора да је прихвати
 Comment[sr@Latn]=Zahtevana je veza, korisnik mora da je prihvati
 Comment[sv]=Anslutning begärd, användaren måste acceptera
 Comment[ta]=இணைப்பு கோரப்பட்டது, பயனர் கண்டிப்பாக ஏற்றுக்கொள்ள வேண்டும்
 Comment[tg]=Пайвастшавӣ дархоста шудааст, корванд бояд қабул кунад
 Comment[th]=มีการร้องขอเชื่อมต่อ ผู้ใช้ต้องทำการยอมรับ
+Comment[tr]=Bağlantı isteği, kullanıcı kabul etmeli
 Comment[uk]=Запрошено з'єднання, користувач має прийняти
 Comment[ven]=Vhukwamani ho humbelwa, mushumisi u fanela u tanganedza
 Comment[xh]=Uxhulumaniso luceliwe, umsebenzisi kufanele amkele
 Comment[zh_CN]=连接已请求，用户必须接受
+Comment[zh_HK]=已請求連線，用戶必須接受
 Comment[zh_TW]=已請求連線，使用者必須接受
 Comment[zu]=Ukuxhumanisa kuceliwe, umsebenzi kumele ivunyelwe
 default_presentation=4
@@ -696,6 +769,7 @@ default_presentation=4
 Name=NewConnectionAutoAccepted
 Name[ar]=اتصال جديد مقبول تلقائياً
 Name[bg]=Нова връзка е установена автоматично
+Name[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্বীকৃত
 Name[ca]=Nova connexió auto-acceptada
 Name[cs]=Nové spojení automaticky přijato
 Name[cy]=CysylltiadNewyddAwtoDerbyn
@@ -705,6 +779,7 @@ Name[el]=Αυτόματη αποδοχή νέας σύνδεσης
 Name[eo]=NovaKonektoAŭtomateAkceptita
 Name[es]=Nueva conexión auto aceptada
 Name[et]=Uue ühendusega automaatselt nõus
+Name[eu]=Konexio berria auto onartu da
 Name[fr]=Nouvelle connexion auto-acceptée
 Name[gl]=Nova conexión aceptada automáticamente
 Name[he]=חיבור חדש נתקבל אוטומטית
@@ -714,7 +789,8 @@ Name[hu]=ÚjKapcsolatAutoElfogadva
 Name[is]=NýTengingSjálfvirktSamþykkt
 Name[it]=Accettata nuova connessione automatica
 Name[ja]=新規接続の新規受け入れ
-Name[lt]=Naujas prisijungimas automatiškai priimtas
+Name[km]=បានទទួលយកការតភ្ជាប់ថ្មីដោយស្វ័យប្រវត្តិ
+Name[lt]=Naujas kvietimas ryšiui automatiškai priimtas
 Name[mk]=Ново поврзување автоматски прифатено
 Name[mn]=Шинэ холболтыг автоматаар зөвшөөрөв
 Name[ms]=Sambungan Baru Diterima Auto
@@ -726,7 +802,7 @@ Name[nso]=Kgokagano ye Ntshwa yago Itirisa e Amogetswe
 Name[pl]=Nowe połączenie automatycznie przyjęte
 Name[pt_BR]=Nova Conexão com aceitação automática
 Name[ro]=Conexiune nouă acceptată automat
-Name[ru]=Соединение создается автоматически
+Name[ru]=Соединение создаётся автоматически
 Name[se]=Ođđa oktavuohta dohkkehuvui automáhtalaččat
 Name[sk]=Nové spojenie automaticky akceptované
 Name[sl]=Nova povezava samodejno sprejeta
@@ -736,16 +812,19 @@ Name[sv]=Ny anslutning accepterades automatiskt
 Name[ta]=புதிய இணைப்புக்கள் தானாக ஏற்பட்டது
 Name[tg]=Пайвастшавии Нав ба таври Худкор Пазируфта мешавад
 Name[th]=รับการเชื่อมต่ออัตโนมัติ
+Name[tr]=Otomatik Kabul Edilen Yeni Bağlantı
 Name[uk]=НовіЗ'єднанняАвтоматичноПрийняті
 Name[ven]=Vhukwamani vhuswa ho tanganedzhwa
 Name[xh]=Uxhulumano Olutsha Lwamkelwe Ngokuzenzekelayo
 Name[zh_CN]=新连接自动接受
+Name[zh_HK]=自動接受的新連線
 Name[zh_TW]=自動接受的新連線
 Name[zu]=UkuxhumanisaOkushaKokuzenzakalelaKuvunyelwe
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
 Comment[ar]=اتصالات جديدة أُنشئت تلقائياً
 Comment[bg]=Нова връзка е установена автоматично
+Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[bs]=Automatski uspostavljena nova konekcija
 Comment[ca]=Nova connexió establerta automàticament
 Comment[cs]=Automaticky navázáno nové spojení
@@ -756,8 +835,10 @@ Comment[el]=Νέα σύνδεση αυτόματα αποκαταστάθηκε
 Comment[eo]=Nova konekto aŭtomate akceptita
 Comment[es]=Nueva conexión establecida automáticamente
 Comment[et]=Uus ühendus automaatselt loodud
-Comment[fi]=Uisi yhteys muodostettu automaattisesti
+Comment[eu]=Konexio berria automatikoki ezarri da
+Comment[fi]=Uusi yhteys muodostettu automaattisesti
 Comment[fr]=Nouvelle connexion établie automatiquement
+Comment[ga]=Ceangal nua bunaithe go huathoibríoch
 Comment[gl]=Nova conexión automáticamente establecida
 Comment[he]=נוצר חיבור חדש באופן אוטומטי
 Comment[hi]=नया कनेक्शन स्वचलित स्थापित
@@ -766,7 +847,8 @@ Comment[hu]=Automatikusan létrejött az új kapcsolat
 Comment[is]=Nýjar tengingar sjálfkrafa samþykktar
 Comment[it]=Stabilita nuova connessione automaticamente
 Comment[ja]=新規接続は自動的に確立されます
-Comment[lt]=Naujas prisijungimas sukurtas automatiškai
+Comment[km]=បានបង្កើតការតភ្ជាប់ថ្មីដោយស្វ័យប្រវត្តិ
+Comment[lt]=Naujas ryšys užmegztas automatiškai
 Comment[mk]=Автоматски е воспоставено ново поврзување
 Comment[mn]=Шинэ холболт автоматаар тавигдав
 Comment[ms]=Sambungan baru secara automatik terjalin
@@ -789,10 +871,12 @@ Comment[sv]=Ny anslutning automatiskt upprättad
 Comment[ta]=இணைப்புகள் தானாக உருவாக்கப்பட்டது
 Comment[tg]=Пайвастшавии нав ба таври худкор барпо мегардад
 Comment[th]=เปิดการเชื่อมต่อใหม่อัตโนมัติ
+Comment[tr]=Yeni bağlantı otomatik olarak kuruldu
 Comment[uk]=Автоматично встановлено нове з'єднання
 Comment[ven]=Vhukwamani vhuswa ho itwa na zwenezwo
 Comment[xh]=Uxhulumaniso olutsha lufunyenwe ngokuzenzekelayo
 Comment[zh_CN]=自动建立新连接
+Comment[zh_HK]=已自動建立新連線
 Comment[zh_TW]=已自動建立新連線
 Comment[zu]=Ukuxhumana okusha kuyazisungulela
 default_presentation=4
@@ -801,6 +885,7 @@ default_presentation=4
 Name=TooManyConnections
 Name[ar]=اتصالات عديدة جداً
 Name[bg]=Получиха се твърде много връзки
+Name[bn]=অত্যাধিক সংযোগ
 Name[ca]=Masses connexions
 Name[cs]=Příliš mnoho spojení
 Name[cy]=GormodOGysylltiadau
@@ -810,7 +895,9 @@ Name[el]=Πάρα πολλές συνδέσεις
 Name[eo]=TroMultajKonektoj
 Name[es]=Demasiadas conexiones
 Name[et]=Liiga palju ühendusi
+Name[eu]=Konexio gehiegi
 Name[fr]=Trop de connexions
+Name[ga]=AnIomarcaCeangal
 Name[gl]=Demasiadas conexións
 Name[he]=יותר מדיי חיבורים
 Name[hi]=Tबहुत-सारे-कनेक्शन
@@ -819,7 +906,8 @@ Name[hu]=TúlSokKapcsolat
 Name[is]=OfMargarTengingar
 Name[it]=Troppe Connessioni
 Name[ja]=多すぎる接続
-Name[lt]=Per daug prisijungimų
+Name[km]=ការតភ្ជាប់ច្រើនពេក
+Name[lt]=Per daug užmegztų ryšių
 Name[mk]=Премногу поврзувања
 Name[mn]=Дэндүү олон холболт
 Name[ms]=Terlalu Banyak Sambungan
@@ -846,12 +934,14 @@ Name[uk]=ЗабагатоЗ'єднань
 Name[ven]=Vhukwamani vhunzhi
 Name[xh]=Uxhulumaniso Oluninzi Kakhulu
 Name[zh_CN]=连接太多
+Name[zh_HK]=太多連線
 Name[zh_TW]=太多連線
 Name[zu]=UkuxhumanaOkuningi
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
 Comment[ar]=مشغول , الاتصال رُفض
 Comment[bg]=Получиха се твърде много връзки
+Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
 Comment[br]=Dalc'het, kevreadenn disteuleret
 Comment[bs]=Zauzet, konekcija odbijena
 Comment[ca]=Ocupat, connexió refusada
@@ -863,8 +953,10 @@ Comment[el]=Απασχολημένο, η σύνδεση απορρίφθηκε
 Comment[eo]=Laborante, konekto rifuzita
 Comment[es]=Ocupado, conexión rechazada
 Comment[et]=Hõivatud, ühendusest keelduti
+Comment[eu]=Lanpetuta, konexioa ukatu da
 Comment[fi]=Varattu, yhteys hylättiin
 Comment[fr]=Occupé, connexion refusée
+Comment[ga]=Gnóthach; ceangal diúltaithe
 Comment[gl]=Ocupado, conexión rexeitada
 Comment[he]=תפוס, החיבור נדחה
 Comment[hi]=व्यस्त, कनेक्शन अस्वीकृत
@@ -873,7 +965,8 @@ Comment[hu]=Foglalt, a csatlakozási kérés visszautasítva
 Comment[is]=Uptekinn, tengingu hafnað
 Comment[it]=Occupato, connessione rifiutata
 Comment[ja]=ビジーです。接続は拒否されました
-Comment[lt]=Užimtas, prisijungimas atmestas
+Comment[km]=រវល់,បោះបង់ការតភ្ជាប់
+Comment[lt]=Užimta, kvietimas ryšiui atmestas
 Comment[mk]=Зафатено, поврзувањето е одбиено
 Comment[mn]=Шугам Чөлөөгүй, холболт зөвшөөрөгдсөнгүй
 Comment[ms]=Sibuk, sambungan ditolak
@@ -888,18 +981,20 @@ Comment[pt_BR]=Ocupado; conexão recusada
 Comment[ro]=Ocupat; conexiune refuzată
 Comment[ru]=Занято, соединение закрыто
 Comment[sk]=Zaneprázdneny, spojenie odmietnuté
-Comment[sl]=zaposlen, povezava zavrnjena
+Comment[sl]=Zaposlen, povezava zavrnjena
 Comment[sr]=Заузето, веза је одбијена
 Comment[sr@Latn]=Zauzeto, veza je odbijena
 Comment[sv]=Upptagen, anslutning vägras
 Comment[ta]=வேலையில் உள்ளது, இணைப்பு நிராகரிக்கப்பட்டது
 Comment[tg]=Банд, пайвастшавӣ рад гардидааст
 Comment[th]=ยังไม่ว่าง ทำการปฏิเสธการเชื่อมต่อ
+Comment[tr]=Meşgul, bağlantı rededildi
 Comment[uk]=Зайнято, у з'єднанні відмовлено
 Comment[uz]=Банд, алоқа рад этилди
 Comment[ven]=U farakanea, vhukwamani ho hanwa
 Comment[xh]=Uxhulumaniso, olu xakekileyo lwaliwe
 Comment[zh_CN]=占线，连接拒绝
+Comment[zh_HK]=忙碌，已拒絕連線
 Comment[zh_TW]=忙碌，已拒絕連線
 Comment[zu]=Imatasa,ukuxhumana kwaliwe
 default_presentation=4
@@ -909,6 +1004,7 @@ default_logfile=
 Name=UnexpectedConnection
 Name[ar]=اتصال غير متوقع
 Name[bg]=Получи се неочаквана връзка
+Name[bn]=অপ্রত্যাশিত সংযোগ
 Name[ca]=Connexió inesperada
 Name[cs]=Neočekávané spojení
 Name[cy]=CysylltiadAnnisgwyl
@@ -918,6 +1014,7 @@ Name[el]=Μη αναμενόμενη σύνδεση
 Name[eo]=NeatenditaKonekto
 Name[es]=Conexión inesperada
 Name[et]=Ootamatu ühendus
+Name[eu]=Ustekabeko konexioa
 Name[fr]=Connexion inattendue
 Name[gl]=Conexión inesperada
 Name[he]=חיבור בלתי צפוי
@@ -927,6 +1024,7 @@ Name[hu]=NemVártKapcsolat
 Name[is]=ÓvæntTenging
 Name[it]=Connessione inaspettata
 Name[ja]=予期しない接続
+Name[km]=ការតភ្ជាប់ដែលមិនបានរំពឹងទុក
 Name[lt]=Netikėtas prisijungimas
 Name[mk]=Неочекувано поврзување
 Name[mn]=Гэнэтийн Холболт
@@ -940,6 +1038,7 @@ Name[pl]=Niespodziewane połączenie
 Name[pt_BR]=Conexão não-aceita
 Name[ro]=Conexiune neaşteptată
 Name[ru]=Неожиданное соединение
+Name[se]=Vuordekeahtes oktavuohta
 Name[sk]=Neočakávane spojenie
 Name[sl]=Nepričakovana povezava
 Name[sr]=Неочекивана веза
@@ -953,22 +1052,25 @@ Name[uk]=НеочікуванеЗ'єднання
 Name[ven]=Vhukwamani vhu songo lavhelelwaho
 Name[xh]=Uxhulumaniso Olungalindelwanga
 Name[zh_CN]=未料到的连接
+Name[zh_HK]=非預期的連線
 Name[zh_TW]=非預期的連線
 Name[zu]=UkuxhumanaOkungalindelwe
 Comment=Received unexpected connection, abort
 Comment[af]=Ontvang onverwagte verbinding, staak
 Comment[ar]=تم استلام اتصال غير متوقع , اقطع
 Comment[bg]=Получи се неочаквана връзка
+Comment[bn]=অপ্রত্যাশিত সংযোগ গ্রহণ করল, বাতিল করুন
 Comment[bs]=Primio neočekivanu konekciju, prekidam
 Comment[ca]=Rebuda una connexió inesperada, avortant
 Comment[cs]=Obdrženo neočekávané spojení, přerušeno
 Comment[cy]=Derbynwyd cysylltiad annisgwyl,terfynu
 Comment[da]=Modtog uventet forbindelse, afbrød
-Comment[de]=Unerwartete Verbindung hergestallt, Abbruch
-Comment[el]=Λήψη μη αναμενόμενης σύνδεσης, διακοπή
+Comment[de]=Unerwartete Verbindung hergestellt, Abbruch
+Comment[el]=Λήψη μη αναμενόμενης σύνδεσης, εγκατάλειψη
 Comment[eo]=Ricevis neatenditan konekton, haltis
-Comment[es]=Recibida conexión inesperada, abortar
+Comment[es]=Recibida conexón inesperada, abortar
 Comment[et]=Saadi ootamatu ühendus, loobuti
+Comment[eu]=Ustegabeko konexioa jaso da, abortatzen
 Comment[fi]=Vastaanotettiin odottamaton yhteys, lopeta
 Comment[fr]=Reçu une connexion inattendue, interruption
 Comment[gl]=Recibíuse unha conexión inesperada. 
@@ -979,7 +1081,8 @@ Comment[hu]=Nem várt csatlakozási kérés, kilépés
 Comment[is]=Tók á móti óvæntri tengingu, hætti
 Comment[it]=Ricevuta connessione inaspettata, termina
 Comment[ja]=予期しない接続を受信しました。廃棄します。
-Comment[lt]=Gautas netikėtas prisijungimas, nutraukiama
+Comment[km]=បានទទួលយកការតភ្ជាប់ដែលមិនបានរំពឹងទុក, បោះបង់
+Comment[lt]=Sulaukta netikėto prisijungimo, nutraukiama
 Comment[mk]=Примено е неочекувано поврзување, се прекинува
 Comment[mn]=Гэнэтийн холболтийг хүлээн авав.Аборт
 Comment[ms]=Menerima sambungan luar jangka, menamatkan
@@ -993,18 +1096,21 @@ Comment[pt]=Foi recebida uma ligação inesperada, a interromper
 Comment[pt_BR]=conexão recebida inesperadamente; abortar
 Comment[ro]=A fost recepţionată o conexiune neaşteptată şi a fost anulată
 Comment[ru]=Получено неожиданное соединение. Отключение
+Comment[se]=Oaččui vuordekeahtes oktavuođa, gaskkalduhte
 Comment[sk]=Prijaté neočakávane spojenie, ukončujem
-Comment[sl]=Prejeta nepričakovana povezava, prekinjam
+Comment[sl]=Prejeta nepričakovana povezava, prekinjeno
 Comment[sr]=Примљена је неочекивана веза, прекидам
 Comment[sr@Latn]=Primljena je neočekivana veza, prekidam
 Comment[sv]=Tog emot oväntad anslutning, avbryter
 Comment[ta]=எதிர்பாராத இணைப்பு, நிறுத்தப்பட்டது
 Comment[tg]=Пайвастшавии ғайричашмдош қабул гардид, кандашавӣ
 Comment[th]=ได้รับการเชื่อมต่อที่ไม่คาดหวัง ทำการยกเลิก
+Comment[tr]=Babul edilmiş beklenmedik bağlantı, durdur
 Comment[uk]=Отримано неочікуване з'єднання, скасовую
 Comment[ven]=Vhukwamani vhu songo lavhelelwaho ho tanganedzhwaho, litsha
 Comment[xh]=Ufumene uxhulumaniso olungalindelekanga, lahla
 Comment[zh_CN]=收到意外连接，中止
+Comment[zh_HK]=接收到非預期的連線，中止
 Comment[zh_TW]=接收到非預期的連線，放棄
 Comment[zu]=Isithole ukuxhumana okungalindelekanga, hushula
 default_presentation=4
--- a/krfb/invite.ui
+++ b/krfb/invite.ui
--- a/krfb/invite.ui.h
+++ b/krfb/invite.ui.h
@@ -1,7 +0,0 @@
-#include <kapplication.h>
-
-void InvitationDialog::helpClicked()
-{
-	KApplication::kApplication()->invokeHelp();
-}
-
--- a/krfb/invitedialog.cc
+++ b/krfb/invitedialog.cc
@@ -0,0 +1,65 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include "invitedialog.h"
+#include "invitewidget.h"
+
+#include <kiconloader.h>
+#include <klocale.h>
+#include <kstdguiitem.h>
+
+#include <qlabel.h>
+#include <qpushbutton.h>
+
+InviteDialog::InviteDialog( QWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n( "Invitation" ),
+      User1|Close|Help, NoDefault, true )
+{
+  m_inviteWidget = new InviteWidget( this, "InviteWidget" );
+  m_inviteWidget->pixmapLabel->setPixmap(
+      UserIcon( "connection-side-image.png" ) );
+  setMainWidget( m_inviteWidget );
+
+  setButtonGuiItem( User1, KStdGuiItem::configure() );
+
+  connect( m_inviteWidget->btnCreateInvite, SIGNAL( clicked() ),
+           SIGNAL( createInviteClicked() ) );
+  connect( m_inviteWidget->btnEmailInvite, SIGNAL( clicked() ),
+           SIGNAL( emailInviteClicked() ) );
+  connect( m_inviteWidget->btnManageInvite, SIGNAL( clicked() ),
+           SIGNAL( manageInviteClicked() ) );
+}
+
+void InviteDialog::slotUser1()
+{
+  emit configureClicked();
+}
+
+void InviteDialog::enableInviteButton( bool enable )
+{
+  m_inviteWidget->btnCreateInvite->setEnabled( enable );
+}
+
+void InviteDialog::setInviteCount( int count )
+{
+  m_inviteWidget->btnManageInvite->setText(
+      i18n( "&Manage Invitations (%1)..." ).arg( count ) );
+}
+
+#include "invitedialog.moc"
--- a/krfb/invitedialog.h
+++ b/krfb/invitedialog.h
@@ -0,0 +1,54 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#ifndef INVITEDIALOG_H
+#define INVITEDIALOG_H
+
+class InviteWidget;
+
+#include <kdialogbase.h>
+
+class InviteDialog : public KDialogBase
+{
+  Q_OBJECT
+
+  public:
+    InviteDialog( QWidget *parent, const char *name );
+    ~InviteDialog() {}
+
+    void enableInviteButton( bool enable );
+
+  public slots:
+    void setInviteCount( int count );
+
+  signals:
+    void createInviteClicked();
+    void emailInviteClicked();
+    void manageInviteClicked();
+    void configureClicked();
+
+  protected slots:
+    void slotUser1();
+
+  protected:
+    InviteWidget *m_inviteWidget;
+};
+
+#endif // INVITEDIALOG_H
+
--- a/krfb/invitewidget.ui
+++ b/krfb/invitewidget.ui
@@ -0,0 +1,197 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>InviteWidget</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>InviteWidget</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>521</width>
+            <height>328</height>
+        </rect>
+    </property>
+    <property name="caption">
+        <string></string>
+    </property>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <widget class="QLabel" row="0" column="1" rowspan="1" colspan="3">
+            <property name="name">
+                <cstring>TextLabel2</cstring>
+            </property>
+            <property name="font">
+                <font>
+                    <bold>1</bold>
+                </font>
+            </property>
+            <property name="text">
+                <string>Welcome to KDE Desktop Sharing</string>
+            </property>
+        </widget>
+        <widget class="KActiveLabel" row="1" column="1" rowspan="1" colspan="3">
+            <property name="name">
+                <cstring>kActiveLabel1</cstring>
+            </property>
+            <property name="focusPolicy">
+                <enum>NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>KDE Desktop Sharing allows you to invite somebody at a remote location to watch and possibly control your desktop.
+&lt;a href="whatsthis:&lt;p&gt;An invitation creates a one-time password that allows the receiver to connect to your desktop. It is valid for only one successful connection and will expire after an hour if it has not been used. When somebody connects to your computer a dialog will appear and ask you for permission. The connection will not be established before you accept it. In this dialog you can also restrict the other person to view your desktop only, without the ability to move your mouse pointer or press keys.&lt;/p&gt;&lt;p&gt;If you want to create a permanent password for Desktop Sharing, allow 'Uninvited Connections' in the configuration.&lt;/p&gt;"&gt;More about invitations...&lt;/a&gt;</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="0" column="0" rowspan="7" colspan="1">
+            <property name="name">
+                <cstring>pixmapLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>0</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="maximumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="frameShape">
+                <enum>WinPanel</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Sunken</enum>
+            </property>
+            <property name="scaledContents">
+                <bool>true</bool>
+            </property>
+            <property name="alignment">
+                <set>AlignTop</set>
+            </property>
+        </widget>
+        <spacer row="4" column="3">
+            <property name="name">
+                <cstring>spacer4</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Horizontal</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>40</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="QPushButton" row="3" column="2">
+            <property name="name">
+                <cstring>btnCreateInvite</cstring>
+            </property>
+            <property name="text">
+                <string>Create &amp;Personal Invitation...</string>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string></string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>Create a new invitation and display the connection data. Use this option if you want to invite somebody personally, for example, to give the connection data over the phone.</string>
+            </property>
+        </widget>
+        <spacer row="6" column="2">
+            <property name="name">
+                <cstring>spacer5</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Fixed</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>24</height>
+                </size>
+            </property>
+        </spacer>
+        <spacer row="4" column="1">
+            <property name="name">
+                <cstring>spacer3</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Horizontal</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>40</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="QPushButton" row="5" column="2">
+            <property name="name">
+                <cstring>btnManageInvite</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;Manage Invitations (%1)...</string>
+            </property>
+        </widget>
+        <widget class="QPushButton" row="4" column="2">
+            <property name="name">
+                <cstring>btnEmailInvite</cstring>
+            </property>
+            <property name="text">
+                <string>Invite via &amp;Email...</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>This button will start your email application with a pre-configured text that explains to the recipient how to connect to your computer. </string>
+            </property>
+        </widget>
+        <spacer row="2" column="2">
+            <property name="name">
+                <cstring>spacer2</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>MinimumExpanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>89</height>
+                </size>
+            </property>
+        </spacer>
+    </grid>
+</widget>
+<signals>
+    <signal>createInviteClicked()</signal>
+    <signal>emailInviteClicked()</signal>
+    <signal>manageInviteClicked()</signal>
+</signals>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</UI>
--- a/krfb/kinetd_krfb.desktop
+++ b/krfb/kinetd_krfb.desktop
@@ -14,10 +14,14 @@ X-KDE-KINETD-multiInstance=false
 X-KDE-KINETD-serviceURL=service:remotedesktop.kde:vnc://%h:%p;(type=shared),(username=%u),(fullname=%f),(serviceid=%i)
 X-KDE-KINETD-serviceAttributes=(type=shared),(username=%u),(fullname=%f),(serviceid=%i)
 X-KDE-KINETD-serviceLifetime=1200
+X-KDE-KINETD-DNSSD-Name=Remote Desktop of %u
+X-KDE-KINETD-DNSSD-Type=_rfb._tcp
+X-KDE-KINETD-DNSSD-Properties=type=shared,u=%u,fullname=%f

 Name=KRfb Desktop Sharing
 Name[ar]=KRfb مشاركة سطح المكتب
 Name[bg]=Споделяне на работно място (KRfb)
+Name[bn]=কে-আর-এফ-বি ডেস্কটপ ভাগাভাগি
 Name[bs]=KRfb dijeljenje desktopa
 Name[ca]=Compartició de l'escriptori KRfb
 Name[cs]=Sdílení pracovní plochy KRfb
@@ -26,10 +30,12 @@ Name[da]=KRfb desktopdeling
 Name[de]=KRfb Arbeitsfläche freigeben
 Name[el]=Κοινή χρήση επιφάνειας εργασίας KRfb
 Name[eo]=KRfb Tabula fordonado
-Name[es]=Compartición de escritorio KRfb
+Name[es]=Escritorio compartido KRfb
 Name[et]=KRfb Töölaua jagamine
-Name[fi]=Työpöydän jakaminen
+Name[eu]=KRfb mahaigain partekatzea
+Name[fi]=KRfb työpöydän jakaminen
 Name[fr]=Partage de bureau KRfb
+Name[ga]=Roinnt Deisce KRfb
 Name[gl]=KRfb Compartición de Escritorios
 Name[he]=שיתוף שולחנות עבודה של KRfb
 Name[hi]=KRfb डेस्कटॉप साझेदारी
@@ -38,12 +44,14 @@ Name[hu]=KRfb munkaasztal-megosztás
 Name[is]=KRfb Skjáborðsmiðlun
 Name[it]=Condivisione desktop KRfb
 Name[ja]=KRfb デスクトップ共有
-Name[lt]=KRfb dalinimasis darbastaliu
+Name[km]=ការចែករំលែកផ្ទៃតុ KRfb
+Name[lt]=KRfb Dalinimasis darbastaliu
 Name[mk]=Делење на површина со KRfb 
 Name[mn]=KRfb ажлын байр
 Name[ms]=Perkongsian Ruang Kerja KRfb
 Name[mt]=Qsim tad-desktop KRfb
 Name[nb]=KRfb skrivebordsdeling
+Name[nl]=KRfb Bureaublad delen
 Name[nn]=KRfb-skrivebordsdeling
 Name[nso]=Kabagano ya Desktop ya KRfp
 Name[pl]=KRfb Współdzielenie pulpitu
@@ -51,6 +59,7 @@ Name[pt]=Partilha do Ecrã KRfb
 Name[pt_BR]=Compartilhamento do Ambiente de Trabalho KRfb
 Name[ro]=Partajare ecran KRfb
 Name[ru]=Общий рабочий стол KRfb
+Name[se]=KRfb-čállinbeavdejuohkin
 Name[sk]=KRfb zdieľanie pracovnej plochy
 Name[sl]=Deljenje namizja z KRfb
 Name[sr]=KRfb дељење радне површине
@@ -64,12 +73,14 @@ Name[uk]=Спільні стільниця KRfb
 Name[ven]=U kovhekana ha Desikithopo ya KRfb
 Name[xh]=Desktop ye KRfb Isebenza ngokuhlangeneyo
 Name[zh_CN]=KRfb 桌面共享
+Name[zh_HK]=KRfb 桌面分享
 Name[zh_TW]=KRfb 桌面分享
 Name[zu]=KRfb ukwahlukanisela kwe-Desktop Sharing
 Comment=A daemon that allows you to share your desktop
 Comment[af]='n bediener wat laat toe jy na deel jou werkskerm
 Comment[ar]=مراقب يسمح لك بمشاركة سطح مكتبك
 Comment[bg]=Демон за споделяне на работното място
+Comment[bn]=একটি ডিমন যে আপনার ডেস্কটপ ভাগাভাগি করতে আপনাকে অনুমতি দেয়
 Comment[bs]=Daemon koji vam omogućuje da dijelite vaš desktop
 Comment[ca]=Un dimoni que us permetrà compartir el vostre escriptori
 Comment[cs]=Démon umožňující sdílení vaší plochy
@@ -80,8 +91,10 @@ Comment[el]=Ένας δαίμονας που σας επιτρέπει να μο
 Comment[eo]=demono por permesi retan fordonadon de via tabulo
 Comment[es]=Un demonio que le permite compartir su escritorio
 Comment[et]=Deemon, mis lubab sul töölauda jagada
-Comment[fi]=Palvelin joka mahdollistaa työpöydän jakamisen
+Comment[eu]=Zure mahaigaina partekatzeko aukera ematen duen deabrua da
+Comment[fi]=Palvelin, joka mahdollistaa työpöydän jakamisen
 Comment[fr]=Un démon qui vous permet de partager votre bureau
+Comment[ga]=Deamhan a chuireann ar do chumas do dheasca a roinnt
 Comment[gl]=Un demo que permite a compartición do teu escritorio
 Comment[he]=תהליך רקע שמאפשר לך לשתף את שולחן העבודה שלך
 Comment[hi]=आपके डेस्कटॉप को साझेदारी करने देने वाला डेमन
@@ -90,7 +103,8 @@ Comment[hu]=Munkaasztal-megosztási szolgáltatás
 Comment[is]=Þjónn sem leyfir þér að miðla skjáborðinu þínu
 Comment[it]=Un demone che permette di condividere il tuo desktop
 Comment[ja]=デスクトップ共有を可能にするデーモン
-Comment[lt]=Tarnyba, leidžianti jums dalintis savo darbastaliu
+Comment[km]=ដេមិនដែលអនុញ្ញាតឲ្យអ្នកចែករំលែកផ្ទៃតុរបស់អ្នក
+Comment[lt]=Tarnyba, leidžianti dalintis savo darbastaliu
 Comment[mk]=Даемон кој ви дозволува да ја делите вашата работна површина
 Comment[mn]=Таны ажлын байрыг хамтран эзэмшихийгзөвшөөрсөн демон
 Comment[ms]=Daemon yang membenarkan anda berkongsi ruang kerja
@@ -103,19 +117,21 @@ Comment[pl]=Usługa, która pozwala na współdzielenie pulpitu
 Comment[pt]=Um servidor que lhe permite partilhar o seu ecrã
 Comment[pt_BR]=Um servidor que permite a você compartilhar o seu ambiente de trabalho
 Comment[ro]=Un demon care vă permite saă partajaţi sistemul dumneavoastră
-Comment[ru]=Демон общего доступа к рабочему столу
+Comment[ru]=Служба совместного доступа к рабочему столу
 Comment[se]=Duogášprográmma mii diktá du juohkit čállinbeavddi earáiguin
 Comment[sk]=Démon ktorý umožní zdieľať vašu pracovnú plochu
-Comment[sl]=Demon, s katerim lahko delite vaše namizje
+Comment[sl]=Strežnik, s katerim lahko delite vaše namizje
 Comment[sr]=Демон који вам дозвољава да делите вашу радну површину
 Comment[sr@Latn]=Demon koji vam dozvoljava da delite vašu radnu površinu
 Comment[sv]=Demon som låter dig dela ut skrivbordet
 Comment[ta]=ஒரு டேமொன் உங்கள் பணிமேடை பகிர்வை அளிக்கும்
 Comment[tg]=Азозиле, ки ба шумо истифодабарии муштараки мизи кориро медиҳад
 Comment[th]=เดมอนอนุญาตให้คุณแบ่งการใช้งานพื้นที่ทำงานร่วมกัน
+Comment[tr]=Masaüstünüzde paylaşılmasına izin verilmiş hayalet program
 Comment[uk]=Демон, що дозволяє спільне використання стільниць
 Comment[ven]=Daemon ine yani tendela nitshi kovhekana desktop yanu
 Comment[xh]=Daemon ekuvumela ukuba wabe i desktop yakho
 Comment[zh_CN]=允许您共享桌面的守护进程
+Comment[zh_HK]=讓您分享您的桌面的系統程式
 Comment[zh_TW]=讓您分享您的桌面的伺服程式
 Comment[zu]=I-daemoni ekuvumela uhlukaniselana nge-desktop
--- a/krfb/krfb.desktop
+++ b/krfb/krfb.desktop
@@ -1,61 +1,51 @@
-# KDE Config File  
+# KDE Config File
 [Desktop Entry]
 Type=Application
 Exec=krfb -caption "%c" %i %m
 Icon=krfb
 DocPath=krfb/index.html
-Terminal=0
-Name=Desktop Sharing
-Name[af]=Werkskerm Deeling
-Name[ar]=مشاركة سطح المكتب
-Name[bg]=Споделяне на работно място
-Name[bs]=Dijeljenje desktopa
-Name[ca]=Compartició de l'escriptori
-Name[cs]=Sdílení pracovní plochy
-Name[cy]=Rhannu Penbwrdd
-Name[da]=Desktopdeling
-Name[de]=Arbeitsfläche freigeben
-Name[el]=Κοινή χρήση επιφάνειας εργασίας
-Name[eo]=Tabuloj komunaj
-Name[es]=Compartición de escritorio
-Name[et]=Töölaua jagamine
-Name[fi]=Työpöydän jakaminen
-Name[fr]=Partage de bureau
-Name[gl]=Compartición do escritorio
-Name[he]=שיתוף שולחנות עבודה
-Name[hi]=डेस्कटॉप साझेदारी
-Name[hr]=Dijeljenje radne površine
-Name[hu]=Munkaasztal-megosztás
-Name[is]=Skjáborðamiðlun
-Name[it]=Condivisione Desktop
-Name[ja]=デスクトップ共有
-Name[lt]=Dalinimasis darbastaliu
-Name[mk]=Делење на работната површина
-Name[mn]=Ажлын байрыг хамтран эзэмших
-Name[ms]=Perkongsian Ruang Kerja
-Name[mt]=Qsim tad-desktop
-Name[nb]=Delte skrivebord
-Name[nl]=Bureaubladvrijgave
-Name[nn]=Skrivebordsdeling
-Name[nso]=Kabagano ya Desktop
-Name[pl]=Współdzielenie pulpitu
-Name[pt]=Partilha do Ambiente de Trabalho
-Name[pt_BR]=Compartilhamento do Desktop
-Name[ro]=Partajare ecran
-Name[ru]=Общий рабочий стол
-Name[sk]=Zdieľanie pracovnej plochy
-Name[sl]=Souporaba namizja
-Name[sr]=Дељење радне површине
-Name[sr@Latn]=Deljenje radne površine
-Name[sv]=Dela ut skrivbordet
-Name[ta]=பணிமேடை பகிர்வு
-Name[tg]=Истифодабарии муштараки Мизи корӣ
-Name[th]=ใช้งานพื้นที่ทำงานร่วมกัน
-Name[tr]=Masaüstü Paylaşımı
-Name[uk]=Спільні стільниці
-Name[ven]=U kovhekana ha Desikithopo
-Name[xh]=Ukwehlulelana kwe Desktop
-Name[zh_CN]=桌面共享
-Name[zh_TW]=桌面分享
-Name[zu]=Ukwahlulelana kwe-Desktop
-Categories=Qt;KDE;System
+Terminal=false
+Name=Krfb
+Name[bn]=কে-আর-এফ-বি
+GenericName=Desktop Sharing
+GenericName[bg]=Споделяне на раб. място
+GenericName[bn]=ডেস্কটপ ভাগাভাগি
+GenericName[br]=Rannañ ar vurev
+GenericName[ca]=Compartició de l'escriptori
+GenericName[cs]=Sdílení pracovní plochy
+GenericName[cy]=Rhannu Penbwrdd
+GenericName[da]=Desktopdeling
+GenericName[de]=Arbeitsfläche freigeben
+GenericName[el]=Κοινή χρήση επιφάνειας εργασίας
+GenericName[es]=Escritorio compartido
+GenericName[et]=Töölaua jagamine
+GenericName[eu]=Mahaigain partekatzea
+GenericName[fi]=Työpöydän jakaminen
+GenericName[fr]=Partage de bureau
+GenericName[ga]=Roinnt Deisce
+GenericName[gl]=Compartidor de Escritorio
+GenericName[he]=שיתוף שולחנות עבודה
+GenericName[hu]=Munkaasztal-megosztás
+GenericName[is]=Skjáborðsmiðlun
+GenericName[it]=Condivisione desktop
+GenericName[ja]=デスクトップ共有
+GenericName[km]=ការចែករំលែកផ្ទៃតុ
+GenericName[lt]=Dalinimasis darbastaliu
+GenericName[mt]=Qsim tad-desktop
+GenericName[nb]=Delte skrivebord
+GenericName[nl]=Bureaublad delen
+GenericName[nn]=Skrivebordsdeling
+GenericName[pl]=Współdzielenie pulpitu
+GenericName[pt]=Partilha do Ambiente de Trabalho
+GenericName[pt_BR]=Compartilhamento de Ambiente de Trabalho
+GenericName[ru]=Общий рабочий стол
+GenericName[sl]=Deljenje namizja
+GenericName[sr]=Дељење радне површине
+GenericName[sr@Latn]=Deljenje radne površine
+GenericName[sv]=Dela ut skrivbordet
+GenericName[tr]=Masaüstü Paylaşımı
+GenericName[uk]=Спільні стільниці
+GenericName[uz]=Иш столи билан бўлишиш
+GenericName[zh_CN]=桌面共享
+GenericName[zh_HK]=桌面分享
+Categories=Qt;KDE;System;
--- a/krfb/newconnectiondialog.ui
+++ b/krfb/newconnectiondialog.ui
--- a/krfb/personalinvitation.ui
+++ b/krfb/personalinvitation.ui
--- a/krfb/personalinvitedialog.cc
+++ b/krfb/personalinvitedialog.cc
@@ -0,0 +1,54 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include "personalinvitedialog.h"
+#include "personalinvitewidget.h"
+
+#include <qlabel.h>
+
+#include <kactivelabel.h>
+#include <kiconloader.h>
+#include <klocale.h>
+
+PersonalInviteDialog::PersonalInviteDialog( QWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n( "Personal Invitation" ),
+                   Close, Close, true )
+{
+  m_inviteWidget = new PersonalInviteWidget( this, "PersonalInviteWidget" );
+  m_inviteWidget->pixmapLabel->setPixmap( 
+      UserIcon( "connection-side-image.png" ) );
+
+  setMainWidget( m_inviteWidget );
+}
+
+void PersonalInviteDialog::setHost( const QString &host, uint port )
+{
+  m_inviteWidget->hostLabel->setText( QString( "%1:%2" )
+      .arg( host ).arg( port ) );
+}
+
+void PersonalInviteDialog::setPassword( const QString &passwd )
+{
+  m_inviteWidget->passwordLabel->setText( passwd );
+}
+
+void PersonalInviteDialog::setExpiration( const QDateTime &expire )
+{
+  m_inviteWidget->expirationLabel->setText( expire.toString( Qt::LocalDate ) );
+}
--- a/krfb/personalinvitedialog.h
+++ b/krfb/personalinvitedialog.h
@@ -0,0 +1,44 @@
+/* This file is part of the KDE project
+   Copyright (C) 2004 Nadeem Hasan <nhasan@kde.org>
+
+   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; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#ifndef PERSONALINVITEDIALOG_H
+#define PERSONALINVITEDIALOG_H
+
+class PersonalInviteWidget;
+
+#include <qdatetime.h>
+
+#include <kdialogbase.h>
+
+class PersonalInviteDialog : public KDialogBase
+{
+  public:
+    PersonalInviteDialog( QWidget *parent, const char *name );
+    virtual ~PersonalInviteDialog() {}
+
+    void setHost( const QString &host, uint port );
+    void setPassword( const QString &passwd );
+    void setExpiration( const QDateTime &expire );
+
+  protected:
+    PersonalInviteWidget *m_inviteWidget;
+};
+
+#endif // PERSONALINVITEDIALOG_H
+
--- a/krfb/personalinvitewidget.ui
+++ b/krfb/personalinvitewidget.ui
@@ -0,0 +1,241 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>PersonalInviteWidget</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>Form1</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>519</width>
+            <height>328</height>
+        </rect>
+    </property>
+    <property name="caption">
+        <string></string>
+    </property>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <property name="resizeMode">
+            <enum>Fixed</enum>
+        </property>
+        <widget class="KActiveLabel" row="0" column="1" rowspan="1" colspan="3">
+            <property name="name">
+                <cstring>mainTextLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="focusPolicy">
+                <enum>NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>&lt;h2&gt;Personal Invitation&lt;/h2&gt;
+Give the information below to the person that you want to invite (&lt;a href="whatsthis:Desktop Sharing uses the VNC protocol. You can use any VNC client to connect. In KDE the client is called 'Remote Desktop Connection'. Enter the host information into the client and it will connect.."&gt;how to connect&lt;/a&gt;). Note that everybody who gets the password can connect, so be careful.</string>
+            </property>
+        </widget>
+        <spacer row="1" column="2">
+            <property name="name">
+                <cstring>spacer9</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>34</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1">
+            <property name="name">
+                <cstring>pixmapLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>0</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="minimumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="maximumSize">
+                <size>
+                    <width>108</width>
+                    <height>318</height>
+                </size>
+            </property>
+            <property name="frameShape">
+                <enum>WinPanel</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Sunken</enum>
+            </property>
+            <property name="scaledContents">
+                <bool>true</bool>
+            </property>
+        </widget>
+        <spacer row="5" column="2">
+            <property name="name">
+                <cstring>spacer10</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>30</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="KActiveLabel" row="2" column="2">
+            <property name="name">
+                <cstring>hostLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="focusPolicy">
+                <enum>NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>cookie.tjansen.de:0</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="3" column="1">
+            <property name="name">
+                <cstring>kActiveLabel6</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>&lt;b&gt;Password:&lt;/b&gt;</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="4" column="1">
+            <property name="name">
+                <cstring>kActiveLabel7</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>&lt;b&gt;Expiration time:&lt;/b&gt;</string>
+            </property>
+        </widget>
+        <widget class="KActiveLabel" row="3" column="2">
+            <property name="name">
+                <cstring>passwordLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="focusPolicy">
+                <enum>NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>12345</string>
+            </property>
+        </widget>
+        <widget class="KActiveLabel" row="4" column="2">
+            <property name="name">
+                <cstring>expirationLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="focusPolicy">
+                <enum>NoFocus</enum>
+            </property>
+            <property name="text">
+                <string>17:12</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="2" column="1">
+            <property name="name">
+                <cstring>kActiveLabel5</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>&lt;b&gt;Host:&lt;/b&gt;</string>
+            </property>
+        </widget>
+        <widget class="KActiveLabel" row="2" column="3">
+            <property name="name">
+                <cstring>hostHelpLabel</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>1</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="text">
+                <string>(&lt;a href="whatsthis:This field contains the address of your computer and the display number, separated by a colon. The address is just a hint - you can use any address that can reach your computer. Desktop Sharing tries to guess your address from your network configuration, but does not always succeed in doing so. If your computer is behind a firewall it may have a different address or be unreachable for other computers."&gt;Help&lt;/a&gt;)</string>
+            </property>
+        </widget>
+    </grid>
+</widget>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</UI>
--- a/krfb/rfbcontroller.cc
+++ b/krfb/rfbcontroller.cc
@@ -170,17 +170,11 @@ static void clipboardHook(char* str,int len, rfbClientPtr)
 	self->clipboardToServer(QString::fromUtf8(str, len));
 }

-
-void ConnectionDialog::closeEvent(QCloseEvent *)
-{
-	emit closed();
-}
-
 VNCEvent::~VNCEvent() {
 }

 Display *KeyboardEvent::dpy;
-char KeyboardEvent::modifiers[0x100];
+signed char KeyboardEvent::modifiers[0x100];
 KeyCode KeyboardEvent::keycodes[0x100];
 KeyCode KeyboardEvent::leftShiftCode;
 KeyCode KeyboardEvent::rightShiftCode;
@@ -228,7 +222,7 @@ void KeyboardEvent::initKeycodes() {
 }

 /* this function adjusts the modifiers according to mod (as from modifiers) and ModifierState */
-void KeyboardEvent::tweakModifiers(char mod, bool down) {
+void KeyboardEvent::tweakModifiers(signed char mod, bool down) {

 	bool isShift = ModifierState & (LEFTSHIFT|RIGHTSHIFT);
 	if(mod < 0)
@@ -351,23 +345,19 @@ void SessionEstablishedEvent::exec() {
        controller->sendSessionEstablished();
 }

-
-
 RFBController::RFBController(Configuration *c) :
 	allowDesktopControl(false),
 	lastClipboardDirection(LAST_SYNC_TO_SERVER),
 	configuration(c),
+	dialog( 0, "ConnectionDialog" ),
 	disableBackgroundPending(false),
 	disableBackgroundState(false),
 	closePending(false),
 	forcedClose(false)
 {
 	self = this;
-	connect(dialog.acceptConnectionButton, SIGNAL(clicked()),
-		SLOT(dialogAccepted()));
-	connect(dialog.refuseConnectionButton, SIGNAL(clicked()),
-		SLOT(dialogRefused()));
-	connect(&dialog, SIGNAL(closed()), SLOT(dialogRefused()));
+	connect(&dialog, SIGNAL(okClicked()), SLOT(dialogAccepted()));
+	connect(&dialog, SIGNAL(cancelClicked()), SLOT(dialogRefused()));
 	connect(&initIdleTimer, SIGNAL(timeout()), SLOT(checkAsyncEvents()));
 	connect(&idleTimer, SIGNAL(timeout()), SLOT(idleSlot()));

@@ -383,7 +373,7 @@ RFBController::RFBController(Configuration *c) :
 	if (gethostname(hostname, 255))
 		hostname[0] = 0;
 	hostname[255] = 0;
-	desktopName = QString(i18n("%1@%2 (shared desktop)")).arg(KUser().loginName()).arg(hostname);
+	desktopName = i18n("%1@%2 (shared desktop)").arg(KUser().loginName()).arg(hostname);
 }

 RFBController::~RFBController()
@@ -647,7 +637,7 @@ void RFBController::idleSlot()
 void RFBController::dialogAccepted()
 {
 	dialog.hide();
-	acceptConnection(dialog.allowRemoteControlCB->isChecked());
+	acceptConnection(dialog.allowRemoteControl());
 }

 void RFBController::dialogRefused()
@@ -769,8 +759,8 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
 				i18n("Received connection from %1, on hold (waiting for confirmation)")
 				.arg(remoteIp));

-	dialog.ipLabel->setText(remoteIp);
-	dialog.allowRemoteControlCB->setChecked(true);
+	dialog.setRemoteHost(remoteIp);
+	dialog.setAllowRemoteControl( true );
 	dialog.setFixedSize(dialog.sizeHint());
 	dialog.show();
 	return RFB_CLIENT_ON_HOLD;
--- a/krfb/rfbcontroller.h
+++ b/krfb/rfbcontroller.h
@@ -24,7 +24,7 @@
 #define RFBCONTROLLER_H

 #include "configuration.h"
-#include "newconnectiondialog.h"
+#include "connectiondialog.h"
 #include "xupdatescanner.h"
 #include <ksock.h>
 #include <qobject.h>
@@ -49,15 +49,6 @@ typedef enum {
 	RFB_CONNECTED
 } RFBState;

-class ConnectionDialog : public KRFBConnectionDialog {
-	Q_OBJECT
-public:
-	virtual void closeEvent(QCloseEvent *);
-
-signals:
-	void closed();
-};
-
 class VNCEvent {
 public:
 	virtual void exec() = 0;
@@ -70,14 +61,14 @@ class KeyboardEvent : public VNCEvent {
 	KeySym keySym;

 	static Display *dpy;
-	static char modifiers[0x100];
+	static signed char modifiers[0x100];
 	static KeyCode keycodes[0x100], leftShiftCode, rightShiftCode, altGrCode;
 	static const int LEFTSHIFT;
 	static const int RIGHTSHIFT;
 	static const int ALTGR;
 	static char ModifierState;

-	static void tweakModifiers(char mod, bool down);
+	static void tweakModifiers(signed char mod, bool down);
 public:
 	static void initKeycodes();

--- a/krfb_httpd/kinetd_krfb_httpd.desktop
+++ b/krfb_httpd/kinetd_krfb_httpd.desktop
@@ -16,6 +16,7 @@ X-KDE-KINETD-serviceLifetime=1200
 Name=KRfb Micro Httpd
 Name[ar]=KRfb ميكرو httpd
 Name[bg]=Микро уеб сървър (KRfb - httpd)
+Name[bn]=কে-আর-এফ-বি মাইক্রো এইচটিটিপিডি
 Name[cs]=KRfb mikro Httpd
 Name[cy]=Meicro-Httpd KRfb
 Name[da]=KRfb Micro-Httpd
@@ -33,22 +34,27 @@ Name[nl]=KRfb micro webserver
 Name[nn]=KRfb-mikro-http-nisse
 Name[pl]=Mikroskopijny serwer HTTP dla KRfb
 Name[pt]=Micro Httpd do KRfb
+Name[ru]=KRfb микро Httpd
 Name[sv]=Krfb mikro-HTTP demon
 Name[tr]=KRfb Mini Httpd
 Name[uk]=KRfb мікро Httpd
 Name[zh_CN]=KRfb 微 Httpd
+Name[zh_HK]=KRfb 微型網頁伺服器
 Comment=A micro http daemon for krfb that serves the VNC viewer applet.
 Comment[ar]=مراقب httpd صغير لـkrfb الذي يخدم بريمج عرض VNC.
 Comment[bg]=Малък уеб сървър, който обслужва аплета за преглед на VNC
+Comment[bn]=কে-আর-এফ-বির জন্য একটি মাইক্রো এইচটিটিপি ডিমন যে ভি-এন-সি প্রদর্শক অ্যাপলেট সরবরাহ করে।
 Comment[bs]=Mikro HTTP demon za krfb koji služi za applet VNC preglednika.
 Comment[ca]=Un micro-dimoni http per a krfb que serveix l'applet visor VNC.
+Comment[cs]=Mikro HTTP server pro krfb sloužící VNC prohlížeči.
 Comment[cy]=Meicro-daemon http sy'n gwasanaethu'r rhaglennig gwelydd VNC
 Comment[da]=En mikro http-dæmon for krfb der betjener VNC visningsappletten.
 Comment[de]=Ein Mikro-HTTP-Dämon für krfb, der als VNC-Anzeige-Applet dient.
 Comment[el]=Ένας μικρός δαίμονας http για το krfb που εξυπηρετεί το εφαρμογίδιο προβολής VNC.
 Comment[es]=Un micro demonio http para krfb que sirve de applet de visor VNC.
 Comment[et]=Mikro-HTTP deemon KRfb jaoks, mis teenindab VNC apletti.
-Comment[fi]=Pieni http-palvelin krfb ohjelmalle, joka jakaa VNC-näyttäjäsovelmaa
+Comment[eu]=VNC ikustaile applet-a zerbitzatzen duen krfb-rako micro http deabrua.
+Comment[fi]=Pieni http-palvelin krfb-ohjelmalle, joka jakaa VNC-näyttäjäsovelmaa
 Comment[fr]=Un mini serveur http pour KRfb dédié à l'applet d'affichage de bureaux VNC.
 Comment[gl]=Un micro demo de HTTP para krfb que serve unha applet de visualización de VNC
 Comment[he]=שרת http זעיר עבור krfb שמשרת את יישומון תצוגת VNC.
@@ -57,6 +63,8 @@ Comment[hu]=Mini HTTP-szolgáltatás a KRfb-hez, a VNC nézegető használatáho
 Comment[is]=Verulega lítill vefþjónn sem veitir aðgang í VNC.
 Comment[it]=Un micro demone http per krfb che server l'applet di VNC viewer. 
 Comment[ja]=krfb用のマイクロhttpデーモン(VNCビューアアプレットを提供)
+Comment[km]=ដេមិន http តូចមួយសម្រាប់ krfb ដែលបម្រើអាប់ភ្លេតមើល VNC ។
+Comment[lt]=Micro http tarnyba skirta krfb ir aptarnaujanti VNC žiūriklį.
 Comment[mk]=http-микродаемон за krfb кој служи на аплетот на VNC-прегледувачот.
 Comment[ms]=Daemon http miKro untuk krfb yang melayan aplet pelihat VNC.
 Comment[nb]=En bitteliten http-nisse for krfb som hjelper visningsprogrammet for VNC.
@@ -65,13 +73,15 @@ Comment[nn]=Ein ørliten http-nisse for krfb som hjelper visingsprogrammet for V
 Comment[pl]=Mikroskopijny serwer HTTP dla KRfb obsługującego aplet przeglądarki VNC.
 Comment[pt]=Um micro-servidor de HTTP para o krfb que serve a 'applet' de visualização de VNC.
 Comment[pt_BR]=Um micro daemon de http, para o krfb, que serve o miniaplicativo de visualização do VNC.
+Comment[ru]=Микро-сервер http для krfb, который обслуживает аплет просмотрщика VNC.
 Comment[sk]=Mikro http démon pre krfb ktorý ovláda prehliadací applet VNC.
-Comment[sl]=Mikro http demon za krfb, ki streže pregledovalniku vstavkov VNC.
+Comment[sl]=Mikro http strežnik za krfb, ki streže ogledovalnikom VNC.
 Comment[sr]=Микро http демон за krfb који опслужује аплет VNC приказивача.
 Comment[sr@Latn]=Mikro http demon za krfb koji opslužuje aplet VNC prikazivača.
 Comment[sv]=En mikro-HTTP demon för Krfb som hanterar VNC-visningsminiprogrammet
 Comment[ta]=krfb க்கான நுண்ணிய http அது VNC சேவையை குறுப்பயன் பார்வையாளர்.
 Comment[tg]=Азозили micro http барои krfb, ки хидматрасони VNC апплети хидматрасон мебошад.
 Comment[tr]=VNC izleyici programcığını çalıştıran mini bir web sunucu.
-Comment[uk]=Мікро http даемон для krfb, який обслуговує аплет переглядача VNC.
+Comment[uk]=Мікро- даемон http для krfb, який обслуговує аплет переглядача VNC.
 Comment[zh_CN]=支持 VNC 查看器小程序的 krfb 小 http 守护程序
+Comment[zh_HK]=用於 krfb，服務 VNC 檢視小程式的微型網頁伺服器
--- a/krfb_httpd/krfb_httpd
+++ b/krfb_httpd/krfb_httpd
@@ -1,72 +1 @@
-#!/bin/bash
-
-if [ "$1" = "--kinetd" ]; then
-	# redirect stdin and stdout to the inetd socket.
-	exec <&$2 >&$2
-fi
-
-read request url httptype || exit 0
-url="${url/
-/}"
-httptype="${httptype/
-/}"
-
-if [ "x$httptype" != "x" ]; then
-	line="x"
-	while [ -n "$line" ]; do
-		read line || exit 0
-		line="${line/
-/}"
-	done
-fi
-# echo "url = $url, request = $request" >> /tmp/httpd.log
-case "$url" in
-/)
-	# We need the size of the display for the current applet.
-	size=`xdpyinfo -display :0| grep dimensions:|head -1|sed -e "s/.*dimensions: *//" -e "s/ pixels.*//"`
-	width=`echo $size|sed -e "s/x.*//"`
-	height=`echo $size|sed -e "s/.*x//"`
-	# The VNC menubar is 20 pixels high ...
-	height=$((height+20))
-
-	port=`dcop kded kinetd port krfb`
-	if [ "$port" == "-1" ]; then
-		port=5900
-	fi
-
-	ctype="text/html"
-	content="
-<HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
-<BODY>
-<APPLET CODE=vncviewer.class ARCHIVE=vncviewer.jar WIDTH=$width HEIGHT=$height>
-	<param name=PORT value=$port>
-</APPLET>
-</BODY></HTML>"
-	;;
-*.jar|*.class)
-	# Use basename to make sure we have just a filename, not ../../...
-	url="`basename "$url"`"
-	ctype="application/octet-stream"
-	cfile="/usr/share/vnc/classes/$url"
-	content="FILE"
-	;;
-esac
-
-if [ "x$httptype" != "x" ]; then
-	echo "HTTP/1.0 200 OK"
-	echo "Content-Type: $ctype"
-	if [ "$content" == "FILE" ]; then
-		clen=`wc -c "$cfile"`
-	else
-		clen=`echo "$content"|wc -c`
-	fi
-	echo "Content-Length: $clen"
-	echo "Connection: close"
-	echo
-fi
-
-if [ "$request" == "GET" ]; then
-	if [ "$content" == "FILE" ]; then
-		cat "$cfile"
-	else
-		echo "$content"
+#! /usr/bin/env bash
--- a/libvncserver/keysym.h
+++ b/libvncserver/keysym.h
--- a/libvncserver/main.c
+++ b/libvncserver/main.c
@@ -74,7 +74,7 @@ rfbLog(const char *format, ...)

    time(&log_clock);
    strftime(buf, 255, "%d/%m/%Y %T ", localtime(&log_clock));
-    fprintf(stderr,buf);
+    fprintf(stderr, "%s", buf);

    vfprintf(stderr, format, args);
    fflush(stderr);
--- a/libvncserver/sraRegion.c
+++ b/libvncserver/sraRegion.c
--- a/libvncserver/sraRegion.h
+++ b/libvncserver/sraRegion.h
Author	SHA1	Message	Date
Script Kiddy	be831dadd2	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=518767	2006-03-15 07:37:13 +00:00
Script Kiddy	749279c766	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=518459	2006-03-14 07:36:32 +00:00
Script Kiddy	83a970ca11	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=517478	2006-03-11 07:35:13 +00:00
Script Kiddy	cac8be85d9	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=517160	2006-03-10 07:30:29 +00:00
Caleb Tennis	42951a11e7	Change head argument so it's compliant with latest coreutils svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=502433	2006-01-25 23:22:55 +00:00
Script Kiddy	5e782a932b	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=501494	2006-01-23 06:35:38 +00:00
Dirk Mueller	a5464ea125	avoid format string warning svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=501250	2006-01-22 14:38:20 +00:00
Script Kiddy	1543cece01	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=500393	2006-01-20 06:33:12 +00:00
Script Kiddy	fa2d957445	Improve portability by declaring using Bash with the help of /usr/bin/env (Bug #95475) (goutte) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=499197	2006-01-17 08:52:21 +00:00
Script Kiddy	60b96a550f	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=484594	2005-12-01 06:10:42 +00:00
Thiago Macieira	222e9fa7ec	SVN_SILENT More non-executables that had the svn:ignore property svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=476279	2005-11-01 01:35:54 +00:00
Script Kiddy	5fb8d4deaf	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=475700	2005-10-30 11:44:48 +00:00
Script Kiddy	12b0ae6fbd	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=474349	2005-10-26 06:09:38 +00:00
Script Kiddy	48985ef458	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=473590	2005-10-24 06:22:36 +00:00
Script Kiddy	6cc8241681	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=465545	2005-09-30 06:10:11 +00:00
Script Kiddy	c4e0e5b09f	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=464752	2005-09-28 05:58:55 +00:00
Script Kiddy	2fa2c0a516	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=462462	2005-09-21 07:01:56 +00:00
Script Kiddy	9b3696f1d6	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=458425	2005-09-08 07:03:27 +00:00
Script Kiddy	cbc7c75dc1	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=458054	2005-09-07 06:41:37 +00:00
Script Kiddy	2159930abd	SVN_SILENT made messages (.desktop file, second try) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=454870	2005-08-30 06:32:47 +00:00
Stephan Binner	d3b031f694	add small icon svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=453644	2005-08-26 18:25:09 +00:00
Script Kiddy	b329dee143	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=450451	2005-08-18 09:01:27 +00:00
Script Kiddy	18664767f4	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=448791	2005-08-13 07:04:13 +00:00
Script Kiddy	bd61242c1b	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/3.5/kdenetwork/krfb/; revision=445900	2005-08-12 04:47:13 +00:00
Script Kiddy	60ecb10298	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=436121	2005-07-19 04:05:24 +00:00
Script Kiddy	f059eedd88	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=434433	2005-07-14 04:03:30 +00:00
Script Kiddy	fe4cd8c787	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=434157	2005-07-13 04:05:45 +00:00
Script Kiddy	0ab660525e	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=425586	2005-06-15 04:25:55 +00:00
Script Kiddy	7ecfdbbad1	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=424487	2005-06-12 03:54:41 +00:00
Script Kiddy	2c068866bf	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=424186	2005-06-11 03:32:04 +00:00
Script Kiddy	f301b9c443	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=421949	2005-06-04 03:45:23 +00:00
Script Kiddy	690a53c590	CVS_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=413567	2005-05-14 03:40:12 +00:00
Script Kiddy	5cb29d745f	CVS_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=410634	2005-05-08 07:11:34 +00:00
Script Kiddy	a812ef6393	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=401169	2005-03-28 03:34:02 +00:00
Script Kiddy	0ef8f2d453	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=400397	2005-03-25 04:09:59 +00:00
Script Kiddy	c5b1b80c7d	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=392535	2005-02-23 05:08:44 +00:00
Aaron J. Seigo	c207e3bb73	fix frame CCBUG:99396 svn path=/trunk/kdenetwork/krfb/; revision=389454	2005-02-14 21:03:08 +00:00
Script Kiddy	c936f30db9	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=388264	2005-02-11 04:54:21 +00:00
Stephan Kulow	4f703bf678	characters can be unsigned too svn path=/trunk/kdenetwork/krfb/; revision=388040	2005-02-10 14:12:16 +00:00
Stephan Binner	9b59119cf3	CVS_SILENT i18n style guide fixes, first run svn path=/trunk/kdenetwork/krfb/; revision=385798	2005-02-03 10:49:53 +00:00
Script Kiddy	69bd756bb7	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=384484	2005-01-31 08:38:42 +00:00
Script Kiddy	d3fac404e0	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=382809	2005-01-27 04:10:52 +00:00
Stephan Binner	b72740d994	fix menu entries svn path=/trunk/kdenetwork/krfb/; revision=378969	2005-01-16 08:28:22 +00:00
Script Kiddy	f067112601	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=378951	2005-01-16 04:04:50 +00:00
Edwin Schepers	153c22d929	Give labels a NoFocus policy, so that it is not selected at startup of the dialog and is not in the tab sequence. BUG: 92032 svn path=/trunk/kdenetwork/krfb/; revision=378279	2005-01-13 22:40:35 +00:00
Laurent Montel	bea44ed778	Fix export svn path=/trunk/kdenetwork/krfb/; revision=377514	2005-01-11 16:35:05 +00:00
Script Kiddy	385d4455a9	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=376742	2005-01-09 04:06:23 +00:00
Script Kiddy	7c29d37323	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=375595	2005-01-05 04:03:22 +00:00
Script Kiddy	eaa39967b3	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=375379	2005-01-04 03:51:03 +00:00
Script Kiddy	b80715e14a	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=374823	2005-01-02 03:44:29 +00:00
Script Kiddy	b751d5529e	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=374569	2005-01-01 03:35:52 +00:00
Albert Astals Cid	fdaa7d29c1	fixuifiles svn path=/trunk/kdenetwork/krfb/; revision=374524	2004-12-31 17:47:59 +00:00
Script Kiddy	f41085f9d2	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=374048	2004-12-29 17:55:25 +00:00
Laurent Montel	93abc31703	Use krun to launch kcm module svn path=/trunk/kdenetwork/krfb/; revision=371072	2004-12-16 14:04:42 +00:00
Laurent Montel	de51a27501	Backport reload config svn path=/trunk/kdenetwork/krfb/; revision=370499	2004-12-14 10:17:16 +00:00
Script Kiddy	6b2da6a798	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=370471	2004-12-14 03:41:19 +00:00
Script Kiddy	68351df3b4	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=369788	2004-12-11 06:41:41 +00:00
Jakub Stachowski	a7808c2433	Add DNS-SD based service publishing to kinetd and enable it in krfb. svn path=/trunk/kdenetwork/krfb/; revision=369499	2004-12-09 20:10:23 +00:00
Stephan Binner	b66e85cb4a	knewsticker/knewstickerstub/Makefile.am: KDE_ICON used but no icons present krfb/kinetd/Makefile.am: KDE_ICON used but no icons present svn path=/trunk/kdenetwork/krfb/; revision=367795	2004-12-02 09:47:55 +00:00
Script Kiddy	d5fedd911c	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=365706	2004-11-24 04:17:20 +00:00
Script Kiddy	7f6af1accf	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=364999	2004-11-22 04:42:34 +00:00
Dirk Mueller	988edb72ba	fix export's svn path=/trunk/kdenetwork/krfb/; revision=364991	2004-11-22 03:58:56 +00:00
Chris Howells	8e6c5ce5f8	s/whatever/whichever svn path=/trunk/kdenetwork/krfb/; revision=362004	2004-11-10 14:08:23 +00:00
Script Kiddy	997ef4a6ff	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=361625	2004-11-09 03:39:00 +00:00
Script Kiddy	7e14c20337	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=359745	2004-11-02 04:22:33 +00:00
Script Kiddy	eaeea7803a	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=357783	2004-10-26 02:51:12 +00:00
Script Kiddy	2b02a82b11	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=356372	2004-10-21 03:02:16 +00:00
Benjamin Meyer	499b09de92	Terminal=0 -> Terminal=false Terminal=1 -> Terminal=true Add missing ';' to Categories Remove depreceted: TerminalOptions, BinaryPattern, MiniIcon (double checked) svn path=/trunk/kdenetwork/krfb/; revision=355834	2004-10-19 03:49:14 +00:00
Albert Astals Cid	6029bcfdc5	Even more fixuifiles svn path=/trunk/kdenetwork/krfb/; revision=355797	2004-10-18 21:42:05 +00:00
Script Kiddy	b4d7816864	CVS_SILENT made messages (.desktop file) svn path=/trunk/kdenetwork/krfb/; revision=353574	2004-10-11 03:13:35 +00:00
Script Kiddy	7a7b70d192	CVS_SILENT made messages (desktop files) svn path=/trunk/kdenetwork/krfb/; revision=353053	2004-10-09 02:33:51 +00:00
Script Kiddy	5d3cf54649	CVS_SILENT made messages svn path=/trunk/kdenetwork/krfb/; revision=350701	2004-10-01 06:51:58 +00:00
Nadeem Hasan	3f01551a08	Use KDialogBase. svn path=/trunk/kdenetwork/krfb/; revision=349503	2004-09-26 17:10:32 +00:00
Laurent Montel	54a7625438	QString(i18n(...)) -> i18n(...) svn path=/trunk/kdenetwork/krfb/; revision=347601	2004-09-19 11:52:23 +00:00
Nadeem Hasan	75f35ea664	Port to KDialogBase. svn path=/trunk/kdenetwork/krfb/; revision=347549	2004-09-19 06:36:43 +00:00
Script Kiddy	671433402e	CVS_SILENT made messages svn path=/trunk/kdenetwork/krfb/; revision=342856	2004-08-30 23:28:00 +00:00
Tim Jansen	c05a9b9d9f	#67519 : adjust applet name, patch by Allen Rouse svn path=/trunk/kdenetwork/krfb/; revision=341875	2004-08-27 17:09:16 +00:00
Script Kiddy	d5b080ec40	CVS_SILENT made messages svn path=/trunk/kdenetwork/krfb/; revision=340251	2004-08-23 22:08:42 +00:00