gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[WEBLATE] merge Develop

This commit is contained in:
RiotTranslate 2017-06-07 18:58:04 +00:00
parent 8398e19cea 96e3c43570
commit c7a5bedb1c
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/home.html
View File

@ -32,7 +32,7 @@
</div> </div>
</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_row">
<div class="mx_HomePage_room"> <div class="mx_HomePage_room">

2
src/i18n/strings/de_DE.json
View File

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

2
src/i18n/strings/en_EN.json
View File

@ -167,7 +167,7 @@
"Search the room directory": "Search the room directory", "Search the room directory": "Search the room directory",
"Chat with Riot Bot": "Chat with Riot Bot", "Chat with Riot Bot": "Chat with Riot Bot",
"Get started with some tips from Riot Bot!": "Get started with some tips from 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!", "Discussion of all things Matrix!": "Discussion of all things Matrix!",
"Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat", "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
"Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat", "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",

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

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