Merge remote branch 'openslx/mcastft' into input

Conflicts:
	CMakeLists.txt
	i18n/pvs_ar_JO.ts
	i18n/pvs_de_DE.ts
	i18n/pvs_es_MX.ts
	i18n/pvs_fr_FR.ts
	i18n/pvs_pl_PL.ts
	i18n/pvsmgr_ar_JO.ts
	i18n/pvsmgr_de_DE.ts
	i18n/pvsmgr_es_MX.ts
	i18n/pvsmgr_fr_FR.ts
	i18n/pvsmgr_pl_PL.ts
	icons/README
	pvsmgr.qrc
	src/gui/mainWindow.cpp
	src/pvs.cpp
	src/pvs.h
	src/pvsDaemon.cpp
	src/util/clientGUIUtils.h

1 files changed, 158 insertions, 4 deletions

diff --git a/i18n/pvs_pl_PL.ts b/i18n/pvs_pl_PL.ts
index b604bb0..8e8a15e 100644
--- a/i18n/pvs_pl_PL.ts
+++ b/i18n/pvs_pl_PL.ts
@@ -4,24 +4,178 @@
 <context>
     <name>PVS</name>
     <message>
-        <location filename="../src/pvs.cpp" line="269"/>
+        <location filename="../src/pvs.cpp" line="353"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvs.cpp" line="362"/>
+        <location filename="../src/pvs.cpp" line="431"/>
         <source>VNC connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvs.cpp" line="362"/>
+        <location filename="../src/pvs.cpp" line="431"/>
         <source>The host </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pvs.cpp" line="364"/>
+        <location filename="../src/pvs.cpp" line="433"/>
         <source> requested your screen!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PVSIncomingMulticastTransfer</name>
+    <message>
+        <location filename="../src/net/pvsIncomingMulticastTransfer.cpp" line="105"/>
+        <source>Aborted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/net/pvsIncomingMulticastTransfer.cpp" line="109"/>
+        <source>Unrecoverable data corruption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/net/pvsIncomingMulticastTransfer.cpp" line="112"/>
+        <source>Connection was reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/net/pvsIncomingMulticastTransfer.cpp" line="115"/>
+        <source>Unrecoverable data loss. Try a lower transfer rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="28"/>
+        <source>Version: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="30"/>
+        <source>Usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="30"/>
+        <source>&lt;&lt;option&gt; &lt;value&gt;, ... &gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="31"/>
+        <source>Options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="32"/>
+        <source>-vncScriptFile &lt;fullpath\filename&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="32"/>
+        <source>Specifies a custom location for the vnc-start/stop-script.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="32"/>
+        <source>If not specified, /usr/bin/pvs-vncsrv is expected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="33"/>
+        <source>-freq &lt;seconds&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="33"/>
+        <source>Specifies how long to wait until a reconnection attempt is made.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="33"/>
+        <source>Default is 5.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="34"/>
+        <source>-port &lt;port&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="34"/>
+        <source>Specifies on which port to run.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="34"/>
+        <source>Default is </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="35"/>
+        <source>-h or --help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="35"/>
+        <source>Shows this help text and exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="36"/>
+        <source>-v or --version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="36"/>
+        <source>Shows the current version and exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="37"/>
+        <source>-d or --daemon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="37"/>
+        <source>Start as daemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="38"/>
+        <source>-c &lt;string command&gt;:&lt;string value&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="38"/>
+        <source>Sends the command and the optional value to a running PVS-Client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="38"/>
+        <source>Command and value may not contain spaces or colons.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="38"/>
+        <source>The dividing colon is mandatory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="39"/>
+        <source>Prints out available commands to use with -c.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/pvsDaemon.cpp" line="48"/>
+        <source>Use -h or --help to get a listing of all options.
+-v or --version gives you the current version.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>