CVS_SILENT made messages

svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=247739
Use QApplication::desktop() to obtain the QDesktopWidget, as recommended in
2026-07-02 08:11:17 -07:00 · 2003-09-02 05:13:35 +00:00 · 2003-07-31 22:57:16 +00:00 · 2003-07-14 05:36:30 +00:00 · 2003-07-07 22:25:29 +00:00 · 2003-07-07 21:20:48 +00:00
26 changed files with 430 additions and 239 deletions
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -25,14 +25,8 @@

 <legalnotice>&FDLNotice;</legalnotice>

-<!-- Date and version information of the documentation
-Don't forget to include this last date and this last revision number, we
-need them for translation coordination !
-Please respect the format of the date (YYYY-MM-DD) and of the version
-(Major.minor.lesser), it could be used by automation scripts -->
-
-<date>2000-09-02</date>
-<releaseinfo>0.00.00</releaseinfo>
+<date>2002-12-01</date>
+<releaseinfo>1.0</releaseinfo>

 <!-- Abstract about this handbook -->

--- a/kcm_krfb/kcm_krfb.cpp
+++ b/kcm_krfb/kcm_krfb.cpp
@@ -49,7 +49,7 @@ extern "C" {
    KGlobal::locale()->insertCatalogue("krfb"); // For invitation translations
    return new KcmKRfbFactory("kcm_krfb"); 
  }
-};
+}


 KcmKRfb::KcmKRfb(QWidget *p, const char *name, const QStringList &) :
--- a/kcm_krfb/kcmkrfb.desktop
+++ b/kcm_krfb/kcmkrfb.desktop
@@ -9,6 +9,7 @@ X-KDE-Library=krfb

 Name=Desktop Sharing
 Name[af]=Werkskerm Deeling
+Name[ar]=مشاركة سطح المكتب
 Name[bg]=Споделяне на Работно място
 Name[bs]=Dijeljenje desktopa
 Name[ca]=Compartició de l'escriptori
@@ -24,15 +25,18 @@ Name[fr]=Partage de bureau
 Name[he]=שיתוף שולחנות עבודה
 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[mt]=Qsim tad-desktop
 Name[nb]=Delte skrivebord
 Name[nl]=Bureaubladvrijgave
 Name[nn]=Skrivebordsdeling
 Name[nso]=Kabagano ya Desktop
-Name[pl]=Współdzielenie biurka
+Name[pl]=Współdzielenie pulpitu
 Name[pt]=Partilha do Ambiente de Trabalho
 Name[pt_BR]=Compartilhamento do Desktop
 Name[ro]=Partajare ecran
@@ -40,6 +44,7 @@ Name[ru]=Общий рабочий стол
 Name[sk]=Zdieľanie pracovnej plochy
 Name[sl]=Deljenje namizja
 Name[sv]=Dela ut skrivbordet
+Name[th]=ใช้งานพื้นที่ทำงานร่วมกัน
 Name[tr]=Masaüstü Paylaşımı
 Name[uk]=Спільні стільниці
 Name[ven]=U kovhekana ha Desikithopo
@@ -50,6 +55,7 @@ Name[zu]=Ukwahlulelana kwe-Desktop

 Comment=Configure Desktop Sharing
 Comment[af]=Konfigureer Werkskerm Deeling
+Comment[ar]=تعديل مشاركة سطح المكتب
 Comment[bg]=Конфигуриране на 'Споделяне на Работно място'
 Comment[bs]=Podesite dijeljenje desktopa
 Comment[ca]=Lupa de l'escriptori
@@ -64,15 +70,18 @@ Comment[fi]=Aseta työpöytien jakoa
 Comment[fr]=Configuration du partage du bureau
 Comment[he]=שינוי הגדרות שיתוף שולחנות העבודה
 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[nb]=Sett opp delte skrivebord
+Comment[mk]=Конфигурирај Десктоп Делење
+Comment[mn]=Ажлын байрны хамтран эзэмших тохируулга
+Comment[nb]=Tilpass delte skrivebord
 Comment[nl]=Bureaubladvrijgave configureren
 Comment[nn]=Set opp skrivebordsdeling
 Comment[nso]=Beakanya Kabagano ya Desktop
-Comment[pl]=Konfiguracja współdzielenia biurka
-Comment[pt]=Configurar a Partilha de Ecrã
+Comment[pl]=Konfiguracja współdzielenia pulpitu
+Comment[pt]=Configura a Partilha do Ecrã
 Comment[pt_BR]=Configurar Compartilhamento do Desktop
 Comment[ru]=Параметры общего рабочего стола
 Comment[sk]=Nastavenie zdieľania pracovnej plochy
@@ -85,6 +94,8 @@ Comment[zh_CN]=配置桌面共享
 Comment[zh_TW]=設定桌面分享
 Comment[zu]=Hlela kahle Ukwahlulelana kwe-Desktop
 Keywords=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,rdp
+Keywords[ar]=مشاركة سطح المكتب,krfb,vnc,مشاركة,rdp,krdc,اتصال سطح مكتب بعيد,rdp
+Keywords[bg]=споделяне не работна площ,споделяне,отдалечена връзка,krfb, vnc,rdp,krdc
 Keywords[bs]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,rdp,dijeljenje desktopa,dijeljenje
 Keywords[ca]=compartició de l'escriptori,krfb,vnc,compartir,rdp,krdc,connexió a l'escriptori remot,rdp
 Keywords[cs]=sdílení plochy,krfb,vnc,sdílení,rdp,krdc,připojení vzdálené plochy
@@ -98,19 +109,21 @@ Keywords[fi]=työpöydän jako,krfb,vnc,jako,rdp,krdc,etätyöpöytä
 Keywords[fr]=partage du bureau,krfb,vnc,rdp,krdc,connexion à un bureau distant,rdp
 Keywords[he]=שיתוף שולחן עבודה,krfb,vnc,שיתוף,rdp,krdc,חיבור לשולחן עבודה מרוחק,rdp
 Keywords[hu]=munkaasztal-megosztás,krfb,vnc,megosztás,rdp,krdc,csatlakozás távoli munkaasztalhoz,rdp
+Keywords[is]=skjáborðsmiðlun,miðlun,krfb,vnc,rdp,krdc,fjarvinnsla,remote desktop connection,rdp
 Keywords[it]=condivisione desktop,krfb,vnc,condivisione,rdp,krdc, connessione desktop remoto,rdp
 Keywords[ja]=デスクトップ共有,krfb,vnc,共有,rdp,krdc,リモートデスクトップ接続,rdp
 Keywords[lt]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,rdp, dalinimasis darbastaliu,prisijungimas prie nutolusio darbastalio
 Keywords[nb]=skrivebordsdeling,krfb,vnc,deling,rdp,krdc,fjernt skrivebord,rdp
 Keywords[nl]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,rdp,verbinding,bureaubladvrijgave,bureaublad op afstand
 Keywords[nn]=skrivebordsdeling,krfb,vnc,deling,rdp,krdc,nettverksskrivebord
-Keywords[nso]=kabagano ya Desktop,krfb,vnc,kabagano,rdp,krdc,kopantsho desktop ya remote, rdp
-Keywords[pl]=współdzielenie biurko,krfb,vnc,współdzielenie,rdp,krdc,zdalne połączenie
+Keywords[nso]=kabagano ya Desktop,krfb,vnc,kabagano,rdp,krdc,kopantšho desktop ya remote, rdp
+Keywords[pl]=współdzielenie pulpitu,krfb,vnc,współdzielenie,rdp,krdc,zdalne połączenie
 Keywords[pt]=partilha do ecrã,krfb,vnc,partilha,rdp,krdc,ligação a um ecrã remoto,rdp
 Keywords[pt_BR]=compartilhamento de desktop,krfb,vnc,sharing,rdp,krdc,conexão a desktop remoto,rdp
 Keywords[sk]=zdieľanie plochy,krfb,vnc,zdieľanie,rdp,krdc,pripojenie vzdialenej pracovnej plochy,rdp
 Keywords[sl]=namizje,deljenje,krfb,vnc,rdp,krdc,povezava oddaljenega namizja,rdp
 Keywords[sv]=dela skrivbord,krfb,vnc,dela,rdp,krdc,fjärrskrivbordsanslutning,rdp
+Keywords[th]=การใช้งานพื้นที่ทำงานร่วมกัน,krfb,vnc,ใช้ทรัพยากรร่วมกัน,rdp,krdc,เชื่อมต่อพื้นที่ทำงานระยะไกล,rdp
 Keywords[uk]=спільні стільниці,krfb,vnc,спільний,rdp,krdc,з'єднання віддаленої стільниці,rdp
 Keywords[ven]=U kovhekana ha desktop,krfb,vnc,kovhekana,rdp,krdc,vhukwamani ha desktop ya kule, rdp
 Keywords[xh]=usebenziso oluhlangeneyo lwe desktop,krfb,vnc, ukusebenzisa ngokuhlangeneyo,rdp,krdc,uxhumaniso lwe desktop elikude,rdp
--- a/kinetd/eventsrc
+++ b/kinetd/eventsrc
@@ -5,6 +5,7 @@ Comment[sv]=Kinetd

 [IncomingConnection]
 Name=IncomingConnection
+Name[ar]=اتصال وارد
 Name[ca]=Connexió entrant
 Name[cs]=Příchozí spojení
 Name[da]=IndkommendeForbindelse
@@ -12,7 +13,7 @@ Name[de]=Eingehende Verbindung
 Name[el]=Εισερχόμενη σύνδεση
 Name[eo]=EnvenantaKonekto
 Name[es]=Conexión entrante
-Name[et]=SissetulevÜhendus
+Name[et]=Sissetulev ühendus
 Name[fi]=Saapuva yhteys
 Name[fr]=Connexion entrante
 Name[he]=חיבור נכנס
@@ -21,11 +22,13 @@ Name[hu]=Bejövő kapcsolat
 Name[it]=Connessioni in entrata
 Name[ja]=外部からの接続
 Name[lt]=Ateinantis prisijungimas
+Name[mk]=ВлезнаВрска
+Name[mn]=Орж ирсэн Холболт
 Name[mt]=KonnessjonijiDieħla
 Name[nb]=Innkommende tilknytning
 Name[nl]=Inkomende verbinding
 Name[nn]=Innkomande samband
-Name[nso]=Kopantsho yeo e Tsenago
+Name[nso]=Kgokagano yeo e Tsenago
 Name[pl]=Połączenia przychodzące
 Name[pt_BR]=Conexões de Entrada
 Name[ro]=Conexiune de intrare
@@ -33,6 +36,7 @@ Name[ru]=Входящее соединение
 Name[sk]=Prichádzajúce spojenia
 Name[sl]=Prihajajoča povezava
 Name[sv]=Inkommande anslutning
+Name[th]=มีการเชื่อมต่อเข้ามา
 Name[tr]=Gelen Bağlantı
 Name[uk]=ВхіднеЗ'єднання
 Name[ven]=Vhukwamanihanga ngomu
@@ -42,6 +46,7 @@ Name[zh_TW]=進來的連接
 Name[zu]=UkuxhumanaOkuzayo
 Comment=Received incoming connection
 Comment[af]=Ontvang inkomende verbinding
+Comment[ar]=تم استلام اتصال وارد
 Comment[bg]=Получена Входяща Връзка
 Comment[bs]=Primio dolaznu konekciju
 Comment[ca]=Rebuda connexió entrant
@@ -57,14 +62,17 @@ Comment[fr]=Reçu une connexion entrante
 Comment[he]=נתקבל חיבור נכנס
 Comment[hr]=Primio dolaznu vezu
 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[mk]=Примена влезна врска
+Comment[mn]=Орж ирсэн Холболтыг хүлээн авав
 Comment[mt]=Irċevejt konnessjoni dieħla
 Comment[nb]=Motta innkommende tilknytning
 Comment[nl]=Ontving een inkomende verbinding
 Comment[nn]=Motta innkomande samband
-Comment[nso]=Kopantsho yeo e amogetswego ya tseo di tsenago
+Comment[nso]=Amogetše kgokagano yeo e tsenago
 Comment[pl]=Otrzymano połącznie przychodzące
 Comment[pt]=Foi recebida uma ligação
 Comment[pt_BR]=Recebendo conexão de entrada
@@ -73,6 +81,7 @@ Comment[ru]=Входящее соединение завершилось усп
 Comment[sk]=Prijaté príchodzie spojenia
 Comment[sl]=Prejeta je prihajajoča povezava
 Comment[sv]=Tar emot inkommande anslutning
+Comment[th]=ได้รับการเชื่อมต่อเข้ามา
 Comment[tr]=Gelen bağlantı alınıyor
 Comment[uk]=Отримано вхідне з'єднання
 Comment[ven]=Vhukwamani hau dzhena ho tanganedzhwaho
@@ -84,6 +93,7 @@ default_presentation=4

 [ProcessFailed]
 Name=ProcessFailed
+Name[ar]=فشلت العملية
 Name[bg]=Пропаднал Процес
 Name[ca]=Procés fallit
 Name[cs]=Proces selhal
@@ -92,7 +102,7 @@ Name[de]=Prozess fehlgeschlagen
 Name[el]=Η επεξεργασία απέτυχε
 Name[eo]=ProcezoFiaskis
 Name[es]=Proceso fallido
-Name[et]=ProtsessEbaõnnestus
+Name[et]=Protsess ebaõnnestus
 Name[fi]=Prosessi epäonnistui
 Name[fr]=Échec du processus
 Name[he]=תהליך נכשל
