SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

.reviewboardrc

@@ -1,4 +0,0 @@
-REPOSITORY = "git://anongit.kde.org/krfb"
-REVIEWBOARD_URL = "https://git.reviewboard.kde.org"
-TARGET_PEOPLE = "whiting"
-

CMakeLists.txt

@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDECompilerSettings)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
 

doc/index.docbook

@@ -1,11 +1,22 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+  <!ENTITY kappname "&krfb;">
+  <!ENTITY package "kdenetwork">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE">
+  <!ENTITY % English "INCLUDE"> <!-- ONLY If you are writing non-English 
+                                     original documentation, change 
+                                     the language here -->
+    
+  <!-- Do not define any other entities; instead, use the entities
+       from entities/general.entities and $LANG/user.entities. -->
 ]>
+<!-- Based on kdoctemplate v0.9 January 10 2003 -->
 
 <book id="krfb" lang="&language;">
 
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
 <bookinfo>
 <title>The &krfb; Handbook</title>
 
@@ -21,11 +32,21 @@
 <year>2003</year>
 <holder>&Brad.Hards;</holder>
 </copyright>
+<!-- Translators: put here the copyright notice of the translation -->
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2016-07-25</date>
-<releaseinfo>5.0 (Applications 16.08)</releaseinfo>
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date>2013-06-19</date>
+<releaseinfo>&kde; 4.11</releaseinfo>
+
+<!-- Abstract about this handbook -->
 
 <abstract>
 <para>
@@ -35,6 +56,10 @@ view or even control the desktop.
 </para>
 </abstract>
 
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdenetwork</keyword>
@@ -50,9 +75,23 @@ view or even control the desktop.
 
 </bookinfo>
 
+<!-- The contents of the documentation begin here.  Label
+each chapter so with the id attribute. This is necessary for two reasons: it
+allows you to easily reference the chapter from other chapters of your
+document, and if there is no ID, the name of the generated HTML files will vary
+from time to time making it hard to manage for maintainers and for the CVS
+system. Any chapter labelled (OPTIONAL) may be left out at the author's
+discretion. Other chapters should not be left out in order to maintain a
+consistent documentation style across all KDE apps. -->
+
 <chapter id="introduction">
 <title>Introduction</title>
 
+<!-- The introduction chapter contains a brief introduction for the
+application that explains what it does and where to report
+problems. Basically a long version of the abstract.  Don't include a
+revision history. (see installation appendix comment) -->
+
 <para>
 &krfb; is a server application that allows you to share your current
 session with a user on another machine, who can use a <acronym>VNC</acronym> client to
@@ -126,8 +165,10 @@ use &krfb; over other links, but performance is unlikely to be as good.
 <chapter id="using-krfb">
 <title>Using &krfb;</title>
 
-<sect1 id="main-windw">
-<title>&krfb; Main Window</title>
+<!-- This chapter should tell the user how to use your app. You should use as
+many sections (Chapter, Sect1, Sect3, etc...) as is necessary to fully document
+your application. -->
+
 <para>
 It is very easy to use &krfb; - it has a simple interface, as shown in
 the screenshot below.
@@ -148,69 +189,64 @@ the screenshot below.
 </para>
 
 <para>
-When you want to allow someone to access your desktop, you have to
-enable the checkbox <guilabel>Enable Desktop Sharing</guilabel>,
-which will start the server.
-</para>
-
-<sect2 id="connection-details">
-<title>Connection Details</title>
-
-<para>
-The <guilabel>Address</guilabel> contains the address of your
-computer and the port number, separated by a colon.
-The address is just a hint - you can use any address that can
-reach your computer. &krfb; tries to guess your address from your
-network configuration, but does not always succeed in doing so.
-If your computer is behind a firewall it may have a different
-address or be unreachable for other computers.
-</para>
-<para>
-You can change the port on the <guilabel>Network</guilabel>
-page in the configuration dialog.
-</para>
-<para>
-The next field is prefilled with an automatically generated password.
-Click in the icon at the right of the field to change the password.
-</para>
-</sect2>
-
-<sect2 id="unattended-access">
-<title>Unattended Access</title>
-
-<para>
-Any remote user with the desktop sharing password will have to be authenticated.
-If unattended access is activated, and the remote user provides the password
-for unattended mode, desktop sharing access will be granted without explicit
-confirmation.
-</para>
-<para>
-By default the password for this mode is empty, to change that click on
-the button and enter a password.
-</para>
-<para>
-If unattended access is allowed, then you should probably specify a
-password.
+When you want to allow someone to access your desktop, you can create
+an personal invitation using the <guibutton>New Personal
+Invitation...</guibutton> button, which will bring up a window
+containing the information needed to access your desktop. An example
+is shown below.
 </para>
 
 <para>
-If the machine is a server and you are using &krfb; for remote
-administration, you probably want to use unattended access.
+<screenshot>
+<screeninfo>Example &krfb; personal invitation</screeninfo>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="personal_invitation.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>Example &krfb; personal invitation</phrase>
+	  </textobject>
+	</mediaobject>
+</screenshot>
 </para>
 
-</sect2>
-
-<sect2 id="transfer-login-information">
-<title>Transfer Login Information</title>
+<para>
+To increase security, the invitation is only valid for an
+hour after it is created, and of course the person connecting has to
+have the correct password. 
+</para>
 
 <para>
-&krfb; has no invitation feature any more as in previous versions.
-So you have to transfer the login information yourself using email
-or a personal invitation.
+Since you may want to invite someone to access your desktop by email,
+&krfb; can create invitations as email messages. You can create such
+an invitation using the <guibutton>New Email Invitation...</guibutton>
+button on the &krfb; main window. This will usually bring up an email
+message that looks like the following, ready for you to type in the
+email address of the person you are sending the invitation to.
+</para>
+
+<para>
+<screenshot>
+<screeninfo>Example &krfb; email invitation</screeninfo>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="email_invitation.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>Example &krfb; email invitation</phrase>
+	  </textobject>
+	</mediaobject>
+</screenshot>
+</para>
+
+<warning>
+<para>
+&krfb; will warn you about the security implications of sending this
+information across an insecure link. You must heed those warnings.
 </para>
 <para>
 If you cannot encrypt the email (or otherwise secure the link),
-sending a password by email is a very serious security risk, since
+sending invitations by email is a very serious security risk, since
 anyone can read the password and address from the email as it passes
 over the network. This means that they can potentially take control of
 your machine.
@@ -219,32 +255,33 @@ your machine.
 If you cannot encrypt the email message, it may be better to use a
 personal invitation, telephone the person you are giving access to,
 verify the identity of that person, and provide the required
-information that way.
+invitation information that way.
 </para>
+</warning>
+
+<sect1 id="krfb-managing-invitations">
+<title>Managing &krfb; invitations</title>
 
-<note>
 <para>
-&krfb; uses the normal <acronym>RFB</acronym> password system, which does not transfer
-your password in the clear across the network. Instead, it uses a
-challenge-response system. This is reasonably secure, as long as the
-password is securely guarded.
+Having created an invitation (either a personal invitation or one that
+was sent by email), &krfb; main window allows you to delete existing
+invitations. To just delete one of the invitations, select it with the
+mouse (it should become highlighted), and then select
+the <guibutton>Delete</guibutton>. To delete all invitations, just
+select the <guibutton>Delete All</guibutton> button.
 </para>
-</note>
 
-</sect2>
+</sect1>
 
-<sect2 id="krfb-qqit">
+<sect1 id="krfb-qit">
 <title>Quit &krfb;</title>
 
 <para>
-If you close the &krfb; main window by clicking on the window close icon or using the
-shortcut <keycombo action="simul">&Alt;<keycap>F4</keycap></keycombo> the server
-keeps running, which is indicated by an icon in the system tray.
-To stop &krfb; either use <menuchoice><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice>
-in the main window or right click on the icon in the system tray and select
+If you close the &krfb; main window the server keeps running, which is
+indicated by an icon in the system tray.
+To stop &krfb; right click on the  icon in the systems tray and select
 <guimenuitem>Quit</guimenuitem>.
 </para>
-</sect2>
 
 </sect1>
 
@@ -253,7 +290,7 @@ in the main window or right click on the icon in the system tray and select
 <para>
 In addition to the main &krfb; interface shown and described above, 
 you can also control &krfb;  using the
