From a30ad77d10da4b8bc117c1d91fbb6a810a0fad22 Mon Sep 17 00:00:00 2001 From: Ganzo DG Date: Wed, 11 Dec 2019 05:05:08 +0000 Subject: [PATCH 1/4] Added translation using Weblate (Mongolian) --- src/i18n/strings/mn.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/i18n/strings/mn.json diff --git a/src/i18n/strings/mn.json b/src/i18n/strings/mn.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/src/i18n/strings/mn.json @@ -0,0 +1 @@ +{} From df3517d7bfc4bda866463cf2e152aee4771fffac Mon Sep 17 00:00:00 2001 From: Ganzo DG Date: Wed, 11 Dec 2019 05:08:23 +0000 Subject: [PATCH 2/4] Translated using Weblate (Mongolian) Currently translated at 100.0% (23 of 23 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/mn/ --- src/i18n/strings/mn.json | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/mn.json b/src/i18n/strings/mn.json index 0967ef424b..1ae2db94c4 100644 --- a/src/i18n/strings/mn.json +++ b/src/i18n/strings/mn.json @@ -1 +1,25 @@ -{} +{ + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Таны Риот тохиргоо буруу ЖСОН агуулж байна. Зөв болгоод, хуудсыг ахин дуудна уу.", + "The message from the parser is: %(message)s": "Парсераас ирсэн мессеж нь: %(message)s", + "Invalid JSON": "Буруу ЖСОН", + "Your Riot is misconfigured": "Таны РИОТ тохиргоо буруу", + "Unexpected error preparing the app. See console for details.": "Апп бэлдэх үед гарах ёсгүй алдаа. Дэлгэрэнгүйг консолоос харна уу.", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Буруу тохиргоо: default_server_config, default_server_name, эсвэл default_hs_url утгын зөвхөн аль нэгийг л зааж болно.", + "Invalid configuration: no default server specified.": "Буруу тохиргоо: Өгөгдсөл серверийг зааж өгөөгүй байна.", + "Riot Desktop on %(platformName)s": "%(platformName)s дээрх Риот Десктоп", + "Unknown device": "Үл мэдэгдэх төхөөрөмж", + "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s дээр %(browserName)s -ээр дамжсан %(appName)s", + "You need to be using HTTPS to place a screen-sharing call.": "Та дэлгэц хуваалцах дуудлага хийхдээ HTTPS ашиглах ёстой.", + "powered by Matrix": "Matrix - Ивээв", + "Custom Server Options": "Кастом серверийн сонголтууд", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Та кастом серверийн сонголтууд ашиглан серверийн хаягийг зааж, өөр сервер рүү нэвтэрч болно. Энэ нь танд Риотыг одоо байгаа матрикс аккаунтаараа өөр сервер дээр ашиглах боломж олгоно.", + "Dismiss": "Орхих", + "Welcome to Riot.im": "Riot.im -д тавтай морил", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Төвлөрсөн бус, нууцлалтай чат & хамтын ажиллагааг [matrix] - ивээв", + "Sign In": "Нэвтрэх", + "Create Account": "Хэрэглэгч үүсгэх", + "Need help?": "Тусламж хэрэгтэй юу?", + "Chat with Riot Bot": "Риот боттой чатлах", + "Explore rooms": "Өрөөнүүд үзэх", + "Room Directory": "Өрөөний директор" +} From 5fbe74e20d83ef42ae345accce7e99b08f8338a9 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Dec 2019 11:16:33 +0000 Subject: [PATCH 3/4] Add accelerators to context menu options like cut&paste in electron --- electron_app/src/webcontents-handler.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/electron_app/src/webcontents-handler.js b/electron_app/src/webcontents-handler.js index 2880cf37cb..c95869007f 100644 --- a/electron_app/src/webcontents-handler.js +++ b/electron_app/src/webcontents-handler.js @@ -56,7 +56,7 @@ function onLinkContextMenu(ev, params) { let addSaveAs = false; if (params.mediaType && params.mediaType === 'image' && !url.startsWith('file://')) { popupMenu.append(new MenuItem({ - label: 'Copy image', + label: '&Copy image', click() { if (url.startsWith('data:')) { clipboard.writeImage(nativeImage.createFromDataURL(url)); @@ -76,14 +76,14 @@ function onLinkContextMenu(ev, params) { // Special-case e-mail URLs to strip the `mailto:` like modern browsers do if (url.startsWith(MAILTO_PREFIX)) { popupMenu.append(new MenuItem({ - label: 'Copy email address', + label: 'Copy email &address', click() { clipboard.writeText(url.substr(MAILTO_PREFIX.length)); }, })); } else { popupMenu.append(new MenuItem({ - label: 'Copy link address', + label: 'Copy link &address', click() { clipboard.writeText(url); }, @@ -93,7 +93,7 @@ function onLinkContextMenu(ev, params) { if (addSaveAs) { popupMenu.append(new MenuItem({ - label: 'Save image as...', + label: 'Sa&ve image as...', click() { const targetFileName = params.titleText || "image.png"; const filePath = dialog.showSaveDialog({ @@ -128,18 +128,22 @@ function onLinkContextMenu(ev, params) { function _CutCopyPasteSelectContextMenus(params) { return [{ role: 'cut', + label: 'Cu&t', enabled: params.editFlags.canCut, }, { role: 'copy', + label: '&Copy', enabled: params.editFlags.canCopy, }, { role: 'paste', + label: '&Paste', enabled: params.editFlags.canPaste, }, { role: 'pasteandmatchstyle', enabled: params.editFlags.canPaste, }, { role: 'selectall', + label: "Select &All", enabled: params.editFlags.canSelectAll, }]; } From 6ead268ef09b43c4401da28fb88c516ac2f530c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Thu, 19 Dec 2019 12:45:32 +0100 Subject: [PATCH 4/4] electron-main: Provide a better error message if Seshat isn't installed. This closes #11637. --- electron_app/src/electron-main.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index deb20a1a3c..453f2fe5e4 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -47,7 +47,11 @@ let Seshat = null; try { Seshat = require('matrix-seshat'); } catch (e) { - console.warn("seshat unavailable", e); + if (e.code === "MODULE_NOT_FOUND") { + console.log("Seshat isn't installed, event indexing is disabled."); + } else { + console.warn("Seshat unexpected error:", e); + } } if (argv["help"]) {