SVN_SILENT made messages (.desktop file)

svn path=/trunk/KDE/kdenetwork/krfb/; revision=957599

connectioncontroller.cpp

@@ -107,7 +107,7 @@ enum rfbNewClientAction ConnectionController::handleNewClient()
 
     if (!allowUninvited && InvitationManager::self()->activeInvitations() == 0) {
         KNotification::event("ConnectionAttempted",
-                             i18n("Attepted uninvited connection from %1: connection refused",
+                             i18n("Refused uninvited connection attempt from %1",
                                   remoteIp));
         return RFB_CLIENT_REFUSE;
     }

connectionwidget.ui

@@ -144,8 +144,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <resources/>
+  <resources/>
  <connections/>
 </ui>

invitewidget.ui

@@ -166,9 +166,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <resources/>
+  <resources/>
  <connections/>
 </ui>

kcm_krfb/configurationwidget.ui

@@ -495,7 +495,6 @@ Most VNC clients use a display number instead of the actual port. This display n
     <tabstop>passwordInput</tabstop>
     <tabstop>portInput</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
 <customwidgets>
     <customwidget>
         <class>KIntNumInput</class>

krfb.desktop

@@ -72,4 +72,4 @@ GenericName[x-test]=xxDesktop Sharingxx
 GenericName[zh_CN]=桌面共享
 GenericName[zh_HK]=桌面分享
 GenericName[zh_TW]=桌面分享
-Categories=Qt;KDE;System;RemoteAccess;Network;
+Categories=Qt;KDE;System;Network;RemoteAccess;

krfb.notifyrc

@@ -292,6 +292,7 @@ Name[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
 Name[ko]=연결이 닫힘
 Name[lt]=Ryšys baigtas
 Name[lv]=Savienojums slēgts
+Name[mai]=संबंधन बन्न भ' गेल
 Name[ml]=ബന്ധം അടച്ചു
 Name[nb]=Forbindelsen lukket
 Name[nds]=Afkoppelt
@@ -379,7 +380,7 @@ Name=Invalid Password
 Name[ar]=كلمة المرور غير صحيحة
 Name[ca]=Contrasenya no vàlida
 Name[cs]=Neplatné heslo
-Name[da]=Ugyldigt kodeord
+Name[da]=Ugyldig adgangskode
 Name[de]=Passwort ungültig
 Name[el]=Μη έγκυρος κωδικός πρόσβασης
 Name[eo]=Nevalida pasvorto
@@ -427,7 +428,7 @@ Comment[br]=Tremenger siek
 Comment[ca]=Contrasenya no vàlida
 Comment[cs]=Neplatné heslo
 Comment[cy]=Cyfrinair annilys
-Comment[da]=Ugyldigt kodeord
+Comment[da]=Ugyldig adgangskode
 Comment[de]=Passwort ungültig
 Comment[el]=Μη έγκυρος κωδικός πρόσβασης
 Comment[eo]=Nevalida pasvorto
@@ -450,6 +451,7 @@ Comment[km]=ពាក្យ​សម្ងាត់​មិន​ត្រឹ
 Comment[ko]=잘못된 암호
 Comment[lt]=Neteisingas slaptažodis
 Comment[lv]=Parole nav derīga
+Comment[mai]=अवैध कूटशब्द
 Comment[mk]=Невалидна лозинка
 Comment[ml]=അസാധുവായ അടയാളവാക്ക്
 Comment[ms]=Kata laluan tidak sah
@@ -488,7 +490,7 @@ Name=Invalid Password Invitations
 Name[ar]=كلمة المرور الدعوات غير صحيحة
 Name[ca]=Contrasenya de les invitacions no vàlides
 Name[cs]=Neplatné hesla výzev
-Name[da]=Ugyldige kodeordsinvitationer
+Name[da]=Ugyldige adgangskodeinvitationer
 Name[de]=Ungültiges Einladungs-Passwort
 Name[el]=Μη έγκυρος κωδικός πρόσβασης πρόσκλησης
 Name[eo]=Nevalidaj pasvortaj invitoj
@@ -535,7 +537,7 @@ 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[da]=Den inviterede part sendte en ugyldig adgangskode. 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.

main.cpp

@@ -74,12 +74,18 @@ int main(int argc, char *argv[])
 			    ki18n("KDesktop background deactivation"));
 	KCmdLineArgs::init(argc, argv, &aboutData);
 
+	KCmdLineOptions options;
+	options.add("nodialog", ki18n("Do not show the invitations management dialog at startup"));
+	KCmdLineArgs::addCmdLineOptions(options);
+
 	KApplication app;
         app.setQuitOnLastWindowClosed(false);
 
-    ManageInvitationsDialog invitationsDialog;
-    invitationsDialog.show();
-    TrayIcon trayicon(&invitationsDialog);
+
+	ManageInvitationsDialog invitationsDialog;
+	if ( KCmdLineArgs::parsedArgs()->isSet("dialog") )
+	    invitationsDialog.show();
+	TrayIcon trayicon(&invitationsDialog);
 
 	KrfbServer *server = KrfbServer::self(); // initialize the server manager
     if (!server->checkX11Capabilities()) {

manageinvitations.ui

@@ -181,7 +181,6 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
  <tabstops>
   <tabstop>invitationWidget</tabstop>
   <tabstop>newPersonalInvitationButton</tabstop>

personalinvitewidget.ui

@@ -200,9 +200,6 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <resources/>
+  <resources/>
  <connections/>
 </ui>