-<guimenuitem>Configure...</guimenuitem> on the &krfb; main window. The &krfb;
+<guibutton>Configure...</guibutton> on the &krfb; main window. The &krfb;
 configuration has two pages, as shown in the screenshot below: 
 </para>
 
@@ -277,8 +314,8 @@ The <guilabel>Network</guilabel> page allows control over the port that
 </para>
 
 <para>
-The <guilabel>Announce service on the local network</guilabel> checkbox
-controls whether &krfb; announces the service over the local network using
+The <guilabel>Announce service on the network</guilabel> checkbox
+controls whether &krfb; announces invitations over the network using
 Service Location Protocol. This is normally a good idea, but only
 works really well with a Service Location Protocol aware client, such
 as &krdc;.
@@ -286,8 +323,8 @@ as &krdc;.
 
 <para>
 If you select the <guilabel>Use default port</guilabel> checkbox, 
-then &krfb; will locate a suitable port.
-If you deselect this checkbox, you can specify a particular
+then &krfb; will locate a suitable port, and invitations will match 
+this port. If you deselect this checkbox, you can specify a particular
 port. Specifying a particular port may be useful if you are using
 port-forwarding on the firewall. Note that if Service Location
 Protocol is turned on, this will automatically deal with identifying
@@ -295,8 +332,8 @@ the correct port.
 </para>
 
 <para>
-The <guilabel>Security</guilabel> page allows you to configure whether the
-person connecting to the &krfb; server can control the desktop, or only view.
+The <guilabel>Security</guilabel> page allows you configure settings
+related to access to the &krfb; server.
 </para>
 
 <para>
@@ -313,15 +350,41 @@ person connecting to the &krfb; server can control the desktop, or only view.
 </screenshot>
 </para>
 
+<para>
+The <guilabel>Allow uninvited connections</guilabel> check box controls
+whether &krfb; allows connection without an invitation. If uninvited
+connections are allowed, then you should probably specify a
+password. You can also use the check boxes here to choose whether you
+have to confirm the connection before it proceeds, and whether the
+person connecting can control the desktop, or only view.
+</para>
+
+<para>
+If the machine is a workstation, and you choose to allow uninvited
+connections, you probably want to select the <guilabel>Ask 
+before accepting connections </guilabel>. Conversely, if the
+machine is a server and you are using &krfb; for remote
+administration, you probably want to deselect this option.
+</para>
+
+<note>
+<para>
+&krfb; uses the normal <acronym>RFB</acronym> password system, which does not transfer
+your password in the clear across the network. Instead, it uses a
+challenge-response system. This is reasonably secure, as long as the
+password is securely guarded.
+</para>
+</note>
+
 </sect1>
 
 <sect1 id="krfb-connection">
-<title>Connecting to &krfb;</title>
+<title>What happens when someone connects to &krfb;</title>
 
 <para>
 When someone connects to &krfb; on your machine, you will get a pop-up
 notification that looks like the following screenshot, unless you are
-accepting unattended access without confirmation.
+accepting uninvited connections without warning.
 </para>
 <para>
 <screenshot>
@@ -339,8 +402,8 @@ accepting unattended access without confirmation.
 
 <para>
 If you <guibutton>Accept Connection</guibutton>, the client can
-proceed to authenticate, which requires the correct password for a
-login. If you <guibutton>Refuse
+proceed to authenticate (which requires the correct password for a
+personal invitation or email invitation). If you <guibutton>Refuse
 Connection</guibutton>, then the attempt to connect will be terminated.
 </para>
 
@@ -350,11 +413,23 @@ mouse</guilabel> check box determines whether this client can only
 observe, or can take control of your machine. 
 </para>
 
+<para>
+If the client connection is successful, and used the password from a
+personal invitation or email invitation, then that invitation is
+deleted and cannot be used again. You will also get a small pop-up
+window in the dock, that shows that the connection has been made.
+</para>
+
 </sect1>
 </chapter>
 
 <chapter id="credits">
 
+<!-- Include credits for the programmers, documentation writers, and
+contributors here. The license for your software should then be included below
+the credits with a reference to the appropriate license file included in the KDE
+distribution. -->
+
 <title>Credits and License</title>
 
 <para>
@@ -383,6 +458,33 @@ Documentation Copyright &copy; 2003 &Brad.Hards; &Brad.Hards.mail;
 
 </chapter>
 
+<appendix id="installation">
+<title>Installation</title>
+
+<sect1 id="getting-krfb">
+<title>How to obtain &krfb;</title>
+
+<!-- This first entity contains boiler plate for applications that are
+part of KDE CVS.  You should remove it if you are releasing your
+application --> 
+
+&install.intro.documentation;
+
+</sect1>
+
+<sect1 id="compilation">
+<title>Compilation and Installation</title>
+
+<!-- This entity contains the boilerplate text for standard -->
+<!-- compilation instructions.  If your application requires any -->
+<!-- special handling, remove it, and replace with your own text. -->
+
+&install.compile.documentation;
+
+</sect1>
+
+</appendix>
+
 &documentation.index;
 </book>
 

framebuffers/qt/krfb_framebuffer_qt.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Qt based Framebuffer for KRfb.
-Comment[ast]=Búfer de cuadros basáu en Qt pa KRfb.
+Comment[ast]=Esquema Qt de buffer pa KRfb
 Comment[bg]=Основан на Qt фреймбуфер за KRfb.
 Comment[bs]=Kadrobafer za KRfb na osnovu Qt.
 Comment[ca]=«Framebuffer» basat en les Qt per al KRfb.
@@ -49,7 +49,7 @@ Comment[x-test]=xxQt based Framebuffer for KRfb.xx
 Comment[zh_CN]=基于 Qt 的 KRfb 帧缓冲机制
 Comment[zh_TW]=KRfb 的 Qt-based Framebuffer
 Name=Qt Framebuffer for KRfb
-Name[ast]=Búfer de cuadros Qt pa KRfb
+Name[ast]=Esquema Qt de buffer pa KRfb
 Name[bg]=Qt фреймбуфер за KRfb
 Name[bs]=Qt-ov kadrobafer za KRFB
 Name[ca]=«Framebuffer» de les Qt per al KRfb.

framebuffers/qt/krfb_framebuffer_qt.json

