Merge branch 'master' of git.openslx.org:pvs2

1 files changed, 116 insertions, 119 deletions

diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts
index 216f223..7ef0974 100644
--- a/i18n/server/pvsmgr_de_DE.ts
+++ b/i18n/server/pvsmgr_de_DE.ts
@@ -2,202 +2,199 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="de_DE" sourcelanguage="en_US">
 <context>
-    <name>AboutDialog</name>
+    <name>Help</name>
     <message>
-        <source>Version: </source>
-        <translation type="obsolete">Version:</translation>
-    </message>
-</context>
-<context>
-    <name>AboutDialogClass</name>
-    <message>
-        <source>PVS - About</source>
-        <translation type="obsolete">PVS - Über</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Über</translation>
+        <location filename="../../build/ui_help.h" line="245"/>
+        <source>Form</source>
+        <translation>Form</translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="obsolete">Autoren</translation>
+        <location filename="../../build/ui_help.h" line="246"/>
+        <source>Cancel</source>
+        <translation>Abbruch</translation>
     </message>
     <message>
-        <source>Translation</source>
-        <translation type="obsolete">Übersetzung</translation>
+        <location filename="../../build/ui_help.h" line="248"/>
+        <source>Stop running projections.</source>
+        <translation>Alle Projektionen abbrechen.</translation>
     </message>
-</context>
-<context>
-    <name>ClientFileSendDialogClass</name>
     <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PVS - Dateiübertragung</translation>
+        <location filename="../../build/ui_help.h" line="250"/>
+        <source>Start projection from selected student to tutor and blank all others.</source>
+        <translation>Projektion des ausgewählten Studierendens an Tutor; alle anderen ausblenden.</translation>
     </message>
     <message>
-        <source>Sending to:</source>
-        <translation type="obsolete">Senden an:</translation>
+        <location filename="../../build/ui_help.h" line="252"/>
+        <source>Start projection from selected student to tutor.</source>
+        <translation>Startet Projektion von ausgewähltem Studierenden an Tutor.</translation>
     </message>
     <message>
-        <source>unknown</source>
-        <translation type="obsolete">unbekannt</translation>
+        <location filename="../../build/ui_help.h" line="254"/>
+        <source>Start projection from tutor to selected student.</source>
+        <translation>Startet Projektion von Tutor an ausgewählten Studierenden.</translation>
     </message>
     <message>
-        <source>0</source>
-        <translation type="obsolete">0</translation>
+        <location filename="../../build/ui_help.h" line="256"/>
+        <source>Start projection from tutor to all connected students.</source>
+        <translation>Startet Projektion von Tutor an alle verbundenen Studierenden.</translation>
     </message>
     <message>
-        <source>/</source>
-        <translation type="obsolete">/</translation>
+        <location filename="../../build/ui_help.h" line="258"/>
+        <source>Lock all connected students screens.</source>
+        <translation>Alle verbundenen Studierendenbildschirme sperren.</translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Abbruch</translation>
+        <location filename="../../build/ui_help.h" line="260"/>
+        <source>Set selected client to tutor.</source>
+        <translation>Ausgewählten Klienten als Tutor festlegen.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="130"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="59"/>
+        <location filename="../../build/ui_mainwindow.h" line="160"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="80"/>
         <source>Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="338"/>
-        <source>Session Name: %1  [click to edit]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="453"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="481"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="486"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="491"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="518"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="546"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="551"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="556"/>
-        <source>Projection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="454"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="482"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="547"/>
-        <source>No projection source selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgang</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="487"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="519"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="552"/>
-        <source>No tutor defined, or tutor is offline.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="557"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="891"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="898"/>
+        <source>Selection</source>
+        <translation>Auswahl</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="492"/>
-        <source>Selected projection target is tutor.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="652"/>
+        <source>Session Name: %1  [click to edit]</source>
+        <translation>Sitzungsname: %1  [anklicken editiert]</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="557"/>
-        <source>Selected projection source is tutor.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="698"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="700"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="702"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="731"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="733"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="735"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="737"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="739"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="770"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="772"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="774"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="776"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="778"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="810"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="812"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="814"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="816"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="818"/>
+        <source>Projection</source>
+        <translation>Projektion</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="770"/>
-        <source>Projection Error</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="891"/>
+        <source>No client is selected.</source>
+        <translation>Kein Klient ausgewählt.</translation>
     </message>
     <message>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="771"/>
