[WEBLATE] merge Develop

res/home.html

@@ -32,7 +32,7 @@
         </div>
     </div>
 
-    <h3>_t("General discussion about Matrix")</h3>
+    <h3>_t("General discussion about Matrix and Riot")</h3>
 
     <div class="mx_HomePage_row">
         <div class="mx_HomePage_room">

src/i18n/strings/de_DE.json

@@ -8,7 +8,7 @@
     "Filter room names": "Raum-Namen filtern",
     "Start chat": "Starte Chat",
     "Room directory": "Raum-Verzeichnis",
-    "Create new room": "Neuen Raum erstellen",
+    "Create new room": "Erstelle neuen Raum",
     "Settings": "Einstellungen",
     "powered by Matrix": "betrieben mit Matrix",
     "Custom Server Options": "Erweiterte Server-Optionen",

src/i18n/strings/en_EN.json

@@ -167,7 +167,7 @@
   "Search the room directory": "Search the room directory",
   "Chat with Riot Bot": "Chat with Riot Bot",
   "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!",
-  "General discussion about Matrix": "General discussion about Matrix",
+  "General discussion about Matrix and Riot": "General discussion about Matrix and Riot",
   "Discussion of all things Matrix!": "Discussion of all things Matrix!",
   "Riot/Web & Desktop chat": "Riot/Web & Desktop chat",
   "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & matrix-ios-sdk chat",

src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss

@@ -34,6 +34,10 @@ limitations under the License.
     word-wrap: nowrap;
 }
 
+.mx_ChatInviteDialog .mx_Dialog_content {
+    min-height: 50px
+}
+
 .mx_ChatInviteDialog_inputContainer {
     border-radius: 3px;
     border: solid 1px $input-border-color;
@@ -64,8 +68,3 @@ limitations under the License.
     pointer-events: none;
 }
 
-.mx_ChatInviteDialog_addressSelectHeader {
-    font-weight: bold;
-    line-height: 150%;
-    text-indent: 4px;
-}