@@ -1,79 +1,70 @@
 {
-    "Encoding": "UTF-8",
+    "Encoding": "UTF-8", 
     "KPlugin": {
-        "Description": "Qt based Framebuffer for KRfb.",
-        "Description[ast]": "Búfer de cuadros basáu en Qt pa KRfb.",
-        "Description[ca@valencia]": "«Framebuffer» basat en les Qt per al KRfb.",
-        "Description[ca]": "«Framebuffer» basat en les Qt per al KRfb.",
-        "Description[cs]": "Framebuffer založený na Qt pro KRfb.",
-        "Description[da]": "Qt-baseret framebuffer til KRfb.",
-        "Description[de]": "Qt-basierter Framebuffer für KRfb",
-        "Description[es]": "Framebuffer basado en Qt para KRfb.",
-        "Description[et]": "KRfb Qt põhine kaadripuhver",
-        "Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle",
-        "Description[fr]": "Tampon d'images utilisant Qt pour KRfb.",
-        "Description[gl]": "Framebuffer baseado en Qt para KRfb.",
-        "Description[ia]": "Framebuffer basate sur Qt per KRfb",
-        "Description[it]": "Framebuffer basato su Qt per KRfb.",
-        "Description[ko]": "KRfb용 Qt 기반 프레임버퍼입니다.",
-        "Description[nl]": "Op Qt gebaseerd framebuffer voor KRfb.",
-        "Description[nn]": "Qt-basert biletbuffer for KRfb.",
-        "Description[pl]": "Bufor ramki na podstawie Qt dla KRfb.",
-        "Description[pt]": "'Framebuffer' baseado no Qt para o KRfb.",
-        "Description[pt_BR]": "Framebuffer baseado no Qt para o KRfb.",
-        "Description[ru]": "Буфер кадров для KRfb на базе Qt",
-        "Description[sk]": "Framebuffer založený na Qt pre KRfb.",
-        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na Qt",
-        "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу КуТ‑у",
-        "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu Qt‑u",
-        "Description[sr@latin]": "Kadrobafer za KRFB na osnovu Qt‑u",
-        "Description[sr]": "Кадробафер за КРФБ на основу КуТ‑у",
-        "Description[sv]": "X11-rambuffert för Krfb.",
-        "Description[tr]": "KRfb için Qt tabanlı Çerçeve tamponu.",
-        "Description[uk]": "Заснований на Qt буфер кадрів для KRfb.",
-        "Description[x-test]": "xxQt based Framebuffer for KRfb.xx",
-        "Description[zh_CN]": "KRfb 的基于 Qt 的帧缓冲。",
-        "Description[zh_TW]": "KRfb 的 Qt-based Framebuffer",
-        "EnabledByDefault": true,
-        "Id": "qt",
-        "License": "GPL",
-        "Name": "Qt Framebuffer for KRfb",
-        "Name[ast]": "Búfer de cuadros Qt pa KRfb",
-        "Name[ca@valencia]": "«Framebuffer» de les Qt per al KRfb.",
-        "Name[ca]": "«Framebuffer» de les Qt per al KRfb.",
-        "Name[cs]": "Qt Framebuffer pro KRfb",
-        "Name[da]": "Qt-framebuffer til KRfb",
-        "Name[de]": "Qt-Framebuffer für KRfb",
-        "Name[es]": "Framebuffer de Qt para KRfb",
-        "Name[et]": "KRfb Qt kaadripuhver",
-        "Name[fi]": "QT-kehyspuskuri KRfb:lle",
-        "Name[fr]": "Tampon d'images Qt pour KRfb",
-        "Name[gl]": "Framebuffer de Qt para KRfb",
-        "Name[ia]": "Framebuffer Qt per KRfb",
-        "Name[it]": "Framebuffer Qt per KRfb",
-        "Name[ko]": "KRfb용 Qt 프레임버퍼",
-        "Name[nl]": "Qt-framebuffer voor KRfb",
-        "Name[nn]": "Qt-biletbuffer for KRfb",
-        "Name[pl]": "Bufor ramki Qt dla KRfb",
-        "Name[pt]": "'Framebuffer' do Qt para o KRfb",
-        "Name[pt_BR]": "Framebuffer do Qt para o KRfb",
-        "Name[ru]": "Буфер кадров Qt для KRfb",
-        "Name[sk]": "Qt Framebuffer pre KRfb",
-        "Name[sl]": "Slikovni medpomnilnik Qt za KRfb",
-        "Name[sr@ijekavian]": "КуТ‑ов кадробафер за КРФБ",
-        "Name[sr@ijekavianlatin]": "Qt‑ov kadrobafer za KRFB",
-        "Name[sr@latin]": "Qt‑ov kadrobafer za KRFB",
-        "Name[sr]": "КуТ‑ов кадробафер за КРФБ",
-        "Name[sv]": "X11-rambuffert för Krfb",
-        "Name[tr]": "KRfb için Qt Çerçeve tamponu",
-        "Name[uk]": "Буфер кадрів на Qt для KRfb",
-        "Name[x-test]": "xxQt Framebuffer for KRfbxx",
-        "Name[zh_CN]": "KRfb 的 Qt 帧缓冲",
-        "Name[zh_TW]": "Krfb 的 Qt Framebuffer",
+        "Description": "Qt based Framebuffer for KRfb.", 
+        "Description[ca@valencia]": "«Framebuffer» basat en les Qt per al KRfb.", 
+        "Description[ca]": "«Framebuffer» basat en les Qt per al KRfb.", 
+        "Description[cs]": "Framebuffer založený na Qt pro KRfb.", 
+        "Description[da]": "Qt-baseret framebuffer til KRfb.", 
+        "Description[de]": "Qt-basierter Framebuffer für KRfb", 
+        "Description[es]": "Framebuffer basado en Qt para KRfb.", 
+        "Description[et]": "KRfb Qt põhine kaadripuhver", 
+        "Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle", 
+        "Description[gl]": "Framebuffer baseado en Qt para KRfb.", 
+        "Description[ia]": "Framebuffer basate sur Qt per KRfb", 
+        "Description[it]": "Framebuffer basato su Qt per KRfb.", 
+        "Description[ko]": "KRfb용 Qt 기반 프레임버퍼입니다.", 
+        "Description[nl]": "Op Qt gebaseerd framebuffer voor KRfb.", 
+        "Description[pl]": "Bufor ramki na podstawie Qt dla KRfb.", 
+        "Description[pt]": "'Framebuffer' baseado no Qt para o KRfb.", 
+        "Description[pt_BR]": "Framebuffer baseado no Qt para o KRfb.", 
+        "Description[ru]": "Буфер кадров для KRfb на базе Qt", 
+        "Description[sk]": "Framebuffer založený na Qt pre KRfb.", 
+        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na Qt", 
+        "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу КуТ‑у", 
+        "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu Qt‑u", 
+        "Description[sr@latin]": "Kadrobafer za KRFB na osnovu Qt‑u", 
+        "Description[sr]": "Кадробафер за КРФБ на основу КуТ‑у", 
+        "Description[sv]": "X11-rambuffert för Krfb.", 
+        "Description[uk]": "Заснований на Qt буфер кадрів для KRfb.", 
+        "Description[x-test]": "xxQt based Framebuffer for KRfb.xx", 
+        "Description[zh_CN]": "KRfb 的基于 Qt 的帧缓冲。", 
+        "EnabledByDefault": true, 
+        "Id": "qt", 
+        "License": "GPL", 
+        "Name": "Qt Framebuffer for KRfb", 
+        "Name[ast]": "Framebuffer Qt pa KRfb", 
+        "Name[ca@valencia]": "«Framebuffer» de les Qt per al KRfb.", 
+        "Name[ca]": "«Framebuffer» de les Qt per al KRfb.", 
+        "Name[cs]": "Qt Framebuffer pro KRfb", 
+        "Name[da]": "Qt-framebuffer til KRfb", 
+        "Name[de]": "Qt-Framebuffer für KRfb", 
+        "Name[es]": "Framebuffer de Qt para KRfb", 
+        "Name[et]": "KRfb Qt kaadripuhver", 
+        "Name[fi]": "QT-kehyspuskuri KRfb:lle", 
+        "Name[gl]": "Framebuffer de Qt para KRfb", 
+        "Name[ia]": "Framebuffer Qt per KRfb", 
+        "Name[it]": "Framebuffer Qt per KRfb", 
+        "Name[ko]": "KRfb용 Qt 프레임버퍼", 
+        "Name[nl]": "Qt-framebuffer voor KRfb", 
+        "Name[pl]": "Bufor ramki Qt dla KRfb", 
+        "Name[pt]": "'Framebuffer' do Qt para o KRfb", 
+        "Name[pt_BR]": "Framebuffer do Qt para o KRfb", 
+        "Name[ru]": "Буфер кадров Qt для KRfb", 
+        "Name[sk]": "Qt Framebuffer pre KRfb", 
+        "Name[sl]": "Slikovni medpomnilnik Qt za KRfb", 
+        "Name[sr@ijekavian]": "КуТ‑ов кадробафер за КРФБ", 
+        "Name[sr@ijekavianlatin]": "Qt‑ov kadrobafer za KRFB", 
+        "Name[sr@latin]": "Qt‑ov kadrobafer za KRFB", 
+        "Name[sr]": "КуТ‑ов кадробафер за КРФБ", 
+        "Name[sv]": "X11-rambuffert för Krfb", 
+        "Name[uk]": "Буфер кадрів на Qt для KRfb", 
+        "Name[x-test]": "xxQt Framebuffer for KRfbxx", 
+        "Name[zh_CN]": "KRfb 的 Qt 帧缓冲", 
         "ServiceTypes": [
             "krfb/framebuffer"
-        ],
-        "Version": "0.1",
+        ], 
+        "Version": "0.1", 
         "Website": "http://www.kde.org"
     }
-}
+}

framebuffers/qt/qtframebuffer.cpp

@@ -14,8 +14,6 @@
 #include <QRegion>
 #include <QPixmap>
 #include <QBitmap>
-#include <QGuiApplication>
-#include <QScreen>
 
 
 const int UPDATE_TIME = 500;
