SVN_SILENT made messages (.desktop file)

svn path=/branches/KDE/4.1/kdenetwork/krfb/; revision=853066
2026-07-02 00:01:18 -07:00 · 2008-08-27 06:05:19 +00:00 · 2008-07-12 23:36:58 +00:00 · 2008-07-01 20:45:46 +00:00 · 2008-06-19 11:31:52 +00:00 · 2008-06-06 21:50:23 +00:00
32 changed files with 582 additions and 262 deletions
--- a/.krazy
+++ b/.krazy
@@ -1,2 +1 @@
 SKIP /kinetd/
-
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,12 +39,12 @@ kde4_add_ui_files(krfb_SRCS connectionwidget.ui

 kde4_add_executable(krfb ${krfb_SRCS})

-target_link_libraries(krfb ${JPEG_LIBRARIES} ${SLP_LIBRARIES} ${LIBVNCSERVER_LIBRARIES} ${X11_Xdamage_LIB} ${KDE4_KDNSSD_LIBRARY})
+target_link_libraries(krfb ${JPEG_LIBRARIES}  ${LIBVNCSERVER_LIBRARIES} ${X11_Xdamage_LIB} ${KDE4_KDNSSD_LIBS})
 if(X11_XTest_FOUND)
-  target_link_libraries(krfb ${X11_XTest_Lib})
+  target_link_libraries(krfb ${X11_XTest_LIB})
 endif(X11_XTest_FOUND)

-install(TARGETS krfb  DESTINATION ${BIN_INSTALL_DIR})
+install(TARGETS krfb  ${INSTALL_TARGETS_DEFAULT_ARGS})

 ########### install files ###############

--- a/connectioncontroller.cpp
+++ b/connectioncontroller.cpp
@@ -4,8 +4,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #include "connectioncontroller.h"
 #include "connectioncontroller.moc"
@@ -154,7 +154,7 @@ bool ConnectionController::handleCheckPassword(rfbClientPtr cl, const char *resp
    if (!authd) {
        QList<Invitation> invlist = InvitationManager::self()->invitations();

-        foreach(Invitation it, invlist) {
+        foreach(const Invitation &it, invlist) {
            kDebug() << "checking password";
            if (checkPassword(it.password(), cl->authChallenge, response, len) && it.isValid()) {
                authd = true;
--- a/connectioncontroller.h
+++ b/connectioncontroller.h
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #ifndef CONNECTIONCONTROLLER_H
--- a/events.cpp
+++ b/events.cpp
@@ -4,8 +4,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #include "events.h"
--- a/events.h
+++ b/events.h
@@ -4,8 +4,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #ifndef EVENTS_H
--- a/framebuffer.cpp
+++ b/framebuffer.cpp
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #include "framebuffer.h"
--- a/framebuffer.h
+++ b/framebuffer.h
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #ifndef FRAMEBUFFER_H
--- a/invitationmanager.cpp
+++ b/invitationmanager.cpp
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #include "invitationmanager.h"
 #include "invitationmanager.moc"
--- a/invitationmanager.h
+++ b/invitationmanager.h
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #ifndef INVITATIONMANAGER_H
 #define INVITATIONMANAGER_H
--- a/invitedialog.cpp
+++ b/invitedialog.cpp
@@ -33,8 +33,8 @@ InviteDialog::InviteDialog( QWidget *parent )
 {
  setCaption(i18n("Invitation"));
  setButtons(User1|Close|Help);
+  setHelp(QString(), "krfb");
  setDefaultButton(NoDefault);
-  setModal(true);

  setMinimumSize(500, 300);

--- a/invitewidget.ui
+++ b/invitewidget.ui
@@ -47,10 +47,7 @@
     <item>
      <widget class="QLabel" name="helpLabel" >
       <property name="text" >
-        <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">KDE Desktop Sharing allows you to invite somebody at a remote location to watch and possibly control your desktop. &lt;a href="whatsthis">More about invitations...&lt;/a>&lt;/p>&lt;/body>&lt;/html></string>
+        <string>KDE Desktop Sharing allows you to invite somebody at a remote location to watch and possibly control your desktop. &lt;a href="whatsthis">More about invitations...&lt;/a></string>
       </property>
       <property name="textFormat" >
        <enum>Qt::RichText</enum>
@@ -58,11 +55,8 @@ p, li { white-space: pre-wrap; }
       <property name="wordWrap" >
        <bool>true</bool>
       </property>
-       <property name="openExternalLinks" >
-        <bool>false</bool>
-       </property>
       <property name="textInteractionFlags" >
-        <set>Qt::LinksAccessibleByMouse</set>
+        <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction</set>
       </property>
      </widget>
     </item>
--- a/kcm_krfb/kcmkrfb.desktop
+++ b/kcm_krfb/kcmkrfb.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Icon=krfb
 Exec=kcmshell4 kcmkrfb
 Type=Service
-DocPath=krfb/krfb-configuration.html
-ServiceTypes=KCModule
+X-DocPath=krfb/krfb-configuration.html
+X-KDE-ServiceTypes=KCModule


 X-KDE-Library=kcm_krfb
@@ -14,6 +13,7 @@ X-KDE-ParentApp=kcontrol
 Name=Desktop Sharing
 Name[af]=Werkskerm Deeling
 Name[bg]=Споделяне на работното място
+Name[bn]=ডেস্কটপ ভাগাভাগি
 Name[br]=Rannañ ar vurev
 Name[ca]=Compartició de l'escriptori
 Name[cs]=Sdílení pracovní plochy
@@ -21,7 +21,7 @@ Name[cy]=Rhannu Penbwrdd
 Name[da]=Desktopdeling
 Name[de]=Arbeitsflächen-Freigabe
 Name[el]=Κοινή χρήση επιφάνειας εργασίας
-Name[eo]=Tabuloj komunaj
+Name[eo]=Tabula komunigado
 Name[es]=Escritorio compartido
 Name[et]=Töölaua jagamine
 Name[eu]=Mahaigain partekatzea
@@ -31,6 +31,7 @@ Name[fr]=Partage de bureau
 Name[ga]=Roinnt Deisce
 Name[gl]=Compartilla do escritorio
 Name[he]=שיתוף שולחנות עבודה
+Name[hi]=डेस्कटॉप साझेदारी
 Name[hr]=Dijeljenje radne površine
 Name[hu]=Munkaasztal-megosztás
 Name[is]=Skjáborðamiðlun
@@ -40,6 +41,7 @@ Name[kk]=Үстелді ортақтастыру
 Name[km]=ការចែករំលែកផ្ទៃតុ
 Name[ko]=데스크톱 공유
 Name[lt]=Dalinimasis darbastaliu
+Name[lv]=Darbvirsmas koplietošana
 Name[mk]=Делење на работната површина
 Name[ms]=Perkongsian Ruang Kerja
 Name[nb]=Delte skrivebord
@@ -47,15 +49,14 @@ Name[nds]=Schriefdisch-Freegaav
 Name[ne]=डेस्कटप साझेदारी
 Name[nl]=Bureaublad delen
 Name[nn]=Skrivebordsdeling
+Name[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
 Name[pl]=Współdzielenie pulpitu
 Name[pt]=Partilha do Ecrã
 Name[pt_BR]=Compartilhamento do Desktop
-Name[ro]=Partajare ecran
 Name[ru]=Общий рабочий стол
 Name[se]=Čállinbeavdejuohkkin
+Name[sk]=Zdieľanie pracovnej plochy
 Name[sl]=Deljenje namizja
-Name[sr]=Дељење радне површине
-Name[sr@latin]=Deljenje radne površine
 Name[sv]=Dela ut skrivbordet
 Name[ta]=பணிமேடை பகிர்வு
 Name[tg]=Истифодабарии муштараки Мизи корӣ
@@ -71,6 +72,7 @@ Name[zh_TW]=桌面分享
 Comment=Configure Desktop Sharing
 Comment[af]=Konfigureer Werkskerm Deeling
 Comment[bg]=Настройване споделянето на работното място
+Comment[bn]=ডেস্কটপ ভাগাভাগি কনফিগার করুন
 Comment[br]=Kefluniañ rannañ ar vurev
 Comment[ca]=Lupa de l'escriptori
 Comment[cs]=Nastavit sdílení pracovní plochy
@@ -78,7 +80,7 @@ Comment[cy]=Ffurfweddu Rhannu Penbwrdd
 Comment[da]=Indstil desktopdeling
 Comment[de]=Freigabe der Arbeitsfläche einrichten
 Comment[el]=Ρύθμιση της κοινής χρήσης της επιφάνειας εργασίας
-Comment[eo]=Agordu fordonadon de viaj tabuloj
+Comment[eo]=Agordi la tabulan komunigadon
 Comment[es]=Configure su escritorio compartido
 Comment[et]=Töölaua jagamise seadistamine
 Comment[eu]=Konfiguratu mahaigain partekatzea
@@ -88,6 +90,7 @@ Comment[fr]=Configuration du partage du bureau
 Comment[ga]=Cumraigh Roinnt Deisce
 Comment[gl]=Configurar a compartilla do escritorio
 Comment[he]=שינוי הגדרות שיתוף שולחנות העבודה
+Comment[hi]=डेस्कटॉप साझेदारी कॉन्फ़िगर करें
 Comment[hr]=Podešavanje dijeljenja radne površine
 Comment[hu]=A munkaasztal-megosztás beállításai
 Comment[is]=Stilla skjáborðsmiðlun
@@ -96,7 +99,8 @@ Comment[ja]=デスクトップ共有の設定
 Comment[kk]=Үстелді ортақтастыруды баптау
 Comment[km]=កំណត់រចនាសម្ព័ន្ធការចែករំលែកផ្ទៃតុ
 Comment[ko]=데스크톱 공유 설정
-Comment[lt]=Derinti dalinimąsi darbastaliu
+Comment[lt]=Konfigūruoti dalinimąsi darbastaliu
+Comment[lv]=Konfigurē darbvirsmas koplietošanu
 Comment[mk]=Конфигурирајте делење на површината
 Comment[ms]= Selaraskan Perkongsian Desktop
 Comment[nb]=Tilpass delte skrivebord
@@ -104,14 +108,14 @@ Comment[nds]=Schriefdisch-Freegaav instellen
 Comment[ne]=डेस्कटप साझेदारी कन्फिगर गर्नुहोस्
 Comment[nl]=Bureaublad delen instellen
 Comment[nn]=Set opp skrivebordsdeling
+Comment[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ ਸੰਰਚਨਾ
 Comment[pl]=Konfiguracja współdzielenia pulpitu
 Comment[pt]=Configurar 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]=Подешавање дељења радне површине
-Comment[sr@latin]=Podešavanje deljenja radne površine
 Comment[sv]=Anpassa utdelning av skrivbord
 Comment[ta]=பணிமேடை பகிர்வை உள்ளமை
 Comment[tg]=Батанзимдарории Истифодабарии муштараки Мизи корӣ
@@ -123,48 +127,48 @@ Comment[xh]=Qwalasela Ukusebenzisa ngokuhlangeneyo kwe Desktop
 Comment[zh_CN]=配置桌面共享
 Comment[zh_HK]=設定桌面分享
 Comment[zh_TW]=設定桌面分享
-Keywords=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
-Keywords[bg]=Keywords=споделяне, работно, място, десктоп, покана, връзка, desktop sharing, krfb, vnc, sharing, krdc, remote desktop connection, invitation, port, slp, uninvited
-Keywords[ca]=compartició de l'escriptori,krfb,vnc,compartir,krdc,connexió a l'escriptori remot,invitació,port,slp,no invitat
-Keywords[cs]=sdílení plochy,krfb,vnc,sdílení,rdp,krdc,připojení vzdálené plochy,pozvánka,port,slp
-Keywords[cy]=rhannu penbwrdd,krfb,vnc,rhannu,rdp,krdc,cysylltiad penbwrdd pell,gwahoddiad,porth,slp,heb wahoddiad
-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,rdp,remote desktop
-Keywords[el]=κοινή χρήση επιφάνειας εργασίας,krfb,vnc,κοινή χρήση,krdc,σύνδεση σε απομακρυσμένη επιφάνεια εργασίας,πρόσκληση,θύρα,slp,απρόσκλητο
-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[eu]=mahaigain partekatzea,krfb,vnc,partekatzea,krdc,urruneko mahaigain konexioa,gonbidapena,ataka,slp,gonbidapen gabea
-Keywords[fa]=اشتراک رومیزی، krfb، vnc، اتصال رومیزی راه دور، دعوت، درگاه، slp، دعوت‌نشده
-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]=compartilla de escritorio, vnc, compartir, krdc, conexón ao escritorio remoto, invitación, porto, slt, convidado, compartillar
-Keywords[he]=שיתוף שולחן עבודה,שיתוף,חיבור לשולחן עבודה מרוחק,desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection, invitation, port, slp, uninvited
-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,リモートデスクトップ接続,招待,ポート,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[nds]=schriefdisch,freegeven,freegaav,krfb,vnc,delen,krdc,feern Schriefdisch,verbinnen,inladen,port,slp,nich inlaadt
-Keywords[ne]=डेस्कटप साझेदारी,krfb,vnc,साझेदारी,krdc, टाढाको डेस्कटप जडान,निमन्त्रणा,पोर्ट,slp,निमन्त्रणा नगरिएको
-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
-Keywords[pt_BR]=compartilhamento de desktop,krfb,vnc,compartilhamento,krdc,conexão a desktop remoto,convite,porta,slp,não convidado
-Keywords[sl]=namizje,souporaba,krfb,vnc,krdc,povezava oddaljenega namizja, povabilo,port,slp,nepovabljen
-Keywords[sr]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,радна површина,дељење,позив,порт,непозван,удаљено
-Keywords[sr@latin]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,radna površina,deljenje,poziv,port,nepozvan,udaljeno
-Keywords[sv]=dela skrivbord,krfb,vnc,dela,krdc,fjärrskrivbordsanslutning,inbjudan,port,slp
-Keywords[ta]=பணிமேடை பகிர்வு,krfb,vnc,பகிர்வு,krdc,தொலை பணிமேடை இணைப்பு,அழைப்பிதழ், துறை, slp, uninvited
-Keywords[tr]=masaüstü paylaşımı,krfb,vnc,paylaşım,krdc,uzak masaüstü bağlantısı,davet,port,slp
-Keywords[uk]=спільні стільниці,krfb,vnc,спільний,rdp,krdc,з'єднання віддаленої стільниці,запрошення,rdp,slp,без запрошення
-Keywords[vi]=chia sẻ màn hình,krfb,vnc,chia sẻ,krdc,màn hình ở xa kết nối,mời kết nối,cổng,slp,không được mời
-Keywords[x-test]=xxdesktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvitedxx
-Keywords[zh_CN]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,桌面共享,共享,远程桌面连接,邀请,端口,未邀请
-Keywords[zh_TW]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,rdp,桌面分享,分享,遠端桌面連線,invitation,port,slp,uninvited
+X-KDE-Keywords=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
+X-KDE-Keywords[bg]=Keywords=споделяне, работно, място, десктоп, покана, връзка, desktop sharing, krfb, vnc, sharing, krdc, remote desktop connection, invitation, port, slp, uninvited
+X-KDE-Keywords[ca]=compartició de l'escriptori,krfb,vnc,compartir,krdc,connexió a l'escriptori remot,invitació,port,slp,no invitat
+X-KDE-Keywords[cs]=sdílení plochy,krfb,vnc,sdílení,rdp,krdc,připojení vzdálené plochy,pozvánka,port,slp
+X-KDE-Keywords[cy]=rhannu penbwrdd,krfb,vnc,rhannu,rdp,krdc,cysylltiad penbwrdd pell,gwahoddiad,porth,slp,heb wahoddiad
+X-KDE-Keywords[da]=desktopdeling,krfb,vnc,deling,krdc,ekstern desktopforbindelse,invitation,port,slp,ikke inviteret
+X-KDE-Keywords[de]=Arbeitsfläche freigeben,krfb,VNC,freigeben,krdc,Entfernte Arbeitsfläche,Einladung,Port,slp,uneingeladen,rdp,remote desktop
+X-KDE-Keywords[el]=κοινή χρήση επιφάνειας εργασίας,krfb,vnc,κοινή χρήση,krdc,σύνδεση σε απομακρυσμένη επιφάνεια εργασίας,πρόσκληση,θύρα,slp,απρόσκλητο
+X-KDE-Keywords[es]=escritorio compartido,krfb,vnc,compartir,rdp,krdc, conexión escritorio remoto,invitación,puerto,slp,no invitado
+X-KDE-Keywords[et]=töölaua jagamine,krfb,vnc,jagamine,rdp,krdc,kaugtöölaua ühendus,rdp,kutse,port,slp,kutsumata
+X-KDE-Keywords[eu]=mahaigain partekatzea,krfb,vnc,partekatzea,krdc,urruneko mahaigain konexioa,gonbidapena,ataka,slp,gonbidapen gabea
+X-KDE-Keywords[fa]=اشتراک رومیزی، krfb، vnc، اتصال رومیزی راه دور، دعوت، درگاه، slp، دعوت‌نشده
+X-KDE-Keywords[fi]=työpöydän jakaminen,krfb,vnc,jakaminen,krdc,etätyöpöytäyhteys, kutsu,portti,slp,kutsumaton, työpöytä
+X-KDE-Keywords[fr]=partage de bureau,krfb,vnc,partage,rdp,krdc,connexion à un bureau distant,invitation,port,slp,non invité
+X-KDE-Keywords[gl]=compartilla de escritorio, vnc, compartir, krdc, conexón ao escritorio remoto, invitación, porto, slt, convidado, compartillar
+X-KDE-Keywords[he]=שיתוף שולחן עבודה,שיתוף,חיבור לשולחן עבודה מרוחק,desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection, invitation, port, slp, uninvited
+X-KDE-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
+X-KDE-Keywords[is]=skjáborðsmiðlun,miðlun,krfb,vnc,rdp,krdc,fjarvinnsla,remote desktop connection,rdp
+X-KDE-Keywords[it]=condivisione desktop,krfb,vnc,condivisione,krdc,connessione desktop remoto,invito,porta,slp,non invitato
+X-KDE-Keywords[ja]=デスクトップ共有,krfb,vnc,共有,rdp,krdc,リモートデスクトップ接続,招待,ポート,slp,uninvited
+X-KDE-Keywords[km]=ការចែករំលែកផ្ទៃតុ,krfb,vnc,ការចែករំលែក,krdc,ការតភ្ជាប់ផ្ទៃតុពីចម្ងាយ,អញ្ជើញ,ច្រក,slp,មិនបានអញ្ជើញ
+X-KDE-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
+X-KDE-Keywords[mk]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,делење на површината,krfb,vnc,делење,krdc,поврзување со оддалечена  површина,покана,порта,slp,непоканет
+X-KDE-Keywords[ms]= perkongsian ruang kerja, sambungan, liang, desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
+X-KDE-Keywords[nb]=skrivebordsdeling,krfb,vnc,deling,krdc,tilkobling til fjernt skrivebord,invitasjon,port,slp,ikke invitert
+X-KDE-Keywords[nds]=schriefdisch,freegeven,freegaav,krfb,vnc,delen,krdc,feern Schriefdisch,verbinnen,inladen,port,slp,nich inlaadt
+X-KDE-Keywords[ne]=डेस्कटप साझेदारी,krfb,vnc,साझेदारी,krdc, टाढाको डेस्कटप जडान,निमन्त्रणा,पोर्ट,slp,निमन्त्रणा नगरिएको
+X-KDE-Keywords[nl]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,uitnodiging,slp,rdp,verbinding, bureaublad delen,bureaublad op afstand
+X-KDE-Keywords[nn]=skrivebordsdeling,krfb,vnc,deling,krdc,nettverksskrivebord,invitasjon,port,slp,ikkje invitert
+X-KDE-Keywords[pl]=współdzielenie pulpitu,krfb,vnc,współdzielenie,rdp,krdc,zdalne połączenie, zdalne biurko, zdalny pulpit, zaproszenie,port,slp
+X-KDE-Keywords[pt]=partilha do ecrã,krfb,vnc,partilha,krdc,ligação a um ecrã remoto,convite,porto,slp,sem convite
+X-KDE-Keywords[pt_BR]=compartilhamento de desktop,krfb,vnc,compartilhamento,krdc,conexão a desktop remoto,convite,porta,slp,não convidado
+X-KDE-Keywords[sl]=namizje,souporaba,krfb,vnc,krdc,povezava oddaljenega namizja, povabilo,port,slp,nepovabljen
+X-KDE-Keywords[sr]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,радна површина,дељење,позив,порт,непозван,удаљено
+X-KDE-Keywords[sr@latin]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,radna površina,deljenje,poziv,port,nepozvan,udaljeno
+X-KDE-Keywords[sv]=dela skrivbord,krfb,vnc,dela,krdc,fjärrskrivbordsanslutning,inbjudan,port,slp
+X-KDE-Keywords[ta]=பணிமேடை பகிர்வு,krfb,vnc,பகிர்வு,krdc,தொலை பணிமேடை இணைப்பு,அழைப்பிதழ், துறை, slp, uninvited
+X-KDE-Keywords[tr]=masaüstü paylaşımı,krfb,vnc,paylaşım,krdc,uzak masaüstü bağlantısı,davet,port,slp
+X-KDE-Keywords[uk]=спільні стільниці,krfb,vnc,спільний,rdp,krdc,з'єднання віддаленої стільниці,запрошення,rdp,slp,без запрошення
+X-KDE-Keywords[vi]=chia sẻ màn hình,krfb,vnc,chia sẻ,krdc,màn hình ở xa kết nối,mời kết nối,cổng,slp,không được mời
+X-KDE-Keywords[x-test]=xxdesktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvitedxx
+X-KDE-Keywords[zh_CN]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,桌面共享,共享,远程桌面连接,邀请,端口,未邀请
+X-KDE-Keywords[zh_TW]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,rdp,桌面分享,分享,遠端桌面連線,invitation,port,slp,uninvited

 Categories=Qt;KDE;X-KDE-settings-network;Settings;
--- a/kinetd/kinetd.cpp
+++ b/kinetd/kinetd.cpp
@@ -35,6 +35,14 @@
 #include <unistd.h>
 #include <fcntl.h>

+#include <kpluginfactory.h>
+#include <kpluginloader.h>
+
+K_PLUGIN_FACTORY(KInetDFactory,
+                 registerPlugin<KInetD>();
+    )
+K_EXPORT_PLUGIN(KInetDFactory("kinetd"))
+
 PortListener::PortListener(KService::Ptr s,
 			   KConfig *config,
 			   KServiceRegistry *srvreg) :
@@ -255,11 +263,11 @@ QStringList PortListener::processServiceTemplate(const QString &a) {
 		QString hostName = address->nodeName();
 		KUser u;
 		QString x = a; // replace does not work in const QString. Why??
-		l.append(x.replace(QRegExp("%h"), KServiceRegistry::encodeAttributeValue(hostName))
-			 .replace(QRegExp("%p"), QString::number(m_port))
-			 .replace(QRegExp("%u"), KServiceRegistry::encodeAttributeValue(u.loginName()))
-			 .replace(QRegExp("%i"), KServiceRegistry::encodeAttributeValue(m_uuid))
-			 .replace(QRegExp("%f"), KServiceRegistry::encodeAttributeValue(u.fullName())));
+		l.append(x.replace(QString("%h"), KServiceRegistry::encodeAttributeValue(hostName))
+			 .replace(QString("%p"), QString::number(m_port))
+			 .replace(QString("%u"), KServiceRegistry::encodeAttributeValue(u.loginName()))
+			 .replace(QString("%i"), KServiceRegistry::encodeAttributeValue(m_uuid))
+			 .replace(QString("%f"), KServiceRegistry::encodeAttributeValue(u.fullName())));
 	}
 	return l;
 }
@@ -408,8 +416,8 @@ PortListener::~PortListener() {
 }


-KInetD::KInetD() :
-	KDEDModule()
+KInetD::KInetD(QObject* parent, const QList<QVariant>&) :
+	KDEDModule(parent)
 {
 	m_config = new KConfig("kinetdrc");
 	m_srvreg = new KServiceRegistry();
@@ -645,12 +653,3 @@ KInetD::~KInetD() {
 	delete m_config;
        delete m_srvreg;
 }
-
-extern "C" {
-	KDE_EXPORT KDEDModule *create_kinetd()
-	{
-        KGlobal::locale()->insertCatalog("kinetd");
-		return new KInetD();
-	}
-}
-
--- a/kinetd/kinetd.desktop
+++ b/kinetd/kinetd.desktop
@@ -1,16 +1,15 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Service

-ServiceTypes=KDEDModule
+X-KDE-ServiceTypes=KDEDModule
 X-KDE-ModuleType=Library
 X-KDE-Library=kinetd
-X-KDE-FactoryName=kinetd
 X-KDE-Kded-autoload=true

 Name=KDE Internet Daemon
 Name[af]=Kde Internet Bediener
 Name[bg]=Интернет демон
+Name[bn]=কে-ডি-ই ইন্টারনেট ডিমন
 Name[br]=Diaoul kenrouedad KDE
 Name[ca]=Dimoni d'Internet per al KDE
 Name[cs]=KDE Internet démon
@@ -18,7 +17,7 @@ Name[cy]=Daemon Rhyngrwyd KDE
 Name[da]=KDE Internet-dæmon
 Name[de]=Internet-Dienst
 Name[el]=Δαίμονας διαδικτύου για το KDE
-Name[eo]=Retodemono
+Name[eo]=KDE interreta demono
 Name[es]=Demonio de Internet de KDE
 Name[et]=KDE internetideemon
 Name[eu]=KDE internet deabrua
@@ -28,6 +27,7 @@ Name[fr]=Démon Internet de KDE
 Name[ga]=Deamhan Idirlín KDE
 Name[gl]=Daemon de internet de KDE
 Name[he]=תהליך הרקע האינטרנטי של KDE
+Name[hi]=केडीई इंटरनेट डेमन
 Name[hu]=KDE internetes szolgáltatás
 Name[is]=KDE Internetþjónn
 Name[it]=Demone internet di KDE
@@ -36,6 +36,7 @@ Name[kk]=KDE Интернет қызметі
 Name[km]=ដេមិនអ៊ីនធឺណិតរបស់ KDE
 Name[ko]=KDE 인터넷 데몬
 Name[lt]=KDE interneto tarnyba
+Name[lv]=KDE Interneta dēmons
 Name[mk]=Даемон за Интернет на KDE 
 Name[ms]=Daemon Internet KDE
 Name[nb]=KDEs Internett-nisse
@@ -45,18 +46,17 @@ Name[nn]=KDE-Internett-nisse
 Name[pl]=Internet/sieć
 Name[pt]=Servidor de Internet do KDE
 Name[pt_BR]=Servidor Internet do KDE
-Name[ro]=Demon internet KDE
 Name[ru]=Доступ к Интернету
 Name[se]=KDE-Interneahtta-duogášprográmma
+Name[sk]=KDE Internet démon
 Name[sl]=Internetni strežnik za KDE
-Name[sr]=KDE-ов интернет демон
-Name[sr@latin]=KDE-ov internet demon
 Name[sv]=KDE:s Internetdemon
 Name[ta]=கேடிஇ இணைய டேமொன்
 Name[tg]=KDE Азозили Интернет
 Name[tr]=KDE İnternet Programı
-Name[uk]=Демон Інтернет KDE
-Name[uz]=KDE Интернет демони
+Name[uk]=Фонова служба Інтернет KDE
+Name[uz]=KDE Internet demoni
+Name[uz@cyrillic]=KDE Интернет демони
 Name[vi]=Trình nền Mạng KDE
 Name[x-test]=xxKDE Internet Daemonxx
 Name[zh_CN]=KDE Internet 守护进程
@@ -64,22 +64,24 @@ Name[zh_HK]=KDE 互聯網系統程式
 Name[zh_TW]=KDE Internet 伺服程式
 Comment=An Internet daemon that starts network services on demand
 Comment[bg]=Интернет демон, който служи за стартиране на мрежови услуги при поискване
+Comment[bn]=একটি ইন্টারনেট ডিমন যে চাহিদা ভিত্তিক নেটওয়ার্ক সার্ভিস আরম্ভ করে
 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]=Startet Netzwerkdienste bei Bedarf
 Comment[el]=Ένας δαίμονας για το διαδίκτυο ο οποίος ξεκινάει τις υπηρεσίες δικτύου όταν απαιτείται
-Comment[eo]=retdemono kiu lanĉas retajn servojn laŭ bezono
+Comment[eo]=Interreta demono 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[eu]=Sare zerbitzuak eskatzean abiarazten dituen deabrua
 Comment[fa]=یک شبح اینترنتی که خدمات شبکه را بر اساس تقاضا آغاز می‌کند
 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[ga]=Deamhan Idirlín a thosaíonn seirbhísí líonra ar éileamh
 Comment[gl]=Un daemon de Internet que comenza servizos de rede baixo demanda
 Comment[he]=תהליך רקע של אינטרנט שמתחיל שירותי רשת לפי דרישה
+Comment[hi]=एक इंटरनेट डेमन जो मांग पर नेटवर्क सेवा प्रारंभ करता है
 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
@@ -89,6 +91,7 @@ Comment[kk]=Талап етілгенде керек желі қызметтер
 Comment[km]=ដេមិនអ៊ីនធឺណិតដែលចាប់ផ្ដើមសេវាបណ្ដាញនៅពេលត្រូវការ
 Comment[ko]=요청에 따라 네트워크 서비스를 시작하는 인터넷 데몬
 Comment[lt]=Interneto tarnyba, paleidžianti tinklo tarnybas esant poreikiui
+Comment[lv]=Interneta dēmons pēc vajadzības palaiž tīkla servisus
 Comment[mk]=Даемон за Интернет кој ги вклучува мрежните сервиси на барање
 Comment[ms]=Daemon Internet yang memulakan servis jaringan di atas permintaan
 Comment[nb]=Internett-nisse som starter nettverkstjenester ved behov
@@ -99,18 +102,17 @@ Comment[nn]=Internett-nisse som startar nettverkstenester når dei trengst
 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[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
-Comment[sr]=Интернет демон који покреће мрежне сервисе по захтеву
-Comment[sr@latin]=Internet demon koji pokreće mrežne servise po zahtevu
 Comment[sv]=Internetdemon som startar nätverkstjänster vid behov
 Comment[ta]=ஒரு இணைய டேமொன், டேமொன் பிணைய சேவையை ஆரம்பிக்கிறது
 Comment[tg]=Азозили шабакавие, ки хидматрасони шабакавиро бо дархост сар медиҳад
 Comment[tr]=Başlangıçta ağ servisleri tarafından istenen internet hayalet programı
-Comment[uk]=Демон Інтернет, що запускає служби мережі при запиті
-Comment[uz]=Талаб қилинганда тармоқ хизматларини ишга тушурувчи Интернет демони
+Comment[uk]=Фонова служба Інтернет, що запускає служби мережі при запиті
+Comment[uz]=Talab qilinganda tarmoq xizmatlarini ishga tushuruvchi Internet demoni
+Comment[uz@cyrillic]=Талаб қилинганда тармоқ хизматларини ишга тушурувчи Интернет демони
 Comment[vi]=Một trình nền Mạng mà chạy các dịch vụ mạng theo nhu cầu
 Comment[x-test]=xxAn Internet daemon that starts network services on demandxx
 Comment[xh]=Internet daemon eqala iinkonzo zomsebenzi wonatha xa zifunwa
--- a/kinetd/kinetd.h
+++ b/kinetd/kinetd.h
@@ -140,8 +140,8 @@ public slots:
 	 * @param service name of a service as specified in its .desktop file
 	 * @param port the first port number to try or -1 to restore defaults
 	 * @param autoPortRange the number of ports to try
-	 * @return true if a port could be found or service is disabled, false 
-	 *          otherwise. 
+	 * @return true if a port could be found or service is disabled, false
+	 *          otherwise.
 	 */
 	bool setPort(QString service, int port = -1, int autoPortRange = 1);

@@ -189,7 +189,7 @@ public slots:
 	void reregistrationTimer();

 public:
-	KInetD();
+	KInetD(QObject* parent, const QList<QVariant>&);
 	virtual ~KInetD();
 	void loadServiceList();
 	PortListener *getListenerByName(QString name);
--- a/kinetd/kinetd.notifyrc
+++ b/kinetd/kinetd.notifyrc
@@ -1,30 +1,38 @@
 [Global]
 IconName=kinetd
 Comment=KInetD
+Comment[bn]=কে-আইনেট-ডি
+Comment[hi]=के-इनिट-डी
 Comment[sv]=Kinetd
 Comment[x-test]=xxKInetDxx

 [Event/IncomingConnection]
 Name=IncomingConnection
+Name[bn]=অন্তর্মুখী সংযোগ
 Name[br]=Kevreadenn resev
 Name[ca]=Connexió entrant
 Name[cs]=Příchozí spojení
 Name[cy]=CysylltiadCyrraedd
 Name[da]=IndkommendeForbindelse
+Name[de]=Eingehende Verbindung
 Name[el]=Εισερχόμενη σύνδεση
-Name[eo]=EnvenantaKonekto
+Name[eo]=Envenanta konekto
+Name[es]=Conexión entrante
 Name[et]=Sissetulev ühendus
 Name[eu]=Sarrerako konexioa
 Name[fi]=Saapuva yhteys
 Name[fr]=Connexion entrante
-Name[ga]=NascIsteach
+Name[ga]=Ceangal Isteach
+Name[gl]=Conexón entrante
 Name[he]=חיבור נכנס
+Name[hi]=आवक-कनेक्शन
 Name[hr]=DolaznaVeza
 Name[hu]=Bejövő kapcsolat
 Name[it]=Connessioni in entrata
 Name[ja]=外部からの接続
 Name[km]=ការតភ្ជាប់ចូល
 Name[lt]=Gautas kvietimas ryšiui
+Name[lv]=IenākošaisSavienojums
 Name[mk]=Дојдовно поврзување
 Name[ms]=Sambungan Masuk
 Name[nb]=Innkommende tilkobling
@@ -32,10 +40,9 @@ Name[nds]=RinkamenVerbinnen
 Name[nl]=Inkomende_verbinding
 Name[pl]=Połączenia przychodzące
 Name[pt_BR]=Conexões de Entrada
-Name[ro]=Conexiune de intrare
 Name[ru]=Входящее соединение
+Name[sk]=Prichádzajúce spojenia
 Name[sl]=Prihajajoča povezava
-Name[sr@latin]=Dolazeća veza
 Name[sv]=Inkommande anslutning
 Name[ta]=உள்வரும் இணைப்புகள்
 Name[tg]=Пайвастшавии Воридшаванда
@@ -47,40 +54,48 @@ Name[zh_HK]=進入連線
 Name[zh_TW]=進來的連線
 Comment=Received incoming connection
 Comment[af]=Ontvang inkomende verbinding
+Comment[bn]=অন্তর্মুখী সংযোগ গ্রহণ করল
 Comment[ca]=Rebuda connexió entrant
 Comment[cs]=Obdrženo příchozí spojení
 Comment[cy]=Derbynwyd cysylltiad a gyrhaeddodd
 Comment[da]=Modtog indkommende forbindelse
+Comment[de]=Verbindungsanfrage eingegangen
 Comment[el]=Λήφθηκε μια εισερχόμενη σύνδεση
-Comment[eo]=Ricevantaj envenantaj konektoj
+Comment[eo]=Ricevis envenantan konekton
+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[ga]=Fuarthas nasc isteach
+Comment[ga]=Fuarthas ceangal isteach
+Comment[gl]=Recebeuse unha conexón entrante
 Comment[he]=נתקבל חיבור נכנס
+Comment[hi]=आवक कनेक्शन प्राप्त
 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[km]=បានទទួលការតភ្ជាប់ចូល
+Comment[ko]=들어오는 연결을 받았습니다
 Comment[lt]=Gautas kvietimas ryšiui
+Comment[lv]=Saņemts ienākošs savienojums
 Comment[mk]=Примено е дојдовно поврзување
 Comment[ms]=Menerima sambungan masuk
 Comment[nb]=Mottok innkommende tilkobling
 Comment[nds]=Tokoppelanfraag kregen
 Comment[nl]=Inkomende verbinding ontvangen
+Comment[pa]=ਮਿਲੇ ਆ ਰਹੇ ਕੁਨੈਕਸ਼ਨ
 Comment[pl]=Otrzymano połącznie przychodzące
 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[sk]=Prijaté príchodzie spojenia
 Comment[sl]=Prejeta je prihajajoča povezava
-Comment[sr@latin]=Primljena je dolazeća veza
 Comment[sv]=Tar emot inkommande anslutning
 Comment[tg]=Пайвастшавии воридшаванда қабул гардид
 Comment[tr]=Gelen bağlantı alınıyor
+Comment[uk]=Отримано вхідне з’єднання
 Comment[x-test]=xxReceived incoming connectionxx
 Comment[xh]=Uxhulumano olungenayo olufunyenweyo
 Comment[zh_CN]=收到进入的连接
@@ -90,35 +105,41 @@ Action=None

 [Event/ProcessFailed]
 Name=ProcessFailed
+Name[bn]=প্রসেস ব্যর্থ
 Name[ca]=Procés fallit
 Name[cs]=Proces selhal
 Name[cy]=MethoddProses
 Name[da]=ProcesMislykkedes
+Name[de]=Prozess fehlgeschlagen
 Name[el]=Η διεργασία απέτυχε
-Name[eo]=ProcezoFiaskis
-Name[et]=Protsess ebaõnnestus
+Name[eo]=Procezo fiaskis
+Name[es]=Proceso fallido
+Name[et]=Protsess nurjus
 Name[eu]=Prozesuak huts egin du
 Name[fi]=Prosessi epäonnistui
 Name[fr]=Échec du processus
 Name[ga]=PróiseasTeipthe
+Name[gl]=Fallou o proceso
 Name[he]=תהליך נכשל
+Name[hi]=प्रक्रिया-असफल
 Name[hr]=ProcesNeuspješan
 Name[hu]=Hibás folyamat
 Name[it]=Processo fallito
 Name[ja]=プロセス失敗
 Name[km]=ដំណើរការបានបរាជ័យ
 Name[lt]=Procesas nepavyko
+Name[lv]=ProcessNeveiksmīgs
 Name[mk]=Процесот не успеа
 Name[ms]=Proses Gagal
 Name[nb]=Prosessen mislyktes
 Name[nds]=PerzessFehlslaan
 Name[nl]=Proces_mislukt
+Name[pa]=ਪਰੋਸੈਸ ਫੇਲ੍ਹ
 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[sl]=Proces ni uspel
-Name[sr@latin]=Proces nije uspeo
 Name[sv]=Process misslyckades
 Name[ta]=செயல் தோல்வியுற்றது
 Name[tg]=Ҷараён бо Нокомӣ анҷомид
@@ -130,24 +151,32 @@ Name[zh_HK]=程序失敗
 Name[zh_TW]=行程失敗
 Comment=Could not call process to handle connection
 Comment[af]=Kon nie roep proses na handvatsel verbinding
+Comment[bn]=সংযোগ পরিচালনা করতে প্রসেস শুরু করতে পারল না
 Comment[ca]=No es pot cridar al procés per a manejar la connexió
 Comment[cs]=Nelze spustit proces k obsluze spojení
 Comment[cy]=Methu galw proses i drin y cysylltiad
 Comment[da]=Kunne ikke kalde proces til at håndtere forbindelse
+Comment[de]=Der Prozess zur Bearbeitung der Verbindungsanfrage kann nicht gestartet werden
 Comment[el]=Αδύνατη η κλήση της διεργασίας για τη διαχείριση της σύνδεσης
-Comment[eo]=Ne eblis lanĉi instancon por prizorgi la konekton
+Comment[eo]=Ne eblis lanĉi la procezon por trakti la konekton
+Comment[es]=No se puede llamar un proceso para manejar la 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[ga]=Níorbh fhéidir próiseas a thosú chun an ceangal a láimhseáil
+Comment[gl]=Non foi posíbel chamar ao proceso que xestiona a conexón
 Comment[he]=אין אפשרות לקרוא לתהליך על מנת לטפל בחיבור
+Comment[hi]=कनेक्शन हैंडल करने के लिए प्रक्रिया काल नहीं कर सका
 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[km]=មិនអាចហៅដំណើរការ ដើម្បីដោះស្រាយការតភ្ជាប់បានឡើយ
-Comment[lt]=Nepavyko iškviesti proceso prisijungimui apdoroti
+Comment[km]=មិនអាចហៅដំណើរការ ដើម្បីដោះស្រាយការតភ្ជាប់បានឡើយ
+Comment[ko]=연결을 처리하기 위한 프로세스를 부를 수 없습니다
+Comment[lt]=Nepavyko iškviesti proceso apdoroti prisijungimui
+Comment[lv]=Neizdevās izsaukt procesu savienojuma apstrādei
 Comment[mk]=Не може да се повика процесот за ракување со поврзувањето
 Comment[ms]=Tidak dapat memanggil proses untuk mengendalikan sambungan
 Comment[nb]=Klarte ikke kalle på prosess for å håndtere tilkobling
@@ -157,12 +186,13 @@ Comment[pl]=Nie można było uruchomić procesu obsługi połączenia
 Comment[pt]=Não foi possível invocar o processo para lidar com as ligações
 Comment[pt_BR]=Não foi possível chamar o processo de controle da conexão
 Comment[ru]=Не удаётся запустить процесс обработки соединения
+Comment[sk]=Nemohol som zavolať proces pre spracovanie spojenia
 Comment[sl]=Ni možno poklicati procesa za upravljanje s povezavo
-Comment[sr@latin]=Nisam mogao da pozovem proces da opsluži vezu
 Comment[sv]=Kunde inte anropa process för att hantera anslutning
 Comment[ta]=இணைப்பை கையாள செயற்பாட்டை அழைக்க முடியவில்லை
 Comment[tg]=Барои даскории пайвастшавӣ ҷараён бозхонда нашуд
 Comment[tr]=Elle bağlantıda başarısız çağrı işlemleri
+Comment[uk]=Не вдалося викликати процес для з’єднання
 Comment[x-test]=xxCould not call process to handle connectionxx
 Comment[xh]=Ayikwazanga ukubiza inkqubo ezakuphatha uxhulumano
 Comment[zh_CN]=无法调用进程处理连接
--- a/kinetd/kinetdmodule.desktop
+++ b/kinetd/kinetdmodule.desktop
@@ -1,11 +1,11 @@
 # describes the servicetype that you need to implement in order to use
 # kinetd.
 [Desktop Entry]
-Encoding=UTF-8
 Type=ServiceType
 X-KDE-ServiceType=KInetDModule
 Name=KInetD Module Type
 Name[bg]=Модул на KInetD
+Name[bn]=কে-আইনেট-ডি মডিউল ধরন
 Name[br]=Seurt ar mollad KInetD
 Name[ca]=Tipus de mòdul del KInetD
 Name[cs]=Typ modulu KInetD
@@ -13,7 +13,7 @@ Name[cy]=Math Modiwl KInetD
 Name[da]=KInetD-modultype
 Name[de]=KInetD-Modultyp
 Name[el]=Τύπος αρθρώματος KInetD
-Name[eo]=KInetD-modulotipo
+Name[eo]=KInetD modulotipo
 Name[es]=Tipo de módulo KInetD
 Name[et]=KInetD mooduli tüüp
 Name[eu]=KInetD modulu mota
@@ -23,6 +23,7 @@ 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]=के-इनिट-डी मॉड्यूल प्रकार
 Name[hr]=Tip KInetD Modula
 Name[hu]=KInetD modultípus
 Name[is]=KInetD Module tegund
@@ -32,6 +33,7 @@ Name[kk]=KInetD модулі
 Name[km]=ប្រភេទម៉ូលឌុល KInetD
 Name[ko]=KInetD 모듈 종류
 Name[lt]=KInetD modulio tipas
+Name[lv]=KInetD moduļa tips
 Name[mk]=Тип на модул за KInetD 
 Name[ms]=Jenis Modul KInetD
 Name[nb]=KInetd-programtillegstype
@@ -42,12 +44,10 @@ Name[nn]=KInetD-programtilleggstype
 Name[pl]=Typ modułu KInetD
 Name[pt]=Tipo de Módulo do KInetD
 Name[pt_BR]=Módulo KInetD
-Name[ro]=Tip modul KInetD
 Name[ru]=Модуль KInetD
 Name[se]=KInetD-moduvlašládja
+Name[sk]=Typ modulu KInetD
 Name[sl]=Vrsta modula KInetD
-Name[sr]=KInetD врста модула
-Name[sr@latin]=KInetD vrsta modula
 Name[sv]=Kinetd-modultyp
 Name[ta]=KInetD கூறு வகை
 Name[tg]=Навъи Модули KInetD
--- a/krfb.desktop
+++ b/krfb.desktop
@@ -1,16 +1,18 @@
 # KDE Config File
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
-Exec=krfb -caption "%c"
+Exec=krfb -caption "%c" %i
 Icon=krfb
 X-DocPath=krfb/index.html
 Terminal=false
 Name=Krfb
+Name[bn]=কে-আর-এফ-বি
+Name[hi]=केआरएफबी
 Name[x-test]=xxKrfbxx
 Name[zh_TW]=Krfb 桌面分享
 GenericName=Desktop Sharing
 GenericName[bg]=Споделяне на работното място
+GenericName[bn]=ডেস্কটপ ভাগাভাগি
 GenericName[br]=Rannañ ar vurev
 GenericName[ca]=Compartició de l'escriptori
 GenericName[cs]=Sdílení pracovní plochy
@@ -18,6 +20,7 @@ GenericName[cy]=Rhannu Penbwrdd
 GenericName[da]=Desktopdeling
 GenericName[de]=Arbeitsfläche freigeben
 GenericName[el]=Κοινή χρήση επιφάνειας εργασίας
+GenericName[eo]=Tabula komunigado
 GenericName[es]=Escritorio compartido
 GenericName[et]=Töölaua jagamine
 GenericName[eu]=Mahaigain partekatzea
@@ -27,6 +30,7 @@ GenericName[fr]=Partage de bureau
 GenericName[ga]=Roinnt Deisce
 GenericName[gl]=Compartilla de escritorio
 GenericName[he]=שיתוף שולחנות עבודה
+GenericName[hi]=डेस्कटॉप साझेदारी
 GenericName[hu]=Munkaasztal-megosztás
 GenericName[is]=Skjáborðsmiðlun
 GenericName[it]=Condivisione desktop
@@ -35,22 +39,24 @@ GenericName[kk]=Үстелді ортақтастыру
 GenericName[km]=ការចែករំលែកផ្ទៃតុ
 GenericName[ko]=데스크톱 공유
 GenericName[lt]=Dalinimasis darbastaliu
+GenericName[lv]=Darbvirsmas koplietošana
 GenericName[nb]=Delte skrivebord
 GenericName[nds]=Schriefdisch-Freegaav
 GenericName[ne]=डेस्कटप साझेदारी
 GenericName[nl]=Bureaublad delen
 GenericName[nn]=Skrivebordsdeling
+GenericName[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
 GenericName[pl]=Współdzielenie pulpitu
 GenericName[pt]=Partilha do Ecrã
 GenericName[pt_BR]=Compartilhamento de Ambiente de Trabalho
 GenericName[ru]=Общий рабочий стол
+GenericName[sk]=Zdieľanie pracovnej plochy
 GenericName[sl]=Deljenje namizja
-GenericName[sr]=Дељење радне површине
-GenericName[sr@latin]=Deljenje radne površine
 GenericName[sv]=Dela ut skrivbordet
 GenericName[tr]=Masaüstü Paylaşımı
 GenericName[uk]=Спільні стільниці
-GenericName[uz]=Иш столи билан бўлишиш
+GenericName[uz]=Ish stoli bilan boʻlishish
+GenericName[uz@cyrillic]=Иш столи билан бўлишиш
 GenericName[vi]=Chia sẻ màn hình nền
 GenericName[x-test]=xxDesktop Sharingxx
 GenericName[zh_CN]=桌面共享
--- a/krfb.kcfg
+++ b/krfb.kcfg
@@ -9,7 +9,7 @@
      <default>true</default>
    </entry>
    <entry name="port" type="Int">
-      <label>This is the port on wich krfb will listen.</label>
+      <label>This is the port on which krfb will listen.</label>
      <default>5900</default>
    </entry>
    <entry name="publishService" type="Bool">
--- a/krfb.notifyrc
+++ b/krfb.notifyrc
@@ -2,42 +2,50 @@
 IconName=krfb
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
+Comment[bn]=ডেস্কটপ ভাগাভাগি
 Comment[br]=Rannañ ar vurev
 Comment[ca]=Compartició de l'escriptori
 Comment[cs]=Sdílení pracovní plochy
 Comment[cy]=Rhannu Penbwrdd
 Comment[da]=Desktopdeling
+Comment[de]=Arbeitsflächen-Freigabe
 Comment[el]=Κοινή χρήση επιφάνειας εργασίας
-Comment[eo]=Tabula fordonado
+Comment[eo]=Tabula komunigado
+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]=डेस्कटॉप साझेदारी
 Comment[hr]=Dijeljenje radne površine
 Comment[hu]=Munkaasztal-megosztás
 Comment[is]=Skjáborðamiðlun
 Comment[it]=Condivisione desktop
 Comment[ja]=デスクトップ共有
 Comment[km]=ការចែករំលែកផ្ទែតុ
+Comment[ko]=데스크톱 공유
 Comment[lt]=Dalinimasis darbastaliu
+Comment[lv]=Darbvirsmas koplietošana
 Comment[mk]=Делење на работната површина
 Comment[ms]=Perkongsian Ruang Kerja
 Comment[nb]=Delte skrivebord
 Comment[nds]=Schriefdisch-Freegaav
 Comment[nl]=Bureaublad delen
+Comment[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
 Comment[pl]=Współdzielenie pulpitu
 Comment[pt]=Partilha do Ecrã
 Comment[pt_BR]=Compartilhamento do Ambiente de Trabalho
-Comment[ro]=Partajare ecran
 Comment[ru]=Параметры общего рабочего стола
+Comment[sk]=Zdieľanie pracovnej plochy
 Comment[sl]=Deljenje namizja
-Comment[sr@latin]=Deljenje radne površine
 Comment[sv]=Dela ut skrivbordet
 Comment[ta]=பணிமேடை பகிர்வு
 Comment[tg]=Истифодаи Муштараки Мизи Корӣ
 Comment[tr]=Masaüstü Paylaşımı
+Comment[uk]=Спільні стільниці
 Comment[x-test]=xxDesktop Sharingxx
 Comment[xh]=Ulwahlulelano lwe Desktop
 Comment[zh_CN]=桌面共享
@@ -47,55 +55,86 @@ Comment[zh_TW]=桌面分享
 [Event/UserAcceptsConnection]
 Name=User Accepts Connection
 Name[ca]=L'usuari accepta la connexió
+Name[cs]=Uživatel přijímá spojení
+Name[da]=Bruger accepterer forbindelse
+Name[de]=Benutzer akzeptiert Verbindung
 Name[el]=Ο χρήστης δέχεται τη σύνδεση
+Name[eo]=Uzanto akceptas la konekton
+Name[es]=El usuario acepta la conexión
+Name[et]=Kasutaja nõustub ühendusega
+Name[fi]=Käyttäjä hyväksyy yhteyden
+Name[fr]=L'utilisateur accepte la connexion
 Name[ga]=Glacann an tÚsáideoir Le Ceangal
+Name[gl]=O usuario aceita a conexón
+Name[hi]=उपयोक्ता ने कनेक्शन स्वीकारा
+Name[hu]=A felhasználó engedélyezi a csatlakozást
+Name[is]=Notandi samþykkir tengingar
+Name[it]=L'utente accetta la connessione
 Name[ja]=ユーザが接続を許可
+Name[km]=អ្នកប្រើទទួលយកការតភ្ជាប់
+Name[ko]=사용자가 연결을 수락함
+Name[lt]=Naudotojas priėmė kvietimą
+Name[lv]=Lietotājs atļauj savienojumu
 Name[nb]=Bruker godtar tilkobling
 Name[nds]=Bruker lett tokoppeln to
 Name[nl]=Gebruiker accepteert de verbinding
+Name[pa]=ਯੂਜ਼ਰ ਨੇ ਕੁਨੈਕਸ਼ਨ ਮਨਜ਼ੂਰ ਕੀਤਾ
+Name[pl]=Połączenie zaakceptowane przez użytkownika
 Name[pt]=O Utilizador Aceita a Ligação
-Name[pt_BR]=O Utilizador Aceita a Ligação
+Name[pt_BR]=Usuário aceita conexão
+Name[ru]=Пользователь принимает соединения
+Name[sl]=Uporabnik sprejel povezavo
 Name[sv]=Användaren accepterar anslutning
+Name[tr]=Kullanıcı Bağlantıyı Kabul Etti
+Name[uk]=Користувач приймає з’єднання
 Name[x-test]=xxUser Accepts Connectionxx
 Name[zh_CN]=用户接受连接
 Name[zh_TW]=使用者接受連線
 Comment=User accepts connection
 Comment[af]=Gebruiker aanvaar verbinding
+Comment[bn]=ব্যবহারকারী সংযোগ গ্রহণ করে
 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 akzeptiert die Verbindung
 Comment[el]=Ο χρήστης δέχεται τη σύνδεση
-Comment[eo]=Uzanto akceptas konektojn
+Comment[eo]=Uzanto akceptas la konekton
+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[fr]=L'utilisateur accepte la connexion
 Comment[ga]=Glacann úsáideoir le ceangal
+Comment[gl]=O usuario aceitou a conexón
 Comment[he]=המשתמש מקבל את החיבור
+Comment[hi]=उपयोक्ता ने कनेक्शन स्वीकारा
 Comment[hr]=Korisnik prihvaća vezu
-Comment[hu]=A felhasználó elfogadja a csatlakozási kérést
+Comment[hu]=A felhasználó engedélyezi a csatlakozást
 Comment[is]=Notandi samþykkir tengingu
 Comment[it]=L'utente accetta la connessione
 Comment[ja]=ユーザが接続を許可
-Comment[km]=អ្នកប្រើទទួលយកការតភ្ជាប់
-Comment[lt]=Naudotojas priima kvietimą
+Comment[km]=អ្នកប្រើទទួលយកការតភ្ជាប់
+Comment[ko]=사용자가 연결을 수락함
+Comment[lt]=Naudotojas priėmė kvietimą
+Comment[lv]=Lietotājs atļauj savienojumu
 Comment[mk]=Корисникот прифаќа поврзување
 Comment[ms]= Pengguna menerima sambungan
 Comment[nb]=Bruker godtar tilkobling
 Comment[nds]=Bruker nimmt Tokoppelanfraag an
 Comment[nl]=Gebruiker accepteert de verbinding
+Comment[pa]=ਯੂਜ਼ਰ ਨੇ ਕੁਨੈਕਸ਼ਨ ਮੰਨਿਆ
 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
-Comment[ro]=Utilizatorul acceptă conexiunea
 Comment[ru]=Пользователь принимает соединения
+Comment[sk]=Užívateľ akceptoval spojenie
 Comment[sl]=Uporabnik sprejel povezavo
-Comment[sr@latin]=Korisnik prihvata vezu
 Comment[sv]=Användaren accepterar anslutning
 Comment[ta]=பயனர் இணைப்பு ஏற்றுக்கொள்ளப்பட்டது
 Comment[tg]=Корванд пайвастшавиро қабул мекунад
 Comment[tr]=Kullanıcı bağlantıyı kabul etti
+Comment[uk]=Користувач приймає з’єднання
 Comment[x-test]=xxUser accepts connectionxx
 Comment[xh]=Umsebenzisi wamkela uxhulumaniso
 Comment[zh_CN]=用户接受连接
@@ -106,55 +145,86 @@ Action=None
 [Event/UserRefusesConnection]
 Name=User Refuses Connection
 Name[ca]=L'usuari refusa la connexió
+Name[cs]=Uživatel odmítá spojení
+Name[da]=Bruger afslår forbindelse
+Name[de]=Benutzer verweigert Verbindung
 Name[el]=Ο χρήστης απέρριψε τη σύνδεση
-Name[ga]=Diúltíonn an tÚsáideoir Le Ceangal
+Name[eo]=Uzanto rifuzas la konekton
+Name[es]=El usuario rechaza la conexión
+Name[et]=Kasutaja keeldub ühendusest
+Name[fi]=Käyttäjä hylkää yhteyden
+Name[fr]=L'utilisateur refuse la connexion
+Name[ga]=Diúltaíonn an tÚsáideoir Le Ceangal
+Name[gl]=O usuario recusou a conexón
+Name[hi]=उपयोक्ता ने कनेक्शन अस्वीकारा
+Name[hu]=A felhasználó elutasítja a csatlakozást
+Name[is]=Notandi hafnar tengingum
+Name[it]=L'utente rifiuta la connessione
 Name[ja]=ユーザが接続を拒否
+Name[km]=អ្នកប្រើបដិសេធការតភ្ជាប់
+Name[ko]=사용자가 연결을 거부함
+Name[lt]=Naudotojas atmetė kvietimą
+Name[lv]=Lietotājs noraida savienojumu
 Name[nb]=Bruker nekter tilkobling
 Name[nds]=Bruker wiest tokoppeln af
 Name[nl]=Gebruiker weigert de verbinding
+Name[pa]=ਯੂਜ਼ਰ ਨੇ ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ
+Name[pl]=Połączenie odrzucone przez użytkownika
 Name[pt]=O Utilizador Recusa a Ligação
-Name[pt_BR]=O Utilizador Recusa a Ligação
+Name[pt_BR]=Usuário rejeita conexão
+Name[ru]=Пользователь отклоняет соединения
+Name[sl]=Uporabnik zavrnil povezavo
 Name[sv]=Användaren vägrar anslutning
+Name[tr]=Kullanıcı Bağlantıyı Reddetti
+Name[uk]=Користувач не приймає з’єднання
 Name[x-test]=xxUser Refuses Connectionxx
 Name[zh_CN]=用户拒绝连接
 Name[zh_TW]=使用者拒絕連線
 Comment=User refuses connection
 Comment[af]=Gebruiker weier verbinding
+Comment[bn]=ব্যবহারকারী সংযোগ অস্বীকার করে
 Comment[ca]=L'usuari refusa la connexió
 Comment[cs]=Uživatel odmítá spojení
 Comment[cy]=Mae'r defnyddiwr yn gwrthod y cysylltiad
 Comment[da]=Bruger afslår forbindelse
+Comment[de]=Der Benutzer verweigert die Verbindung
 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[fr]=L'utilisateur refuse la connexion
 Comment[ga]=Diúltaíonn úsáideoir ceangal
+Comment[gl]=O usuario non aceita a conexón
 Comment[he]=המשתמש מסרב לחיבור
+Comment[hi]=उपयोक्ता ने कनेक्शन अस्वीकारा
 Comment[hr]=Korisnik odbija vezu
-Comment[hu]=A felhasználó visszautasítja a csatlakozási kérést
+Comment[hu]=A felhasználó elutasítja a csatlakozást
 Comment[is]=Notandi hafnar tengingu
 Comment[it]=L'utente rifiuta la connessione
 Comment[ja]=ユーザが接続を拒否
 Comment[km]=អ្នកប្រើបដិសេធការតភ្ជាប់
-Comment[lt]=Naudotojas atmeta kvietimą
+Comment[ko]=사용자가 연결을 거부함
+Comment[lt]=Naudotojas atmetė kvietimą
+Comment[lv]=Lietotājs noraida savienojumu
 Comment[mk]=Корисникот одбива поврзување
 Comment[ms]=Pengguna menolak sambungan
 Comment[nb]=Bruker nekter tilkobling
 Comment[nds]=Bruker wiest Tokoppelanfraag af
 Comment[nl]=Gebruiker weigert de verbinding
+Comment[pa]=ਯੂਜ਼ਰ ਨੇ ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ
 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
-Comment[ro]=Utilizatorul refuză conexiunea
-Comment[ru]=Пользователь не принимает соединения
+Comment[ru]=Пользователь отклоняет соединения
+Comment[sk]=Užívateľ odmietol spojenie
 Comment[sl]=Uporabnik zavrnil povezavo
-Comment[sr@latin]=Korisnik odbija vezu
 Comment[sv]=Användaren vägrar anslutning
 Comment[ta]=பயனர் இணைப்பு ஏற்க மறுக்கப்பட்டது
 Comment[tg]=Корванд пайвастшавиро рад мекунад
-Comment[tr]=Kullanıcı bağlantıyı iptal etti
+Comment[tr]=Kullanıcı bağlantıyı reddetti
+Comment[uk]=Користувач не приймає з’єднання
 Comment[x-test]=xxUser refuses connectionxx
 Comment[xh]=Umsebenzisi wala uxhulumaniso
 Comment[zh_CN]=用户拒绝连接
@@ -165,57 +235,89 @@ Action=None
 [Event/ConnectionClosed]
 Name=Connection Closed
 Name[ca]=Connexió tancada
+Name[cs]=Spojení ukončeno
+Name[da]=Forbindelse lukket
+Name[de]=Verbindung geschlossen
 Name[el]=Η σύνδεση έκλεισε
+Name[eo]=Konekto fermita
+Name[es]=Conexión cerrada
+Name[et]=Ühendus suletud
+Name[fi]=Yhteys suljettu
+Name[fr]=Connexion fermée
 Name[ga]=Ceangal Dúnta
+Name[gl]=Conexón pechada
+Name[hi]=कनेक्शन बन्द
+Name[hu]=A kapcsolat megszűnt
+Name[is]=Tengingu lokað
+Name[it]=Connessione chiusa
 Name[ja]=接続切断
+Name[km]=បានបិទការតភ្ជាប់
+Name[ko]=연결이 닫힘
+Name[lt]=Ryšys baigtas
+Name[lv]=Savienojums slēgts
 Name[nb]=Forbindelsen lukket
 Name[nds]=Afkoppelt
 Name[nl]=Verbinding gesloten
+Name[pa]=ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ
+Name[pl]=Połączenia zakończone
 Name[pt]=Ligação Fechada
-Name[pt_BR]=Ligação Fechada
+Name[pt_BR]=Conexão fechada
+Name[ru]=Соединение закрыто
+Name[sl]=Povezava zaprta
 Name[sv]=Anslutning stängd
+Name[tr]=Bağlantı Kapatıldı
+Name[uk]=З'єднання закрито
 Name[x-test]=xxConnection Closedxx
 Name[zh_CN]=连接关闭
 Name[zh_TW]=連線已關閉
 Comment=Connection closed
 Comment[af]=Verbinding gesluit
+Comment[bn]=সংযোগ বন্ধ করা হল
 Comment[br]=Serret eo ar gevreadenn
 Comment[ca]=Connexió tancada
 Comment[cs]=Spojení ukončeno
 Comment[cy]=Mae'r cysylltiad ar gau
 Comment[da]=Forbindelse lukket
+Comment[de]=Verbindung geschlossen
 Comment[el]=Η σύνδεση έκλεισε
 Comment[eo]=Konekto fermita
+Comment[es]=Conexión cerrada
 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]=A conexón está pechada
 Comment[he]=החיבור נסגר
+Comment[hi]=कनेक्शन बन्द
 Comment[hr]=Veza prekinuta
-Comment[hu]=A kapcsolat bezárva
+Comment[hu]=A kapcsolat megszűnt
 Comment[is]=Tengingu lokað
 Comment[it]=Connessione chiusa
 Comment[ja]=接続が閉じられました
 Comment[km]=បានបិទការតភ្ជាប់
+Comment[ko]=연결이 닫힘
 Comment[lt]=Ryšys baigtas
+Comment[lv]=Savienojums tika slēgts
 Comment[mk]=Поврзувањето е затворено
 Comment[ms]=Sambungan ditutup
 Comment[nb]=Forbindelsen lukket
 Comment[nds]=Afkoppelt
 Comment[nl]=Verbinding verbroken
+Comment[pa]=ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ
 Comment[pl]=Połączenie zakończone
 Comment[pt]=A ligação foi encerrada
 Comment[pt_BR]=conexão encerrada
-Comment[ro]=Conexiune închisă
 Comment[ru]=Соединение закрыто
+Comment[sk]=Spojenie ukončené
 Comment[sl]=Povezava zaprta
-Comment[sr@latin]=Veza je zatvorena
 Comment[sv]=Anslutning stängd
 Comment[ta]=இணைப்புகள் மூடப்பட்டது
 Comment[tg]=Пайвастшавӣ пӯшида аст
-Comment[tr]=Bağlantı kesildi
-Comment[uz]=Алоқа узилди
+Comment[tr]=Bağlantı kapatıldı
+Comment[uk]=З'єднання закрито
+Comment[uz]=Aloqa uzildi
+Comment[uz@cyrillic]=Алоқа узилди
 Comment[x-test]=xxConnection closedxx
 Comment[xh]=Uxhulumaniso luvaliwe
 Comment[zh_CN]=连接关闭
@@ -226,57 +328,89 @@ Action=None
 [Event/InvalidPassword]
 Name=Invalid Password
 Name[ca]=Contrasenya no vàlida
+Name[cs]=Neplatné heslo
+Name[da]=Ugyldigt kodeord
+Name[de]=Passwort ungültig
 Name[el]=Μη έγκυρος κωδικός πρόσβασης
+Name[eo]=Nevalida pasvorto
+Name[es]=Contraseña incorrecta
+Name[et]=Vale parool
+Name[fi]=Virheellinen salasana
+Name[fr]=Mot de passe non valable
 Name[ga]=Focal Faire Neamhbhailí
+Name[gl]=Contrasinal non válido
+Name[hi]=अवैध पासवर्ड
+Name[hu]=Érvénytelen jelszó
+Name[is]=Ógilt lykilorð
+Name[it]=Password non valida
 Name[ja]=無効なパスワード
+Name[km]=ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
+Name[ko]=잘못된 암호
+Name[lt]=Neteisingas slaptažodžis
+Name[lv]=Nederīga parole
 Name[nb]=Ugyldig passord
 Name[nds]=Leeg Passwoort
 Name[nl]=Ongeldig wachtwoord
+Name[pa]=ਗਲਤ ਪਾਸਵਰਡ
+Name[pl]=Błędne hasło
 Name[pt]=Senha Inválida
-Name[pt_BR]=Senha Inválida
+Name[pt_BR]=Senha inválida
+Name[ru]=Неверный пароль
+Name[sl]=Neveljavno geslo
 Name[sv]=Ogiltigt lösenord
+Name[tr]=Geçersiz Parola
+Name[uk]=Неправильний пароль
 Name[x-test]=xxInvalid Passwordxx
 Name[zh_CN]=无效密码
 Name[zh_TW]=不正確的密碼
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
+Comment[bn]=অবৈধ পাসওয়ার্ড
 Comment[br]=Tremenger siek 
 Comment[ca]=Contrasenya no vàlida
 Comment[cs]=Neplatné heslo
 Comment[cy]=Cyfrinair annilys
 Comment[da]=Ugyldigt kodeord
+Comment[de]=Passwort ungültig
 Comment[el]=Μη έγκυρος κωδικός πρόσβασης
-Comment[eo]=nevalida pasvorto
+Comment[eo]=Nevalida pasvorto
+Comment[es]=Contraseña incorrecta
 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]=O contrasinal non é válido
 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[ko]=잘못된 암호
 Comment[lt]=Neteisingas slaptažodis
+Comment[lv]=Parole nav derīga
 Comment[mk]=Невалидна лозинка
 Comment[ms]=Kata laluan tidak sah
 Comment[nb]=Ugyldig passord
 Comment[nds]=Leeg Passwoort
 Comment[nl]=Ongeldig wachtwoord
+Comment[pa]=ਗਲਤ ਪਾਸਵਰਡ
 Comment[pl]=Błędne hasło
 Comment[pt]=A senha é inválida
 Comment[pt_BR]=senha inválida
-Comment[ro]=Parolă eronată
 Comment[ru]=Неверный пароль
+Comment[sk]=Zlé heslo
 Comment[sl]=Neveljavno geslo
-Comment[sr@latin]=Pogrešna lozinka
 Comment[sv]=Ogiltigt lösenord
 Comment[ta]=செல்லாத கடவுச்சொல்
 Comment[tg]=Гузарвожаи нодуруст
 Comment[tr]=Geçersiz parola
-Comment[uz]=Махфий сўз ҳақиқий эмас
+Comment[uk]=Неправильний пароль
+Comment[uz]=Maxfiy soʻz haqiqiy emas
+Comment[uz@cyrillic]=Махфий сўз ҳақиқий эмас
 Comment[wa]=Sicret nén valide
 Comment[x-test]=xxInvalid passwordxx
 Comment[xh]=Igama lokugqitha elingasebenziyo
@@ -288,37 +422,68 @@ Action=None
 [Event/InvalidPasswordInvitations]
 Name=Invalid Password Invitations
 Name[ca]=Contrasenya de les invitacions no vàlides
+Name[cs]=Neplatné hesla výzev
+Name[da]=Ugyldige kodeordsinvitationer
+Name[de]=Ungültiges Einladungs-Passwort
 Name[el]=Μη έγκυρος κωδικός πρόσβασης πρόσκλησης
+Name[eo]=Nevalidaj pasvortaj invitoj
+Name[es]=Contraseñas de invitaciones incorrectas
+Name[et]=Kutsutu vale parool
+Name[fi]=Virheellinen salasana kutsuun
+Name[fr]=Invitations de mot de passe non valables
+Name[ga]=Cuirí Neamhbhailí Focal Faire
+Name[gl]=Contrasinal de convidado non válido
+Name[hi]=अवैध पासवर्ड निमंत्रण
+Name[hu]=Érvénytelen jelszavas meghívó
+Name[is]=Ógild lykilorðsboð
+Name[it]=Password di invito non valida
 Name[ja]=招待に対する無効なパスワード
+Name[km]=ការអញ្ជើញពាក្យសម្ងាត់មិនត្រឹមត្រូវ
+Name[ko]=잘못된 비밀번호 초대장
+Name[lt]=Neteisingas kvietimo slaptažodis
+Name[lv]=Nepareiza parole ar ielūgumu
 Name[nb]=Ugyldig invitasjonspassord
 Name[nds]=Leeg Passwoort bi Inladen
 Name[nl]=Ongeldig wachtwoord uitnodiging
+Name[pa]=ਗਲਤ ਪਾਸਵਰਡ ਸੱਦਾ
+Name[pl]=Informacja o błędnym haśle
 Name[pt]=Convites de Senha Inválidos
-Name[pt_BR]=Convites de Senha Inválidos
+Name[pt_BR]=Avisos de senha inválida
+Name[sl]=Povabila z neveljavnimi gesli
 Name[sv]=Ogiltigt lösenord vid inbjudan
+Name[tr]=Geçersiz Parola Daveti
+Name[uk]=Запрошення з некоректними паролями
 Name[x-test]=xxInvalid Password Invitationsxx
 Name[zh_CN]=无效密码邀请
 Name[zh_TW]=不合法的密碼邀請
 Comment=The invited party sent an invalid password. Connection refused.
 Comment[af]=Die uitgenooi party gestuur 'n ongeldige wagwoord. Verbinding geweier.
+Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল।
 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 Person hat ein ungültiges Passwort gesendet: Verbindung abgelehnt.
 Comment[el]=Η πρόσκληση περιέχει μη έγκυρο κωδικό πρόσβασης. Η σύνδεση απορρίφθηκε.
 Comment[eo]=La invitita kliento sendis nevalidan pasvorton. Konekto rifuzita.
+Comment[es]=El invitado 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[ga]=Sheol an duine le cuireadh focal faire neamhbhailí. Diúltaíodh an ceangal.
+Comment[gl]=A parte convidante envioulle un contrasinal non válido. A conexón foi rexeitada.
 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[hu]=A meghívott fél érvénytelen jelszót küldött. A csatlakozási kérés elutasítva.
 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[km]=ភាគីដែលបានអញ្ជើញ បានផ្ញើពាក្យសម្ងាត់មិនត្រឹមត្រូវ ។ ការតភ្ជាប់ត្រូវបានបដិសេធ ។
+Comment[ko]=초대한 사람이 잘못된 비밀번호를 보냈습니다. 연결이 잘못되었습니다.
 Comment[lt]=Pakviestoji pusė atsiuntė neteisingą slaptažodį. Ryšys nutrauktas.
+Comment[lv]=Ielūgtā persona nosūtīja nepareizu paroli. Savienojums noraidīts.
 Comment[mk]=Поканетата страна испрати невалидна лозинка. Поврзувањето е одбиено.
 Comment[ms]=Pihak yang dijemput telah menghantar kata laluan yang salah. Sambungan ditolak.
 Comment[nb]=Den inviterte brukeren sendte et ugyldig passord. Tilkobling nektet.
@@ -327,13 +492,14 @@ Comment[nl]=De uitgenodigde partij stuurde een ongeldig wachtwoord. De verbindin
 Comment[pl]=Z drugiej strony podano błędne hasło. Połączenie odrzucone.
 Comment[pt]=O utilizador 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[ru]=Приглашенный пользователь ввёл неверный пароль. Соединение отклонено.
+Comment[sk]=Pozvaný účastnik poslal zlé heslo. Spojenie zamietnuté.
 Comment[sl]=Povabljena stranka je poslala neveljavno geslo. Povezava zavrnjena.
-Comment[sr@latin]=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[tr]=Davet edilenden gönderilmiş geçersiz parola. Bağlantı rededildi.
+Comment[uk]=Запрошений учасник надіслав некоректний пароль. У з’єднанні відмовлено.
 Comment[x-test]=xxThe invited party sent an invalid password. Connection refused.xx
 Comment[xh]=Umhlangano omenyiweyo uthumele igama lokugqitha elisebenzayo. Uxhulumano lwa liwe.
 Comment[zh_CN]=受邀请方发送的密码不对。连接被拒绝。
@@ -344,39 +510,68 @@ Action=Popup
 [Event/NewConnectionOnHold]
 Name=New Connection on Hold
 Name[ca]=Nova connexió en espera
+Name[cs]=Nové spojení pozdrženo
+Name[da]=Ny forbindelse sat til at vente
+Name[de]=Neue Verbindung wartet
 Name[el]=Νέα σύνδεση σε αναμονή
+Name[eo]=Nova konekto atendante
+Name[es]=Conexión nueva a la espera
+Name[et]=Uus ühendus ootel
+Name[fi]=Uusi yhteys odottaa
+Name[fr]=Nouvelle connexion en attente
 Name[ga]=Ceangal Nua Ag Fanacht
+Name[gl]=Nova conexón en espera
+Name[hi]=नया कनेक्शन होल्ड पर रखा
+Name[hu]=Új kapcsolat tartva
+Name[is]=Ný tenging á bið
+Name[it]=Nuova connessione da tenere
 Name[ja]=保留中の新規接続
+Name[km]=ការតភ្ជាប់ថ្មី កំពុងស្ថិតនៅក្នុងការរង់ចាំ
+Name[ko]=새 연결 대기 중
+Name[lt]=Naujas kvietimas ryšiui sulaikytas
+Name[lv]=Jauns savienojums gaida
 Name[nb]=Ny tilkobling venter
 Name[nds]=Nieg Verbinnen töövt
 Name[nl]=Nieuwe verbinding in de wacht
+Name[pa]=ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਹੋਲਡ ਉੱਤੇ ਹੈ
+Name[pl]=Nowe połączenie wstrzymane
 Name[pt]=Ligação Nova em Espera
-Name[pt_BR]=Ligação Nova em Espera
+Name[pt_BR]=Nova conexão ativa
+Name[sl]=Nova povezava na čakanju
 Name[sv]=Ny anslutning väntar
+Name[tr]=Yeni Açık Bağlantı
+Name[uk]=Очікування на нове з’єднання
 Name[x-test]=xxNew Connection on Holdxx
-Name[zh_CN]=新连接暂时搁置
+Name[zh_CN]=新连接已搁置
 Name[zh_TW]=新連線等待處理
 Comment=Connection requested, user must accept
 Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
+Comment[bn]=সংযোগ অনুরোধ করা হল, ব্যবহারকারীকে অবশ্যই স্বীকার করতে হবে
 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[eo]=Konekto pridemandita, uzanto devas akcepti
+Comment[eo]=Konekto pridemandita, la uzanto devas akcepti
+Comment[es]=Conexión solicitada, el usuario debe aceptarla
 Comment[et]=Nõutakse ühendust, kasutaja peab seda lubama
 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[ga]=Ceangal iarrtha; ní mór don úsáideoir glacadh leis
+Comment[gl]=Pediuse a conexón, o usuario debe aceitar
 Comment[he]=נתבקש חיבור, על המשתמש לקבלו
+Comment[hi]=कनेक्शन निवेदित. उपयोक्ता को स्वीकार होना चाहिए
 Comment[hr]=Veza je zatražena, korisnik mora prihvatiti
-Comment[hu]=Csatlakozási kérés, megerősítés szükséges
+Comment[hu]=Csatlakozási kérés, a felhasználónak el kell fogadnia
 Comment[is]=Beiðni um tengingu, notandi verður að samþykkja
 Comment[it]=Connessione richiesta, l'utente deve accettare
 Comment[ja]=接続が要求されています。ユーザが許可しなければなりません。
-Comment[km]=បានស្នើការតភ្ជាប់, អ្នកប្រើត្រូវតែទទួលយក
+Comment[km]=បានស្នើការតភ្ជាប់ អ្នកប្រើត្រូវតែទទួលយក
+Comment[ko]=연결 요청됨, 사용자가 수락해야 함
 Comment[lt]=Kvietimas ryšiui išsiųstas, naudotojas turi priimti kvietimą
+Comment[lv]=Ir pieprasīts jauns savienojums, kurš lietotājam ir jāapstiprina
 Comment[mk]=Побарано е поврзување, корисникот мора да прифати
 Comment[ms]=Sambungan diminta, pengguna mesti menerima
 Comment[nb]=Anmodning om tilkobling, bruker må godta
@@ -385,14 +580,14 @@ Comment[nl]=Verbindingsverzoek, gebruiker dient toe te stemmen
 Comment[pl]=Próba połączenia, musi być zaakceptowana przez użytkownika
 Comment[pt]=Foi pedida uma ligação que o utilizador deverá aceitar
 Comment[pt_BR]=Conexão requisitada; o usuário deve aceitar
-Comment[ro]=Cerere de conectare; utilizatorul trebuie să accepte
 Comment[ru]=Запрос на соединение, требуется подтверждение пользователя
+Comment[sk]=Vyžiadané spojenie, užívateľ musí akceptovať
 Comment[sl]=Povezava zahtevana, uporabnik mora sprejeti
-Comment[sr@latin]=Zahtevana je veza, korisnik mora da je prihvati
 Comment[sv]=Anslutning begärd, användaren måste acceptera
 Comment[ta]=இணைப்பு கோரப்பட்டது, பயனர் கண்டிப்பாக ஏற்றுக்கொள்ள வேண்டும்
 Comment[tg]=Пайвастшавӣ дархоста шудааст, корванд бояд қабул кунад
 Comment[tr]=Bağlantı isteği, kullanıcı kabul etmeli
+Comment[uk]=Отримано запит на з’єднання, користувач має його прийняти
 Comment[x-test]=xxConnection requested, user must acceptxx
 Comment[xh]=Uxhulumaniso luceliwe, umsebenzisi kufanele amkele
 Comment[zh_CN]=连接已请求，用户必须接受
@@ -403,55 +598,86 @@ Action=None
 [Event/NewConnectionAutoAccepted]
 Name=New Connection Auto Accepted
 Name[ca]=Nova connexió acceptada automàticament
+Name[cs]=Nové spojení automaticky přijato
+Name[da]=Ny forbindelse automatisk accepteret
+Name[de]=Neue Verbindung automatisch angenommen
 Name[el]=Αυτόματη αποδοχή νέας σύνδεσης
+Name[eo]=Nova konekto aŭtomate akceptita
+Name[es]=Conexión nueva aceptada automáticamente
+Name[et]=Uue ühendusega automaatselt nõus
+Name[fi]=Uusi yhteys hyväksyttiin automaattisesti
+Name[fr]=Nouvelle connexion auto-acceptée
 Name[ga]=Ceangal nua bunaithe go huathoibríoch
+Name[gl]=Nova conexón aceitada automaticamente
+Name[hi]=नय कनेक्शन स्वचालित स्वीकारा
+Name[hu]=Új kapcsolat automatikusan engedélyezve
+Name[is]=Ný tenging sjálfvirkt samþykkt
+Name[it]=Accettata nuova connessione automatica
 Name[ja]=新規接続の自動受け入れ
+Name[km]=បានទទួលយកការតភ្ជាប់ថ្មីដោយស្វ័យប្រវត្តិ
+Name[ko]=새 연결 자동 수락
+Name[lt]=Naujas kvietimas ryšiui automatiškai priimtas
+Name[lv]=Automātiski pieņemts jauns savienojums
 Name[nb]=Ny tilkobling automatisk godtatt
 Name[nds]=Nieg Verbinnen automaatsch tolaten
 Name[nl]=Nieuwe verbinding automatisch accepteren
+Name[pa]=ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਆਟੋ ਮਨਜ਼ੂਰ
+Name[pl]=Nowe połączenie automatycznie przyjęte
 Name[pt]=Nova Ligação Aceite Automaticamente
-Name[pt_BR]=Nova Ligação Aceite Automaticamente
+Name[pt_BR]=Nova Conexão com aceitação automática
+Name[ru]=Новое соединение принимается автоматически
+Name[sl]=Nova povezava samodejno sprejeta
 Name[sv]=Ny anslutning accepterades automatiskt
+Name[tr]=Yeni Bağlantı Otomatik olarak Kabul Edildi
+Name[uk]=Нове з’єднання автоматично прийнято
 Name[x-test]=xxNew Connection Auto Acceptedxx
 Name[zh_CN]=新连接自动接受
 Name[zh_TW]=新連線自動接受
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
+Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[ca]=Nova connexió establerta automàticament
 Comment[cs]=Automaticky navázáno nové spojení
 Comment[cy]=Sefydlwyd cysylltiad newydd yn awtomatig
 Comment[da]=Ny forbindelse automatisk etableret
+Comment[de]=Neue Verbindung automatisch hergestellt
 Comment[el]=Μια νέα σύνδεση δημιουργήθηκε αυτόματα
-Comment[eo]=Nova konekto aŭtomate akceptita
+Comment[eo]=Nova konekto aŭtomate establita
+Comment[es]=Conexión nueva establecida automáticamente
 Comment[et]=Uus ühendus automaatselt loodud
 Comment[eu]=Konexio berria automatikoki ezarri da
-Comment[fi]=Uusi yhteys muodostettu automaattisesti
+Comment[fi]=Uusi yhteys muodostettiin automaattisesti
 Comment[fr]=Nouvelle connexion établie automatiquement
 Comment[ga]=Ceangal nua bunaithe go huathoibríoch
+Comment[gl]=Estabeleceuse automaticamente unha nova conexón
 Comment[he]=נוצר חיבור חדש באופן אוטומטי
+Comment[hi]=नया कनेक्शन स्वचलित स्थापित
 Comment[hr]=Nova veza automatski prihvaćena
-Comment[hu]=Automatikusan létrejött az új kapcsolat
+Comment[hu]=Automatikusan létrejött egy új kapcsolat
 Comment[is]=Nýjar tengingar sjálfkrafa samþykktar
 Comment[it]=Stabilita nuova connessione automaticamente
 Comment[ja]=新規接続を自動的に確立しました
 Comment[km]=បានបង្កើតការតភ្ជាប់ថ្មីដោយស្វ័យប្រវត្តិ
+Comment[ko]=새 연결이 자동으로 성립됨
 Comment[lt]=Naujas ryšys užmegztas automatiškai
+Comment[lv]=Automātiski izveidots jauns savienojums
 Comment[mk]=Автоматски е воспоставено ново поврзување
 Comment[ms]=Sambungan baru secara automatik terjalin
 Comment[nb]=En ny tilkobling er automatisk opprettet
 Comment[nds]=Nieg Verbinnen automaatsch inricht
 Comment[nl]=Nieuwe verbinding automatisch opgebouwd
+Comment[pa]=ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਆਟੋਮੈਟਿਕ ਹੀ ਬਣਾਇਆ ਗਿਆ
 Comment[pl]=Nowe połączenie ustanowiono automatycznie
 Comment[pt]=Foi estabelecida automaticamente uma nova ligação
 Comment[pt_BR]=Nova conexão estabelecida automaticamente
-Comment[ro]=Conexiune nouă stabilită automat
 Comment[ru]=Новое соединение устанавливается автоматически
+Comment[sk]=Nové spojenie automaticky vytvorené
 Comment[sl]=Nova povezava samodejno vzpostavljena
-Comment[sr@latin]=Nova veza je automatski uspostavljena
 Comment[sv]=Ny anslutning automatiskt upprättad
 Comment[ta]=இணைப்புகள் தானாக உருவாக்கப்பட்டது
 Comment[tg]=Пайвастшавии нав ба таври худкор барпо мегардад
 Comment[tr]=Yeni bağlantı otomatik olarak kuruldu
+Comment[uk]=Автоматично встановлено нове з’єднання
 Comment[x-test]=xxNew connection automatically establishedxx
 Comment[xh]=Uxhulumaniso olutsha lufunyenwe ngokuzenzekelayo
 Comment[zh_CN]=自动建立新连接
@@ -462,60 +688,92 @@ Action=None
 [Event/TooManyConnections]
 Name=Too Many Connections
 Name[ca]=Massa connexions
+Name[cs]=Příliš mnoho spojení
+Name[da]=For mange forbindelser
+Name[de]=Zu viele Verbindungen
 Name[el]=Πάρα πολλές συνδέσεις
+Name[eo]=Tro multaj konektoj
+Name[es]=Demasiadas conexiones
+Name[et]=Liiga palju ühendusi
+Name[fi]=Liikaa yhteyksiä
+Name[fr]=Trop de connexions
 Name[ga]=An Iomarca Ceangal
+Name[gl]=Demasiadas conexóns
+Name[hi]=बहुत सारे कनेक्शन
+Name[hu]=Túl sok kapcsolat
+Name[is]=Of margar tengingar
+Name[it]=Troppe connessioni
 Name[ja]=多すぎる接続
+Name[km]=ការតភ្ជាប់ច្រើនពេក
+Name[ko]=너무 많은 연결
+Name[lt]=Per daug užmegztų ryšių
+Name[lv]=Pārāk daudz savienojumu
 Name[nb]=For mange tilkoblinger
 Name[nds]=To vele Verbinnen
 Name[nl]=Teveel verbindingen
+Name[pa]=ਬਹੁਤ ਸਾਰੇ ਕੁਨੈਕਸ਼ਨ
+Name[pl]=Zbyt wiele połączeń
 Name[pt]=Demasiadas Ligações
-Name[pt_BR]=Demasiadas Ligações
+Name[pt_BR]=Conexões em excesso
+Name[ru]=Слишком много соединений
+Name[sl]=Preveč povezav
 Name[sv]=För många anslutningar
+Name[tr]=Çok Fazla Bağlantı
+Name[uk]=Забагато з’єднань
 Name[x-test]=xxToo Many Connectionsxx
-Name[zh_CN]=连接太多
+Name[zh_CN]=连接过多
 Name[zh_TW]=太多連線
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
+Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
 Comment[br]=Dalc'het, kevreadenn disteuleret
 Comment[ca]=Ocupat, connexió refusada
 Comment[cs]=Zaneprázdněn, spojení odmítnuto
 Comment[cy]=Prysur, gwrthodwyd y cysylltiad
 Comment[da]=Optaget, forbindelse afslået
+Comment[de]=Beschäftigt, Verbindung abgelehnt
 Comment[el]=Απασχολημένος, η σύνδεση απορρίφθηκε
-Comment[eo]=Laborante, konekto rifuzita
+Comment[eo]=Okupata, 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, a conexón foi recusada
 Comment[he]=תפוס, החיבור נדחה
+Comment[hi]=व्यस्त, कनेक्शन अस्वीकृत
 Comment[hr]=Zauzeto, veza odbijena
-Comment[hu]=Foglalt, a csatlakozási kérés visszautasítva
+Comment[hu]=A csatlakozási kérés elutasítva túlterhelés miatt
 Comment[is]=Uptekinn, tengingu hafnað
 Comment[it]=Occupato, connessione rifiutata
 Comment[ja]=ビジーです、接続を拒否しました
-Comment[km]=រវល់,បោះបង់ការតភ្ជាប់
+Comment[km]=រវល់ បដិសេធការតភ្ជាប់
+Comment[ko]=바쁨, 연결 거부됨
 Comment[lt]=Užimta, kvietimas ryšiui atmestas
+Comment[lv]=Aizņemts, savienojums noraidīts
 Comment[mk]=Зафатено, поврзувањето е одбиено
 Comment[ms]=Sibuk, sambungan ditolak
 Comment[nb]=Opptatt, tilkobling nektet
 Comment[nds]=Bunnen, Verbinnen torüchwiest
 Comment[nl]=Bezet, verbinding geweigerd
+Comment[pa]=ਬਿਜ਼ੀ, ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ
 Comment[pl]=Zajęte, połączenie odrzucone
 Comment[pt]=Ocupado, pelo a ligação foi recusada
 Comment[pt_BR]=Ocupado; conexão recusada
-Comment[ro]=Ocupat; conexiune refuzată
-Comment[ru]=Занято, соединение закрыто
+Comment[ru]=Занят, соединение отклонено
+Comment[sk]=Zaneprázdneny, spojenie odmietnuté
 Comment[sl]=Zaposlen, povezava zavrnjena
-Comment[sr@latin]=Zauzeto, veza je odbijena
 Comment[sv]=Upptagen, anslutning vägras
 Comment[ta]=வேலையில் உள்ளது, இணைப்பு நிராகரிக்கப்பட்டது
 Comment[tg]=Банд, пайвастшавӣ рад гардидааст
 Comment[tr]=Meşgul, bağlantı rededildi
-Comment[uz]=Банд, алоқа рад этилди
+Comment[uk]=Зайнято, у з’єднанні відмовлено
+Comment[uz]=Band, aloqa rad etildi
+Comment[uz@cyrillic]=Банд, алоқа рад этилди
 Comment[x-test]=xxBusy, connection refusedxx
 Comment[xh]=Uxhulumaniso, olu xakekileyo lwaliwe
-Comment[zh_CN]=占线，连接拒绝
+Comment[zh_CN]=对方处于忙碌状态，连接被拒绝
 Comment[zh_HK]=忙碌，已拒絕連線
 Comment[zh_TW]=忙碌，連線被拒
 Action=None
@@ -524,38 +782,69 @@ default_logfile=
 [Event/UnexpectedConnection]
 Name=Unexpected Connection
 Name[ca]=Connexió inesperada
+Name[cs]=Neočekávané spojení
+Name[da]=Uventet forbindelse
+Name[de]=Unerwartete Verbindung
 Name[el]=Μη αναμενόμενη σύνδεση
-Name[ga]=Nasc Gan Choinne
+Name[eo]=Neatendita konekto
+Name[es]=Conexión inesperada
+Name[et]=Ootamatu ühendus
+Name[fi]=Odottamaton yhteys
+Name[fr]=Connexion inattendue
+Name[ga]=Ceangal Gan Choinne
+Name[gl]=Conexón non agardada
+Name[hi]=अप्रत्याशित कनेक्शन
+Name[hu]=Nem várt kapcsolat
+Name[is]=Óvænt Tenging
+Name[it]=Connessione inaspettata
 Name[ja]=予期しない接続
+Name[km]=ការតភ្ជាប់ដែលមិនបានរំពឹងទុក
+Name[ko]=예상하지 않은 연결
+Name[lt]=Netikėtas kvietimas ryšiui
+Name[lv]=Negaidīts savienojums
 Name[nb]=Uventet tilkobling
 Name[nds]=Nich verwacht Tokoppeln
 Name[nl]=Onverwachte verbinding
+Name[pa]=ਅਣਜਾਣ ਕੁਨੈਕਸ਼ਨ
+Name[pl]=Niespodziewane połączenie
 Name[pt]=Ligação Inesperada
-Name[pt_BR]=Ligação Inesperada
+Name[pt_BR]=Conexão inesperada
+Name[ru]=Неожиданное соединение
+Name[sl]=Nepričakovana povezava
 Name[sv]=Oväntad anslutning
+Name[tr]=Beklenmeyen Bağlantı
+Name[uk]=Неочікуване з’єднання
 Name[x-test]=xxUnexpected Connectionxx
-Name[zh_CN]=未料到的连接
+Name[zh_CN]=未预料的连接
 Name[zh_TW]=未知的連線
 Comment=Received unexpected connection, abort
 Comment[af]=Ontvang onverwagte verbinding, staak
+Comment[bn]=অপ্রত্যাশিত সংযোগ গ্রহণ করল, বাতিল করুন
 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 hergestellt, Abbruch
 Comment[el]=Λήφθηκε μια μη αναμενόμενη σύνδεση· εγκατάλειψη
-Comment[eo]=Ricevis neatenditan konekton, haltis
+Comment[eo]=Ricevis neatenditan konekton, ĉesi
+Comment[es]=Recibida conexió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[ga]=Fuarthas ceangal gan choinne, á thobscor
+Comment[gl]=Recebiuse unha conexón non agardada, abortouse
 Comment[he]=נתקבל חיבור בלתי צפוי, בוטל
+Comment[hi]=अप्रत्याशित कनेक्शन प्राप्त. छोड़ा
 Comment[hr]=Primio sam neočekivanu vezu, prekid
-Comment[hu]=Nem várt csatlakozási kérés, kilépés
+Comment[hu]=Nem várt csatlakozási kérés érkezett, megszakítás
 Comment[is]=Tók á móti óvæntri tengingu, hætti
 Comment[it]=Ricevuta connessione inaspettata, termina
 Comment[ja]=予期しない接続を受信しました。廃棄します。
-Comment[km]=បានទទួលយកការតភ្ជាប់ដែលមិនបានរំពឹងទុក, បោះបង់
-Comment[lt]=Sulaukta netikėto prisijungimo, nutraukiama
+Comment[km]=បានទទួលយកការតភ្ជាប់ដែលមិនបានរំពឹងទុក បោះបង់
+Comment[ko]=예상하지 않은 연결을 받았습니다, 중지합니다
+Comment[lt]=Sulaukta netikėto kvietimo ryšiui, nutraukiama
+Comment[lv]=Saņemts negaidīts savienojums, pārtraukts
 Comment[mk]=Примено е неочекувано поврзување, се прекинува
 Comment[ms]=Menerima sambungan luar jangka, menamatkan
 Comment[nb]=Mottok uventet tilkobling, avbrutt
@@ -564,17 +853,17 @@ Comment[nl]=Ontving een onverwachte verbinding, afgebroken
 Comment[pl]=Otrzymano niespodziewane połączenie. Przerwane.
 Comment[pt]=Foi recebida uma ligação inesperada, pelo que foi interrompida
 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[sk]=Prijaté neočakávane spojenie, ukončujem
 Comment[sl]=Prejeta nepričakovana povezava, prekinjeno
-Comment[sr@latin]=Primljena je neočekivana veza, prekidam
 Comment[sv]=Tog emot oväntad anslutning, avbryter
 Comment[ta]=எதிர்பாராத இணைப்பு, நிறுத்தப்பட்டது
 Comment[tg]=Пайвастшавии ғайричашмдош қабул гардид, кандашавӣ
 Comment[tr]=Babul edilmiş beklenmedik bağlantı, durdur
+Comment[uk]=Отримано з’єднання, яке не очікувалось, припиняється
 Comment[x-test]=xxReceived unexpected connection, abortxx
 Comment[xh]=Ufumene uxhulumaniso olungalindelekanga, lahla
-Comment[zh_CN]=收到意外连接，中止
+Comment[zh_CN]=收到意外连接，已中止
 Comment[zh_HK]=接收到非預期的連線，中止
 Comment[zh_TW]=已接收到未知的連線，中止。
 Action=None
--- a/krfbserver.cpp
+++ b/krfbserver.cpp
@@ -4,8 +4,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */


@@ -199,7 +199,7 @@ void KrfbServer::startListening()

    rfbInitServer(screen);
    if (!rfbIsActive(screen)) {
-        KMessageBox::error(0,"krfb","Address already in use");
+        KMessageBox::error(0,i18n("Address already in use"),"krfb");
        disconnectAndQuit();
    };

@@ -209,7 +209,7 @@ void KrfbServer::startListening()
    }

    while (d->running) {
-        foreach(QRect r, d->fb->modifiedTiles()) {
+        foreach(const QRect &r, d->fb->modifiedTiles()) {
            rfbMarkRectAsModified(screen, r.x(), r.y(), r.right(), r.bottom());
        }
        rfbProcessEvents(screen, 100);
@@ -241,10 +241,8 @@ void KrfbServer::disconnectAndQuit()
 enum rfbNewClientAction KrfbServer::handleNewClient(struct _rfbClientRec * cl)
 {
    ConnectionController *cc = new ConnectionController(cl, this);
-    if (d->numClients == 0) {
+    if (d->numClients++ == 0)
        d->fb->startMonitor();
-        d->numClients++;
-    }

    d->controllers.append(cc);
    cc->setControlEnabled(KrfbConfig::allowDesktopControl());
@@ -296,12 +294,10 @@ bool KrfbServer::checkX11Capabilities() {
 void KrfbServer::clientDisconnected(ConnectionController *cc)
 {
    kDebug() << "clients--: " << d->numClients;
-    d->numClients--;
-    if (d->numClients == 0) {
+    if (!--d->numClients) {
        d->fb->stopMonitor();
    }
    disconnect(cc, SIGNAL(clientDisconnected(ConnectionController)),this, SLOT(clientDisconnected(ConnectionController)));
 }


-
--- a/krfbserver.h
+++ b/krfbserver.h
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #ifndef KRFBSERVER_H
--- a/main.cpp
+++ b/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
        "(c) 2000, heXoNet Support GmbH, D-66424 Homburg\n"
        "(c) 2000-2001, Const Kaplinsky\n"
        "(c) 2000, Tridia Corporation\n"
-        "(c) 1999, AT&T Laboratories Cambridge\n"));
+        "(c) 1999, AT&T Laboratories Boston\n"));
    aboutData.addAuthor(ki18n("Alessandro Praduroux"), ki18n("KDE4 porting"), "pradu@pradu.it");
    aboutData.addAuthor(ki18n("Tim Jansen"), KLocalizedString(), "tim@tjansen.de");
    aboutData.addAuthor(ki18n("Ian Reinhart Geiser"), ki18n("DCOP interface"), "geiseri@kde.org");
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 			    ki18n("TightVNC encoder"));
 	aboutData.addCredit(ki18n("Tridia Corporation"),
 			    ki18n("ZLib encoder"));
-	aboutData.addCredit(ki18n("AT&T Laboratories Cambridge"),
+	aboutData.addCredit(ki18n("AT&T Laboratories Boston"),
 			    ki18n("original VNC encoders and "
 				      "protocol design"));
 	aboutData.addCredit(ki18n("Jens Wagner (heXoNet Support GmbH)"),
@@ -75,7 +75,6 @@ int main(int argc, char *argv[])
 	KCmdLineArgs::init(argc, argv, &aboutData);

 	KApplication app;
-
    TrayIcon trayicon(new ManageInvitationsDialog);

 	KrfbServer *server = KrfbServer::self(); // initialize the server manager
--- a/manageinvitations.ui
+++ b/manageinvitations.ui
@@ -95,7 +95,7 @@ p, li { white-space: pre-wrap; }
     </property>
     <column>
      <property name="text" >
-       <string>Created</string>
+       <string>Creation Time</string>
      </property>
     </column>
     <column>
--- a/manageinvitationsdialog.cpp
+++ b/manageinvitationsdialog.cpp
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #include "manageinvitationsdialog.h"
 #include "manageinvitationsdialog.moc"
@@ -55,6 +55,7 @@ ManageInvitationsDialog::ManageInvitationsDialog(QWidget *parent)
 {
    setCaption(i18n("Invitation"));
    setButtons(User1|Close|Help);
+    setHelp(QString(), "krfb");
    setDefaultButton(NoDefault);

    setMinimumSize(500, 330);
@@ -127,7 +128,7 @@ void ManageInvitationsDialog::inviteByMail()
    QList<QNetworkInterface> ifl = QNetworkInterface::allInterfaces();
    QString host;
    int port = KrfbConfig::port();
-    foreach (QNetworkInterface nif, ifl) {
+    foreach (const QNetworkInterface &nif, ifl) {
        if (nif.flags() & QNetworkInterface::IsLoopBack) continue;
        if (nif.flags() & QNetworkInterface::IsRunning) {
            host = nif.addressEntries()[0].ip().toString();
@@ -158,7 +159,7 @@ void ManageInvitationsDialog::reloadInvitations()
 {
    invitationWidget->clear();
    KLocale *loc = KGlobal::locale();
-    foreach(Invitation inv, InvitationManager::self()->invitations()) {
+    foreach(const Invitation &inv, InvitationManager::self()->invitations()) {
        QStringList strs;
        strs <<  loc->formatDateTime(inv.creationTime()) << loc->formatDateTime(inv.expirationTime());
        QTreeWidgetItem *it = new QTreeWidgetItem(strs);
@@ -175,8 +176,9 @@ void ManageInvitationsDialog::showConfiguration()
        return;

    KConfigDialog *dialog = new KConfigDialog(this, "settings", KrfbConfig::self());
-    dialog->addPage(new TCP, i18n("Network"), "network");
+    dialog->addPage(new TCP, i18n("Network"), "network-workgroup");
    dialog->addPage(new Security, i18n("Security"), "security-high");
+    dialog->setHelp(QString(),"krfb");
    connect(dialog, SIGNAL(settingsChanged(QString)),KrfbServer::self(),SLOT(updateSettings()));
    dialog->show();
 }
@@ -216,7 +218,7 @@ void ManageInvitationsDialog::deleteCurrent()

    QList<QTreeWidgetItem *> itl = invitationWidget->selectedItems();
    foreach(QTreeWidgetItem *itm, itl) {
-        foreach(Invitation inv, InvitationManager::self()->invitations()) {
+        foreach(const Invitation &inv, InvitationManager::self()->invitations()) {
            if (inv.creationTime() == itm->data(0,Qt::UserRole+1)) {
                InvitationManager::self()->removeInvitation(inv);
            }
--- a/manageinvitationsdialog.h
+++ b/manageinvitationsdialog.h
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #ifndef MANAGEINVITATIONSDIALOG_H
--- a/personalinvitedialog.cpp
+++ b/personalinvitedialog.cpp
@@ -47,7 +47,7 @@ PersonalInviteDialog::PersonalInviteDialog( QWidget *parent )

  QList<QNetworkInterface> ifl = QNetworkInterface::allInterfaces();

-  foreach (QNetworkInterface nif, ifl) {
+  foreach (const QNetworkInterface &nif, ifl) {
    if (nif.flags() & QNetworkInterface::IsLoopBack) continue;
    if (nif.flags() & QNetworkInterface::IsRunning && !nif.addressEntries().isEmpty()) {
        hostLabel->setText( QString( "%1:%2" ).arg(nif.addressEntries().first().ip().toString()).arg(port));
--- a/qtframebuffer.cpp
+++ b/qtframebuffer.cpp
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #include "qtframebuffer.h"
--- a/qtframebuffer.h
+++ b/qtframebuffer.h
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #ifndef QTFRAMEBUFFER_H
--- a/x11framebuffer.cpp
+++ b/x11framebuffer.cpp
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */

 #include "x11framebuffer.h"
@@ -55,7 +55,7 @@ X11FrameBuffer::X11FrameBuffer(WId id, QObject* parent)
 {
 #ifdef HAVE_XSHM
    d->useShm = XShmQueryExtension(QX11Info::display());
-    kDebug() << "shm: " << d->useShm << endl;
+    kDebug() << "shm: " << d->useShm;
 #else
    d->useShm = false;
 #endif
@@ -194,24 +194,24 @@ void X11FrameBuffer::cleanupRects() {
    QList<QRect> cpy = tiles;
    bool inserted = false;
    tiles.clear();
-//     kDebug() << "before cleanup: " << cpy.size() << endl;
-    foreach (QRect r, cpy) {
+//     kDebug() << "before cleanup: " << cpy.size();
+    foreach (const QRect &r, cpy) {
        if (tiles.size() > 0) {
            for(int i = 0; i < tiles.size(); i++) {
-    //             kDebug() << r << tiles[i] << endl;
+    //             kDebug() << r << tiles[i];
                if (r.intersects(tiles[i])) {
                    tiles[i] |= r;
                    inserted = true;
                    break;
-    //                 kDebug() << "merged into " << tiles[i] << endl;
+    //                 kDebug() << "merged into " << tiles[i];
                }
            }
            if (!inserted) {
                tiles.append(r);
-    //             kDebug() << "appended " << r << endl;
+    //             kDebug() << "appended " << r;
            }
        } else {
-    //         kDebug() << "appended " << r << endl;
+    //         kDebug() << "appended " << r;
            tiles.append(r);
        }
    }
@@ -230,7 +230,7 @@ void X11FrameBuffer::cleanupRects() {
            tiles[i].setRight(d->framebufferImage->width);
        }
    }
-//     kDebug() << "after cleanup: " << tiles.size() << endl;
+//     kDebug() << "after cleanup: " << tiles.size();
 }

 void X11FrameBuffer::acquireEvents() {
@@ -254,8 +254,8 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
        if (d->useShm) {
 #ifdef HAVE_XSHM

-            foreach(QRect r, tiles) {
-//                 kDebug() << r << endl;
+            foreach(const QRect &r, tiles) {
+//                 kDebug() << r;
                gl |= r;
                int y = r.y();
                int x = r.x();
@@ -267,7 +267,7 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
                        if (x+d->updateTile->width > d->framebufferImage->width) {
                            x = d->framebufferImage->width - d->updateTile->width;
                        }
-//                         kDebug() << "x: " << x << " (" << r.x() << ") y: " << y << " (" << r.y() << ") " << r << endl;
+//                         kDebug() << "x: " << x << " (" << r.x() << ") y: " << y << " (" << r.y() << ") " << r;
                        XShmGetImage(QX11Info::display(), win, d->updateTile, x, y, AllPlanes);
                        int pxsize =  d->framebufferImage->bits_per_pixel / 8;
                        char *dest = fb + ((d->framebufferImage->bytes_per_line * y) + (x*pxsize));
@@ -285,7 +285,7 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
            }
 #endif
        } else {
-            foreach(QRect r, tiles) {
+            foreach(const QRect &r, tiles) {
                XGetSubImage(QX11Info::display(),
                    win,
                    r.left(),
@@ -301,8 +301,8 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
            }
        }
    }
-//     kDebug() << "tot: " << gl << endl;
-//     kDebug() << tiles.size() << endl;
+//     kDebug() << "tot: " << gl;
+//     kDebug() << tiles.size();
    ret = tiles;
    tiles.clear();
    return ret;
--- a/x11framebuffer.h
+++ b/x11framebuffer.h
@@ -3,8 +3,8 @@

   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; version 2
-   of the License.
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
 */
 #ifndef X11FRAMEBUFFER_H
 #define X11FRAMEBUFFER_H
Author	SHA1	Message	Date
Script Kiddy	a77f6423f4	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/4.1/kdenetwork/krfb/; revision=853066	2008-08-27 06:05:19 +00:00
Script Kiddy	25bfb5e714	SVN_SILENT made messages (.desktop file) svn path=/branches/KDE/4.1/kdenetwork/krfb/; revision=831631	2008-07-12 23:36:58 +00:00
Jakub Stachowski	dc2c6f0db7	Remove SLP bits from buildsystem. Code itself was removed long ago anyway. svn path=/trunk/KDE/kdenetwork/krfb/; revision=826942	2008-07-01 20:45:46 +00:00
Laurent Montel	c7fda197fd	Translate svn path=/trunk/KDE/kdenetwork/krfb/; revision=822166	2008-06-19 11:31:52 +00:00
Script Kiddy	9e372bc6b5	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=817871	2008-06-06 21:50:23 +00:00
Script Kiddy	b3be22f5aa	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=817023	2008-06-05 02:26:24 +00:00
Script Kiddy	e76e391c4f	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=815784	2008-06-02 15:16:19 +00:00
Script Kiddy	1eb1b7a053	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=814787	2008-05-31 09:43:22 +00:00
Laurent Montel	32769b41e5	Use INSTALL_TARGETS_DEFAULT_ARGS svn path=/trunk/KDE/kdenetwork/krfb/; revision=813293	2008-05-27 11:14:39 +00:00
Script Kiddy	d551495469	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=808732	2008-05-17 12:48:23 +00:00
Script Kiddy	0e39f8c09e	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=803891	2008-05-04 12:28:40 +00:00
Friedrich W. H. Kossebau	9befaf6f6a	removed unnessecary explicit setting of the application icon svn path=/trunk/KDE/kdenetwork/krfb/; revision=799270	2008-04-20 22:50:58 +00:00
Script Kiddy	e5326e218f	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=788508	2008-03-21 17:48:42 +00:00
Script Kiddy	fe5e724bd1	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=784312	2008-03-10 22:15:23 +00:00
Urs Wolfer	74fe120ea8	Fix typo. Patch by crazy. BUG:155173 svn path=/trunk/KDE/kdenetwork/krfb/; revision=783749	2008-03-09 14:11:27 +00:00
Script Kiddy	80d794873c	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=780677	2008-02-29 19:02:40 +00:00
Script Kiddy	bef509ac05	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=779685	2008-02-26 19:55:06 +00:00
Script Kiddy	b17a0b5815	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=774942	2008-02-14 13:05:43 +00:00
Script Kiddy	2709312471	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=774170	2008-02-12 16:55:33 +00:00
Albert Astals Cid	a6f727d990	microoptimization const & in foreach svn path=/trunk/KDE/kdenetwork/krfb/; revision=772847	2008-02-09 15:56:10 +00:00
Script Kiddy	d641dc702b	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=771196	2008-02-05 13:33:12 +00:00
Script Kiddy	ad824b9b80	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=767678	2008-01-28 14:23:45 +00:00
Script Kiddy	35d083a674	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=765168	2008-01-23 11:39:45 +00:00
Script Kiddy	d571aaf062	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=764654	2008-01-22 10:07:15 +00:00
Urs Wolfer	af216dabe1	* fix help buttons * fix some strings * do not set the main dialog modal; that will cause trouble for example with about and quit dialog sometimes svn path=/trunk/KDE/kdenetwork/krfb/; revision=762755	2008-01-17 20:17:01 +00:00
Laurent Montel	ce4d5c60ee	Fix help button svn path=/trunk/KDE/kdenetwork/krfb/; revision=760517	2008-01-12 21:14:03 +00:00
Script Kiddy	5a04b9ef09	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=760329	2008-01-12 12:20:38 +00:00
Script Kiddy	073257304d	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=758824	2008-01-09 10:39:07 +00:00
Urs Wolfer	01eab2a02f	Krazy fixes svn path=/trunk/KDE/kdenetwork/krfb/; revision=758702	2008-01-08 21:14:52 +00:00
Urs Wolfer	b77d07c08d	this should work again...(old one did not anymore) svn path=/trunk/KDE/kdenetwork/krfb/; revision=757767	2008-01-05 21:14:07 +00:00
Urs Wolfer	0fb20dfff0	Fix: Make quit working when krfb has been started from menu Fix icons. Patch by crazy. svn path=/trunk/KDE/kdenetwork/krfb/; revision=757206	2008-01-04 13:14:35 +00:00
Script Kiddy	a9ff5ffc8b	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=757117	2008-01-04 08:42:10 +00:00
Script Kiddy	d30bdd7404	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=756425	2008-01-03 08:35:06 +00:00
Script Kiddy	9cafe806a4	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=755853	2008-01-02 08:28:53 +00:00
Jakob Petsovits	6fdad54a7a	Icon naming spec compliance (code changes - KDE/): network -> network-workgroup, or whatever fits best. Plus some other icon name fixes. svn path=/trunk/KDE/kdenetwork/krfb/; revision=754310	2007-12-29 14:44:22 +00:00
Script Kiddy	0432b60d4f	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=754157	2007-12-29 08:22:18 +00:00
Script Kiddy	9beb3ac122	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=752704	2007-12-25 08:11:26 +00:00
Script Kiddy	aad4a17674	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=751147	2007-12-21 07:56:46 +00:00
Script Kiddy	78fd984dd8	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=750406	2007-12-19 08:09:37 +00:00
Script Kiddy	77dfcd28d8	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=747948	2007-12-13 08:04:25 +00:00
Script Kiddy	9ba02362f7	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=743875	2007-12-02 08:05:56 +00:00
Script Kiddy	376357337c	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=743233	2007-11-30 07:56:37 +00:00
Script Kiddy	a5be8fc33b	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=742560	2007-11-28 07:46:42 +00:00
Script Kiddy	2cbb930877	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=742121	2007-11-27 07:46:56 +00:00
Giovanni Venturi	7e41e3c244	fixed compiling, thanks to Laurent and David CCMAIL:faure@kde.org,montel@kde.org svn path=/trunk/KDE/kdenetwork/krfb/; revision=741971	2007-11-26 20:59:39 +00:00
Script Kiddy	c021cd6d42	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=741705	2007-11-26 08:06:14 +00:00
Script Kiddy	d2f1a0e3f8	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=741243	2007-11-25 07:48:46 +00:00
Script Kiddy	2e13247d25	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=738181	2007-11-18 07:52:37 +00:00
Laurent Montel	21d8285fb9	Remove "endl;" not necessary now svn path=/trunk/KDE/kdenetwork/krfb/; revision=737505	2007-11-16 12:01:49 +00:00
Allen Winter	924a4af066	various fixes: - replace DocPath with X-DocPath - replace Keywords with X-KDE-Keywords - replace ServicesTypes with X-KDE-ServiceTypes - remove deprecated Encoding - minor stuff svn path=/trunk/KDE/kdenetwork/krfb/; revision=737252	2007-11-15 21:40:29 +00:00
Script Kiddy	ad0d5f8a9f	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=735600	2007-11-12 08:08:54 +00:00
Dirk Mueller	6061ed71fd	fix FSF address svn path=/trunk/KDE/kdenetwork/krfb/; revision=734468	2007-11-08 22:49:41 +00:00
Urs Wolfer	24edd4302d	Relicense GPLv2 only code to GPLv2+. All these files have been added to SVN by Alessandro Praduroux. He agreed on this change. CCMAIL: pradu@pradu.it svn path=/trunk/KDE/kdenetwork/krfb/; revision=734376	2007-11-08 18:50:58 +00:00
Script Kiddy	d54df82b05	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=733797	2007-11-07 07:59:50 +00:00
David Faure	d045784353	Ported to KPluginFactory -- and then realized it was disabled from compilation... svn path=/trunk/KDE/kdenetwork/krfb/; revision=733078	2007-11-05 12:37:48 +00:00
Dirk Mueller	279324047a	only increase the reference counter if it is zero? That doesn't make sense. a counter is a counter, not a boolean. svn path=/trunk/KDE/kdenetwork/krfb/; revision=731746	2007-11-01 19:27:53 +00:00
Script Kiddy	f2fed6edcf	SVN_SILENT made messages (.desktop file) svn path=/trunk/KDE/kdenetwork/krfb/; revision=730930	2007-10-30 07:54:29 +00:00