@@ -101,18 +111,21 @@ Name[hu]=Hibás folyamat
 Name[it]=Processo fallito
 Name[ja]=プロセス失敗
 Name[lt]=Procesas nepavyko
+Name[mk]=ПроцесотНеУспеа
+Name[mn]=Ажиллагаа сүйрэв
 Name[mt]=ProċessFalla
 Name[nb]=Prosess mislyktes
 Name[nl]=Proces faalde
 Name[nn]=Prosess mislukkast
-Name[nso]=Tiragalo e Paletswe
+Name[nso]=Tiragalo e Paletšwe
 Name[pl]=Błąd procesu
 Name[pt_BR]=Falha de Processo
 Name[ro]=Proces eşuat
 Name[ru]=Ошибка процесса
-Name[sk]=Proces neúspešny
+Name[sk]=Proces neúspešný
 Name[sl]=Proces ni uspel
 Name[sv]=Process misslyckades
+Name[th]=โปรเซสล้มเหลว
 Name[uk]=ПомилкаПроцесу
 Name[ven]=Tshitenwa tsho bala
 Name[xh]=Inkqubo Yahlulekile
@@ -121,6 +134,7 @@ 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[bs]=Ne mogu pokrenuti proces koji upravlja konekcijom
 Comment[ca]=No es pot cridar al procés per a manejar la connexió
@@ -136,14 +150,17 @@ Comment[fr]=Impossible d'appeler le processus pour gérer la connexion
 Comment[he]=אין אפשרות לקרוא לתהליך על מנת לטפל בחיבור
 Comment[hr]=Nisam mogao pozvati proces za kontrolu veze
 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[mk]=Не може да повикам процес да ја превземе врската
+Comment[mn]=Холболтыг заах ажиллагаагдуудаж чадаагүй
 Comment[mt]=Ma stajtx insejjaħ proċess biex jieħu ħsieb il-konnessjoni
 Comment[nb]=Kunne ikke kalle en prosess for å håndtere tilknytningen
 Comment[nl]=Het proces om de verbinding af te handelen kon niet worden aangeroepen
 Comment[nn]=Klarte ikkje kalla prosess for sambandshandtering
-Comment[nso]=Ebe ekase bitse tiragalo go swara kopantsho
+Comment[nso]=Ebe ekase bitše tiragalo go swara kopantšho
 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
@@ -151,6 +168,7 @@ Comment[ru]=Не удается запустить процесс обработ
 Comment[sk]=Nemohol som zavolať proces pre spracovanie spojenia
 Comment[sl]=Ni možno poklicati procesa za upravljanje s povezavo
 Comment[sv]=Kunde inte anropa process för att hantera anslutning
+Comment[th]=ไม่สามารถเรียกโปรเซสเพื่อรับการเชื่อมต่อได้
 Comment[uk]=Неможливо викликати процес для обробки з'єднання
 Comment[ven]=Ingasi vhidze tshitenwa uitela u fara vhukwamani
 Comment[xh]=Ayikwazanga ukubiza inkqubo ezakuphatha uxhulumano