@@ -23,16 +21,8 @@ const int UPDATE_TIME = 500;
 QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
     : FrameBuffer(id, parent)
 {
-    QScreen *screen = QGuiApplication::primaryScreen();
-    if (screen) {
-        primaryScreen = screen;
-        fbImage = screen->grabWindow(win).toImage();
-        fb = new char[fbImage.byteCount()];
-    } else {
-        fb = Q_NULLPTR;
-        primaryScreen = Q_NULLPTR;
-    }
-
+    fbImage = QPixmap::grabWindow(win).toImage();
+    fb = new char[fbImage.byteCount()];
     t = new QTimer(this);
     connect(t, &QTimer::timeout, this, &QtFrameBuffer::updateFrameBuffer);
 }
@@ -40,8 +30,7 @@ QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
 
 QtFrameBuffer::~QtFrameBuffer()
 {
-    if (fb)
-        delete [] fb;
+    delete [] fb;
     fb = 0;
 }
 
@@ -77,8 +66,7 @@ void QtFrameBuffer::getServerFormat(rfbPixelFormat &format)
 
 void QtFrameBuffer::updateFrameBuffer()
 {
-    if (!fb || !primaryScreen) return;
-    QImage img = primaryScreen->grabWindow(win).toImage();
+    QImage img = QPixmap::grabWindow(win).toImage();
 #if 0 // This is actually slower than updating the whole desktop...
     QSize imgSize = img.size();
 

framebuffers/qt/qtframebuffer.h

@@ -14,7 +14,6 @@
 #include "framebuffer.h"
 
 class QTimer;
-class QScreen;
 /**
     @author Alessandro Praduroux <pradu@pradu.it>
 */
@@ -40,7 +39,6 @@ public Q_SLOTS:
 private:
     QImage fbImage;
     QTimer *t;
-    QScreen *primaryScreen;
 };
 
 #endif

framebuffers/x11/krfb_framebuffer_x11.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=X11 XDamage/XShm based Framebuffer for KRfb.
-Comment[ast]=Búfer de cuadros basáu en XDamage/XShm de X11 pa KRfb.
+Comment[ast]=Esquema de buffer pa KRfb basáu en XDamage/XShm
 Comment[bg]=Основан на X11 XDamage/XShm фреймбуфер за KRfb.
 Comment[bs]=X11 XDamage/XShm baziran framebafer za KRfb.
 Comment[ca]=«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.
@@ -49,7 +49,7 @@ Comment[x-test]=xxX11 XDamage/XShm based Framebuffer for KRfb.xx
 Comment[zh_CN]=基于 X11 XDamage/XShm 扩展的 KRfb 帧缓冲机制。
 Comment[zh_TW]=KRfb 的 X11 XDamage/XShm based Framebuffer
 Name=X11 Framebuffer for KRfb
-Name[ast]=Búfer de cuadros de X11 pa KRfb
+Name[ast]=Buffer de X11 pa KRfb
 Name[bg]=X11 фреймбуфер за KRfb
 Name[bs]=X11 frame bafer za KRfb
 Name[ca]=«Framebuffer» del X11 per al KRfb.

framebuffers/x11/krfb_framebuffer_x11.json

@@ -1,79 +1,69 @@
 {
-    "Encoding": "UTF-8",
+    "Encoding": "UTF-8", 
     "KPlugin": {
-        "Description": "X11 XDamage/XShm based Framebuffer for KRfb.",
-        "Description[ast]": "Búfer de cuadros basáu en XDamage/XShm de X11 pa KRfb.",
-        "Description[ca@valencia]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.",
-        "Description[ca]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.",
-        "Description[cs]": "Framebuffer založený na X11 XDamage/XShm pro KRfb.",
-        "Description[da]": "X11 XDamage/XShm-baseret framebuffer til KRfb.",
-        "Description[de]": "X11 XDamage/XShm-basierter Framebuffer für KRfb.",
-        "Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.",
-        "Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver",
-        "Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.",
-        "Description[fr]": "Tampon d'images utilisant XDamage/XShm de X11 pour KRfb.",
-        "Description[gl]": "Framebuffer baseado en Xll XDamage/Xshm para XRfb.",
-        "Description[ia]": "Framebuffer basate sur X11 XDamage/XShm per KRfb.",
-        "Description[it]": "Framebuffer basato su XDamage/XShm di X11 per KRfb.",
-        "Description[ko]": "KRfb용 X11 XDamage/XShm 기반 프레임버퍼입니다.",
-        "Description[nl]": "Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.",
-        "Description[nn]": "X11 XDamage/XShm-basert biletbuffer for KRfb.",
-        "Description[pl]": "Bufor ramki na podstawie X11 XDamage/XShm dla KRfb.",
-        "Description[pt]": "'Framebuffer' do X11, baseado no XDamage/XShm, para o KRfb.",
-        "Description[pt_BR]": "Framebuffer baseado no XDamage/XShm do X11 para o KRfb.",
-        "Description[ru]": "Буфер кадров для KRfb на базе X11 XDamage/XShm",
-        "Description[sk]": "Framebuffer založený na X11 XDamage/XShm pre KRfb.",
-        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na X11 XDamage/XShm",
-        "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.",
-        "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.",
-        "Description[sr@latin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.",
-        "Description[sr]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.",
-        "Description[sv]": "X11 XDamage/XShm-baserad rambuffert för Krfb.",
-        "Description[tr]": "KRfb için X11 XDamage/XShm tabanlı Çerçeve tamponu.",
-        "Description[uk]": "Заснований на XDamage/XShm X11 буфер кадрів для KRfb.",
-        "Description[x-test]": "xxX11 XDamage/XShm based Framebuffer for KRfb.xx",
-        "Description[zh_CN]": "KRfb 的基于 X11 XDamage/XShm 的帧缓冲。",
-        "Description[zh_TW]": "KRfb 的 X11 XDamage/XShm based Framebuffer",
-        "EnabledByDefault": true,
-        "Id": "x11",
-        "License": "GPL",
-        "Name": "X11 Framebuffer for KRfb",
-        "Name[ast]": "Búfer de cuadros de X11 pa KRfb",
-        "Name[ca@valencia]": "«Framebuffer» del X11 per al KRfb.",
-        "Name[ca]": "«Framebuffer» del X11 per al KRfb.",
-        "Name[cs]": "X11 Framebuffer pro KRfb",
-        "Name[da]": "X11-framebuffer til KRfb",
-        "Name[de]": "X11-Framebuffer für KRfb",
-        "Name[es]": "Framebuffer X11 para KRfb",
-        "Name[et]": "KRfb X11 kaadripuhver",
-        "Name[fi]": "X11-kehyspuskuri KRfb:lle",
-        "Name[fr]": "Tampon d'images X11 pour KRfb",
-        "Name[gl]": "Framebuffer de X11 para KRfb",
-        "Name[ia]": "Framebuffer X11 per KRfb",
-        "Name[it]": "Framebuffer X11 per KRfb",
-        "Name[ko]": "KRfb용 X11 프레임버퍼",
-        "Name[nl]": "X11 framebuffer voor KRfb",
-        "Name[nn]": "X11-biletbuffer for KRfb",
-        "Name[pl]": "Bufor ramki X11 dla KRfb",
-        "Name[pt]": "'Framebuffer' do X11 para o KRfb",
-        "Name[pt_BR]": "Framebuffer do X11 para o KRfb",
-        "Name[ru]": "Буфер кадров X11 для KRfb",
-        "Name[sk]": "X11 Framebuffer pre KRfb",
-        "Name[sl]": "Slikovni medpomnilnik X11 za KRfb",
-        "Name[sr@ijekavian]": "Икс11 кадробафер за КРФБ.",
-        "Name[sr@ijekavianlatin]": "X11 kadrobafer za KRFB.",
-        "Name[sr@latin]": "X11 kadrobafer za KRFB.",
-        "Name[sr]": "Икс11 кадробафер за КРФБ.",
-        "Name[sv]": "X11-rambuffert för Krfb",
-        "Name[tr]": "KRfb için X11 Çerçeve tamponu",
-        "Name[uk]": "Буфер кадрів X11 для KRfb",
-        "Name[x-test]": "xxX11 Framebuffer for KRfbxx",
-        "Name[zh_CN]": "XRfb 的 X11 帧缓冲",
-        "Name[zh_TW]": "KRfb 的 X11 Framebuffer",
+        "Description": "X11 XDamage/XShm based Framebuffer for KRfb.", 
+        "Description[ca@valencia]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.", 
+        "Description[ca]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.", 
+        "Description[cs]": "Framebuffer založený na X11 XDamage/XShm pro KRfb.", 
+        "Description[da]": "X11 XDamage/XShm-baseret framebuffer til KRfb.", 
+        "Description[de]": "X11 XDamage/XShm-basierter Framebuffer für KRfb.", 
+        "Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.", 
+        "Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver", 
+        "Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.", 
+        "Description[gl]": "Framebuffer baseado en Xll XDamage/Xshm para XRfb.", 
+        "Description[ia]": "Framebuffer basate sur X11 XDamage/XShm per KRfb.", 
+        "Description[it]": "Framebuffer basato su XDamage/XShm di X11 per KRfb.", 
+        "Description[ko]": "KRfb용 X11 XDamage/XShm 기반 프레임버퍼입니다.", 
+        "Description[nl]": "Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.", 
+        "Description[pl]": "Bufor ramki na podstawie X11 XDamage/XShm dla KRfb.", 
+        "Description[pt]": "'Framebuffer' do X11, baseado no XDamage/XShm, para o KRfb.", 
+        "Description[pt_BR]": "Framebuffer baseado no XDamage/XShm do X11 para o KRfb.", 
+        "Description[ru]": "Буфер кадров для KRfb на базе X11 XDamage/XShm", 
+        "Description[sk]": "Framebuffer založený na X11 XDamage/XShm pre KRfb.", 
+        "Description[sl]": "Slikovni medpomnilnik za KRfb, ki temelji na X11 XDamage/XShm", 
+        "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.", 
+        "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.", 
+        "Description[sr@latin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.", 
+        "Description[sr]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.", 
+        "Description[sv]": "X11 XDamage/XShm-baserad rambuffert för Krfb.", 
+        "Description[uk]": "Заснований на XDamage/XShm X11 буфер кадрів для KRfb.", 
+        "Description[x-test]": "xxX11 XDamage/XShm based Framebuffer for KRfb.xx", 
+        "Description[zh_CN]": "KRfb 的基于 X11 XDamage/XShm 的帧缓冲。", 
+        "EnabledByDefault": true, 
+        "Id": "x11", 
+        "License": "GPL", 
+        "Name": "X11 Framebuffer for KRfb", 
+        "Name[ca@valencia]": "«Framebuffer» del X11 per al KRfb.", 
+        "Name[ca]": "«Framebuffer» del X11 per al KRfb.", 
+        "Name[cs]": "X11 Framebuffer pro KRfb", 
+        "Name[da]": "X11-framebuffer til KRfb", 
+        "Name[de]": "X11-Framebuffer für KRfb", 
+        "Name[es]": "Framebuffer X11 para KRfb", 
+        "Name[et]": "KRfb X11 kaadripuhver", 
+        "Name[fi]": "X11-kehyspuskuri KRfb:lle", 
+        "Name[gl]": "Framebuffer de X11 para KRfb", 
+        "Name[ia]": "Framebuffer X11 per KRfb", 
+        "Name[it]": "Framebuffer X11 per KRfb", 
+        "Name[ko]": "KRfb용 X11 프레임버퍼", 
+        "Name[nl]": "X11 framebuffer voor KRfb", 
+        "Name[pl]": "Bufor ramki X11 dla KRfb", 
+        "Name[pt]": "'Framebuffer' do X11 para o KRfb", 
+        "Name[pt_BR]": "Framebuffer do X11 para o KRfb", 
+        "Name[ru]": "Буфер кадров X11 для KRfb", 
+        "Name[sk]": "X11 Framebuffer pre KRfb", 
+        "Name[sl]": "Slikovni medpomnilnik X11 za KRfb", 
+        "Name[sr@ijekavian]": "Икс11 кадробафер за КРФБ.", 
+        "Name[sr@ijekavianlatin]": "X11 kadrobafer za KRFB.", 
+        "Name[sr@latin]": "X11 kadrobafer za KRFB.", 
+        "Name[sr]": "Икс11 кадробафер за КРФБ.", 
+        "Name[sv]": "X11-rambuffert för Krfb", 
+        "Name[uk]": "Буфер кадрів X11 для KRfb", 
+        "Name[x-test]": "xxX11 Framebuffer for KRfbxx", 
+        "Name[zh_CN]": "XRfb 的 X11 帧缓冲", 
         "ServiceTypes": [
             "krfb/framebuffer"
-        ],
-        "Version": "0.1",
+        ], 
+        "Version": "0.1", 
         "Website": "http://www.kde.org"
     }
