From 87996b3a8aebb47507a6742aa1d22147d0d246d9 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Wed, 7 Jun 2017 17:14:36 +0100 Subject: [PATCH 1/3] Update CSS for ChatInviteDialog for https://github.com/matrix-org/matrix-react-sdk/pull/1050 - Remove address selector header - Adjust dialog content so that the error message ("No results" or otherwise) doesn't cause a change in height --- .../views/dialogs/_ChatInviteDialog.scss | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss index 4a214b51ce..38bb4f01c3 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss +++ b/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; -} From 8e2609d23e2dedadeaed3e5af7fe93b30ba6b6a5 Mon Sep 17 00:00:00 2001 From: RiotTranslate Date: Wed, 7 Jun 2017 19:46:24 +0200 Subject: [PATCH 2/3] Update from Weblate. (#4218) * Translated using Weblate (Hungarian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/ * Translated using Weblate (Russian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (German) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (Russian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (German) Currently translated at 82.7% (163 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.2% (164 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (Russian) Currently translated at 84.7% (167 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (Thai) Currently translated at 97.9% (193 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ * Translated using Weblate (Thai) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ --- src/i18n/strings/de_DE.json | 43 +++++++++++++++++++++++++++++++++---- src/i18n/strings/ru.json | 11 +++++++--- src/i18n/strings/th.json | 37 ++++++++++++++++++++++++++++++- 3 files changed, 83 insertions(+), 8 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 59483af82d..e89edc15f6 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -6,9 +6,9 @@ "Notifications": "Benachrichtigungen", "Invite to this room": "In diesen Raum einladen", "Filter room names": "Raum-Namen filtern", - "Start chat": "Neuen Chat starten", + "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", @@ -120,7 +120,7 @@ "Advanced notification settings": "Erweiterte Benachrichtigungs-Einstellungen", "Call invitation": "Anruf-Einladung", "Messages containing my display name": "Nachrichten, die meinen Anzeigenamen enthalten", - "Messages containing my user name": "Nachrichten, die meinen Nutzernamen enthalten", + "Messages containing my user name": "Nachrichten, die meinen Benutzernamen enthalten", "Messages in group chats": "Nachrichten in Gruppen-Chats", "Messages in one-to-one chats": "Nachrichten in Einzel-Chats", "Messages sent by bot": "Nachrichten von Bots", @@ -168,5 +168,40 @@ "Waiting for response from server": "Warte auf eine Antwort vom Server", "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Du verwendest Riot als Gast. Registriere oder melde dich an um Zugang zu mehr Räumen und Funktionen zu bekommen!", "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.", - "OK": "OK" + "OK": "OK", + "Login": "Anmeldung", + "Welcome to Riot.im": "Willkommen bei Riot.im", + "Decentralised, encrypted chat & collaboration powered by": "Dezentralisierter, verschlüsselter Chat & Zusammenarbeit unterstützt von", + "Search the room directory": "Durchsuche Raum-Verzeichnis", + "Chat with Riot Bot": "Chatte mit dem Riot-Bot", + "Get started with some tips from Riot Bot!": "Beginne mit einigen Tipps vom Riot-Bot!", + "General discussion about Matrix": "Generelle Diskussion über Matrix", + "Discussion of all things Matrix!": "\"Diskussion über alle Dinge\"-Matrix!", + "Riot/Web & Desktop chat": "Riot-Web & Desktop-Chat", + "Riot/iOS & matrix-ios-sdk chat": "Riot-iOS & \"matrix-ios-sdk\"-Chat", + "Riot/Android & matrix-android-sdk chat": "Riot-Android & matrix-android-sdk-Chat", + "Matrix technical discussions": "Technische Diskussion über Matrix", + "Running Matrix services": "Matrix-Dienste betreiben", + "Community-run support for Synapse": "Synapse-Support von der Community", + "Admin support for Dendrite": "Admin-Unterstützung für Dendrite", + "Announcements about Synapse releases": "Ankündigungen über Synapse-Versionen", + "Support for those using and running matrix-appservice-irc": "Unterstützung für die, die \"matrix-appservice-irc\" betreiben und nutzen", + "Building services on Matrix": "Dienste bauen für Matrix", + "Support for those using the Matrix spec": "Unterstützung für die Nutzer der Matrix-Spezification", + "Design and implementation of E2E in Matrix": "Design und Implementierung von Ende-zu-Ende-Verschlüsselung in Matrix", + "Implementing VR services with Matrix": "Implementierung von VR-Diensten mit Matrix", + "Implementing VoIP services with Matrix": "Implementierung von VoIP-Diensten mit Matrix", + "Discussion of the Identity Service API": "Diskussion der Identitätsdienst-API", + "Support for those using, running and writing other bridges": "Unterstützung für die, die andere Brücken nutzen, betreiben oder schreiben", + "Contributing code to Matrix and Riot": "Code zu Matrix und Riot beitragen", + "Dev chat for the Riot/Web dev team": "Entwickler-Chat für das Riot-Web-Entwickler-Team", + "Co-ordination for Riot/Web translators": "Koordination für Riot-Web-Übersetzer", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Viele Räume, die in Matrix existieren, sind verknüpft mit existierenden Netzwerken (Slack, IRC, Gitter usw.) oder unabhängig. Schau mal ins Verzeichnis!", + "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?", + "You have successfully set a password!": "Du hast erfolgreich ein Passwort gesetzt!", + "You can now return to your account after signing out, and sign in on other devices.": "Du kannst nun zu deinem Konto zurückkehren nach dem du dich an anderen Geräten ab- und angemeldet hast.", + "Continue": "Fortfahren", + "Please set a password!": "Bitte setze ein Passwort!", + "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.", + "Dev chat for the Dendrite dev team": "Entwickler-Chat for das Dendrite-Entwickler-Team" } diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index cc5ca1e861..1fa04d956b 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -40,7 +40,7 @@ " from room": " из комнаты", "Guests can join": "Гость может присоединиться", "Guest users can't invite users. Please register to invite.": "Гость не может приглашать пользователей. Зарегистрируйтесь для приглошений.", - "Invite to this room": "Пригласить в эту комнату", + "Invite to this room": "Пригласить", "Keywords": "Ключевые слова", "Leave": "Покинуть", "Low Priority": "Низкий приоритет", @@ -129,7 +129,7 @@ "A new version of Riot is available.": "Доступна новая версия Riot.", "All Rooms": "Все комнаты", "Cancel": "Отмена", - "Changelog": "Истоея изменений", + "Changelog": "История изменений", "Collapse panel": "Закрыпть панель", "Collecting app version information": "Сбор информации о версиях программы", "Collecting logs": "Сбор протоколов", @@ -167,5 +167,10 @@ "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Вы пользуетесь Riot как гость. Зарегистрируйтесь или войдите в систему и плучите доступ к огромному количеству комнат и функций!", "OK": "ОК", "You need to be using HTTPS to place a screen-sharing call.": "Вы должны пользоваться HTTPS чтобы пользоваться видиозвонком.", - "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Еали ваш браузер не корректно отображает информацию и все или некоторые фукции отключены, вы можете и дальше этим браузеом пользоваться но но ваши проблемы останутся с вами!" + "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Еали ваш браузер не корректно отображает информацию и все или некоторые фукции отключены, вы можете и дальше этим браузеом пользоваться но но ваши проблемы останутся с вами!", + "Login": "Войти", + "Welcome to Riot.im": "Добро пожаловать на Riot.im", + "Decentralised, encrypted chat & collaboration powered by": "Децентрализованное, шифрованное общение и сотрудничество на основе", + "Search the room directory": "Поиск по директории комнат", + "Chat with Riot Bot": "Пообщаться с Riot Bot" } diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index f885c15616..16ba2a8f5b 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -160,5 +160,40 @@ "Call invitation": "คำเชิญเข้าร่วมการโทร", "Failed to forget room %(errCode)s": "การลืมห้องล้มเหลว %(errCode)s", "Forget": "ลืม", - "Notifications on the following keywords follow rules which can’t be displayed here:": "การแจ้งเตือนจากคีย์เวิร์ดเหล่านี้ เป็นไปตามกฏที่ไม่สามารถแสดงที่นี่ได้:" + "Notifications on the following keywords follow rules which can’t be displayed here:": "การแจ้งเตือนจากคีย์เวิร์ดเหล่านี้ เป็นไปตามกฏที่ไม่สามารถแสดงที่นี่ได้:", + "Login": "เข้าสู่ระบบ", + "Welcome to Riot.im": "ยินดีต้อนรับสู่ Riot.im", + "Search the room directory": "ค้นหาในไดเรกทอรีห้อง", + "Chat with Riot Bot": "แชทกับบอท Riot", + "Get started with some tips from Riot Bot!": "มาเริ่มกันด้วยเคล็ดลับเล็กน้อยจากบอท Riot!", + "General discussion about Matrix": "พูดคุยเรื่องทั่วไปเกี่ยวกับ Matrix", + "Discussion of all things Matrix!": "พูดคุยทุกเรื่อง เรื่อง Matrix!", + "Riot/Web & Desktop chat": "แชทเกี่ยวกับ Riot บนเว็บและเดสก์ทอป", + "Riot/iOS & matrix-ios-sdk chat": "แชทเกี่ยวกับ Riot บน iOS และ matrix-ios-sdk", + "Riot/Android & matrix-android-sdk chat": "แชทเกี่ยวกับ Riot บน Android และ matrix-android-sdk", + "Matrix technical discussions": "พูดคุยเรื่อง Matrix ทางเทคนิค", + "Running Matrix services": "การติดตั้งบริการ Matrix", + "Community-run support for Synapse": "ฝ่ายสนับสนุน Synapse โดยชุมชนผู้ใช้", + "Admin support for Dendrite": "ฝ่ายสนับสนุน Dendrite จากผู้ดูแล", + "Announcements about Synapse releases": "ประกาศเกี่ยวกับ Synapse รุ่นใหม่", + "Support for those using and running matrix-appservice-irc": "ฝ่ายสนับสนุนสำหรับผู้ใช้ matrix-appservice-irc", + "Building services on Matrix": "การพัฒนาบริการบน Matrix", + "Support for those using the Matrix spec": "ฝ่ายสนับสนุนสำหรับผู้ใช้สเปค Matrix", + "Implementing VR services with Matrix": "การอิมพลีเมนต์บริการ VR ด้วย Matrix", + "Implementing VoIP services with Matrix": "การอิมพลีเมนต์บริการ VoIP ด้วย Matrix", + "Support for those using, running and writing other bridges": "ฝ่ายสนับสนุนสำหรับผู้ใช้หรือพัฒนาตัวเชื่อม Matrix", + "Contributing code to Matrix and Riot": "สมทบโค๊ดกับ Matrix และ Riot", + "Dev chat for the Riot/Web dev team": "แชทสำหรับทีมพัฒนา Riot บนเว็บ", + "Dev chat for the Dendrite dev team": "แชทสำหรับทีมพัฒนา Dendrite", + "Co-ordination for Riot/Web translators": "แชทสำหรับประสานงานการแปล Riot บนเว็บ", + "Failed to change password. Is your password correct?": "การเปลี่ยนรหัสผ่านล้มเหลว รหัสผ่านของคุณถูกต้องหรือไม่?", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "มีห้องอยู่มากมายใน Matrix ทั้งห้องที่เชื่อมไปยังเคีือข่ายอื่น (Slack, IRC, Gitter ฯลฯ) และห้องที่อยู่ด้วยตัวเอง ลองดูไดเรกทอรีสิ!", + "You have successfully set a password!": "การตั้งรหัสผ่านเสร็จสมบูรณ์!", + "You can now return to your account after signing out, and sign in on other devices.": "คุณสามารถกลับไปยังบัญชีของคุณหลังจากออกจากระบบ แล้วกลับเขาสู่ระบบบนอุปกรณ์อื่น ๆ", + "Continue": "ดำเนินการต่อ", + "Please set a password!": "กรุณาตั้งรหัสผ่าน!", + "This will allow you to return to your account after signing out, and sign in on other devices.": "เพื่อคุณจะได้กลับมายังบัญชีเดิมของคุณได้ หลังจากออกจากระบบ แล้วกลับเข้าสู่ระบบในอุปกรณ์อื่น ๆ", + "Design and implementation of E2E in Matrix": "การออกแบบและใช้งาน E2E ใน Matrix", + "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API", + "Decentralised, encrypted chat & collaboration powered by": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก" } From 96e3c43570f65e47a6a48d876837cf10238a0e99 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 7 Jun 2017 18:48:14 +0100 Subject: [PATCH 3/3] tweak welcome page text --- res/home.html | 2 +- src/i18n/strings/en_EN.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/home.html b/res/home.html index 8a94d4af22..c77b38090c 100644 --- a/res/home.html +++ b/res/home.html @@ -32,7 +32,7 @@ -

_t("General discussion about Matrix")

+

_t("General discussion about Matrix and Riot")

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index b57dbb65be..afc8cc687e 100644 --- a/src/i18n/strings/en_EN.json +++ b/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",