--- a/kinetd/kinetd.cpp
+++ b/kinetd/kinetd.cpp
@@ -165,6 +165,10 @@ void PortListener::loadConfig(KService::Ptr s) {
 void PortListener::accepted(KSocket *sock) {
 	QString host, port;
 	KSocketAddress *ksa = KExtendedSocket::peerAddress(sock->socket());
+	if ((!ksa) || !ksa->address()) {
+		delete sock;
+		return;
+	}
 	KExtendedSocket::resolve(ksa, host, port);
 	KNotifyClient::event("IncomingConnection",
 		i18n("Connection from %1").arg(host));
--- a/kinetd/kinetd.desktop
+++ b/kinetd/kinetd.desktop
@@ -10,8 +10,9 @@ X-KDE-Kded-autoload=true

 Name=KDE Internet Daemon
 Name[af]=Kde Internet Bediener
+Name[ar]=مراقب انترنت كيدي
 Name[bg]=KDE Демон на Интернет
-Name[ca]=Dimoni d'Internet pel KDE
+Name[ca]=Dimoni d'Internet per al KDE
 Name[cs]=KDE Internet démon
 Name[da]=KDE Internet-dæmon
 Name[de]=KDE Internet-Dämon
@@ -21,11 +22,14 @@ Name[es]=Demonio de Internet de KDE
 Name[et]=KDE internetideemon
 Name[fi]=KDE Internet palvelin
 Name[fr]=Démon Internet de KDE
-Name[he]=תהליך שירות האינטרנט של KDE
+Name[he]=תהליך הרקע האינטרנטי של KDE
 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[mk]=KDE Интернет Демон
+Name[mn]=KDE Интернет-демон
 Name[mt]=Daemon tal-internet KDE
 Name[nb]=KDEs Internett-nisse
 Name[nn]=KDE-Internett-nisse
@@ -38,12 +42,14 @@ Name[ru]=Интернет-демон KDE
 Name[sk]=KDE Internet démon
 Name[sl]=Internetni strežnik za KDE
 Name[sv]=KDE:s Internetdemon
+Name[th]=เดมอนอินเตอร์เน็ต KDE
 Name[tr]=KDE İnternet Programı
 Name[uk]=Демон Інтернет KDE
 Name[zh_CN]=KDE Internet 守护进程
 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[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
@@ -56,17 +62,20 @@ 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[fr]=Un démon Internet qui démarre le service réseau à la demande
-Comment[he]=תהליך שירות אינטרנט שמתחיל שירותי רשת לפי דרישה
+Comment[he]=תהליך רקע של אינטרנט שמתחיל שירותי רשת לפי דרישה
 Comment[hr]=Internet daemon koji pokreće mrežne usluge kada su zatražene
 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[lt]=Interneto tarnyba, paleidžianti tinklo tarnybas esant poreikiui
+Comment[mk]=Интернет демон кој стартува мрежни сервиси на побарување
+Comment[mn]=Сүлжээ-үйлчилгээний эрэлтээр ассан Сүлжээний демон
 Comment[mt]=Proċess tal-internet li jħaddem servizzi skond il-bżonn
 Comment[nb]=Internett-nisse som starter nettverkstjenester ved behov
 Comment[nl]=Een Internetdaemon die netwerkdiensten op afroep start
 Comment[nn]=Internett-nisse som startar nettverkstenester når dei trengst
-Comment[nso]=Daemon ya Internet yeo e thomisago ditirelo tsa kgokagano ge e nyakilwe
+Comment[nso]=Daemon ya Internet yeo e thomišago ditirelo tša kgokagano ge e nyakilwe
 Comment[pl]=Demon internetowy, który uruchamia na żądanie usługi sieciowe
 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
@@ -75,6 +84,7 @@ Comment[ru]=Сетевой демон, запускающий серверы п
 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
 Comment[sv]=Internetdemon som startar nätverkstjänster vid behov
+Comment[th]=เดมอนอินเตอร์เน็ตซึ่งจะเริ่มทำงานบริการเครือข่ายเมื่อมีความต้องการ
 Comment[uk]=Демон Інтернет, що запускає служби мережі при запиті
 Comment[ven]=Internet daemon ine ya thoma tshumelo ya vhukwamani kha muthetho
 Comment[xh]=Internet daemon eqala iinkonzo zomsebenzi wonatha xa zifunwa
--- a/kinetd/kinetdmodule.desktop
+++ b/kinetd/kinetdmodule.desktop
@@ -4,6 +4,7 @@
 Type=ServiceType
 X-KDE-ServiceType=KInetDModule
 Name=KInetD Module Type
+Name[ar]=KInetD نوع وحدة
 Name[bg]=KInetD Тип на Модул
 Name[bs]=KInetD tip modula
 Name[ca]=Tipus de mòdul del KInetD
@@ -14,14 +15,17 @@ Name[el]=Τύπος αρθρώματος KInetD
 Name[eo]=KInetD-modulotipo
 Name[es]=Tipo de módulo KInetD
 Name[et]=KInetD mooduli tüüp
-Name[fi]=KInetD modulityyppi
+Name[fi]=KInetD moduulityyppi
 Name[fr]=Type de module de KInetD
 Name[he]=סוג מודול של KInetD
 Name[hr]=Tip KInetD Modula
 Name[hu]=KInetD modultípus
+Name[is]=KInetD Module tegund
 Name[it]=Tipo modulo KInetD
 Name[ja]=KInetD モジュールタイプ
 Name[lt]=KInetD modulio tipas
+Name[mk]=KInetD Тип на Модул
+Name[mn]=Модуль KInetD
 Name[mt]=Tip ta' modulu KInetD
 Name[nb]=KInetd-programtillegstype
 Name[nl]=KInetD-moduletype
--- a/krfb/Makefile.am
+++ b/krfb/Makefile.am
@@ -14,7 +14,7 @@ krfb_SOURCES = rfbcontroller.cc xupdatescanner.cc main.cpp \
 krfb_LDADD   = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_KDEUI) $(LIBJPEG) 
 krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH)

-noinst_HEADER = configuration.h invitation.h invite.h krfbiface.h \
+noinst_HEADERS = configuration.h invitation.h invite.h krfbiface.h \
                krfbifaceimpl.h rfbcontroller.h trayicon.h xupdatescanner.h


--- a/krfb/eventsrc
+++ b/krfb/eventsrc
@@ -2,6 +2,7 @@
 IconName=krfb
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
+Comment[ar]=مشاركة سطح المكتب
 Comment[bg]=Споделяне на Работно място
 Comment[bs]=Dijeljenje desktopa
 Comment[ca]=Compartició de l'escriptori
@@ -17,15 +18,18 @@ Comment[fr]=Partage du bureau
 Comment[he]=שיתוף שולחנות עבודה
 Comment[hr]=Dijeljenje radne površine
 Comment[hu]=Munkaasztal-megosztás
+Comment[is]=Skjáborðamiðlun
 Comment[it]=Condivisione desktop
 Comment[ja]=デスクトップ共有
 Comment[lt]=Dalinimasis darbastaliu
+Comment[mk]=Десктоп Делење
+Comment[mn]=Ажлын байрыг хамтран эзэмших
 Comment[mt]=Qsim tad-desktop
 Comment[nb]=Skrivebordsdeling
 Comment[nl]=Bureaubladvrijgave
 Comment[nn]=Skrivebordsdeling
 Comment[nso]=Kabagano ya Desktop
-Comment[pl]=Współdzielenie biurka
+Comment[pl]=Współdzielenie pulpitu
 Comment[pt]=Partilha do Ecrã
 Comment[pt_BR]=Compartilhamento do Ambiente de Trabalho
 Comment[ro]=Partajare ecran
@@ -33,16 +37,18 @@ Comment[ru]=Параметры общего рабочего стола
 Comment[sk]=Zdieľanie pracovnej plochy
 Comment[sl]=Deljenje namizja
 Comment[sv]=Dela ut skrivbord
+Comment[th]=ใช้งานพื้นที่ทำงานร่วมกัน
 Comment[tr]=Masaüstü Paylaşımı
 Comment[uk]=Спільні стільниці
 Comment[ven]=U kovhekana ha desikithopo
-Comment[xh]=Ulwahlulelano lwe Desktop
+Comment[xh]=Ukwahlulelano kwe Desktop
 Comment[zh_CN]=桌面共享
 Comment[zh_TW]=桌面分享
 Comment[zu]=Ukuhlukaniselana kwe-Desktop

 [UserAcceptsConnection]
 Name=UserAcceptsConnection
+Name[ar]=المستخدم قبل الاتصال
 Name[bg]=Потребител Приема Връзка
 Name[ca]=L'usuari accepta la connexió
 Name[cs]=Uživatel přijímá spojení
@@ -51,19 +57,22 @@ Name[de]=BenutzerBestätigtVerbindung
 Name[el]=Ο χρήστης δέχεται σύνδεση
 Name[eo]=UzantoAkceptasKonektojn
 Name[es]=El usuario acepta la conexión
-Name[et]=KasutajaÜhendusegaNõus
+Name[et]=Kasutaja ühendusega nõus
 Name[fr]=L'utilisateur accepte les connexions
 Name[he]=משתמש מקבל חיבור
 Name[hr]=KorisnikPrihvaćaVezu
 Name[hu]=KapcsolatElfogadva
+Name[is]=NotandiSamþykkirTengingar
 Name[it]=L'utente accetta la connessione
 Name[ja]=ユーザが許可した接続
 Name[lt]=Vartotojas priima prisijungima
+Name[mk]=КорисникотПрифатиВрска
+Name[mn]=Хэрэглэгч зөвшөөрсөн холболт
 Name[mt]=UserJaċċettaKonnessjoni
 Name[nb]=Bruker aksepterer oppkobling
 Name[nl]=Gebruiker accepteert verbinding
 Name[nn]=Brukar godtek samband
-Name[nso]=Modirisi o Amogela Kgokagano
+Name[nso]=Modiriši o Amogela Kgokagano
 Name[pl]=Połączenie akceptowane przez użytkownika
 Name[pt_BR]=Aceita Conexões do Usuário
 Name[ro]=Conexiune acceptată de utilizator
@@ -71,6 +80,7 @@ Name[ru]=Пользователь принимает соединения
 Name[sk]=Užívateľ akceptoval spojenie
 Name[sl]=Uporabnik sprejema povezavo
 Name[sv]=Användare accepterar anslutning
+Name[th]=ผู้ใช้ยอมรับการเชื่อมต่อ
 Name[uk]=КористувачПриймаєЗ'єднання
 Name[ven]=Mushumisi o tanganedza vhukwamani
 Name[xh]=Umsebenzisi Wamkela Uxhulumaniso
@@ -79,6 +89,7 @@ Name[zh_TW]=使用者接受連線
 Name[zu]=UmsebenziUvumelaUkuxhumana
 Comment=User accepts connection
 Comment[af]=Gebruiker aanvaar verbinding
+Comment[ar]=المستخدم قبل الإتصال
 Comment[bg]=Потребител приема връзка
 Comment[bs]=Korisnik prihvata konekciju
 Comment[ca]=L'usuari accepta la connexió
@@ -94,14 +105,17 @@ Comment[fr]=l'utilisateur accepte les connexions
 Comment[he]=המשתמש מקבל את החיבור
 Comment[hr]=Korisnik prihvaća vezu
 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[mk]=Корисникот ја прифати врската
+Comment[mn]=Хэрэглэгч зөвшөөрсөн холболт
 Comment[mt]=User jaċċetta l-konnessjoni
 Comment[nb]=Bruker aksepterer oppkobling
 Comment[nl]=Gebruiker accepteert verbinding
 Comment[nn]=Brukar godtek samband
-Comment[nso]=Modirisi o Amogela Kgokagano
+Comment[nso]=Modiriši o Amogela Kgokagano
 Comment[pl]=Użytkownik akceptuje połączenie
 Comment[pt]=O utilizador aceita a ligação
 Comment[pt_BR]=O usuário aceita a conexão
@@ -110,6 +124,7 @@ Comment[ru]=Пользователь принимает соединения
 Comment[sk]=Užívateľ akceptoval spojenie
 Comment[sl]=Uporabnik sprejema povezavo
 Comment[sv]=Användaren accepterar anslutning
+Comment[th]=ผู้ใช้ยอมรับการเชื่อมต่อ
 Comment[tr]=Kullanıcı bağlantıyı kabul etti
 Comment[uk]=Користувач приймає з'єднання
 Comment[ven]=Mushumisi o tanganedza vhukwamani
@@ -121,6 +136,7 @@ default_presentation=4

 [UserRefusesConnection]
 Name=UserRefusesConnection
+Name[ar]=المستخدم رفض الاتصال
 Name[bg]=Потребител Отказва Връзка
 Name[ca]=L'usuari refusa la connexió
 Name[cs]=Uživatel odmítá spojení
@@ -129,19 +145,22 @@ Name[de]=BenutzerLehntVerbindungAb
 Name[el]=Ο χρήστης δε δέχεται σύνδεση
 Name[eo]=UzantoRifuzasKonektojn
 Name[es]=El usuario rechaza la conexión
-Name[et]=KasutajaKeeldubÜhendusest
+Name[et]=Kasutaja keeldub ühendusest
 Name[fr]=L'utilisateur refuse les connexions
 Name[he]=משתמש דוחה חיבור
 Name[hr]=KorisnikOdbijaVezu
 Name[hu]=KapcsolatVisszautasítva
+Name[is]=NotandiHafnarTengingum
 Name[it]=L'utente rifiuta la connessione
 Name[ja]=ユーザが拒否した接続
 Name[lt]=Vartotojas atmeta prisijungimą
+Name[mk]=КорисникотОдбиВрска
+Name[mn]=Хэрэглэгч зөвшөөрөөгүй холболт
 Name[mt]=UserJirrifjutaKonnessjoni
 Name[nb]=Bruker avviser oppkobling
 Name[nl]=Gebruiker weigert verbinding
 Name[nn]=Brukar nektar samband
-Name[nso]=Modirisi o Gana Kgokagano
+Name[nso]=Modiriši o Gana Kgokagano
 Name[pl]=Połączenie odrzucone przez użytkownika
 Name[pt_BR]=Rejeita Conexões do Usuário
 Name[ro]=Conexiune respinsă de utilizator
@@ -149,6 +168,7 @@ Name[ru]=Пользователь не принимает соединения
 Name[sk]=Užívateľ zamietol spojenie
 Name[sl]=Uporabnik zavrača povezavo
 Name[sv]=Användaren vägrar anslutning
+Name[th]=ผู้ใช้ปฏิเสธการเชื่อมต่อ
 Name[uk]=КористувачВідмовляєУЗ'єднанні
 Name[ven]=Mushumisi o hana Vhukwamani
 Name[xh]=Umsebenzisi Uyalwala Uxhulumaniso
@@ -157,6 +177,7 @@ Name[zh_TW]=使用者拒絕連線
 Name[zu]=UmsebenzisiWalaUxhumaniso
 Comment=User refuses connection
 Comment[af]=Gebruiker weier verbinding
+Comment[ar]=المستخدم رفض الاتصال
 Comment[bg]=Потребител отказва връзка
 Comment[bs]=Korisnik odbija konekciju
 Comment[ca]=L'usuari refusa la connexió
@@ -172,14 +193,17 @@ Comment[fr]=L'utilisateur refuse les connexions
 Comment[he]=המשתמש מסרב לחיבור
 Comment[hr]=Korisnik odbija vezu
 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[mk]=Корисникот ја одби врската
+Comment[mn]=Хэрэглэгч зөвшөөрөөгүй холболт
 Comment[mt]=User jiċħad il-konnessjoni
 Comment[nb]=Bruker avviser oppkobling
 Comment[nl]=Gebruiker weigert verbinding
 Comment[nn]=Brukar nektar samband
-Comment[nso]=Modirisi o gana kgokagano
+Comment[nso]=Modiriši o gana kgokagano
 Comment[pl]=Użytkownik odrzuca połączenie
 Comment[pt]=O utilizador recusa a ligação
 Comment[pt_BR]=O usuário rejeita a conexão
@@ -188,6 +212,7 @@ Comment[ru]=Пользователь не принимает соединени
 Comment[sk]=Užívateľ odmietol spojenie
 Comment[sl]=Uporabnik zavrnil povezavo
 Comment[sv]=Användaren vägrar anslutning
+Comment[th]=ผู้ใช้ปฏิเสธการเชื่อมต่อ
 Comment[tr]=Kullanıcı bağlantıyı iptal etti
 Comment[uk]=Користувач відмовляє у з'єднанні
 Comment[ven]=Mushumisi o hana vhukwamani
@@ -199,6 +224,7 @@ default_presentation=4

 [ConnectionClosed]
 Name=ConnectionClosed
+Name[ar]=اتصال مغلق
 Name[bg]=Връзката е Затворена
 Name[ca]=Connexió tancada
 Name[cs]=Spojení ukončeno
@@ -207,19 +233,22 @@ Name[de]=VerbindungGeschlossen
 Name[el]=Η σύνδεση έκλεισε
 Name[eo]=KonektoFermita
 Name[es]=Conexión cerrada
-Name[et]=ÜhendusSuletud
+Name[et]=Ühendus suletud
 Name[fr]=Connexion fermée
 Name[he]=חיבור נסגר
 Name[hr]=VezaPrekinuta
 Name[hu]=KapcsolatBezárva
+Name[is]=TenginguLokað
 Name[it]=Connessione chiusa
 Name[ja]=接続切断
 Name[lt]=Prisijungimas uždarytas
+Name[mk]=ВрскатаЗатворена
+Name[mn]=Холболт хаагдав
 Name[mt]=KonnessjonijiMagħluqa
 Name[nb]=Kobling stengt
 Name[nl]=Verbinding gesloten
 Name[nn]=Samband stengt
-Name[nso]=Kgokagano e Tswaletswe
+Name[nso]=Kgokagano e Tswaletšwe
 Name[pl]=Połączenia zakończone
 Name[pt_BR]=Conexão fechada
 Name[ro]=Conexiune închisă
@@ -227,6 +256,7 @@ Name[ru]=Соединение закрыто
 Name[sk]=Spojenie ukončené
 Name[sl]=Povezava zaprta
 Name[sv]=Anslutning stängd
+Name[th]=การเชื่อมต่อยุติ
 Name[tr]=Bağlantı Kapatıldı
 Name[uk]=З'єднанняЗакрито
 Name[ven]=Vhukwamani ho valwa
@@ -236,6 +266,7 @@ Name[zh_TW]=連線已關閉
 Name[zu]=UkuxhumanisaKuvaliwe
 Comment=Connection closed
 Comment[af]=Verbinding gesluit
+Comment[ar]=الاتصال قُطع
 Comment[bg]=Връзката е затворена
 Comment[bs]=Konekcija prekinuta
 Comment[ca]=Connexió tancada
@@ -251,14 +282,17 @@ Comment[fr]=Connexion coupée
 Comment[he]=החיבור נסגר
 Comment[hr]=Veza prekinuta
 Comment[hu]=A kapcsolat bezárva
+Comment[is]=Tengingu lokað
 Comment[it]=Connessione chiusa
 Comment[ja]=接続が閉じられました
 Comment[lt]=Prisijungimas uždarytas
+Comment[mk]=Врската е затворена
+Comment[mn]=Холболт хаагдав
 Comment[mt]=Konnessjoni magħluqa
 Comment[nb]=Oppkobling stengt
 Comment[nl]=Verbinding verbroken
 Comment[nn]=Samband stengt
-Comment[nso]=Kopantsho e tswaletswe
+Comment[nso]=Kopantšho e tswaletšwe
 Comment[pl]=Połączenie zakończone
 Comment[pt]=Ligação fechada
 Comment[pt_BR]=conexão encerrada
@@ -267,6 +301,7 @@ Comment[ru]=Соединение закрыто
 Comment[sk]=Spojenie ukončené
 Comment[sl]=Povezava zaprta
 Comment[sv]=Anslutning stängd
+Comment[th]=การเชื่อมต่อยุติ
 Comment[tr]=Bağlantı kesildi
 Comment[uk]=З'єднання закрито
 Comment[ven]=Vhukwamani ho valwa
@@ -278,6 +313,7 @@ default_presentation=4

 [InvalidPassword]
 Name=InvalidPassword
+Name[ar]=كلمة مرور غير صالحة
 Name[be]=Некарэктны пароль
 Name[bg]=Грешна Парола
 Name[ca]=Contrasenya no vàlida
@@ -287,19 +323,22 @@ Name[de]=UngültigesPasswort
 Name[el]=Λάθος κωδικός πρόσβασης
 Name[eo]=NevalidaPasvorto
 Name[es]=Contraseña errónea
-Name[et]=ValeParool
+Name[et]=Vale parool
 Name[fr]=Mots de passe non valable
 Name[he]=סיסמה לא תקפה
 Name[hr]=NevažećaLozinka
 Name[hu]=ÉrvénytelenJelszó
+Name[is]=ÓgiltLykilorð
 Name[it]=Password non valida
 Name[ja]=不正なパスワード
 Name[lt]=Neteisingas slaptažodžis
+Name[mk]=НевалиднаЛозинка
+Name[mn]=Буруу нууц үг
 Name[mt]=PasswordĦażin
 Name[nb]=Ugyldig passord
 Name[nl]=Ongeldig wachtwoord
 Name[nn]=Ugyldig passord
-Name[nso]=Lentsuphetiso gase la Nnete
+Name[nso]=Lentšuphetišo gase la Nnete
 Name[pl]=Błędne hasło
 Name[pt_BR]=Senha inválida
 Name[ro]=Parolă eronată
@@ -307,6 +346,7 @@ Name[ru]=Неверный пароль
 Name[sk]=Zlé heslo
 Name[sl]=Nepravilno geslo
 Name[sv]=Ogiltigt lösenord
+Name[th]=รหัสผ่านไม่ถูกต้อง
 Name[tr]=Geçersiz Parola
 Name[uk]=НевірнийПароль
 Name[ven]=Phasiwede asi yone
@@ -316,6 +356,7 @@ Name[zh_TW]=無效的密碼
 Name[zu]=IgamaEliyimfihloLokudlulaOkungasiyilona
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
+Comment[ar]=كلمة مرور غير صالحة
 Comment[be]=Некарэктны пароль
 Comment[bg]=Грешна парола
 Comment[bs]=Neispravna šifra
@@ -332,14 +373,17 @@ Comment[fr]=Mot de passe non valable
 Comment[he]=הסיסמה אינה תקפה
 Comment[hr]=Nevažeća šifra
 Comment[hu]=Érvénytelen jelszó
+Comment[is]=Lykilorð ógilt
 Comment[it]=Password non valida
 Comment[ja]=不正なパスワード
 Comment[lt]=Neteisingas slaptažodis
+Comment[mk]=Невалидна лозинка
+Comment[mn]=Буруу нууц үг
 Comment[mt]=Password ħażin
 Comment[nb]=Ugyldig passord
 Comment[nl]=Ongeldig wachtwoord
 Comment[nn]=Ugyldig passord
-Comment[nso]=Lentsuphetiso gase la nnete
+Comment[nso]=Lentšuphetišo gase la nnete
 Comment[pl]=Błędne hasło
 Comment[pt]=Senha inválida
 Comment[pt_BR]=senha inválida
@@ -348,6 +392,7 @@ Comment[ru]=Неверный пароль
 Comment[sk]=Zlé heslo
 Comment[sl]=Nepravilno geslo
 Comment[sv]=Ogiltigt lösenord
+Comment[th]=รหัสผ่านไม่ถูกต้อง
 Comment[tr]=Geçersiz parola
 Comment[uk]=Невірний пароль
 Comment[ven]=Phasiwede isa shumi
@@ -359,6 +404,7 @@ default_presentation=4

 [InvalidPasswordInvitations]
 Name=InvalidPasswordInvitations
+Name[ar]=دعوات كلمات مرور غير صالحة
 Name[bg]=Грешна Парола за Покана
 Name[ca]=Contrasenya convidats no vàlides
 Name[cs]=Neplatné hesla výzev
@@ -366,19 +412,22 @@ Name[da]=UgyldigtKodeordInvitationer
 Name[de]=UngültigePasswortAnfragen
 Name[eo]=NevalidaPasvortoInvito
 Name[es]=Invitación de contraseñas erróneas
-Name[et]=ValeParoolKutsed
+Name[et]=Vale parool kutsed
 Name[fr]=Invitations de mot de passe non valable
 Name[he]=סיסמת לא תקפה - הזמנות
 Name[hr]=KrivePizovniceŠifri
 Name[hu]=ÉrvénytelenJelszóMeghívások
+Name[is]=ÓgildLykilorðsBoð
 Name[it]=Invito password non valida
 Name[ja]=不正なパスワードの招待
 Name[lt]=Neteisingo slaptažodžio kvietimai
+Name[mk]=ПоканиСоНевалидниЛозинки
+Name[mn]=Буруу нууц үгээр орох
 Name[mt]=PasswordĦażinaStediniet
 Name[nb]=Ugyldig passord ved invitasjon
 Name[nl]=Ongeldige wachtwoordaanvragen
 Name[nn]=Ugyldige passordinvitasjonar
-Name[nso]=Ditaletso tsa Mantsuphetiso tseo esego tsa Nnete
+Name[nso]=Ditaletšo tša Mantsuphetišo tšeo esego tša Nnete
 Name[pl]=Informacja o błędnym haśle
 Name[pt_BR]=Aviso de senha inválida
 Name[ru]=Неверный запрос пароля
@@ -393,6 +442,8 @@ 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[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.
@@ -407,21 +458,25 @@ Comment[fr]=La partie invitée a envoyé un mot de passe non valable. Connexion
 Comment[he]=הצד המוזמן שלח סיסמה לא תקפה. החיבור נדחה.
 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 festa invitata ha inviato una password non valida. Connessione rifiutata.
 Comment[ja]=招待された人が不正なパスワードを送って来ました。接続は拒否されました。
 Comment[lt]=Kviečiančioji pusė atsiuntė blogą slaptažodį.  Prisijungimas atmestas.
+Comment[mk]=Поканетата странка испрати невалидна лозинка. Врската одбиена.
+Comment[mn]=Буруу нууц үгийг уригдсан хэсэг илгээв. Холболт зөвшөөрөгдсөнгүй
 Comment[mt]=Il-persuna mistiedna bagħtet password ħażin. Konnessjoni miċħuda.
 Comment[nb]=Den inviterte parten sendte ugyldig passord. Oppkobling avvist.
 Comment[nl]=De uitgenodigde partij stuurde een ongeldig wachtwoord. Verbinding geweigerd.
 Comment[nn]=Den inviterte parten sende eit ugyldig passord. Sambandet vart nekta.
-Comment[nso]=Sehlopha seo se memilwego se romela lentsuphetiso leo esego la nnete. Kgokagano e gannwe.
+Comment[nso]=Sehlopha seo se memilwego se romela lentšuphetišo leo esego la nnete. Kgokagano e gannwe.
 Comment[pl]=Z drugiej strony podano błędne hasło. Połączenie odrzucone.
 Comment[pt]=O convidado enviou uma senha inválida. A ligação foi recusada.
 Comment[pt_BR]=A parte "convidada" enviou uma senha inválida. Conexão recusada.
 Comment[ru]=Удалённый пользователь ввёл неверный пароль. В доступе отказано.
-Comment[sk]=Pozvaný účastnik poslal zlé heslo. Spojenie zamietnuté.
+Comment[sk]=Pozvaný účastník poslal zlé heslo. Spojenie zamietnuté.
 Comment[sl]=Povabljena stranka je poslala nepravilno geslo. Povezava zavrnjena.
 Comment[sv]=Den inbjudna personen skickade ett ogiltigt lösenord. Anslutning vägrades.
+Comment[th]=ผู้เข้าร่วมการเชิญชวนส่งรหัสผ่านมาไม่ถูกต้อง ทำการปฏิเสธการเชื่อมต่อ
 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.
@@ -432,6 +487,7 @@ default_presentation=2

 [NewConnectionOnHold]
 Name=NewConnectionOnHold
+Name[ar]=اتصال جديد على الانتظار
 Name[bg]=Поддържа Нова Връзка
 Name[ca]=Nova connexió en espera
 Name[cs]=Nové spojení pozdrženo
@@ -440,19 +496,22 @@ Name[de]=NeueVerbindungWartet
 Name[el]=Νέα σύνδεση σε αναμονή
 Name[eo]=NovaKonektoAtendante
 Name[es]=Nueva conexión en espera
-Name[et]=UusÜhendusOotel
+Name[et]=Uus ühendus ootel
 Name[fr]=Nouvelle connexion au raccroché
 Name[he]=חיבור חדש בהמתנה
 Name[hr]=NovaVezaNaČekanju
 Name[hu]=ÚjKapcsolatTartva
+Name[is]=NýTengingÁBið
 Name[it]=Nuova connessione da tenere
 Name[ja]=維持中の新規接続
 Name[lt]=Naujas prisijungimas sulaikytas
+Name[mk]=НоваВрскаНаПочек
+Name[mn]=Шинэ холболт тогтоов
 Name[mt]=KonnessjoniĠdidaMiżmuma
 Name[nb]=Ny oppkobling venter
 Name[nl]=Nieuwe verbinding is wachtende
 Name[nn]=Nytt samband ventar
-Name[nso]=Kgokagano ye Ntshwa e Emisitswe
+Name[nso]=Kgokagano ye Ntshwa e Emišitšwe
 Name[pl]=Nowe połączenie wstrzymane
 Name[pt_BR]=Nova Conexão
 Name[ro]=Conexiune nouă în aşteptare
@@ -468,6 +527,7 @@ Name[zh_TW]=保持的新連線
 Name[zu]=UkuxhumanisaOkushaKubanjiwe
 Comment=Connection requested, user must accept
 Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
+Comment[ar]=طلب اتصال, يجب أن يقبل المستخدم
 Comment[bg]=Заявка за връзка, потребителя трябва да приеме
 Comment[bs]=Zatražena konekcija, korisnik mora prihvatiti
 Comment[ca]=Connexió solicitada, l'usuari ha d'acceptar-la
@@ -483,14 +543,17 @@ Comment[fr]=Connexion demandée, l'utilisateur doit accepter
 Comment[he]=נתבקש חיבור, על המשתמש לקבלו
 Comment[hr]=Veza je zatražena, korisnik mora prihvatiti
 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[mk]=Врска е побарана, корисникот мора да прифати
+Comment[mn]=Холболт хүсэж байна, хэрэглэгч зөвшөөрөх ёстой
 Comment[mt]=Konnessjoni mitluba, user irid jaċċetta
 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
+Comment[nso]=Kgokagano e kgopetšwe, modiriši o swanetše go dumela
 Comment[pl]=Próba połączenia, musi być zaakceptowana przez użytkownika
 Comment[pt]=A ligação foi pedida e o utilizador deve aceitar
 Comment[pt_BR]=Conexão requisitada; o usuário deve aceitar
@@ -499,6 +562,7 @@ Comment[ru]=Запрос на соединение, требуется подт
 Comment[sk]=Vyžiadané spojenie, užívateľ musí akceptovať
 Comment[sl]=Povezava vzpostavljena, uporabnik mora sprejeti
 Comment[sv]=Anslutning begärd, användaren måste acceptera
+Comment[th]=มีการร้องขอเชื่อมต่อ ผู้ใช้ต้องทำการยอมรับ
 Comment[uk]=Запрошено з'єднання, користувач має прийняти
 Comment[ven]=Vhukwamani ho humbelwa, mushumisi u fanela u tanganedza
 Comment[xh]=Uxhulumaniso luceliwe, umsebenzisi kufanele amkele
@@ -509,6 +573,7 @@ default_presentation=4

 [NewConnectionAutoAccepted]
 Name=NewConnectionAutoAccepted
+Name[ar]=اتصال جديد مقبول تلقائياً
 Name[bg]=Автоматично Приема Нова Връзка
 Name[ca]=Nova connexió auto-acceptada
 Name[cs]=Nové spojení automaticky přijato
@@ -517,19 +582,22 @@ Name[de]=NeueVerbindungAutomatischAkzeptiert
 Name[el]=Αυτόματη αποδοχή νέας σύνδεσης
 Name[eo]=NovaKonektoAŭtomateAkceptita
 Name[es]=Nueva conexión auto aceptada
-Name[et]=UueÜhendusegaAutomaatseltNõus
+Name[et]=Uue ühendusega automaatselt nõus
 Name[fr]=Nouvelle connexion auto-acceptée
 Name[he]=חיבור חדש נתקבל אוטומטית
 Name[hr]=NovaVezaAutoPrihvaćena
 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[mk]=НоваВрскаАвтоматскиПрифатена
+Name[mn]=Шинэ холболтыг автоматаар зөвшөөрөв
 Name[mt]=KonnessjoniĠdidaAwtoAċċettata
 Name[nb]=Ny oppkobling aksepteres automatisk
 Name[nl]=Nieuwe verbinding automatisch geaccepteerd
 Name[nn]=Nytt samband automatisk godteke
-Name[nso]=Kgokagano ye Ntshwa yago Itirisa e Amogetswe
+Name[nso]=Kgokagano ye Ntshwa yago Itiriša e Amogetšwe
 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
@@ -537,6 +605,7 @@ Name[ru]=Соединение создается автоматически
 Name[sk]=Nové spojenie automaticky akceptované
 Name[sl]=Nova povezava samodejno sprejeta
 Name[sv]=Ny anslutning accepterades automatiskt
+Name[th]=รับการเชื่อมต่ออัตโนมัติ
 Name[uk]=НовіЗ'єднанняАвтоматичноПрийняті
 Name[ven]=Vhukwamani vhuswa ho tanganedzhwa
 Name[xh]=Uxhulumano Olutsha Lwamkelwe Ngokuzenzekelayo
@@ -545,6 +614,7 @@ Name[zh_TW]=自動接受的新連線
 Name[zu]=UkuxhumanisaOkushaKokuzenzakalelaKuvunyelwe
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
+Comment[ar]=اتصالات جديدة أُنشئت تلقائياً
 Comment[bg]=Автоматично установяване на нова връзка
 Comment[bs]=Automatski uspostavljena nova konekcija
 Comment[ca]=Nova connexió establerta automàticament
@@ -560,14 +630,17 @@ Comment[fr]=Nouvelle connexion établie automatiquement
 Comment[he]=נוצר חיבור חדש באופן אוטומטי
 Comment[hr]=Nova veza automatski prihvaćena
 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[mk]=Нова врска автоматски поставена
+Comment[mn]=Шинэ холболт автоматаар тавигдав
 Comment[mt]=Konnessjoni ġdida aċċettata awtomatikament
 Comment[nb]=Ny oppkobling automatisk opprettet
 Comment[nl]=Nieuwe verbinding automatisch opgebouwd
 Comment[nn]=Nytt samband automatisk oppretta
-Comment[nso]=Kgokagano ye ntshwa e hlagisitswe kago itirsa
+Comment[nso]=Kgokagano ye ntshwa e hlagišitšwe kago itiriša
 Comment[pl]=Nowe połączenie ustanowiono automatycznie
 Comment[pt]=A nova ligação foi estabelecida automaticamente
 Comment[pt_BR]=Nova conexão estabelecida automaticamente
@@ -576,6 +649,7 @@ Comment[ru]=Новое соединение устанавливается ав
 Comment[sk]=Nové spojenie automaticky vytvorené
 Comment[sl]=Nova povezava samodejno vzpostavljena
 Comment[sv]=Ny anslutning automatiskt upprättad
+Comment[th]=เปิดการเชื่อมต่อใหม่อัตโนมัติ
 Comment[uk]=Автоматично встановлено нове з'єднання
 Comment[ven]=Vhukwamani vhuswa ho itwa na zwenezwo
 Comment[xh]=Uxhulumaniso olutsha lufunyenwe ngokuzenzekelayo
@@ -586,6 +660,7 @@ default_presentation=4

 [TooManyConnections]
 Name=TooManyConnections
+Name[ar]=اتصالات عديدة جداً
 Name[bg]=Твърде Много Връзки
 Name[ca]=Masses connexions
 Name[cs]=Příliš mnoho spojení
@@ -594,19 +669,22 @@ Name[de]=ZuVieleVerbindungen
 Name[el]=Πάρα πολλές συνδέσεις
 Name[eo]=TroMultajKonektoj
 Name[es]=Demasiadas conexiones
-Name[et]=LiigaPaljuÜhendusi
+Name[et]=Liiga palju ühendusi
 Name[fr]=Trop de connexions
 Name[he]=יותר מדיי חיבורים
 Name[hr]=PrevišeVeza
 Name[hu]=TúlSokKapcsolat
+Name[is]=OfMargarTengingar
 Name[it]=Troppe Connessioni
 Name[ja]=多すぎる接続
 Name[lt]=Per daug prisijungimų
+Name[mk]=ПремногуВрски
+Name[mn]=Дэндүү олон холболт
 Name[mt]=WisqKonnessjonijiet
 Name[nb]=For mange oppkoblinger
 Name[nl]=Teveel verbindingen
 Name[nn]=For mange samband
-Name[nso]=Dikgokagano tse Ntshi Kudu
+Name[nso]=Dikgokagano tše Ntšhi Kudu
 Name[pl]=Zbyt wiele połączeń
 Name[pt_BR]=Conexões em excesso
 Name[ro]=Prea multe conexiuni
@@ -614,6 +692,7 @@ Name[ru]=Слишком много соединений
 Name[sk]=Príliš veľa spojení
 Name[sl]=Preveč povezav
 Name[sv]=För många anslutningar
+Name[th]=มีการเชื่อมต่อมากเกินไป
 Name[tr]=ÇokFazlaBağlantı
 Name[uk]=ЗабагатоЗ'єднань
 Name[ven]=Vhukwamani vhunzhi
@@ -623,6 +702,7 @@ Name[zh_TW]=太多連線
 Name[zu]=UkuxhumanaOkuningi
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
+Comment[ar]=مشغول , الاتصال رُفض
 Comment[bg]=Заето, връзката е отказана
 Comment[bs]=Zauzet, konekcija odbijena
 Comment[ca]=Ocupat, connexió refusada
@@ -638,9 +718,12 @@ Comment[fr]=Occupé, connexion refusée
 Comment[he]=תפוס, החיבור נדחה
 Comment[hr]=Zauzeto, veza odbijena
 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[mk]=Зафатено, врската одбиена
+Comment[mn]=Шугам Чөлөөгүй, холболт зөвшөөрөгдсөнгүй
 Comment[mt]=Okkupat, konnessjoni miċħuda
 Comment[nb]=Opptatt, oppkobling avvist
 Comment[nl]=Bezig, verbinding geweigerd
@@ -651,9 +734,10 @@ Comment[pt]=Ocupado, a ligação foi recusada
 Comment[pt_BR]=Ocupado; conexão recusada
 Comment[ro]=Ocupat; conexiune refuzată
 Comment[ru]=Занято, соединение закрыто
-Comment[sk]=Zaneprázdneny, spojenie odmietnuté
+Comment[sk]=Zaneprázdnený, spojenie odmietnuté
 Comment[sl]=zaposlen, povezava zavrnjena
 Comment[sv]=Upptagen, anslutning vägras
+Comment[th]=ยังไม่ว่าง ทำการปฏิเสธการเชื่อมต่อ
 Comment[uk]=Зайнято, у з'єднанні відмовлено
 Comment[ven]=U farakanea, vhukwamani ho hanwa
 Comment[xh]=Uxhulumaniso, olu xakekileyo lwaliwe
@@ -665,6 +749,7 @@ default_logfile=

 [UnexpectedConnection]
 Name=UnexpectedConnection
+Name[ar]=اتصال غير متوقع
 Name[bg]=Неочаквана Връзка
 Name[ca]=Connexió inesperada
 Name[cs]=Neočekávané spojení
@@ -673,14 +758,17 @@ Name[de]=UnerwarteteVerbindung
 Name[el]=Μη αναμενόμενη σύνδεση
 Name[eo]=NeatenditaKonekto
 Name[es]=Conexión inesperada
-Name[et]=OotamatuÜhendus
+Name[et]=Ootamatu ühendus
 Name[fr]=Connexion inattendue
 Name[he]=חיבור בלתי צפוי
 Name[hr]=NeočekivanaVeza
 Name[hu]=NemVártKapcsolat
+Name[is]=ÓvæntTenging
 Name[it]=Connessione inaspettata
 Name[ja]=予期しない接続
 Name[lt]=Netikėtas prisijungimas
+Name[mk]=НеочекуванаВрска
+Name[mn]=Гэнэтийн Холболт
 Name[mt]=KonnessjonijietMhuxMistennija
 Name[nb]=Uventet oppkobling
 Name[nl]=Onverwachte verbinding
@@ -693,6 +781,7 @@ Name[ru]=Неожиданное соединение
 Name[sk]=Neočakávane spojenie
 Name[sl]=Nepričakovana povezava
 Name[sv]=Oväntad anslutning
+Name[th]=การเชื่อมต่อที่ไม่คาดหวัง
 Name[tr]=Beklenmedik Bağlantı
 Name[uk]=НеочікуванеЗ'єднання
 Name[ven]=Vhukwamani vhu songo lavhelelwaho
@@ -702,9 +791,10 @@ Name[zh_TW]=非預期的連線
 Name[zu]=UkuxhumanaOkungalindelwe
 Comment=Received unexpected connection, abort
 Comment[af]=Ontvang onverwagte verbinding, staak
+Comment[ar]=تم استلام اتصال غير متوقع , اقطع
 Comment[bg]=Получи се неочаквана връзка, прекъсва
 Comment[bs]=Primio neočekivanu konekciju, prekidam
-Comment[ca]=Rebuda una connexió inesperada, abortant
+Comment[ca]=S'ha rebut una connexió inesperada, s'està avortant
 Comment[cs]=Obdrženo neočekávané spojení, přerušeno
 Comment[da]=Modtog uventet forbindelse, afbrød
 Comment[de]=Unerwartete Verbindung hergestallt, Abbruch
@@ -717,14 +807,17 @@ Comment[fr]=Reçu une connexion inattendue, interruption
 Comment[he]=נתקבל חיבור בלתי צפוי, בוטל
 Comment[hr]=Primio sam neočekivanu vezu, prekid
 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[mk]=Примена неочекувана врска, прекини
+Comment[mn]=Гэнэтийн холболтийг хүлээн авав.Аборт
 Comment[mt]=Irċevejt konnessjoni mhux mistennija, ieqaf
 Comment[nb]=Mottok uventet oppkobling, avbryt
 Comment[nl]=Ontving een onverwachte verbinding, gestopt
 Comment[nn]=Mottok uventa samband, avbryt
-Comment[nso]=Amogetse kgokagano yeo ebego esa emelwa, bolaya
+Comment[nso]=Amogetše kgokagano yeo ebego esa emelwa, bolaya
 Comment[pl]=Otrzymano niespodziewane połączenie. Przerwane.
 Comment[pt]=Foi recebida uma ligação inesperada, a interromper
 Comment[pt_BR]=conexão recebida inesperadamente; abortar
@@ -733,6 +826,7 @@ Comment[ru]=Получено неожиданное соединение. Отк
 Comment[sk]=Prijaté neočakávane spojenie, ukončujem
 Comment[sl]=Prejeta nepričakovana povezava, prekinjam
 Comment[sv]=Tog emot oväntad anslutning, avbryter
+Comment[th]=ได้รับการเชื่อมต่อที่ไม่คาดหวัง ทำการยกเลิก
 Comment[uk]=Отримано неочікуване з'єднання, скасовую
 Comment[ven]=Vhukwamani vhu songo lavhelelwaho ho tanganedzhwaho, litsha
 Comment[xh]=Ufumene uxhulumaniso olungalindelekanga, lahla
--- a/krfb/kinetd_krfb.desktop
+++ b/krfb/kinetd_krfb.desktop
@@ -15,6 +15,7 @@ X-KDE-KINETD-serviceURL=service:remotedesktop.kde:vnc://%h:%p;(type=shared),(use
 X-KDE-KINETD-serviceAttributes=(type=shared),(username=%u),(fullname=%f)

 Name=KRfb Desktop Sharing
+Name[ar]=KRfb مشاركة سطح المكتب
 Name[bg]=Споделяне на Работно място KRfb
 Name[bs]=KRfb dijeljenje desktopa
 Name[ca]=Compartició de l'escriptori KRfb
@@ -30,14 +31,17 @@ Name[fr]=Partage de bureau KRfb
 Name[he]=שיתוף שולחנות עבודה של KRfb
 Name[hr]=KRfb dijeljenje radne površine
 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[mk]=KRfb Десктоп Делење
+Name[mn]=KRfb ажлын байр
 Name[mt]=Qsim tad-desktop KRfb
 Name[nb]=KRfb skrivebordsdeling
 Name[nn]=KRfb-skrivebordsdeling
 Name[nso]=Kabagano ya Desktop ya KRfp
-Name[pl]=KRfb Współdzielenie biurka
+Name[pl]=KRfb Współdzielenie pulpitu
 Name[pt]=Partilha do Ecrã KRfb
 Name[pt_BR]=Compartilhamento do Ambiente de Trabalho KRfb
 Name[ro]=Partajare ecran KRfb
@@ -45,6 +49,7 @@ Name[ru]=Общий рабочий стол KRfb
 Name[sk]=KRfb zdieľanie pracovnej plochy
 Name[sl]=Deljenje namizja z KRfb
 Name[sv]=Krfb dela ut skrivbord
+Name[th]=แบ่งการใช้งานพื้นที่ทำงานร่วมกัน
 Name[tr]=KRfb Masaüstü Paylaşımı
 Name[uk]=Спільні стільниця KRfb
 Name[ven]=U kovhekana ha Desikithopo ya KRfb
@@ -54,6 +59,7 @@ 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[bs]=Daemon koji vam omogućuje da dijelite vaš desktop
 Comment[ca]=Un dimoni que us permetrà compartir el vostre escriptori
@@ -66,18 +72,21 @@ 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öytien jaon
 Comment[fr]=Un démon qui vous permet de partager votre bureau
-Comment[he]=תהליך שירות שמאפשר לך לשתף את שולחן העבודה שלך
+Comment[he]=תהליך רקע שמאפשר לך לשתף את שולחן העבודה שלך
 Comment[hr]=Daemon koji vam omogućuje da dijelite svoju radnu površinu s drugima
 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[mk]=Демон што дозволува да го делиш десктопот
+Comment[mn]=Таны ажлын байрыг хамтран эзэмшихийгзөвшөөрсөн демон
 Comment[mt]=Daemon li jħallik taqsam id-desktop ma' ħaddieħor
 Comment[nb]=En programnisse som tillater deling av ditt skrivebord med andre
 Comment[nl]=Een daemon waarmee u uw bureaublad kunt vrijgeven om te delen
 Comment[nn]=Ein nisse som let deg dela skrivebordet
 Comment[nso]=Daemon yeo ego dumelelago go abelana ka desktop ya gago
-Comment[pl]=Demon, który pozwala na współdzielenie biurka
+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ă
@@ -85,6 +94,7 @@ Comment[ru]=Демон общего доступа к рабочему стол
 Comment[sk]=Démon ktorý umožní zdieľať vašu pracovnú plochu
 Comment[sl]=Demon, s katerim lahko delite vaše namizje
 Comment[sv]=Demon som låter dig dela ut skrivbordet
+Comment[th]=เดมอนอนุญาตให้คุณแบ่งการใช้งานพื้นที่ทำงานร่วมกัน
 Comment[uk]=Демон, що дозволяє спільне використання стільниць
 Comment[ven]=Daemon ine yani tendela nitshi kovhekana desktop yanu
 Comment[xh]=Daemon ekuvumela ukuba wabe i desktop yakho
--- a/krfb/krfb.desktop
+++ b/krfb/krfb.desktop
@@ -7,6 +7,7 @@ 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
@@ -22,15 +23,18 @@ Name[fr]=Partage de bureau
 Name[he]=שיתוף שולחנות עבודה
 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[mt]=Qsim tad-desktop
 Name[nb]=Delte skrivebord
 Name[nl]=Bureaubladvrijgave
 Name[nn]=Skrivebordsdeling
 Name[nso]=Kabagano ya Desktop
-Name[pl]=Współdzielenie biurka
+Name[pl]=Współdzielenie pulpitu
 Name[pt]=Partilha do Ambiente de Trabalho
 Name[pt_BR]=Compartilhamento do Desktop
 Name[ro]=Partajare ecran
@@ -38,6 +42,7 @@ Name[ru]=Общий рабочий стол
 Name[sk]=Zdieľanie pracovnej plochy
 Name[sl]=Deljenje namizja
 Name[sv]=Dela ut skrivbordet
+Name[th]=ใช้งานพื้นที่ทำงานร่วมกัน
 Name[tr]=Masaüstü Paylaşımı
 Name[uk]=Спільні стільниці
 Name[ven]=U kovhekana ha Desikithopo
--- a/krfb/rfbcontroller.cc
+++ b/krfb/rfbcontroller.cc
@@ -50,6 +50,7 @@
 #include <qglobal.h>
 #include <qlabel.h>
 #include <qmutex.h>
+#include <qdesktopwidget.h>

 #include <X11/Xutil.h>
 #include <X11/extensions/XTest.h>
@@ -150,6 +151,10 @@ static void clientGoneHook(rfbClientPtr)
 	self->handleClientGone();
 }

+static void inetdDisconnectHook()
+{
+	self->handleClientGone();
+}


 void ConnectionDialog::closeEvent(QCloseEvent *)
@@ -178,9 +183,9 @@ void KeyboardEvent::initKeycodes() {
 	int i,j,minkey,maxkey,syms_per_keycode;

 	dpy = qt_xdisplay();
-	
+
 	memset(modifiers,-1,sizeof(modifiers));
-	
+
 	XDisplayKeycodes(dpy,&minkey,&maxkey);
 	ASSERT(minkey >= 8);
 	ASSERT(maxkey < 256);
@@ -274,7 +279,12 @@ PointerEvent::PointerEvent(int b, int _x, int _y) :
 }

 void PointerEvent::exec() {
-	XTestFakeMotionEvent(dpy, 0, x, y, CurrentTime);
+	QDesktopWidget *desktopWidget = QApplication::desktop();
+
+	int screen = desktopWidget->screenNumber();
+	if (screen < 0)
+		screen = 0;
+	XTestFakeMotionEvent(dpy, screen, x, y, CurrentTime);
 	for(int i = 0; i < 5; i++)
 		if ((buttonMask&(1<<i))!=(button_mask&(1<<i)))
 			XTestFakeButtonEvent(dpy,
@@ -319,6 +329,7 @@ RFBController::RFBController(Configuration *c) :
 	connect(dialog.refuseConnectionButton, SIGNAL(clicked()),
 		SLOT(dialogRefused()));
 	connect(&dialog, SIGNAL(closed()), SLOT(dialogRefused()));
+	connect(&initIdleTimer, SIGNAL(timeout()), SLOT(checkAsyncEvents()));
 	connect(&idleTimer, SIGNAL(timeout()), SLOT(idleSlot()));

 	asyncQueue.setAutoDelete(true);
@@ -360,14 +371,15 @@ void RFBController::startServer(int inetdFd, bool xtestGrab)
 	server->rfbServerFormat.depth = framebufferImage->depth;
 	//rfbEndianTest = framebufferImage->bitmap_bit_order != MSBFirst;
 	server->rfbServerFormat.trueColour = (CARD8) TRUE;
+	server->rfbServerFormat.bigEndian =  (CARD8) ((framebufferImage->bitmap_bit_order == MSBFirst) ? TRUE : FALSE);

 	if ( server->rfbServerFormat.bitsPerPixel == 8 ) {
-		server->rfbServerFormat.redShift = 0;
-		server->rfbServerFormat.greenShift = 2;
-		server->rfbServerFormat.blueShift = 5;
-		server->rfbServerFormat.redMax   = 3;
-		server->rfbServerFormat.greenMax = 7;
-		server->rfbServerFormat.blueMax  = 3;
+                server->rfbServerFormat.redShift = 0;
+                server->rfbServerFormat.greenShift = 3;
+                server->rfbServerFormat.blueShift = 6;
+                server->rfbServerFormat.redMax   = 7;
+                server->rfbServerFormat.greenMax = 7;
+                server->rfbServerFormat.blueMax  = 3;
 	} else {
 		server->rfbServerFormat.redShift = 0;
 		if ( framebufferImage->red_mask )
@@ -393,6 +405,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab)
 	server->kbdAddEvent = keyboardHook;
 	server->ptrAddEvent = pointerHook;
 	server->newClientHook = newClientHook;
+	server->inetdDisconnectHook = inetdDisconnectHook;
 	server->passwordCheck = passwordCheck;

 	if (!myCursor)
@@ -416,6 +429,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab)
 	}

 	rfbRunEventLoop(server, -1, TRUE);
+	initIdleTimer.start(IDLE_PAUSE);
 }

 void RFBController::stopServer(bool xtestUngrab)