-}
+}

krfb/CMakeLists.txt

@@ -78,6 +78,7 @@ add_executable (krfb
 
 target_link_libraries (krfb
                        krfbprivate
+                       vncserver
                        ${JPEG_LIBRARIES}
                        ${X11_Xext_LIB}
                        ${X11_X11_LIB}
@@ -111,10 +112,6 @@ install (PROGRAMS org.kde.krfb.desktop
          DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
 
-install(FILES org.kde.krfb.appdata.xml
-        DESTINATION ${KDE_INSTALL_METAINFODIR}
-)
-
 install (FILES krfb.notifyrc
          DESTINATION ${DATA_INSTALL_DIR}/krfb
 )

krfb/krfb-framebuffer.desktop

@@ -3,7 +3,7 @@ Type=ServiceType
 X-KDE-ServiceType=krfb/framebuffer
 
 Comment=Frame Buffer plugins for KRfb
-Comment[ast]=Complementos del búfer de cuadros pa KRfb
+Comment[ast]=Complementu de buffer pa KRfb
 Comment[bg]=Приставки за фреймбуфер за KRfb
 Comment[bs]=Priključci framebafera za KRfb
 Comment[ca]=Connectors de «framebuffer» per al KRfb.

krfb/krfb-framebuffer.json

@@ -1,38 +1,33 @@
 {
     "KPlugin": {
-        "Description": "Frame Buffer plugins for KRfb",
-        "Description[ast]": "Complementos del búfer de cuadros pa KRfb",
-        "Description[ca@valencia]": "Connectors de «framebuffer» per al KRfb.",
-        "Description[ca]": "Connectors de «framebuffer» per al KRfb.",
-        "Description[cs]": "Moduly Frame bufferu pro KRfb",
-        "Description[da]": "Framebuffer-plugins til KRfb",
-        "Description[de]": "Framebuffer-Module für KRfb",
-        "Description[es]": "Complementos de framebuffer para KRfb",
-        "Description[et]": "KRfb kaadripuhvri pluginad",
-        "Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb",
-        "Description[fr]": "Modules de tampons d'image pour KRfb",
-        "Description[gl]": "Engadido de frame buffer para KRfb",
-        "Description[ia]": "Plug-ins de Frame Buffer per KRfb",
-        "Description[it]": "Estensioni del framebuffer per KRfb",
-        "Description[ko]": "KRfb 프레임버퍼 플러그인",
-        "Description[nl]": "Framebuffer-plugins voor KRfb",
-        "Description[nn]": "Biletbuffer-tillegg KRfb",
-        "Description[pl]": "Wtyczki buforów ramek dla KRfb",
-        "Description[pt]": "'Plugins' do 'Framebuffer' para o KRfb",
-        "Description[pt_BR]": "Plugins de framebuffers para o KRfb",
-        "Description[ru]": "Модули буфера кадров для KRfb",
-        "Description[sk]": "Frame Buffer modul pre KRfb",
-        "Description[sl]": "Vstavki slikovnih medpomnilnikov za KRfb",
-        "Description[sr@ijekavian]": "Прикључци кадробафера за КРФБ",
-        "Description[sr@ijekavianlatin]": "Priključci kadrobafera za KRFB",
-        "Description[sr@latin]": "Priključci kadrobafera za KRFB",
-        "Description[sr]": "Прикључци кадробафера за КРФБ",
-        "Description[sv]": "Insticksprogram med rambuffert för Krfb",
-        "Description[tr]": "KRfb için Çerçeve Tamponu eklentileri",
-        "Description[uk]": "Додатки буфера кадрів для KRfb",
-        "Description[x-test]": "xxFrame Buffer plugins for KRfbxx",
-        "Description[zh_CN]": "KRfb 的帧缓冲插件",
-        "Description[zh_TW]": "KRfb 的 Frame Buffer 外掛程式"
-    },
+        "Description": "Frame Buffer plugins for KRfb", 
+        "Description[ca@valencia]": "Connectors de «framebuffer» per al KRfb.", 
+        "Description[ca]": "Connectors de «framebuffer» per al KRfb.", 
+        "Description[cs]": "Moduly Frame bufferu pro KRfb", 
+        "Description[da]": "Framebuffer-plugins til KRfb", 
+        "Description[de]": "Framebuffer-Module für KRfb", 
+        "Description[es]": "Complementos de framebuffer para KRfb", 
+        "Description[et]": "KRfb kaadripuhvri pluginad", 
+        "Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb", 
+        "Description[gl]": "Engadido de frame buffer para KRfb", 
+        "Description[ia]": "Plug-ins de Frame Buffer per KRfb", 
+        "Description[it]": "Estensioni del framebuffer per KRfb", 
+        "Description[ko]": "KRfb 프레임버퍼 플러그인", 
+        "Description[nl]": "Framebuffer-plugins voor KRfb", 
+        "Description[pl]": "Wtyczki buforów ramek dla KRfb", 
+        "Description[pt]": "'Plugins' do 'Framebuffer' para o KRfb", 
+        "Description[pt_BR]": "Plugins de framebuffers para o KRfb", 
+        "Description[ru]": "Модули буфера кадров для KRfb", 
+        "Description[sk]": "Frame Buffer modul pre KRfb", 
+        "Description[sl]": "Vstavki slikovnih medpomnilnikov za KRfb", 
+        "Description[sr@ijekavian]": "Прикључци кадробафера за КРФБ", 
+        "Description[sr@ijekavianlatin]": "Priključci kadrobafera za KRFB", 
+        "Description[sr@latin]": "Priključci kadrobafera za KRFB", 
+        "Description[sr]": "Прикључци кадробафера за КРФБ", 
+        "Description[sv]": "Insticksprogram med rambuffert för Krfb", 
+        "Description[uk]": "Додатки буфера кадрів для KRfb", 
+        "Description[x-test]": "xxFrame Buffer plugins for KRfbxx", 
+        "Description[zh_CN]": "KRfb 的帧缓冲插件"
+    }, 
     "X-KDE-ServiceType": "krfb/framebuffer"
-}
+}

krfb/krfb.kcfg

@@ -46,7 +46,7 @@
   <group name="FrameBuffer">
     <entry name="preferredFrameBufferPlugin" type="String">
       <label>Preferred Frame Buffer Plugin</label>
-      <default>qt</default>
+      <default>x11</default>
     </entry>
   </group>
 </kcfg>

krfb/krfb.notifyrc

@@ -3,7 +3,7 @@ IconName=krfb
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب
-Comment[ast]=Compartición d'escritoriu
+Comment[ast]=Escritoriu compartíu
 Comment[bg]=Споделяне на работния плот
 Comment[bn]=ডেস্কটপ ভাগাভাগি
 Comment[br]=Rannañ ar vurev
@@ -358,7 +358,7 @@ Name[eu]=Konexioa itxi da
 Name[fi]=Yhteys suljettu
 Name[fr]=Connexion fermée
 Name[ga]=Ceangal Dúnta
-Name[gl]=Conexión pechada
+Name[gl]=Conexión fechada
 Name[hi]=कनेक्शन बन्द
 Name[hne]=कनेक्सन बन्द
 Name[hr]=Veza prekinuta
@@ -404,7 +404,7 @@ Name[zh_TW]=連線已關閉
 Comment=Connection closed
 Comment[af]=Verbinding gesluit
 Comment[ar]=تمّ غلق الاتصال
-Comment[ast]=Zarróse la conexón
+Comment[ast]=Conexón zarrada
 Comment[bg]=Връзката е прекъсната
 Comment[bn]=সংযোগ বন্ধ করা হল
 Comment[br]=Serret eo ar gevreadenn
@@ -424,7 +424,7 @@ Comment[eu]=Konexioa itxi da
 Comment[fi]=Yhteys suljettu
 Comment[fr]=Connexion fermée
 Comment[ga]=Ceangal dúnta
-Comment[gl]=A conexión está pechada
+Comment[gl]=A conexión está fechada
 Comment[he]=החיבור נסגר
 Comment[hi]=कनेक्शन बन्द
 Comment[hne]=कनेक्सन बन्द
@@ -480,7 +480,7 @@ Action=Popup
 [Event/InvalidPassword]
 Name=Invalid Password
 Name[ar]=كلمة المرور غير صحيحة
-Name[ast]=Contraseña non válida
+Name[ast]=Contraseña incorreuta
 Name[bg]=Неправилна парола
 Name[bs]=Neispravna šifra
 Name[ca]=Contrasenya no vàlida
@@ -543,7 +543,7 @@ Name[zh_TW]=不正確的密碼
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
 Comment[ar]=كلمة المرور غير صحيحة
-Comment[ast]=La contraseña nun ye válida
+Comment[ast]=Contraseña incorreuta
 Comment[bg]=Неправилна парола
 Comment[bn]=অবৈধ পাসওয়ার্ড
 Comment[br]=Tremenger siek 
@@ -622,6 +622,7 @@ Action=Popup
 [Event/InvalidPasswordInvitations]
 Name=Invalid Password Invitations
 Name[ar]=كلمة المرور الدعوات غير صحيحة
+Name[ast]=Contraseñas d'invitaciones incorreutes
 Name[bg]=Неправилна парола за покана
 Name[bs]=Neispravna šifra pozivnice
 Name[ca]=Contrasenya de les invitacions no vàlides
@@ -682,7 +683,7 @@ 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[ar]=المدعو أرسل كلمة مرور غير صحيحة. رفض الإتصال.
-Comment[ast]=La parte invitada unvió una contraseña non válida. Refugóse la conexón.
+Comment[ast]=L'invitáu unvió una contraseña incorreuta. Conexón refugada.
 Comment[bg]=Поканената страна изпрати неправилна парола. Връзката е отказана.
 Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল।
 Comment[bs]=Pozvana strana je poslala pogrešnu šifru. Veza je odbijena.
@@ -752,7 +753,7 @@ Action=Popup
 [Event/NewConnectionOnHold]
 Name=New Connection on Hold
 Name[ar]=اتصال جديد  على التوقف
-Name[ast]=Conexón nueva n'espera
+Name[ast]=Conexón nueva a la espera
 Name[bg]=Изчакване на новата връзка
 Name[bs]=Nova veza je na čekanju
 Name[ca]=Connexió nova en espera
@@ -812,7 +813,7 @@ Name[zh_TW]=新連線等待處理
 Comment=Connection requested, user must accept
 Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
 Comment[ar]=الاتصال طلب، يجب موافقة المستخدم
-Comment[ast]=Solicitóse la conexón, l'usuariu ha aceutar
+Comment[ast]=Conexón solicitada, l'usuario tien d'aceutala
 Comment[bg]=Поискана е връзка, следва потребителят да приеме
 Comment[bn]=সংযোগ অনুরোধ করা হল, ব্যবহারকারীকে অবশ্যই স্বীকার করতে হবে
 Comment[bs]=Veza je zahtijevana, korinik mora da je prihvati
@@ -883,7 +884,7 @@ Action=Popup
 [Event/NewConnectionAutoAccepted]
 Name=New Connection Auto Accepted
 Name[ar]=اتصال جديد مقبول تلقائيا
-Name[ast]=Conexón nueva auto-aceutada
+Name[ast]=Conexón nueva aceutada automáticamente
 Name[bg]=Автоматично приемане на новата връзка
 Name[bs]=Nova veza je automatski prihvaćena
 Name[ca]=Connexió nova acceptada automàticament
@@ -943,12 +944,12 @@ Name[zh_TW]=新連線自動接受
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
 Comment[ar]=اتصال جديد مفعل تلقائيا 
-Comment[ast]=Afitóse automáticamente la conexón nueva
+Comment[ast]=Conexón nueva afitada automáticamente
 Comment[bg]=Новата връзка е автоматично приета
 Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[bs]=Nova veza je automatski uspostavljena
 Comment[ca]=Connexió nova establerta automàticament
-Comment[ca@valencia]=Connexió nova establida automàticament
+Comment[ca@valencia]=Connexió nova establerta automàticament
 Comment[cs]=Automaticky navázáno nové spojení
 Comment[cy]=Sefydlwyd cysylltiad newydd yn awtomatig
 Comment[da]=Ny forbindelse automatisk etableret
@@ -1014,7 +1015,7 @@ Action=Popup
 [Event/TooManyConnections]
 Name=Too Many Connections
 Name[ar]=اتصالات عديدة
-Name[ast]=Milenta conexones
+Name[ast]=Abondes conexones
 Name[bg]=Твърде много връзки
 Name[bs]=Previše veza
 Name[ca]=Massa connexions
@@ -1074,7 +1075,7 @@ Name[zh_TW]=太多連線
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
 Comment[ar]=مشغول، الإتصال رفض
-Comment[ast]=Ocupáu, refugóse la conexón
+Comment[ast]=Ocupáu, conexón refugada
 Comment[bg]=Заето. Връзката е отказана.
 Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
 Comment[br]=Dalc'het, kevreadenn disteuleret
@@ -1209,7 +1210,7 @@ Name[zh_TW]=未知的連線
 Comment=Received unexpected connection, abort
 Comment[af]=Ontvang onverwagte verbinding, staak
 Comment[ar]=استقبال اتصال غير متوقع، إنهاء
-Comment[ast]=Recibióse una conexón inesperada, albortando
+Comment[ast]=Recibióse conexón inesperada, albortando
 Comment[bg]=Получена е неочаквана връзка. Прекъсване.
 Comment[bn]=অপ্রত্যাশিত সংযোগ গ্রহণ করল, বাতিল করুন
 Comment[bs]=Primljena je neočekivana veza, prekini

krfb/main.cpp

@@ -37,7 +37,7 @@
 
 static const char KRFB_VERSION[] = "5.0";
 static const char description[] = I18N_NOOP("VNC-compatible server to share "
-                                  "desktops");
+                                  "KDE desktops");
 
 static bool checkX11Capabilities()
 {

krfb/org.kde.krfb.appdata.xml

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component type="desktop">
-  <id>org.kde.krfb.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2+</project_license>
-  <name>Krfb</name>
-  <name xml:lang="ca">Krfb</name>
-  <name xml:lang="ca-valencia">Krfb</name>
-  <name xml:lang="cs">Krfb</name>
-  <name xml:lang="de">Krfb</name>
-  <name xml:lang="en-GB">Krfb</name>
-  <name xml:lang="es">Krfb</name>
-  <name xml:lang="it">Krfb</name>
-  <name xml:lang="nl">Krfb</name>
-  <name xml:lang="pl">Krfb</name>
-  <name xml:lang="pt">Krfb</name>
-  <name xml:lang="sk">Krfb</name>
-  <name xml:lang="sl">Krfb</name>
-  <name xml:lang="sr">КРФБ</name>
-  <name xml:lang="sr-Latn">KRFB</name>
-  <name xml:lang="sr-ijekavian">КРФБ</name>
-  <name xml:lang="sr-ijekavianlatin">KRFB</name>
-  <name xml:lang="sv">Krfb</name>
-  <name xml:lang="tr">Krfb</name>
-  <name xml:lang="uk">Krfb</name>
-  <name xml:lang="x-test">xxKrfbxx</name>
-  <name xml:lang="zh-CN">Krfb</name>
-  <summary>Desktop sharing</summary>
-  <summary xml:lang="ca">Compartició de l'escriptori</summary>
-  <summary xml:lang="ca-valencia">Compartició de l'escriptori</summary>
-  <summary xml:lang="cs">Sdílení pracovní plochy</summary>
-  <summary xml:lang="de">Freigabe der Arbeitsfläche</summary>
-  <summary xml:lang="en-GB">Desktop sharing</summary>
-  <summary xml:lang="es">Compartir el escritorio</summary>
-  <summary xml:lang="it">Condivisione del desktop</summary>
-  <summary xml:lang="nl">Bureaublad delen</summary>
-  <summary xml:lang="pl">Współdzielenie pulpitu</summary>
-  <summary xml:lang="pt">Partilha do ecrã</summary>
-  <summary xml:lang="sk">Zdieľanie pracovnej plochy</summary>
-  <summary xml:lang="sl">Souporaba namizja</summary>
-  <summary xml:lang="sr">Дељење површи</summary>
-  <summary xml:lang="sr-Latn">Deljenje površi</summary>
-  <summary xml:lang="sr-ijekavian">Дељење површи</summary>
-  <summary xml:lang="sr-ijekavianlatin">Deljenje površi</summary>
-  <summary xml:lang="sv">Skrivbordsdelning</summary>
-  <summary xml:lang="tr">Masaüstü paylaşımı</summary>
-  <summary xml:lang="uk">Спільне користування стільницею</summary>
-  <summary xml:lang="x-test">xxDesktop sharingxx</summary>
-  <summary xml:lang="zh-CN">桌面共享</summary>
-  <description>
-    <p>Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
-    <p xml:lang="ca">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per veure o controlar l'escriptori.</p>
-    <p xml:lang="ca-valencia">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per veure o controlar l'escriptori.</p>
-    <p xml:lang="de">Krfb ist eine Serveranwendung, welche die gemeinsame Benutzung der aktuellen Sitzung mit einem Benutzer auf einem anderen Rechner ermöglicht, der mit Hilfe eines VNC-Programms den Bildschirminhalt sehen oder sogar die Arbeitsfläche bedienen kann.</p>
-    <p xml:lang="en-GB">Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
-    <p xml:lang="es">Krfb para compartir el escritorio es una aplicación de servidor que le permite compartir su sesión actual con un usuario de otra máquina, que puede usar un cliente VNC para ver e incluso controlar su escritorio.</p>
-    <p xml:lang="it">Condivisione del desktop Krfb è un'applicazione server che permette di condividere la sessione attuale con un utente su un'altra macchina, che potrà usare un client VNC per visualizzare ed anche controllare il desktop.</p>
-    <p xml:lang="nl">Bureaublad delen is een server-applicatie die u in staat stelt uw huidige sessie te delen met een gebruiker op een andere machine, die een VNC-client kan gebruiken om uw bureaublad te bekijken of zelfs te besturen.</p>
-    <p xml:lang="pl">Współdzielenie pulpitu Krfb jest aplikacją serwerową, która umożliwia współdzielenie twojej bieżącej sesji z użytkownikiem na innym komputerze, który może użyć klienta VNC do oglądania,a a nawet sterowania twoim pulpitem.</p>
-    <p xml:lang="pt">A Partilha de Ecrã Krfb é uma aplicação de servidor que lhe permite partilhar a sua sessão actual com um utilizador noutra máquina, o qual poderá usar um cliente de VNC para ver ou mesmo controlar o ambiente de trabalho.</p>
-    <p xml:lang="sk">Krfb je serverová aplikácia, ktorá vám umožní zdieľať vaše aktuálne sedenie s používateľom na inom stroji, ktorý môže používať VNC klienta na pripojenie alebo ovládanie stanice.</p>
-    <p xml:lang="sl">Souporaba namizja Krfb je strežniški program, ki vam dovoli, da delite vašo trenutno sejo z uporabnikom na drugem računalniku, ki ima odjemalec VNC. Uporabnik lahko gleda ali celo nadzira namizje.</p>
-    <p xml:lang="sr">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
-    <p xml:lang="sr-Latn">KRFB je serverski program za deljenje površi, kojim možete da podelite svoju tekuću sesiju sa korisnikom na drugoj mašini. Udaljeni korisnik može da upotrebi neki VNC klijent za gledanje površi, pa čak i upravljanje njome.</p>
-    <p xml:lang="sr-ijekavian">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
-    <p xml:lang="sr-ijekavianlatin">KRFB je serverski program za deljenje površi, kojim možete da podelite svoju tekuću sesiju sa korisnikom na drugoj mašini. Udaljeni korisnik može da upotrebi neki VNC klijent za gledanje površi, pa čak i upravljanje njome.</p>
-    <p xml:lang="sv">Krfb-skrivbordsdelning är ett serverprogram som gör det möjligt att dela aktuell session med en användare på en annan dator, som kan använda en VNC-klient för att betrakta eller till och med kontrollera skrivbordet.</p>
-    <p xml:lang="tr">Krfb Masaüstü Paylaşımı, mevcut oturumu masaüstünü görüntülemek veya kontrol etmek için, VNC istemcisi kullanan başka bir makinedeki, kullanıcıyla paylaşmanızı sağlayan bir sunucu uygulamasıdır.</p>
-    <p xml:lang="uk">Програма для спільного використання стільниці Krfb — це серверна програма, яка надає вам змогу розділити ваш поточний сеанс роботи з користувачем, який працює на іншому комп’ютері, так, щоб цей користувач зміг скористатися клієнтом VNC для перегляду або навіть керування вашою стільницею.</p>
-    <p xml:lang="x-test">xxKrfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.xx</p>
-    <p xml:lang="zh-CN">Krfb 桌面共享是一个可以让您与另一个在其他机器上的用户共享当前会话的服务器程序，他可以使用 VNC 客户端来查看甚至控制桌面。</p>
-  </description>
-  <url type="homepage">https://www.kde.org</url>
-  <url type="bugtracker">https://bugs.kde.org</url>
-  <url type="donation">https://www.kde.org/community/donations</url>
-  <screenshots>
-    <screenshot type="default">
-      <image>
-        https://cdn.kde.org/screenshots/krfb/krfb.png
-      </image>
-    </screenshot>
-  </screenshots>
-  <provides>
-    <binary>krfb</binary>
-  </provides>
-  <project_group>KDE</project_group>
-</component>

krfb/org.kde.krfb.desktop

@@ -76,7 +76,7 @@ Name[zh_HK]=Krfb
 Name[zh_TW]=桌面分享_Krfb
 GenericName=Desktop Sharing
 GenericName[ar]=مشاركة سطح المكتب
-GenericName[ast]=Compartición d'escritoriu
+GenericName[ast]=Escritoriu compartíu
 GenericName[bg]=Споделяне на работния плот
 GenericName[bn]=ডেস্কটপ ভাগাভাগি
 GenericName[br]=Rannañ ar vurev
@@ -144,76 +144,5 @@ GenericName[x-test]=xxDesktop Sharingxx
 GenericName[zh_CN]=桌面共享
 GenericName[zh_HK]=桌面分享
 GenericName[zh_TW]=桌面分享
-Comment=Desktop Sharing
-Comment[af]=Werkskerm Deeling
-Comment[ar]=مشاركة سطح المكتب
-Comment[ast]=Compartición d'escritoriu
-Comment[bg]=Споделяне на работния плот
-Comment[bn]=ডেস্কটপ ভাগাভাগি
-Comment[br]=Rannañ ar vurev
-Comment[bs]=Dijeljenje radne površine
-Comment[ca]=Compartir l'escriptori
-Comment[ca@valencia]=Compartir l'escriptori
-Comment[cs]=Sdílení pracovní plochy
-Comment[cy]=Rhannu Penbwrdd
-Comment[da]=Skrivebordsdeling
-Comment[de]=Arbeitsflächen-Freigabe
-Comment[el]=Κοινή χρήση επιφάνειας εργασίας
-Comment[en_GB]=Desktop Sharing
-Comment[eo]=Tabula komunigado
-Comment[es]=Escritorio compartido
-Comment[et]=Töölaua jagamine
-Comment[eu]=Mahaigaina partekatzea
-Comment[fi]=Työpöydän jakaminen
-Comment[fr]=Partage de bureaux
-Comment[ga]=Roinnt Deisce
-Comment[gl]=Compartición do escritorio
-Comment[he]=שיתוף שולחנות עבודה
-Comment[hi]=डेस्कटॉप साझेदारी
-Comment[hne]=डेस्कटाप साझेदारी
-Comment[hr]=Dijeljenje radne površine
-Comment[hu]=Munkaasztal-megosztás
-Comment[ia]=Compartir de scriptorio
-Comment[is]=Skjáborðamiðlun
-Comment[it]=Condivisione del desktop
-Comment[ja]=デスクトップ共有
-Comment[kk]=Үстелді ортақтастыру
-Comment[km]=ការ​ចែក​រំលែក​ផ្ទែ​តុ
-Comment[ko]=데스크톱 공유
-Comment[lt]=Dalinimasis darbalaukiu
-Comment[lv]=Darbvirsmas koplietošana
-Comment[mk]=Делење на работната површина
-Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍
-Comment[mr]=डेस्कटॉप शेअरींग
-Comment[ms]=Perkongsian Ruang Kerja
-Comment[nb]=Delte skrivebord
-Comment[nds]=Schriefdisch-Freegaav
-Comment[nl]=Bureaublad delen
-Comment[nn]=Skrivebordsdeling
-Comment[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
-Comment[pl]=Współdzielenie pulpitu
-Comment[pt]=Partilha do Ecrã
-Comment[pt_BR]=Compartilhamento do ambiente de trabalho
-Comment[ro]=Partajare birou
-Comment[ru]=Параметры общего рабочего стола
-Comment[si]=වැඩතල හවුල්
-Comment[sk]=Zdieľanie pracovnej plochy
-Comment[sl]=Souporaba namizja
-Comment[sr]=Дељење површи
-Comment[sr@ijekavian]=Дијељење површи
-Comment[sr@ijekavianlatin]=Dijeljenje površi
-Comment[sr@latin]=Deljenje površi
-Comment[sv]=Dela ut skrivbordet
-Comment[ta]=பணிமேடை பகிர்வு
-Comment[tg]=Истифодаи Муштараки Мизи Корӣ
-Comment[th]=ใช้งานพื้นที่ทำงานร่วมกัน
-Comment[tr]=Masaüstü Paylaşımı
-Comment[ug]=ئۈستەلئۈستىنى ھەمبەھىرلەش
-Comment[uk]=Спільні стільниці
-Comment[xh]=Ulwahlulelano lwe Desktop
-Comment[x-test]=xxDesktop Sharingxx
-Comment[zh_CN]=桌面共享
-Comment[zh_HK]=桌面分享
-Comment[zh_TW]=桌面分享
 Categories=Qt;KDE;System;Network;RemoteAccess;
 X-DBUS-ServiceName=org.kde.krfb

krfb/rfb.h

@@ -8,10 +8,6 @@
 
 #include "rfb/rfb.h"
 
-#ifdef max
-#undef max
-#endif
-
 #undef TRUE
 #undef FALSE
 

krfb/ui/invitewidget.ui

@@ -0,0 +1,171 @@
+<ui version="4.0" >
+ <class>InviteWidget</class>
+ <widget class="QWidget" name="InviteWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>603</width>
+    <height>364</height>
+   </rect>
+  </property>
+  <layout class="QHBoxLayout" >
+   <item>
+    <widget class="QLabel" name="pixmapLabel" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>128</width>
+       <height>128</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" >
+     <item>
+      <widget class="QLabel" name="TextLabel2" >
+       <property name="font" >
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text" >
+        <string>Welcome to KDE Desktop Sharing</string>
+       </property>
+       <property name="wordWrap" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="helpLabel" >
+       <property name="text" >
+        <string>KDE Desktop Sharing allows you to invite somebody at a remote location to watch and possibly control your desktop. &lt;a href="whatsthis">More about invitations...&lt;/a></string>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::RichText</enum>
+       </property>
+       <property name="wordWrap" >
+        <bool>true</bool>
+       </property>
+       <property name="textInteractionFlags" >
+        <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>215</width>
+         <height>101</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" >
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>90</width>
+           <height>26</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" >
+         <item>
+          <widget class="QPushButton" name="btnCreateInvite" >
+           <property name="toolTip" >
+            <string/>
+           </property>
+           <property name="whatsThis" >
+            <string>Create a new invitation and display the connection data. Use this option if you want to invite somebody personally, for example, to give the connection data over the phone.</string>
+           </property>
+           <property name="text" >
+            <string>Create &amp;Personal Invitation...</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="btnEmailInvite" >
+           <property name="whatsThis" >
+            <string>This button will start your email application with a pre-configured text that explains to the recipient how to connect to your computer. </string>
+           </property>
+           <property name="text" >
+            <string>Invite via &amp;Email...</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="btnManageInvite" >
+           <property name="text" >
+            <string>&amp;Manage Invitations (%1)...</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>90</width>
+           <height>26</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>24</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+  <resources/>
+ <connections/>
+</ui>