-        <source>Could not send screen contents of %1 to other clients: VNC Startup failed.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="898"/>
+        <source>The selected client is not connected.</source>
+        <translation>Ausgewählter Klient ist nicht verbunden.</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="135"/>
-        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="60"/>
+        <location filename="../../build/ui_mainwindow.h" line="165"/>
+        <location filename="../../src/server/mainwindow/mainwindow.cpp" line="81"/>
         <source>Lock or Unlock all Clients</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Klienten sperren oder entsperren</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="127"/>
+        <location filename="../../build/ui_mainwindow.h" line="157"/>
         <source>PVS2 Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>PVS2-Manager</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="128"/>
+        <location filename="../../build/ui_mainwindow.h" line="158"/>
         <source>&amp;Exit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Abbruch</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="132"/>
+        <location filename="../../build/ui_mainwindow.h" line="162"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="133"/>
+        <location filename="../../build/ui_mainwindow.h" line="163"/>
         <source>lock</source>
-        <translation type="unfinished"></translation>
+        <translation>lock</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="137"/>
+        <location filename="../../build/ui_mainwindow.h" line="167"/>
         <source>Ctrl+A</source>
-        <translation type="unfinished"></translation>
+        <translation>Strg+A</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="138"/>
-        <source>Broadcast Screen to Everyone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../build/ui_mainwindow.h" line="140"/>
-        <source>Student&apos;s Screen to Everyone</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../build/ui_mainwindow.h" line="168"/>
+        <source>Student&apos;s Screen to Tutor</source>
+        <translation>Studierendenbildschirm an Tutor</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="142"/>
-        <source>Student&apos;s Screen to Tutor</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../build/ui_mainwindow.h" line="169"/>
+        <source>Student&apos;s Screen to Tutor, others blanked</source>
+        <translation>Studierendenbildschirm an Tutor; alle anderen ausgeblendet</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="143"/>
+        <location filename="../../build/ui_mainwindow.h" line="170"/>
         <source>Tutor&apos;s Screen to Student</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutorenbildschirm an Studierenden</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="144"/>
+        <location filename="../../build/ui_mainwindow.h" line="171"/>
         <source>Tutor&apos;s Screen to Everyone</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutorenbildschirm an alle</translation>
     </message>
     <message>
-        <location filename="../../build/ui_mainwindow.h" line="145"/>
-        <source>toolBar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../build/ui_mainwindow.h" line="172"/>
+        <source>Stop Projection on every Client</source>
+        <translation>Projektion an alle Klienten abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../../build/ui_mainwindow.h" line="173"/>
+        <source>SetAsTutor</source>
+        <translation>AlsTutorSetzen</translation>
+    </message>
+    <message>
+        <location filename="../../build/ui_mainwindow.h" line="175"/>
+        <source>Set current Frame as Tutor</source>
+        <translation>Derzeitigen Rahmen als Tutor festlegen</translation>
+    </message>
+    <message>
+        <location filename="../../build/ui_mainwindow.h" line="177"/>
+        <location filename="../../build/ui_mainwindow.h" line="179"/>
+        <source>Help</source>
+        <translation>Hilfe</translation>
     </message>
-</context>
-<context>
-    <name>ServerFileTransfert</name>
     <message>
-        <source>PVS - File Transfer</source>
-        <translation type="obsolete">PVS - Dateiübertragung</translation>
+        <location filename="../../build/ui_mainwindow.h" line="182"/>
+        <source>toolBar</source>
+        <translation>toolBar</translation>
     </message>
 </context>
 <context>
     <name>SessionName</name>
     <message>
-        <location filename="../../build/ui_sessionname.h" line="72"/>
+        <location filename="../../build/ui_sessionname.h" line="71"/>
         <source>Set session name</source>
-        <translation type="unfinished"></translation>
+        <translation>Sitzungsname eingeben</translation>
     </message>
     <message>
-        <location filename="../../build/ui_sessionname.h" line="73"/>
+        <location filename="../../build/ui_sessionname.h" line="72"/>
         <source>New session name</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer Sitzungsname</translation>
     </message>
     <message>
-        <location filename="../../build/ui_sessionname.h" line="74"/>
+        <location filename="../../build/ui_sessionname.h" line="73"/>
         <source>Random name</source>
-        <translation type="unfinished"></translation>
+        <translation>Zufälliger Sitzungsname</translation>
     </message>
 </context>
 </TS>