Merge branch 'master' into 'production'

Master

See merge request !101

fairchat/fairchat_de.ts

@@ -73,7 +73,7 @@
     </message>
     <message>
         <source>leave room</source>
-        <translation>Raum verlassen</translation>
+        <translation>Gruppe verlassen</translation>
     </message>
 </context>
 <context>
@@ -190,7 +190,7 @@
     </message>
     <message>
         <source>invite new</source>
-        <translation>einladen</translation>
+        <translation type="vanished">einladen</translation>
     </message>
 </context>
 <context>
@@ -217,7 +217,7 @@
     </message>
     <message>
         <source>invite new</source>
-        <translation>einladen</translation>
+        <translation type="vanished">einladen</translation>
     </message>
 </context>
 <context>
@@ -340,7 +340,7 @@
     <name>MainView</name>
     <message>
         <source>channels</source>
-        <translation type="vanished">Gruppen</translation>
+        <translation>Gruppen</translation>
     </message>
     <message>
         <source>private messages</source>
@@ -362,34 +362,42 @@
         <source>groups</source>
         <translation>Gruppen</translation>
     </message>
+    <message>
+        <source>messages</source>
+        <translation>Nachrichten</translation>
+    </message>
 </context>
 <context>
     <name>MessageText</name>
     <message>
         <source>copy</source>
-        <translation type="unfinished"></translation>
+        <translation>kopieren</translation>
     </message>
     <message>
         <source>blockUser</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzer blockieren</translation>
     </message>
     <message>
         <source>report content</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht melden</translation>
     </message>
 </context>
 <context>
     <name>OpenIDLogin</name>
     <message>
         <source>Server Choice</source>
-        <translation>Server Auswahl</translation>
+        <translation type="vanished">Server Auswahl</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation>Anmelden</translation>
     </message>
 </context>
 <context>
     <name>ReportContentPopup</name>
     <message>
         <source>are you sure you want to report this message?</source>
-        <translation>Diese Nachricht als unangemessen berichten=</translation>
+        <translation>Diese Nachricht als unangemessen berichten?</translation>
     </message>
     <message>
         <source>yes</source>