@@ -439,6 +453,7 @@ void RFBController::connectionAccepted(bool aRC)

 	allowDesktopControl = aRC;
 	emit desktopControlSettingChanged(aRC);
+	initIdleTimer.stop();
 	idleTimer.start(IDLE_PAUSE);

 	server->rfbClientHead->clientGoneHook = clientGoneHook;
@@ -497,6 +512,7 @@ void RFBController::connectionClosed()
 			     .arg(remoteIp));

 	idleTimer.stop();
+	initIdleTimer.stop();
 	state = RFB_WAITING;
 	if (forcedClose)
 	        emit quitApp();
@@ -729,10 +745,6 @@ void RFBController::sendSessionEstablished()
        emit sessionEstablished();
 }

-#ifdef __osf__
-extern "C" Bool XShmQueryExtension(Display*);
-#endif
-
 bool RFBController::checkX11Capabilities() {
 	int bp1, bp2, majorv, minorv;
 	Bool r = XTestQueryExtension(qt_xdisplay(), &bp1, &bp2,
@@ -744,13 +756,6 @@ bool RFBController::checkX11Capabilities() {
 		return false;
 	}

-	r = XShmQueryExtension(qt_xdisplay());
-	if (!r) {
-		KMessageBox::error(0,
-		   i18n("Your X11 Server does not support the required XShm extension. You can only share a local desktop."),
-				   i18n("Desktop Sharing Error"));
-		return false;
-	}
 	return true;
 }

--- a/krfb/rfbcontroller.h
+++ b/krfb/rfbcontroller.h
@@ -158,13 +158,13 @@ signals:
 private:
 	void stopServer(bool xtestUngrab = true);
 	void sendKNotifyEvent(const QString &name, const QString &desc);
-	bool checkAsyncEvents();
 	void sendSessionEstablished();
 	
 	QString remoteIp;
 	bool allowDesktopControl;

 	QTimer idleTimer;
+	QTimer initIdleTimer;
 	Configuration *configuration;
 	XUpdateScanner *scanner;
 	ConnectionDialog dialog;
@@ -179,6 +179,7 @@ private:
 	bool closePending; // set when libvncserver detected close
 	bool forcedClose;  // set when user closed connection
 private slots:
+	bool checkAsyncEvents();
 	void idleSlot();
 	void dialogAccepted();
 	void dialogRefused();
--- a/krfb/xupdatescanner.cc
+++ b/krfb/xupdatescanner.cc
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XShm.h>
@@ -72,23 +73,42 @@ XUpdateScanner::XUpdateScanner(Display *_dpy,
 	scanline(NULL),
 	tile(NULL)
 {
-	tile = XShmCreateImage(dpy,
-			       DefaultVisual( dpy, 0 ),
-			       bitsPerPixel,
-			       ZPixmap,
-			       NULL,
-			       &shminfo_tile,
-			       tileWidth,
-			       tileHeight);
+	useShm = XShmQueryExtension(dpy);
+	
+	if (useShm) {
+		tile = XShmCreateImage(dpy,
+				       DefaultVisual( dpy, 0 ),
+				       bitsPerPixel,
+				       ZPixmap,
+				       NULL,
+				       &shminfo_tile,
+				       tileWidth,
+				       tileHeight);
+		
+		shminfo_tile.shmid = shmget(IPC_PRIVATE,
+					    tile->bytes_per_line * tile->height,
+					    IPC_CREAT | 0777);
+		shminfo_tile.shmaddr = tile->data = (char *) 
+			shmat(shminfo_tile.shmid, 0, 0);
+		shminfo_tile.readOnly = False;

-	shminfo_tile.shmid = shmget(IPC_PRIVATE,
-				    tile->bytes_per_line * tile->height,
-				    IPC_CREAT | 0777);
-	shminfo_tile.shmaddr = tile->data = (char *) 
-		shmat(shminfo_tile.shmid, 0, 0);
-	shminfo_tile.readOnly = False;
-
-	XShmAttach(dpy, &shminfo_tile);
+		XShmAttach(dpy, &shminfo_tile);
+	}
+	else {
+		int tlen = tileWidth*(bitsPerPixel/8);
+		void *data = malloc(tlen*tileHeight);
+		
+		tile = XCreateImage(dpy,
+				    DefaultVisual(dpy, 0),
+				    bitsPerPixel,
+				    ZPixmap,
+				    0,
+				    (char*)data,
+				    tileWidth,
+				    tileHeight,
+				    8,
+				    tlen);
+	}

 	tilesX = (width + tileWidth - 1) / tileWidth;
 	tilesY = (height + tileHeight - 1) / tileHeight;
@@ -99,38 +119,62 @@ XUpdateScanner::XUpdateScanner(Display *_dpy,
 	for (i = 0; i < tilesX * tilesY; i++) 
 		tileMap[i] = false;

-	scanline = XShmCreateImage(dpy,
-				   DefaultVisual(dpy, 0),
-				   bitsPerPixel,
-				   ZPixmap,
-				   NULL,
-				   &shminfo_scanline,
-				   width,
-				   1);
+	if (useShm) {
+		scanline = XShmCreateImage(dpy,
+					   DefaultVisual(dpy, 0),
+					   bitsPerPixel,
+					   ZPixmap,
+					   NULL,
+					   &shminfo_scanline,
+					   width,
+					   1);
+		
+		shminfo_scanline.shmid = shmget(IPC_PRIVATE,
+						scanline->bytes_per_line,
+						IPC_CREAT | 0777);
+		shminfo_scanline.shmaddr = scanline->data = (char *) 
+			shmat( shminfo_scanline.shmid, 0, 0 );
+		shminfo_scanline.readOnly = False;

-	shminfo_scanline.shmid = shmget(IPC_PRIVATE,
-					scanline->bytes_per_line,
-					IPC_CREAT | 0777);
-	shminfo_scanline.shmaddr = scanline->data = (char *) 
-		shmat( shminfo_scanline.shmid, 0, 0 );
-	shminfo_scanline.readOnly = False;
-
-	XShmAttach(dpy, &shminfo_scanline);
-};
+		XShmAttach(dpy, &shminfo_scanline);
+	}
+	else {
+		int slen = width*(bitsPerPixel/8);
+		void *data = malloc(slen);
+		scanline = XCreateImage(dpy,
+					DefaultVisual(dpy, 0),
+					bitsPerPixel,
+					ZPixmap,
+					0,
+					(char*)data,
+					width,
+					1,
+					8,
+					slen);
+	}
+}


 XUpdateScanner::~XUpdateScanner()
 {
-	XShmDetach(dpy, &shminfo_scanline);
-	XDestroyImage(scanline);
-	shmdt(shminfo_scanline.shmaddr);
-	shmctl(shminfo_scanline.shmid, IPC_RMID, 0);
+	if (useShm) {
+		XShmDetach(dpy, &shminfo_scanline);
+		XDestroyImage(scanline);
+		shmdt(shminfo_scanline.shmaddr);
+		shmctl(shminfo_scanline.shmid, IPC_RMID, 0);
+		XShmDetach(dpy, &shminfo_tile);
+		XDestroyImage(tile);
+		shmdt(shminfo_tile.shmaddr);
+		shmctl(shminfo_tile.shmid, IPC_RMID, 0);
+	}
+	else {
+		free(tile->data);
+		free(scanline->data);
+		XDestroyImage(scanline);
+		XDestroyImage(tile);
+	}
 	delete tileMap;
        delete tileRegionMap;
-	XShmDetach(dpy, &shminfo_tile);
-	XDestroyImage(tile);
-	shmdt(shminfo_tile.shmaddr);
-	shmctl(shminfo_tile.shmid, IPC_RMID, 0);
 }


@@ -145,12 +189,17 @@ bool XUpdateScanner::copyTile(int x, int y, int tx, int ty)
 	if (maxHeight > tileHeight) 
 		maxHeight = tileHeight;

-	if ((maxWidth == tileWidth) && (maxHeight == tileHeight)) {
-		XShmGetImage(dpy, window, tile, x, y, AllPlanes);
-	} else {
+	if (useShm) {
+		if ((maxWidth == tileWidth) && (maxHeight == tileHeight)) {
+			XShmGetImage(dpy, window, tile, x, y, AllPlanes);
+		} else {
+			XGetSubImage(dpy, window, x, y, maxWidth, maxHeight, 
+				     AllPlanes, ZPixmap, tile, 0, 0);
+		}
+	}
+	else
 		XGetSubImage(dpy, window, x, y, maxWidth, maxHeight, 
 			     AllPlanes, ZPixmap, tile, 0, 0);
-	}
 	unsigned int line;
 	int pixelsize = bitsPerPixel >> 3;
 	unsigned char *src = (unsigned char*) tile->data;
@@ -338,7 +387,11 @@ void XUpdateScanner::searchUpdates(QPtrList<Hint> &hintList)

 	y = scanlines[count];
 	while (y < height) {
-		XShmGetImage(dpy, window, scanline, 0, y, AllPlanes);
+		if (useShm)
+			XShmGetImage(dpy, window, scanline, 0, y, AllPlanes);
+		else
+			XGetSubImage(dpy, window, 0, y, width, 1, 
+				     AllPlanes, ZPixmap, scanline, 0, 0);
 		x = 0;
 		while (x < width) {
 			int pixelsize = bitsPerPixel >> 3;
--- a/krfb/xupdatescanner.h
+++ b/krfb/xupdatescanner.h
@@ -93,6 +93,7 @@ class XUpdateScanner
 	int bitsPerPixel, bytesPerLine;
 	unsigned int tileWidth, tileHeight;
 	unsigned int count;
+	bool useShm;
 	
 	XImage *scanline;
 	XShmSegmentInfo shminfo_scanline;
--- a/libvncserver/httpd.c
+++ b/libvncserver/httpd.c
@@ -116,7 +116,7 @@ httpCheckFds(rfbScreenInfoPtr rfbScreen)
    fd_set fds;
    struct timeval tv;
    struct sockaddr_in addr;
-    socklen_t addrlen = sizeof(addr);
+    size_t addrlen = sizeof(addr);

    if (!rfbScreen->httpDir)
 	return;
@@ -199,7 +199,7 @@ static void
 httpProcessInput(rfbScreenInfoPtr rfbScreen)
 {
    struct sockaddr_in addr;
-    socklen_t addrlen = sizeof(addr);
+    size_t addrlen = sizeof(addr);
    char fullFname[256];
    char *fname;
    unsigned int maxFnameLen;
--- a/libvncserver/mac.c
+++ b/libvncserver/mac.c
@@ -552,7 +552,7 @@ int main(int argc,char *argv[])
  for(i=argc-1;i>0;i--)
 #ifdef LOCAL_CONTROL
    if(i<argc-1 && !strcmp(argv[i],"-toggleviewonly")) {
-      sprintf(message,"t%s",argv[i+1]);
+      snprintf(message, sizeof(message), "t%s",argv[i+1]);
      send_message(&single_instance,message);
      exit(0);
    } else if(!strcmp(argv[i],"-listclients")) {
@@ -562,7 +562,7 @@ int main(int argc,char *argv[])
    } else
 #ifdef BACKCHANNEL
    if(i<argc-1 && !strcmp(argv[i],"-backchannel")) {
-      sprintf(message,"b%s",argv[i+1]);
+      snprintf(message, sizeof(message), "b%s",argv[i+1]);
      send_message(&single_instance,message);
      exit(0);
    } else
--- a/libvncserver/main.c
+++ b/libvncserver/main.c
@@ -35,6 +35,9 @@ typedef int socklen_t;
 #include "rfb.h"
 #include "sraRegion.h"

+/* minimum interval between attempts to send something */
+#define PING_MS 10000
+
 MUTEX(logMutex);

 int rfbEnableLogging=1;
@@ -257,11 +260,13 @@ clientOutput(void *data)
 	    UNLOCK(cl->updateMutex);

            if (!haveUpdate) {
-                WAIT(cl->updateCond, cl->updateMutex);
+                TIMEDWAIT(cl->updateCond, cl->updateMutex, PING_MS);
 		UNLOCK(cl->updateMutex); /* we really needn't lock now. */
+		if (!haveUpdate)
+		    rfbSendPing(cl);
            }
        }
-        
+
        /* OK, now, to save bandwidth, wait a little while for more
           updates to come along. */
        usleep(cl->screen->rfbDeferUpdateTime * 1000);
@@ -318,19 +323,21 @@ listenerRun(void *data)
    int client_fd;
    struct sockaddr_in peer;
    rfbClientPtr cl;
-    socklen_t len;
+    size_t len;

    if (rfbScreen->inetdSock != -1) {
       cl = rfbNewClient(rfbScreen, rfbScreen->inetdSock);
-              if (cl && !cl->onHold )
-                rfbStartOnHoldClient(cl);
+       if (cl && !cl->onHold)
+           rfbStartOnHoldClient(cl);
+       else if (rfbScreen->inetdDisconnectHook && !cl)
+           rfbScreen->inetdDisconnectHook();
       return 0;
    }

    len = sizeof(peer);

    /* TODO: this thread wont die by restarting the server */
-    while ((client_fd = accept(rfbScreen->rfbListenSock, 
+    while ((client_fd = accept(rfbScreen->rfbListenSock,
                               (struct sockaddr*)&peer, &len)) >= 0) {
        cl = rfbNewClient(rfbScreen,client_fd);
        len = sizeof(peer);
@@ -601,6 +608,7 @@ rfbScreenInfoPtr rfbGetScreen(int* argc,char** argv,
   rfbScreen->setTranslateFunction = rfbSetTranslateFunction;
   rfbScreen->newClientHook = defaultNewClientHook;
   rfbScreen->displayHook = 0;
+   rfbScreen->inetdDisconnectHook = 0;

   /* initialize client list and iterator mutex */
   rfbClientListInit(rfbScreen);
--- a/libvncserver/rfb.h
+++ b/libvncserver/rfb.h
@@ -65,8 +65,12 @@ typedef unsigned long KeySym;
 #elif defined(__APPLE__) || defined(__FreeBSD__)
 #include <sys/types.h>
 #include <machine/endian.h>
+#ifndef _BYTE_ORDER
 #define _BYTE_ORDER BYTE_ORDER
+#endif
+#ifndef _LITTLE_ENDIAN
 #define _LITTLE_ENDIAN LITTLE_ENDIAN
+#endif
 #elif defined (__SVR4) && defined (__sun) /* Solaris */
 #include <sys/types.h>
 #if defined(__sparc)
@@ -147,6 +151,10 @@ typedef unsigned long KeySym;
 #define TINI_MUTEX(mutex) pthread_mutex_destroy(&(mutex))
 #define TSIGNAL(cond) pthread_cond_signal(&(cond))
 #define WAIT(cond,mutex) pthread_cond_wait(&(cond),&(mutex))
+#define TIMEDWAIT(cond,mutex,t) {struct timeval tv;\
+  tv.tv_sec = (t) / 1000;\
+  tv.tv_usec = ((t) % 1000) * 1000;\
+  pthread_cond_timedwait(&(cond),&(mutex),&tv);}
 #define COND(cond) pthread_cond_t (cond)
 #define INIT_COND(cond) pthread_cond_init(&(cond),NULL)
 #define TINI_COND(cond) pthread_cond_destroy(&(cond))
@@ -199,6 +207,7 @@ typedef Bool (*SetTranslateFunctionProcPtr)(struct _rfbClientRec* cl);
 typedef Bool (*PasswordCheckProcPtr)(struct _rfbClientRec* cl,const char* encryptedPassWord,int len);
 typedef enum rfbNewClientAction (*NewClientHookPtr)(struct _rfbClientRec* cl);
 typedef void (*DisplayHookPtr)(struct _rfbClientRec* cl);
+typedef void (*InetdDisconnectPtr)();

 typedef struct {
  CARD32 count;
@@ -336,12 +345,14 @@ typedef struct _rfbScreenInfo
    SetXCutTextProcPtr setXCutText;
    GetCursorProcPtr getCursorPtr;
    SetTranslateFunctionProcPtr setTranslateFunction;
-  
+
    /* newClientHook is called just after a new client is created */
    NewClientHookPtr newClientHook;
    /* displayHook is called just before a frame buffer update */
    DisplayHookPtr displayHook;
-
+    /* inetdDisconnectHook is called when the connection has been
+       interrupted before a client could connect. */
+    InetdDisconnectPtr inetdDisconnectHook;
 #ifdef HAVE_PTHREADS
    MUTEX(cursorMutex);
    Bool backgroundLoop;
@@ -616,6 +627,7 @@ extern void rfbProcessClientMessage(rfbClientPtr cl);
 extern void rfbClientConnFailed(rfbClientPtr cl, char *reason);
 extern void rfbNewUDPConnection(rfbScreenInfoPtr rfbScreen,int sock);
 extern void rfbProcessUDPInput(rfbScreenInfoPtr rfbScreen);
+extern Bool rfbSendPing(rfbClientPtr cl);
 extern Bool rfbSendFramebufferUpdate(rfbClientPtr cl, sraRegionPtr updateRegion);
 extern Bool rfbSendRectEncodingRaw(rfbClientPtr cl, int x,int y,int w,int h);
 extern Bool rfbSendUpdateBuf(rfbClientPtr cl);
--- a/libvncserver/rfbserver.c
+++ b/libvncserver/rfbserver.c
@@ -200,7 +200,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
    rfbClientIteratorPtr iterator;
    rfbClientPtr cl,cl_;
    struct sockaddr_in addr;
-    socklen_t addrlen = sizeof(struct sockaddr_in);
+    size_t addrlen = sizeof(struct sockaddr_in);
    int i;

    cl = (rfbClientPtr)calloc(sizeof(rfbClientRec),1);
@@ -721,6 +721,8 @@ rfbProcessClientNormalMessage(cl)
 		}
 		break;
 	    case rfbEncodingXCursor:
+		if (cl->enableSoftCursorUpdates)
+		  break;
 		if(!cl->screen->dontConvertRichCursorToXCursor) {
 		    rfbLog("Enabling X-style cursor updates for client %s\n",
 			   cl->host);
@@ -731,9 +733,11 @@ rfbProcessClientNormalMessage(cl)
 	    case rfbEncodingRichCursor:
 	        rfbLog("Enabling full-color cursor updates for client "
 		      "%s\n", cl->host);
-	        cl->enableCursorShapeUpdates = TRUE;
-	        cl->useRichCursorEncoding = TRUE;
-	        cl->cursorWasChanged = TRUE;
+		if (cl->enableSoftCursorUpdates)
+		  break;
+		cl->enableCursorShapeUpdates = TRUE;
+		cl->useRichCursorEncoding = TRUE;
+		cl->cursorWasChanged = TRUE;
 	        break;
 	    case rfbEncodingSoftCursor:
 	        rfbLog("Enabling soft cursor updates for client "
@@ -741,6 +745,8 @@ rfbProcessClientNormalMessage(cl)
 	        cl->enableSoftCursorUpdates = TRUE;
 	        cl->cursorWasChanged = TRUE;
 	        cl->cursorWasMoved = TRUE;
+		cl->enableCursorShapeUpdates = FALSE;
+		cl->useRichCursorEncoding = FALSE;
 	        break;
 	    case rfbEncodingLastRect:
 		if (!cl->enableLastRectEncoding) {
@@ -909,6 +915,22 @@ rfbProcessClientNormalMessage(cl)
 }


+/*
+ * rfbSendPing - send an empty framebuffer request
+ */
+
+Bool
+rfbSendPing(cl)
+     rfbClientPtr cl;
+{
+    rfbFramebufferUpdateMsg *fu = (rfbFramebufferUpdateMsg *)cl->updateBuf;
+    cl->rfbFramebufferUpdateMessagesSent++;
+    fu->type = rfbFramebufferUpdate;
+    fu->nRects = Swap16IfLE((CARD16)0);
+    cl->ublen = sz_rfbFramebufferUpdateMsg;
+    return TRUE;
+}
+

 /*
 * rfbSendFramebufferUpdate - send the currently pending framebuffer update to
--- a/libvncserver/sockets.c
+++ b/libvncserver/sockets.c
@@ -183,7 +183,7 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec)
    fd_set fds;
    struct timeval tv;
    struct sockaddr_in addr;
-    socklen_t addrlen = sizeof(addr);
+    size_t addrlen = sizeof(addr);
    char buf[6];
    const int one = 1;
    int sock;
@@ -369,7 +369,8 @@ rfbConnect(rfbScreen, host, port)
 /*
 * ReadExact reads an exact number of bytes from a client.  Returns 1 if
 * those bytes have been read, 0 if the other end has closed, or -1 if an error
- * occurred (errno is set to ETIMEDOUT if it timed out).
+ * occurred (errno is set to ETIMEDOUT if it timed out). 
+ * timeout is the timeout in ms, 0 for no timeout.
 */

 int
@@ -379,6 +380,9 @@ ReadExactTimeout(rfbClientPtr cl, char* buf, int len, int timeout)
    int n;
    fd_set fds;
    struct timeval tv;
+    int to = 20000;
+    if (timeout)
+	to = timeout;

    while (len > 0) {
        n = read(sock, buf, len);
@@ -402,14 +406,14 @@ ReadExactTimeout(rfbClientPtr cl, char* buf, int len, int timeout)

            FD_ZERO(&fds);
            FD_SET(sock, &fds);
-            tv.tv_sec = timeout / 1000;
-            tv.tv_usec = (timeout % 1000) * 1000;
+            tv.tv_sec = to / 1000;
+            tv.tv_usec = (to % 1000) * 1000;
            n = select(sock+1, &fds, NULL, &fds, &tv);
            if (n < 0) {
                rfbLogPerror("ReadExact: select");
                return n;
            }
-            if (n == 0) {
+            if ((n == 0) && timeout) {
                errno = ETIMEDOUT;
                return -1;
            }
@@ -420,7 +424,7 @@ ReadExactTimeout(rfbClientPtr cl, char* buf, int len, int timeout)

 int ReadExact(rfbClientPtr cl,char* buf,int len)
 {
-  return(ReadExactTimeout(cl,buf,len,rfbMaxClientWait));
+    return ReadExactTimeout(cl, buf, len, 0);
 }

 /*
--- a/libvncserver/sraRegion.c
+++ b/libvncserver/sraRegion.c
@@ -83,8 +83,7 @@ void
 sraSpanCheck(const sraSpan *span, const char *text) {
  /* Check the span is valid! */
  if (span->start == span->end) {
-    printf(text); 
-    printf(":%d-%d\n", span->start, span->end);
+    printf("%s:%d-%d\n", text, span->start, span->end); 
    exit(0);
  }
 }
--- a/libvncserver/x11vnc.c
+++ b/libvncserver/x11vnc.c
@@ -338,7 +338,7 @@ int main(int argc,char** argv)
  for(i=argc-1;i>0;i--)
 #ifdef LOCAL_CONTROL
    if(i<argc-1 && !strcmp(argv[i],"-toggleviewonly")) {
-      sprintf(message,"t%s",argv[i+1]);
+      snprintf(message, sizeof(message), "t%s",argv[i+1]);
      send_message(&single_instance,message);
      exit(0);
    } else if(!strcmp(argv[i],"-listclients")) {
@@ -348,7 +348,7 @@ int main(int argc,char** argv)
    } else
 #ifdef BACKCHANNEL
    if(i<argc-1 && !strcmp(argv[i],"-backchannel")) {
-      sprintf(message,"b%s",argv[i+1]);
+      snprintf(message, sizeof(message), "b%s",argv[i+1]);
      send_message(&single_instance,message);
      exit(0);
    } else
--- a/srvloc/kinetaddr.cpp
+++ b/srvloc/kinetaddr.cpp
@@ -34,16 +34,15 @@
 #include "kinetaddr.h"
 #include <netdb.h>

-#if defined(__osf__) && defined(AF_INET6)
-#undef AF_INET6
-#endif
+#include <sys/types.h> 
+#include <sys/socket.h> 
+#include <netinet/in.h> 
+#include <arpa/inet.h> 
+#include <arpa/nameser.h> 
+#include <resolv.h>

-#define V6_CAN_CONVERT_TO_V4(addr)	(KDE_IN6_IS_ADDR_V4MAPPED(addr) || KDE_IN6_IS_ADDR_V4COMPAT(addr))
-
-// This is how it is
-// 46 == strlen("1234:5678:9abc:def0:1234:5678:255.255.255.255")
-#ifndef INET6_ADDRSTRLEN
-#define INET6_ADDRSTRLEN		46
+#ifdef sun
+#include <sys/socket.h>
 #endif

 class KInetAddressPrivate
@@ -51,16 +50,10 @@ class KInetAddressPrivate
 public:
 	int sockfamily;
 	struct in_addr in;
-#ifdef AF_INET6
-	struct in6_addr in6;
-#endif

 	KInetAddressPrivate() : sockfamily(AF_UNSPEC)
 	{
 		memset((void*)&in, 0, sizeof(in));
-#ifdef AF_INET6
-		memset((void*)&in6, 0, sizeof(in6));
-#endif
 	}

 };
@@ -70,9 +63,6 @@ KInetAddress::KInetAddress(const KInetAddress &other) :
 {
 	d->sockfamily = other.d->sockfamily;
 	memcpy(&d->in, &other.d->in, sizeof(d->in));
-#ifdef AF_INET6
-	memcpy(&d->in6, &other.d->in6, sizeof(d->in6));
-#endif
 }

 KInetAddress::KInetAddress(const struct in_addr& in) :
@@ -82,17 +72,6 @@ KInetAddress::KInetAddress(const struct in_addr& in) :
 	memcpy(&d->in, &in, sizeof(in));
 }

-KInetAddress::KInetAddress(const struct in6_addr& in6) :
-	d(new KInetAddressPrivate)
-{
-#ifdef AF_INET6
-	d->sockfamily = AF_INET6;
-	memcpy(&d->in6, &in6, sizeof(in6));
-#else
-	d->sockfamily = AF_UNSPEC;
-#endif
-}
-
 KInetAddress::KInetAddress(const QString &host) :
 	d(new KInetAddressPrivate)
 {
@@ -102,16 +81,7 @@ KInetAddress::KInetAddress(const QString &host) :
 		return;
 	}
 	d->sockfamily = h->h_addrtype;
-#ifdef AF_INET6
-	if (h->h_addrtype == AF_INET6)
-		memcpy(&d->in6, h->h_addr_list[0], h->h_length);
-	else
-		memcpy(&d->in, h->h_addr_list[0], h->h_length);
-#else
 	memcpy(&d->in, h->h_addr_list[0], h->h_length);
-#endif
-
-	
 }

 KInetAddress::~KInetAddress()
@@ -125,19 +95,11 @@ const struct in_addr *KInetAddress::addressV4() const {
 	return &d->in;
 }

-#ifdef AF_INET6
-const struct in6_addr *KInetAddress::addressV6() const {
-	if (d->sockfamily != AF_INET6)
-		return 0;
-	return &d->in6;
-}
-#endif
-
 QString KInetAddress::nodeName() const
 {
-	char buf[INET6_ADDRSTRLEN+1];	// INET6_ADDRSTRLEN > INET_ADDRSTRLEN
+	char buf[INET_ADDRSTRLEN+1];

-#ifdef __osf__
+#ifdef __osf__ || defined(sun)
 	if (d->sockfamily == AF_INET) {
 	    char *p = inet_ntoa(d->in);
 	    strncpy(buf, p, sizeof(buf));
@@ -145,10 +107,6 @@ QString KInetAddress::nodeName() const
 #else
 	if (d->sockfamily == AF_INET)
 		inet_ntop(d->sockfamily, (void*)&d->in, buf, sizeof(buf));
-#endif
-#ifdef AF_INET6
-	else if (d->sockfamily == AF_INET6)
-		inet_ntop(d->sockfamily, (void*)&d->in6, buf, sizeof(buf));
 #endif
 	else {
 		kdWarning() << "KInetAddress::nodeName() called on uninitialized class\n";
@@ -167,12 +125,6 @@ bool KInetAddress::areEqual(const KInetAddress &a1, const KInetAddress &a2)
 		return (memcmp(&a1.d->in.s_addr, &a2.d->in.s_addr, 
 			sizeof(a1.d->in.s_addr))  == 0);
 	}
-#ifdef AF_INET6
-	if (a1.d->sockfamily == AF_INET6) {
-		return (memcmp(&a1.d->in6.s6_addr, &a2.d->in6.s6_addr, 
-			sizeof(a1.d->in6.s6_addr))  == 0);
-	}
-#endif
 	return true;
 }

--- a/srvloc/kinetaddr.h
+++ b/srvloc/kinetaddr.h
@@ -42,9 +42,9 @@ class KInetAddressPrivate;


 /**
- * An Inet (IPv4 or IPv6) address.
+ * An Inet (IPv4) address.
 *
- * This class represents an internet (IPv4 or IPv6) address. The difference
+ * This class represents an internet (IPv4) address. The difference
 * between KInetAddress and KInetSocketAddress is that the socket address
 * consists of the address and the port, KInetAddress peresents only the 
 * address itself.
@@ -66,13 +66,6 @@ public:
   */
  KInetAddress(const struct in_addr& in);

-  /**
-   * Creates an IPv6 socket from in6_addr
-   * @param in6       	a in_addr6 structure to copy from
-   * @param len		the socket address length
-   */
-  KInetAddress(const struct in6_addr& in6);
-
  /**
   * Creates a socket from text representation. Be careful with names
   * as they may require a name server lookup which can block for a 
@@ -104,24 +97,12 @@ public:
   * Returns the in_addr structure. The pointer is valid as long as
   * the KInetAddress object lives.
   * This will be NULL if this is not a v4 address.
-   * @see addressV6
   */
  const struct in_addr* addressV4() const;

-  /**
-   * Returns the in6_addr structure. The pointer is valid as long as
-   * the KInetAddress object lives.
-   * This will be NULL if this is not a v6 address.
-   * @see addressV4
-   */
-  const struct in6_addr* addressV6() const;
-
  operator const struct in_addr*() const
  { return addressV4(); }

-  operator const struct in6_addr*() const
-  { return addressV6(); }
-
  /**
   * Returns an address that can be used for communication with
   * other computers on the internet.
--- a/srvloc/kinetaddr_ipfinder.cpp
+++ b/srvloc/kinetaddr_ipfinder.cpp
@@ -61,8 +61,8 @@
 #endif


-static char *local_address = NULL;
-static char *inet_address = NULL;
+static const char *local_address = NULL;
+static const char *inet_address = NULL;

 /* max number of network interfaces*/
 #define MAX_IF 8
@@ -85,7 +85,8 @@ char *getdefaultdev()
 	FILE *fp = fopen( PROCROUTE, "r");
 	char buff[4096], gate_addr[128], net_addr[128];
 	char mask_addr[128];
-	int irtt, window, mss, num, metric, iflags, refcnt, use;
+	int irtt, window, mss, num, metric, refcnt, use;
+        unsigned int iflags;
 	char i;
 	if( !fp ) {
 		return NULL;
@@ -93,9 +94,9 @@ char *getdefaultdev()
 	i=0;
 // cruise through the list, and find the gateway interface
 	while( fgets(buff, 1023, fp) ) {
-		num = sscanf(buff, "%s %s %s %X %d %d %d %s %d %d %d\n",
+		num = sscanf(buff, "%15s %127s %127s %X %d %d %d %127s %d %d %d\n",
 			iface, net_addr, gate_addr, &iflags, &refcnt, &use, &metric,
-			&mask_addr, &mss, &window, &irtt);
+			mask_addr, &mss, &window, &irtt);
 		i++;
 		if( i == 1) continue;
Author	SHA1	Message	Date
Script Kiddy	67fc034a88	CVS_SILENT made messages svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=247739	2003-09-02 05:13:35 +00:00
Tim Jansen	47a9860950	Use QApplication::desktop() to obtain the QDesktopWidget, as recommended in the Qt docs. This will hopefully solve bug 61904. CCMAIL: 61904-done@bugs.kde.org svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=240312	2003-07-31 22:57:16 +00:00
Script Kiddy	5824df3d9f	CVS_SILENT made messages svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=236950	2003-07-14 05:36:30 +00:00
Tim Jansen	6eb9167230	backport: don't hang on portscan svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=236038	2003-07-07 22:25:29 +00:00
Tim Jansen	46fc25b68f	fix crash on portscan svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=236016	2003-07-07 21:20:48 +00:00
Script Kiddy	0b22ba1ee5	CVS_SILENT made messages svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=235689	2003-07-06 03:08:51 +00:00
Dirk Mueller	6a52b895d2	fix makefile svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=234922	2003-07-01 17:14:55 +00:00
Script Kiddy	e5b2f4e8a9	CVS_SILENT made messages svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=231476	2003-06-15 01:34:13 +00:00
Tim Jansen	92b5684d60	Remove all references to IPv6 as IPv6 addresses will never be displayed anyway and the class is not contained in HEAD anymore. (Adventurous attempt to create a version that compiles on all Solaris versions at the same time...) svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=228317	2003-05-27 18:44:34 +00:00
Dirk Mueller	17d258e590	compiler warning fixes QByteArray -> QCString conversion fixes svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=226551	2003-05-18 14:51:20 +00:00
Script Kiddy	aac12c0641	CVS_SILENT made messages svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=223116	2003-05-01 02:49:04 +00:00
Tim Jansen	ec5aec621c	Get rid of in6_addr (on systems without AF_INET6) svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=219162	2003-04-08 21:56:42 +00:00
Script Kiddy	78d6970930	CVS_SILENT made messages svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=218189	2003-04-04 01:32:14 +00:00
Tim Jansen	fe4bbda0c5	#53620 : solaris 7 problems / AF_INET6 compilation problems again svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=216209	2003-03-25 19:37:17 +00:00
Tim Jansen	0b256c5117	#54873 : get rid of socklen_t which is not available on Solaris 2.6 svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=215975	2003-03-24 12:44:23 +00:00
Tim Jansen	12e8effc1a	#51792 : a bunch of includes to make Solaris 2/6 happy svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=215971	2003-03-24 12:26:25 +00:00
Tim Jansen	98debc4910	Make krfb work on thin-clients without XShm. You need a lot of bandwidth though... svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=205753	2003-02-09 01:10:59 +00:00
Tim Jansen	a65c5fd148	Fix #52126 (krfb mangles colours when serving 8-bit displays) svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=205627	2003-02-08 13:04:33 +00:00
Tim Jansen	1405623863	fix krfb on machines with big-endian framebuffers svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=205094	2003-02-05 18:49:51 +00:00
Tim Jansen	612e3b8aab	Fix behaviour for clients that support soft cursor and rich cursor encodings (like krdc will soon): soft cursor has the higher priority svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=204221	2003-02-01 19:35:40 +00:00
Tim Jansen	f80311e260	#53620 : krfb did not compile on Solaris 7 svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=203810	2003-01-30 22:39:31 +00:00
Tim Jansen	caab1aad51	Backport from HEAD: Remove read timeouts. Instead make sure to send something at least every 10 seconds (empty framebuffer requests if nothing else has been sent). This fixes problems with the windows vnc client which had been kicked after a minute of inactivity without losing the capability to detect dead clients. svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=201809	2003-01-21 21:31:43 +00:00
Tim Jansen	9a4432a0fd	#51792 : Compile patch for solaris versions without IPv6 svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=201807	2003-01-21 21:15:28 +00:00
Dirk Mueller	fefe8c1a11	don't interpret format strings here (backport) svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=199229	2003-01-12 13:14:55 +00:00
Waldo Bastian	6b36501ba0	CCMAIL: peter@hawkins.emu.id.au string fixes, patches by Peter Hawkins <peter@hawkins.emu.id.au> svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=194091	2002-12-15 15:44:47 +00:00
Luboš Luňák	7426b84321	Max size limits for scanf(). Correct arguments to scanf() - people, can't you read the warnings? Got rid of two more warnings. svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=192448	2002-12-06 16:01:45 +00:00
Lauri Watts	b04b1591e5	Fixing Date svn path=/branches/KDE_3_1_BRANCH/kdenetwork/doc/krfb/; revision=191476	2002-12-01 18:57:36 +00:00
Andy Fawcett	42f9c6e578	+#ifndef _BYTE_ORDER #define _BYTE_ORDER BYTE_ORDER +#endif +#ifndef _LITTLE_ENDIAN #define _LITTLE_ENDIAN LITTLE_ENDIAN +#endif These are already defined on FreeBSD, so don't try and do it again. Previously applied to HEAD, these didn't make it to the release or the branch. svn path=/branches/KDE_3_1_BRANCH/kdenetwork/krfb/; revision=191459	2002-12-01 17:13:07 +00:00