From c7f9defd12491a962d2012eb07b5e37bc60f17a6 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Thu, 11 Feb 2021 22:18:10 +1300 Subject: [PATCH 001/163] Add simple implementation of a KeyBindingsManager + match tests --- src/KeyBindingsManager.ts | 102 ++++++++++++++++++++++++ test/KeyBindingsManager-test.ts | 137 ++++++++++++++++++++++++++++++++ 2 files changed, 239 insertions(+) create mode 100644 src/KeyBindingsManager.ts create mode 100644 test/KeyBindingsManager-test.ts diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts new file mode 100644 index 0000000000..b9cf9749ca --- /dev/null +++ b/src/KeyBindingsManager.ts @@ -0,0 +1,102 @@ +import { isMac } from "./Keyboard"; + +export enum KeyBindingContext { + +} + +export enum KeyAction { + None = 'None', +} + +/** + * Represent a key combination. + * + * The combo is evaluated strictly, i.e. the KeyboardEvent must match the exactly what is specified in the KeyCombo. + */ +export type KeyCombo = { + /** Currently only one `normal` key is supported */ + keys: string[]; + + /** On PC: ctrl is pressed; on Mac: meta is pressed */ + ctrlOrCmd?: boolean; + + altKey?: boolean; + ctrlKey?: boolean; + metaKey?: boolean; + shiftKey?: boolean; +} + +export type KeyBinding = { + keyCombo: KeyCombo; + action: KeyAction; +} + +/** + * Helper method to check if a KeyboardEvent matches a KeyCombo + * + * Note, this method is only exported for testing. + */ +export function isKeyComboMatch(ev: KeyboardEvent, combo: KeyCombo, onMac: boolean): boolean { + if (combo.keys.length > 0 && ev.key !== combo.keys[0]) { + return false; + } + + const comboCtrl = combo.ctrlKey ?? false; + const comboAlt = combo.altKey ?? false; + const comboShift = combo.shiftKey ?? false; + const comboMeta = combo.metaKey ?? false; + // When ctrlOrCmd is set, the keys need do evaluated differently on PC and Mac + if (combo.ctrlOrCmd) { + if (onMac) { + if (!ev.metaKey + || ev.ctrlKey !== comboCtrl + || ev.altKey !== comboAlt + || ev.shiftKey !== comboShift) { + return false; + } + } else { + if (!ev.ctrlKey + || ev.metaKey !== comboMeta + || ev.altKey !== comboAlt + || ev.shiftKey !== comboShift) { + return false; + } + } + return true; + } + + if (ev.metaKey !== comboMeta + || ev.ctrlKey !== comboCtrl + || ev.altKey !== comboAlt + || ev.shiftKey !== comboShift) { + return false; + } + + return true; +} + +export class KeyBindingsManager { + contextBindings: Record = {}; + + /** + * Finds a matching KeyAction for a given KeyboardEvent + */ + getAction(context: KeyBindingContext, ev: KeyboardEvent): KeyAction { + const bindings = this.contextBindings[context]; + if (!bindings) { + return KeyAction.None; + } + const binding = bindings.find(it => isKeyComboMatch(ev, it.keyCombo, isMac)); + if (binding) { + return binding.action; + } + + return KeyAction.None; + } +} + +const manager = new KeyBindingsManager(); + +export function getKeyBindingsManager(): KeyBindingsManager { + return manager; +} diff --git a/test/KeyBindingsManager-test.ts b/test/KeyBindingsManager-test.ts new file mode 100644 index 0000000000..f272878658 --- /dev/null +++ b/test/KeyBindingsManager-test.ts @@ -0,0 +1,137 @@ +import { isKeyComboMatch, KeyCombo } from '../src/KeyBindingsManager'; +const assert = require('assert'); + +function mockKeyEvent(key: string, modifiers?: { + ctrlKey?: boolean, + altKey?: boolean, + shiftKey?: boolean, + metaKey?: boolean +}): KeyboardEvent { + return { + key, + ctrlKey: modifiers?.ctrlKey ?? false, + altKey: modifiers?.altKey ?? false, + shiftKey: modifiers?.shiftKey ?? false, + metaKey: modifiers?.metaKey ?? false + } as KeyboardEvent; +} + +describe('KeyBindingsManager', () => { + it('should match basic key combo', () => { + const combo1: KeyCombo = { + keys: ['k'], + }; + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo1, false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n'), combo1, false), false); + + }); + + it('should match key + modifier key combo', () => { + const combo: KeyCombo = { + keys: ['k'], + ctrlKey: true, + }; + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true }), combo, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true }), combo, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true, metaKey: true }), combo, false), false); + + const combo2: KeyCombo = { + keys: ['k'], + metaKey: true, + }; + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo2, false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { metaKey: true }), combo2, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo2, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { altKey: true, metaKey: true }), combo2, false), false); + + const combo3: KeyCombo = { + keys: ['k'], + altKey: true, + }; + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { altKey: true }), combo3, false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { altKey: true }), combo3, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo3, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo3, false), false); + + const combo4: KeyCombo = { + keys: ['k'], + shiftKey: true, + }; + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true }), combo4, false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { shiftKey: true }), combo4, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo4, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true, ctrlKey: true }), combo4, false), false); + }); + + it('should match key + multiple modifiers key combo', () => { + const combo: KeyCombo = { + keys: ['k'], + ctrlKey: true, + altKey: true, + }; + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, altKey: true }), combo, false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true, altKey: true }), combo, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true, shiftKey: true }), combo, + false), false); + + const combo2: KeyCombo = { + keys: ['k'], + ctrlKey: true, + shiftKey: true, + altKey: true, + }; + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, shiftKey: true, altKey: true }), combo2, + false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true, shiftKey: true, altKey: true }), combo2, + false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo2, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', + { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo2, false), false); + + const combo3: KeyCombo = { + keys: ['k'], + ctrlKey: true, + shiftKey: true, + altKey: true, + metaKey: true, + }; + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', + { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo3, false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', + { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo3, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', + { ctrlKey: true, shiftKey: true, altKey: true }), combo3, false), false); + }); + + it('should match ctrlOrMeta key combo', () => { + const combo: KeyCombo = { + keys: ['k'], + ctrlOrCmd: true, + }; + // PC: + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo, false), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true }), combo, false), false); + // MAC: + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo, true), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, true), false); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('n', { ctrlKey: true }), combo, true), false); + }); + + it('should match advanced ctrlOrMeta key combo', () => { + const combo: KeyCombo = { + keys: ['k'], + ctrlOrCmd: true, + altKey: true, + }; + // PC: + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, altKey: true }), combo, false), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true, altKey: true }), combo, false), false); + // MAC: + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true, altKey: true }), combo, true), true); + assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, altKey: true }), combo, true), false); + }); +}); From b4c5dec4e5f7e904b6eb54f767c0c3b698e0a40e Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sun, 14 Feb 2021 15:56:55 +1300 Subject: [PATCH 002/163] Use the KeyBindingsManager for the SendMessageComposer --- src/KeyBindingsManager.ts | 73 +++++++++++++-- .../views/rooms/SendMessageComposer.js | 91 ++++++++----------- 2 files changed, 107 insertions(+), 57 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index b9cf9749ca..c32610670d 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -1,17 +1,23 @@ -import { isMac } from "./Keyboard"; +import { isMac, Key } from './Keyboard'; +import SettingsStore from './settings/SettingsStore'; export enum KeyBindingContext { - + SendMessageComposer = 'SendMessageComposer', } export enum KeyAction { None = 'None', + // SendMessageComposer actions: + Send = 'Send', + SelectPrevSendHistory = 'SelectPrevSendHistory', + SelectNextSendHistory = 'SelectNextSendHistory', + EditLastMessage = 'EditLastMessage', } /** * Represent a key combination. * - * The combo is evaluated strictly, i.e. the KeyboardEvent must match the exactly what is specified in the KeyCombo. + * The combo is evaluated strictly, i.e. the KeyboardEvent must match exactly what is specified in the KeyCombo. */ export type KeyCombo = { /** Currently only one `normal` key is supported */ @@ -27,8 +33,53 @@ export type KeyCombo = { } export type KeyBinding = { - keyCombo: KeyCombo; action: KeyAction; + keyCombo: KeyCombo; +} + +const messageComposerBindings = (): KeyBinding[] => { + const bindings: KeyBinding[] = [ + { + action: KeyAction.SelectPrevSendHistory, + keyCombo: { + keys: [Key.ARROW_UP], + altKey: true, + ctrlKey: true, + }, + }, + { + action: KeyAction.SelectNextSendHistory, + keyCombo: { + keys: [Key.ARROW_DOWN], + altKey: true, + ctrlKey: true, + }, + }, + { + action: KeyAction.EditLastMessage, + keyCombo: { + keys: [Key.ARROW_UP], + } + }, + ]; + if (SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend')) { + bindings.push({ + action: KeyAction.Send, + keyCombo: { + keys: [Key.ENTER], + ctrlOrCmd: true, + }, + }); + } else { + bindings.push({ + action: KeyAction.Send, + keyCombo: { + keys: [Key.ENTER], + }, + }); + } + + return bindings; } /** @@ -75,14 +126,24 @@ export function isKeyComboMatch(ev: KeyboardEvent, combo: KeyCombo, onMac: boole return true; } +export type KeyBindingsGetter = () => KeyBinding[]; + export class KeyBindingsManager { - contextBindings: Record = {}; + /** + * Map of KeyBindingContext to a KeyBinding getter arrow function. + * + * Returning a getter function allowed to have dynamic bindings, e.g. when settings change the bindings can be + * recalculated. + */ + contextBindings: Record = { + [KeyBindingContext.SendMessageComposer]: messageComposerBindings, + }; /** * Finds a matching KeyAction for a given KeyboardEvent */ getAction(context: KeyBindingContext, ev: KeyboardEvent): KeyAction { - const bindings = this.contextBindings[context]; + const bindings = this.contextBindings[context]?.(); if (!bindings) { return KeyAction.None; } diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js index 62c474e417..0559c71e9e 100644 --- a/src/components/views/rooms/SendMessageComposer.js +++ b/src/components/views/rooms/SendMessageComposer.js @@ -48,6 +48,7 @@ import SettingsStore from "../../../settings/SettingsStore"; import CountlyAnalytics from "../../../CountlyAnalytics"; import {MatrixClientPeg} from "../../../MatrixClientPeg"; import EMOJI_REGEX from 'emojibase-regex'; +import { getKeyBindingsManager, KeyAction, KeyBindingContext } from '../../../KeyBindingsManager'; function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) { const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent); @@ -144,60 +145,48 @@ export default class SendMessageComposer extends React.Component { if (this._editorRef.isComposing(event)) { return; } - const hasModifier = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey; - const ctrlEnterToSend = !!SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend'); - const send = ctrlEnterToSend - ? event.key === Key.ENTER && isOnlyCtrlOrCmdKeyEvent(event) - : event.key === Key.ENTER && !hasModifier; - if (send) { - this._sendMessage(); - event.preventDefault(); - } else if (event.key === Key.ARROW_UP) { - this.onVerticalArrow(event, true); - } else if (event.key === Key.ARROW_DOWN) { - this.onVerticalArrow(event, false); - } else if (event.key === Key.ESCAPE) { - dis.dispatch({ - action: 'reply_to_event', - event: null, - }); - } else if (this._prepareToEncrypt) { - // This needs to be last! - this._prepareToEncrypt(); + const action = getKeyBindingsManager().getAction(KeyBindingContext.MessageComposer, event); + switch (action) { + case KeyAction.Send: + this._sendMessage(); + event.preventDefault(); + break; + case KeyAction.SelectPrevSendHistory: + case KeyAction.SelectNextSendHistory: + // Try select composer history + const selected = this.selectSendHistory(action === KeyAction.SelectPrevSendHistory); + if (selected) { + // We're selecting history, so prevent the key event from doing anything else + event.preventDefault(); + } + break; + case KeyAction.EditLastMessage: + // selection must be collapsed and caret at start + if (this._editorRef.isSelectionCollapsed() && this._editorRef.isCaretAtStart()) { + const editEvent = findEditableEvent(this.props.room, false); + if (editEvent) { + // We're selecting history, so prevent the key event from doing anything else + event.preventDefault(); + dis.dispatch({ + action: 'edit_event', + event: editEvent, + }); + } + } + break; + default: + if (event.key === Key.ESCAPE) { + dis.dispatch({ + action: 'reply_to_event', + event: null, + }); + } else if (this._prepareToEncrypt) { + // This needs to be last! + this._prepareToEncrypt(); + } } }; - onVerticalArrow(e, up) { - // arrows from an initial-caret composer navigates recent messages to edit - // ctrl-alt-arrows navigate send history - if (e.shiftKey || e.metaKey) return; - - const shouldSelectHistory = e.altKey && e.ctrlKey; - const shouldEditLastMessage = !e.altKey && !e.ctrlKey && up && !this.props.replyToEvent; - - if (shouldSelectHistory) { - // Try select composer history - const selected = this.selectSendHistory(up); - if (selected) { - // We're selecting history, so prevent the key event from doing anything else - e.preventDefault(); - } - } else if (shouldEditLastMessage) { - // selection must be collapsed and caret at start - if (this._editorRef.isSelectionCollapsed() && this._editorRef.isCaretAtStart()) { - const editEvent = findEditableEvent(this.props.room, false); - if (editEvent) { - // We're selecting history, so prevent the key event from doing anything else - e.preventDefault(); - dis.dispatch({ - action: 'edit_event', - event: editEvent, - }); - } - } - } - } - // we keep sent messages/commands in a separate history (separate from undo history) // so you can alt+up/down in them selectSendHistory(up) { From 4a138f3b84f4346ebde24c37a7cf2a22e3490b8e Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Mon, 15 Feb 2021 19:21:08 +1300 Subject: [PATCH 003/163] Only support a single key in the KeyCombo Keep it simple... --- src/KeyBindingsManager.ts | 15 +++++++-------- test/KeyBindingsManager-test.ts | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index c32610670d..030cd94e99 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -20,8 +20,7 @@ export enum KeyAction { * The combo is evaluated strictly, i.e. the KeyboardEvent must match exactly what is specified in the KeyCombo. */ export type KeyCombo = { - /** Currently only one `normal` key is supported */ - keys: string[]; + key?: string; /** On PC: ctrl is pressed; on Mac: meta is pressed */ ctrlOrCmd?: boolean; @@ -42,7 +41,7 @@ const messageComposerBindings = (): KeyBinding[] => { { action: KeyAction.SelectPrevSendHistory, keyCombo: { - keys: [Key.ARROW_UP], + key: Key.ARROW_UP, altKey: true, ctrlKey: true, }, @@ -50,7 +49,7 @@ const messageComposerBindings = (): KeyBinding[] => { { action: KeyAction.SelectNextSendHistory, keyCombo: { - keys: [Key.ARROW_DOWN], + key: Key.ARROW_DOWN, altKey: true, ctrlKey: true, }, @@ -58,7 +57,7 @@ const messageComposerBindings = (): KeyBinding[] => { { action: KeyAction.EditLastMessage, keyCombo: { - keys: [Key.ARROW_UP], + key: Key.ARROW_UP, } }, ]; @@ -66,7 +65,7 @@ const messageComposerBindings = (): KeyBinding[] => { bindings.push({ action: KeyAction.Send, keyCombo: { - keys: [Key.ENTER], + key: Key.ENTER, ctrlOrCmd: true, }, }); @@ -74,7 +73,7 @@ const messageComposerBindings = (): KeyBinding[] => { bindings.push({ action: KeyAction.Send, keyCombo: { - keys: [Key.ENTER], + key: Key.ENTER, }, }); } @@ -88,7 +87,7 @@ const messageComposerBindings = (): KeyBinding[] => { * Note, this method is only exported for testing. */ export function isKeyComboMatch(ev: KeyboardEvent, combo: KeyCombo, onMac: boolean): boolean { - if (combo.keys.length > 0 && ev.key !== combo.keys[0]) { + if (combo.key !== undefined && ev.key !== combo.key) { return false; } diff --git a/test/KeyBindingsManager-test.ts b/test/KeyBindingsManager-test.ts index f272878658..28204be9c8 100644 --- a/test/KeyBindingsManager-test.ts +++ b/test/KeyBindingsManager-test.ts @@ -19,7 +19,7 @@ function mockKeyEvent(key: string, modifiers?: { describe('KeyBindingsManager', () => { it('should match basic key combo', () => { const combo1: KeyCombo = { - keys: ['k'], + key: 'k', }; assert.strictEqual(isKeyComboMatch(mockKeyEvent('k'), combo1, false), true); assert.strictEqual(isKeyComboMatch(mockKeyEvent('n'), combo1, false), false); @@ -28,7 +28,7 @@ describe('KeyBindingsManager', () => { it('should match key + modifier key combo', () => { const combo: KeyCombo = { - keys: ['k'], + key: 'k', ctrlKey: true, }; assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true }), combo, false), true); @@ -38,7 +38,7 @@ describe('KeyBindingsManager', () => { assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true, metaKey: true }), combo, false), false); const combo2: KeyCombo = { - keys: ['k'], + key: 'k', metaKey: true, }; assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { metaKey: true }), combo2, false), true); @@ -47,7 +47,7 @@ describe('KeyBindingsManager', () => { assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { altKey: true, metaKey: true }), combo2, false), false); const combo3: KeyCombo = { - keys: ['k'], + key: 'k', altKey: true, }; assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { altKey: true }), combo3, false), true); @@ -56,7 +56,7 @@ describe('KeyBindingsManager', () => { assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { ctrlKey: true, metaKey: true }), combo3, false), false); const combo4: KeyCombo = { - keys: ['k'], + key: 'k', shiftKey: true, }; assert.strictEqual(isKeyComboMatch(mockKeyEvent('k', { shiftKey: true }), combo4, false), true); @@ -67,7 +67,7 @@ describe('KeyBindingsManager', () => { it('should match key + multiple modifiers key combo', () => { const combo: KeyCombo = { - keys: ['k'], + key: 'k', ctrlKey: true, altKey: true, }; @@ -78,7 +78,7 @@ describe('KeyBindingsManager', () => { false), false); const combo2: KeyCombo = { - keys: ['k'], + key: 'k', ctrlKey: true, shiftKey: true, altKey: true, @@ -92,7 +92,7 @@ describe('KeyBindingsManager', () => { { ctrlKey: true, shiftKey: true, altKey: true, metaKey: true }), combo2, false), false); const combo3: KeyCombo = { - keys: ['k'], + key: 'k', ctrlKey: true, shiftKey: true, altKey: true, @@ -108,7 +108,7 @@ describe('KeyBindingsManager', () => { it('should match ctrlOrMeta key combo', () => { const combo: KeyCombo = { - keys: ['k'], + key: 'k', ctrlOrCmd: true, }; // PC: @@ -123,7 +123,7 @@ describe('KeyBindingsManager', () => { it('should match advanced ctrlOrMeta key combo', () => { const combo: KeyCombo = { - keys: ['k'], + key: 'k', ctrlOrCmd: true, altKey: true, }; From 12387b497862393c286eedc2c31466ae69b10c83 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Tue, 16 Feb 2021 19:05:39 +1300 Subject: [PATCH 004/163] Use the KeyBindingsManager in EditMessageComposer --- src/KeyBindingsManager.ts | 40 +++++++++--- .../views/rooms/EditMessageComposer.js | 64 ++++++++++--------- 2 files changed, 65 insertions(+), 39 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index 030cd94e99..b411c7ff27 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -2,21 +2,33 @@ import { isMac, Key } from './Keyboard'; import SettingsStore from './settings/SettingsStore'; export enum KeyBindingContext { - SendMessageComposer = 'SendMessageComposer', + /** Key bindings for the chat message composer component */ + MessageComposer = 'MessageComposer', } export enum KeyAction { None = 'None', + // SendMessageComposer actions: + + /** Send a message */ Send = 'Send', + /** Go backwards through the send history and use the message in composer view */ SelectPrevSendHistory = 'SelectPrevSendHistory', + /** Go forwards through the send history */ SelectNextSendHistory = 'SelectNextSendHistory', - EditLastMessage = 'EditLastMessage', + /** Start editing the user's last sent message */ + EditPrevMessage = 'EditPrevMessage', + /** Start editing the user's next sent message */ + EditNextMessage = 'EditNextMessage', + + /** Cancel editing a message */ + CancelEditing = 'CancelEditing', } /** * Represent a key combination. - * + * * The combo is evaluated strictly, i.e. the KeyboardEvent must match exactly what is specified in the KeyCombo. */ export type KeyCombo = { @@ -55,10 +67,22 @@ const messageComposerBindings = (): KeyBinding[] => { }, }, { - action: KeyAction.EditLastMessage, + action: KeyAction.EditPrevMessage, keyCombo: { key: Key.ARROW_UP, - } + }, + }, + { + action: KeyAction.EditNextMessage, + keyCombo: { + key: Key.ARROW_DOWN, + }, + }, + { + action: KeyAction.CancelEditing, + keyCombo: { + key: Key.ESCAPE, + }, }, ]; if (SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend')) { @@ -83,7 +107,7 @@ const messageComposerBindings = (): KeyBinding[] => { /** * Helper method to check if a KeyboardEvent matches a KeyCombo - * + * * Note, this method is only exported for testing. */ export function isKeyComboMatch(ev: KeyboardEvent, combo: KeyCombo, onMac: boolean): boolean { @@ -130,12 +154,12 @@ export type KeyBindingsGetter = () => KeyBinding[]; export class KeyBindingsManager { /** * Map of KeyBindingContext to a KeyBinding getter arrow function. - * + * * Returning a getter function allowed to have dynamic bindings, e.g. when settings change the bindings can be * recalculated. */ contextBindings: Record = { - [KeyBindingContext.SendMessageComposer]: messageComposerBindings, + [KeyBindingContext.MessageComposer]: messageComposerBindings, }; /** diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js index c59b3555b9..8aa637f680 100644 --- a/src/components/views/rooms/EditMessageComposer.js +++ b/src/components/views/rooms/EditMessageComposer.js @@ -29,11 +29,10 @@ import EditorStateTransfer from '../../../utils/EditorStateTransfer'; import classNames from 'classnames'; import {EventStatus} from 'matrix-js-sdk'; import BasicMessageComposer from "./BasicMessageComposer"; -import {Key, isOnlyCtrlOrCmdKeyEvent} from "../../../Keyboard"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import {Action} from "../../../dispatcher/actions"; -import SettingsStore from "../../../settings/SettingsStore"; import CountlyAnalytics from "../../../CountlyAnalytics"; +import {getKeyBindingsManager, KeyAction, KeyBindingContext} from '../../../KeyBindingsManager'; function _isReply(mxEvent) { const relatesTo = mxEvent.getContent()["m.relates_to"]; @@ -134,38 +133,41 @@ export default class EditMessageComposer extends React.Component { if (this._editorRef.isComposing(event)) { return; } - if (event.metaKey || event.altKey || event.shiftKey) { - return; - } - const ctrlEnterToSend = !!SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend'); - const send = ctrlEnterToSend ? event.key === Key.ENTER && isOnlyCtrlOrCmdKeyEvent(event) - : event.key === Key.ENTER; - if (send) { - this._sendEdit(); - event.preventDefault(); - } else if (event.key === Key.ESCAPE) { - this._cancelEdit(); - } else if (event.key === Key.ARROW_UP) { - if (this._editorRef.isModified() || !this._editorRef.isCaretAtStart()) { - return; - } - const previousEvent = findEditableEvent(this._getRoom(), false, this.props.editState.getEvent().getId()); - if (previousEvent) { - dis.dispatch({action: 'edit_event', event: previousEvent}); + const action = getKeyBindingsManager().getAction(KeyBindingContext.MessageComposer, event); + switch (action) { + case KeyAction.Send: + this._sendEdit(); event.preventDefault(); + break; + case KeyAction.CancelEditing: + this._cancelEdit(); + break; + case KeyAction.EditPrevMessage: { + if (this._editorRef.isModified() || !this._editorRef.isCaretAtStart()) { + return; + } + const previousEvent = findEditableEvent(this._getRoom(), false, + this.props.editState.getEvent().getId()); + if (previousEvent) { + dis.dispatch({action: 'edit_event', event: previousEvent}); + event.preventDefault(); + } + break; } - } else if (event.key === Key.ARROW_DOWN) { - if (this._editorRef.isModified() || !this._editorRef.isCaretAtEnd()) { - return; + case KeyAction.EditNextMessage: { + if (this._editorRef.isModified() || !this._editorRef.isCaretAtEnd()) { + return; + } + const nextEvent = findEditableEvent(this._getRoom(), true, this.props.editState.getEvent().getId()); + if (nextEvent) { + dis.dispatch({action: 'edit_event', event: nextEvent}); + } else { + dis.dispatch({action: 'edit_event', event: null}); + dis.fire(Action.FocusComposer); + } + event.preventDefault(); + break; } - const nextEvent = findEditableEvent(this._getRoom(), true, this.props.editState.getEvent().getId()); - if (nextEvent) { - dis.dispatch({action: 'edit_event', event: nextEvent}); - } else { - dis.dispatch({action: 'edit_event', event: null}); - dis.fire(Action.FocusComposer); - } - event.preventDefault(); } } From ac7963b509ba630276424f86634f2a068e73bdbd Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Tue, 16 Feb 2021 19:05:51 +1300 Subject: [PATCH 005/163] Fix lint and style issues --- src/components/views/rooms/SendMessageComposer.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js index 0559c71e9e..5b018f2f0e 100644 --- a/src/components/views/rooms/SendMessageComposer.js +++ b/src/components/views/rooms/SendMessageComposer.js @@ -38,17 +38,16 @@ import * as sdk from '../../../index'; import Modal from '../../../Modal'; import {_t, _td} from '../../../languageHandler'; import ContentMessages from '../../../ContentMessages'; -import {Key, isOnlyCtrlOrCmdKeyEvent} from "../../../Keyboard"; +import {Key} from "../../../Keyboard"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import RateLimitedFunc from '../../../ratelimitedfunc'; import {Action} from "../../../dispatcher/actions"; import {containsEmoji} from "../../../effects/utils"; import {CHAT_EFFECTS} from '../../../effects'; -import SettingsStore from "../../../settings/SettingsStore"; import CountlyAnalytics from "../../../CountlyAnalytics"; import {MatrixClientPeg} from "../../../MatrixClientPeg"; import EMOJI_REGEX from 'emojibase-regex'; -import { getKeyBindingsManager, KeyAction, KeyBindingContext } from '../../../KeyBindingsManager'; +import {getKeyBindingsManager, KeyAction, KeyBindingContext} from '../../../KeyBindingsManager'; function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) { const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent); @@ -152,7 +151,7 @@ export default class SendMessageComposer extends React.Component { event.preventDefault(); break; case KeyAction.SelectPrevSendHistory: - case KeyAction.SelectNextSendHistory: + case KeyAction.SelectNextSendHistory: { // Try select composer history const selected = this.selectSendHistory(action === KeyAction.SelectPrevSendHistory); if (selected) { @@ -160,7 +159,8 @@ export default class SendMessageComposer extends React.Component { event.preventDefault(); } break; - case KeyAction.EditLastMessage: + } + case KeyAction.EditPrevMessage: // selection must be collapsed and caret at start if (this._editorRef.isSelectionCollapsed() && this._editorRef.isCaretAtStart()) { const editEvent = findEditableEvent(this.props.room, false); @@ -251,7 +251,7 @@ export default class SendMessageComposer extends React.Component { const myReactionKeys = [...myReactionEvents] .filter(event => !event.isRedacted()) .map(event => event.getRelation().key); - shouldReact = !myReactionKeys.includes(reaction); + shouldReact = !myReactionKeys.includes(reaction); } if (shouldReact) { MatrixClientPeg.get().sendEvent(lastMessage.getRoomId(), "m.reaction", { @@ -486,7 +486,7 @@ export default class SendMessageComposer extends React.Component { _insertQuotedMessage(event) { const {model} = this; const {partCreator} = model; - const quoteParts = parseEvent(event, partCreator, { isQuotedMessage: true }); + const quoteParts = parseEvent(event, partCreator, {isQuotedMessage: true}); // add two newlines quoteParts.push(partCreator.newline()); quoteParts.push(partCreator.newline()); From c84ad9bedc1299935b7cb8c8f4d1ebbf333ef7d3 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Tue, 16 Feb 2021 19:12:18 +1300 Subject: [PATCH 006/163] Use key binding for cancelling a message reply --- src/KeyBindingsManager.ts | 2 +- src/components/views/rooms/SendMessageComposer.js | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index b411c7ff27..e8f4126fbd 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -22,7 +22,7 @@ export enum KeyAction { /** Start editing the user's next sent message */ EditNextMessage = 'EditNextMessage', - /** Cancel editing a message */ + /** Cancel editing a message or cancel replying to a message */ CancelEditing = 'CancelEditing', } diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js index 5b018f2f0e..adfa38b56a 100644 --- a/src/components/views/rooms/SendMessageComposer.js +++ b/src/components/views/rooms/SendMessageComposer.js @@ -38,7 +38,6 @@ import * as sdk from '../../../index'; import Modal from '../../../Modal'; import {_t, _td} from '../../../languageHandler'; import ContentMessages from '../../../ContentMessages'; -import {Key} from "../../../Keyboard"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import RateLimitedFunc from '../../../ratelimitedfunc'; import {Action} from "../../../dispatcher/actions"; @@ -174,13 +173,14 @@ export default class SendMessageComposer extends React.Component { } } break; + case KeyAction.CancelEditing: + dis.dispatch({ + action: 'reply_to_event', + event: null, + }); + break; default: - if (event.key === Key.ESCAPE) { - dis.dispatch({ - action: 'reply_to_event', - event: null, - }); - } else if (this._prepareToEncrypt) { + if (this._prepareToEncrypt) { // This needs to be last! this._prepareToEncrypt(); } From 54c38844d254546a35afbe8d81be4f6380a54262 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Wed, 17 Feb 2021 22:00:48 +1300 Subject: [PATCH 007/163] Use key bindings in BasicMessageComposer --- src/KeyBindingsManager.ts | 164 +++++++++++++++- .../views/rooms/BasicMessageComposer.tsx | 175 +++++++++--------- 2 files changed, 245 insertions(+), 94 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index e8f4126fbd..ef5084c16c 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -4,6 +4,8 @@ import SettingsStore from './settings/SettingsStore'; export enum KeyBindingContext { /** Key bindings for the chat message composer component */ MessageComposer = 'MessageComposer', + /** Key bindings for text editing autocompletion */ + AutoComplete = 'AutoComplete', } export enum KeyAction { @@ -21,9 +23,34 @@ export enum KeyAction { EditPrevMessage = 'EditPrevMessage', /** Start editing the user's next sent message */ EditNextMessage = 'EditNextMessage', - - /** Cancel editing a message or cancel replying to a message */ + /** Cancel editing a message or cancel replying to a message*/ CancelEditing = 'CancelEditing', + + /** Set bold format the current selection */ + FormatBold = 'FormatBold', + /** Set italics format the current selection */ + FormatItalics = 'FormatItalics', + /** Format the current selection as quote */ + FormatQuote = 'FormatQuote', + /** Undo the last editing */ + EditUndo = 'EditUndo', + /** Redo editing */ + EditRedo = 'EditRedo', + /** Insert new line */ + NewLine = 'NewLine', + MoveCursorToStart = 'MoveCursorToStart', + MoveCursorToEnd = 'MoveCursorToEnd', + + // Autocomplete + + /** Apply the current autocomplete selection */ + AutocompleteApply = 'AutocompleteApply', + /** Cancel autocompletion */ + AutocompleteCancel = 'AutocompleteCancel', + /** Move to the previous autocomplete selection */ + AutocompletePrevSelection = 'AutocompletePrevSelection', + /** Move to the next autocomplete selection */ + AutocompleteNextSelection = 'AutocompleteNextSelection', } /** @@ -84,7 +111,69 @@ const messageComposerBindings = (): KeyBinding[] => { key: Key.ESCAPE, }, }, + { + action: KeyAction.FormatBold, + keyCombo: { + key: Key.B, + ctrlOrCmd: true, + }, + }, + { + action: KeyAction.FormatItalics, + keyCombo: { + key: Key.I, + ctrlOrCmd: true, + }, + }, + { + action: KeyAction.FormatQuote, + keyCombo: { + key: Key.GREATER_THAN, + ctrlOrCmd: true, + shiftKey: true, + }, + }, + { + action: KeyAction.EditUndo, + keyCombo: { + key: Key.Z, + ctrlOrCmd: true, + }, + }, + // Note: the following two bindings also work with just HOME and END, add them here? + { + action: KeyAction.MoveCursorToStart, + keyCombo: { + key: Key.HOME, + ctrlOrCmd: true, + }, + }, + { + action: KeyAction.MoveCursorToEnd, + keyCombo: { + key: Key.END, + ctrlOrCmd: true, + }, + }, ]; + if (isMac) { + bindings.push({ + action: KeyAction.EditRedo, + keyCombo: { + key: Key.Z, + ctrlOrCmd: true, + shiftKey: true, + }, + }); + } else { + bindings.push({ + action: KeyAction.EditRedo, + keyCombo: { + key: Key.Y, + ctrlOrCmd: true, + }, + }); + } if (SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend')) { bindings.push({ action: KeyAction.Send, @@ -93,6 +182,12 @@ const messageComposerBindings = (): KeyBinding[] => { ctrlOrCmd: true, }, }); + bindings.push({ + action: KeyAction.NewLine, + keyCombo: { + key: Key.ENTER, + }, + }); } else { bindings.push({ action: KeyAction.Send, @@ -100,17 +195,75 @@ const messageComposerBindings = (): KeyBinding[] => { key: Key.ENTER, }, }); + bindings.push({ + action: KeyAction.NewLine, + keyCombo: { + key: Key.ENTER, + shiftKey: true, + }, + }); + if (isMac) { + bindings.push({ + action: KeyAction.NewLine, + keyCombo: { + key: Key.ENTER, + altKey: true, + }, + }); + } } - return bindings; } +const autocompleteBindings = (): KeyBinding[] => { + return [ + { + action: KeyAction.AutocompleteApply, + keyCombo: { + key: Key.TAB, + }, + }, + { + action: KeyAction.AutocompleteApply, + keyCombo: { + key: Key.TAB, + ctrlKey: true, + }, + }, + { + action: KeyAction.AutocompleteApply, + keyCombo: { + key: Key.TAB, + shiftKey: true, + }, + }, + { + action: KeyAction.AutocompleteCancel, + keyCombo: { + key: Key.ESCAPE, + }, + }, + { + action: KeyAction.AutocompletePrevSelection, + keyCombo: { + key: Key.ARROW_UP, + }, + }, + { + action: KeyAction.AutocompleteNextSelection, + keyCombo: { + key: Key.ARROW_DOWN, + }, + }, + ] +} + /** * Helper method to check if a KeyboardEvent matches a KeyCombo * * Note, this method is only exported for testing. */ -export function isKeyComboMatch(ev: KeyboardEvent, combo: KeyCombo, onMac: boolean): boolean { +export function isKeyComboMatch(ev: KeyboardEvent | React.KeyboardEvent, combo: KeyCombo, onMac: boolean): boolean { if (combo.key !== undefined && ev.key !== combo.key) { return false; } @@ -160,12 +313,13 @@ export class KeyBindingsManager { */ contextBindings: Record = { [KeyBindingContext.MessageComposer]: messageComposerBindings, + [KeyBindingContext.AutoComplete]: autocompleteBindings, }; /** * Finds a matching KeyAction for a given KeyboardEvent */ - getAction(context: KeyBindingContext, ev: KeyboardEvent): KeyAction { + getAction(context: KeyBindingContext, ev: KeyboardEvent | React.KeyboardEvent): KeyAction { const bindings = this.contextBindings[context]?.(); if (!bindings) { return KeyAction.None; diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx index 017ce77166..d0119ddc05 100644 --- a/src/components/views/rooms/BasicMessageComposer.tsx +++ b/src/components/views/rooms/BasicMessageComposer.tsx @@ -46,6 +46,7 @@ import {IDiff} from "../../../editor/diff"; import AutocompleteWrapperModel from "../../../editor/autocomplete"; import DocumentPosition from "../../../editor/position"; import {ICompletion} from "../../../autocomplete/Autocompleter"; +import { getKeyBindingsManager, KeyBindingContext, KeyAction } from '../../../KeyBindingsManager'; // matches emoticons which follow the start of a line or whitespace const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$'); @@ -419,98 +420,94 @@ export default class BasicMessageEditor extends React.Component private onKeyDown = (event: React.KeyboardEvent) => { const model = this.props.model; - const modKey = IS_MAC ? event.metaKey : event.ctrlKey; let handled = false; - // format bold - if (modKey && event.key === Key.B) { - this.onFormatAction(Formatting.Bold); - handled = true; - // format italics - } else if (modKey && event.key === Key.I) { - this.onFormatAction(Formatting.Italics); - handled = true; - // format quote - } else if (modKey && event.key === Key.GREATER_THAN) { - this.onFormatAction(Formatting.Quote); - handled = true; - // redo - } else if ((!IS_MAC && modKey && event.key === Key.Y) || - (IS_MAC && modKey && event.shiftKey && event.key === Key.Z)) { - if (this.historyManager.canRedo()) { - const {parts, caret} = this.historyManager.redo(); - // pass matching inputType so historyManager doesn't push echo - // when invoked from rerender callback. - model.reset(parts, caret, "historyRedo"); - } - handled = true; - // undo - } else if (modKey && event.key === Key.Z) { - if (this.historyManager.canUndo()) { - const {parts, caret} = this.historyManager.undo(this.props.model); - // pass matching inputType so historyManager doesn't push echo - // when invoked from rerender callback. - model.reset(parts, caret, "historyUndo"); - } - handled = true; - // insert newline on Shift+Enter - } else if (event.key === Key.ENTER && (event.shiftKey || (IS_MAC && event.altKey))) { - this.insertText("\n"); - handled = true; - // move selection to start of composer - } else if (modKey && event.key === Key.HOME && !event.shiftKey) { - setSelection(this.editorRef.current, model, { - index: 0, - offset: 0, - }); - handled = true; - // move selection to end of composer - } else if (modKey && event.key === Key.END && !event.shiftKey) { - setSelection(this.editorRef.current, model, { - index: model.parts.length - 1, - offset: model.parts[model.parts.length - 1].text.length, - }); - handled = true; - // autocomplete or enter to send below shouldn't have any modifier keys pressed. - } else { - const metaOrAltPressed = event.metaKey || event.altKey; - const modifierPressed = metaOrAltPressed || event.shiftKey; - if (model.autoComplete && model.autoComplete.hasCompletions()) { - const autoComplete = model.autoComplete; - switch (event.key) { - case Key.ARROW_UP: - if (!modifierPressed) { - autoComplete.onUpArrow(event); - handled = true; - } - break; - case Key.ARROW_DOWN: - if (!modifierPressed) { - autoComplete.onDownArrow(event); - handled = true; - } - break; - case Key.TAB: - if (!metaOrAltPressed) { - autoComplete.onTab(event); - handled = true; - } - break; - case Key.ESCAPE: - if (!modifierPressed) { - autoComplete.onEscape(event); - handled = true; - } - break; - default: - return; // don't preventDefault on anything else - } - } else if (event.key === Key.TAB) { - this.tabCompleteName(event); + const action = getKeyBindingsManager().getAction(KeyBindingContext.MessageComposer, event); + switch (action) { + case KeyAction.FormatBold: + this.onFormatAction(Formatting.Bold); handled = true; - } else if (event.key === Key.BACKSPACE || event.key === Key.DELETE) { - this.formatBarRef.current.hide(); - } + break; + case KeyAction.FormatItalics: + this.onFormatAction(Formatting.Italics); + handled = true; + break; + case KeyAction.FormatQuote: + this.onFormatAction(Formatting.Quote); + handled = true; + break; + case KeyAction.EditRedo: + if (this.historyManager.canRedo()) { + const {parts, caret} = this.historyManager.redo(); + // pass matching inputType so historyManager doesn't push echo + // when invoked from rerender callback. + model.reset(parts, caret, "historyRedo"); + } + handled = true; + break; + case KeyAction.EditUndo: + if (this.historyManager.canUndo()) { + const {parts, caret} = this.historyManager.undo(this.props.model); + // pass matching inputType so historyManager doesn't push echo + // when invoked from rerender callback. + model.reset(parts, caret, "historyUndo"); + } + handled = true; + break; + case KeyAction.NewLine: + this.insertText("\n"); + handled = true; + break; + case KeyAction.MoveCursorToStart: + setSelection(this.editorRef.current, model, { + index: 0, + offset: 0, + }); + handled = true; + break; + case KeyAction.MoveCursorToEnd: + setSelection(this.editorRef.current, model, { + index: model.parts.length - 1, + offset: model.parts[model.parts.length - 1].text.length, + }); + handled = true; + break; } + if (handled) { + event.preventDefault(); + event.stopPropagation(); + return; + } + + const autocompleteAction = getKeyBindingsManager().getAction(KeyBindingContext.AutoComplete, event); + if (model.autoComplete && model.autoComplete.hasCompletions()) { + const autoComplete = model.autoComplete; + switch (autocompleteAction) { + case KeyAction.AutocompletePrevSelection: + autoComplete.onUpArrow(event); + handled = true; + break; + case KeyAction.AutocompleteNextSelection: + autoComplete.onDownArrow(event); + handled = true; + break; + case KeyAction.AutocompleteApply: + autoComplete.onTab(event); + handled = true; + break; + case KeyAction.AutocompleteCancel: + autoComplete.onEscape(event); + handled = true; + break; + default: + return; // don't preventDefault on anything else + } + } else if (autocompleteAction === KeyAction.AutocompleteApply) { + this.tabCompleteName(event); + handled = true; + } else if (event.key === Key.BACKSPACE || event.key === Key.DELETE) { + this.formatBarRef.current.hide(); + } + if (handled) { event.preventDefault(); event.stopPropagation(); From 563620484df6fa79f666ef72f414838cf0e342f1 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Thu, 25 Feb 2021 14:39:20 -0500 Subject: [PATCH 008/163] Support replying with a message command Signed-off-by: Robin Townsend --- src/SlashCommands.tsx | 28 +++++++----- .../views/rooms/SendMessageComposer.js | 44 +++++++++++++------ 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx index 6b5f261374..06468c135e 100644 --- a/src/SlashCommands.tsx +++ b/src/SlashCommands.tsx @@ -20,6 +20,7 @@ limitations under the License. import * as React from 'react'; +import { ContentHelpers } from 'matrix-js-sdk'; import {MatrixClientPeg} from './MatrixClientPeg'; import dis from './dispatcher/dispatcher'; import * as sdk from './index'; @@ -126,10 +127,10 @@ export class Command { return this.getCommand() + " " + this.args; } - run(roomId: string, args: string, cmd: string) { + run(roomId: string, args: string) { // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me` if (!this.runFn) return reject(_t("Command error")); - return this.runFn.bind(this)(roomId, args, cmd); + return this.runFn.bind(this)(roomId, args); } getUsage() { @@ -163,7 +164,7 @@ export const Commands = [ if (args) { message = message + ' ' + args; } - return success(MatrixClientPeg.get().sendTextMessage(roomId, message)); + return success(ContentHelpers.makeTextMessage(message)); }, category: CommandCategories.messages, }), @@ -176,7 +177,7 @@ export const Commands = [ if (args) { message = message + ' ' + args; } - return success(MatrixClientPeg.get().sendTextMessage(roomId, message)); + return success(ContentHelpers.makeTextMessage(message)); }, category: CommandCategories.messages, }), @@ -189,7 +190,7 @@ export const Commands = [ if (args) { message = message + ' ' + args; } - return success(MatrixClientPeg.get().sendTextMessage(roomId, message)); + return success(ContentHelpers.makeTextMessage(message)); }, category: CommandCategories.messages, }), @@ -202,7 +203,7 @@ export const Commands = [ if (args) { message = message + ' ' + args; } - return success(MatrixClientPeg.get().sendTextMessage(roomId, message)); + return success(ContentHelpers.makeTextMessage(message)); }, category: CommandCategories.messages, }), @@ -211,7 +212,7 @@ export const Commands = [ args: '', description: _td('Sends a message as plain text, without interpreting it as markdown'), runFn: function(roomId, messages) { - return success(MatrixClientPeg.get().sendTextMessage(roomId, messages)); + return success(ContentHelpers.makeTextMessage(messages)); }, category: CommandCategories.messages, }), @@ -220,7 +221,7 @@ export const Commands = [ args: '', description: _td('Sends a message as html, without interpreting it as markdown'), runFn: function(roomId, messages) { - return success(MatrixClientPeg.get().sendHtmlMessage(roomId, messages, messages)); + return success(ContentHelpers.makeHtmlMessage(messages, messages)); }, category: CommandCategories.messages, }), @@ -966,7 +967,7 @@ export const Commands = [ args: '', runFn: function(roomId, args) { if (!args) return reject(this.getUserId()); - return success(MatrixClientPeg.get().sendHtmlMessage(roomId, args, textToHtmlRainbow(args))); + return success(ContentHelpers.makeHtmlMessage(args, textToHtmlRainbow(args))); }, category: CommandCategories.messages, }), @@ -976,7 +977,7 @@ export const Commands = [ args: '', runFn: function(roomId, args) { if (!args) return reject(this.getUserId()); - return success(MatrixClientPeg.get().sendHtmlEmote(roomId, args, textToHtmlRainbow(args))); + return success(ContentHelpers.makeHtmlEmote(args, textToHtmlRainbow(args))); }, category: CommandCategories.messages, }), @@ -1201,10 +1202,13 @@ export function parseCommandString(input: string) { * processing the command, or 'promise' if a request was sent out. * Returns null if the input didn't match a command. */ -export function getCommand(roomId: string, input: string) { +export function getCommand(input: string) { const {cmd, args} = parseCommandString(input); if (CommandMap.has(cmd) && CommandMap.get(cmd).isEnabled()) { - return () => CommandMap.get(cmd).run(roomId, args, cmd); + return { + cmd: CommandMap.get(cmd), + args, + }; } } diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js index 62c474e417..d1482c0df6 100644 --- a/src/components/views/rooms/SendMessageComposer.js +++ b/src/components/views/rooms/SendMessageComposer.js @@ -33,7 +33,7 @@ import ReplyThread from "../elements/ReplyThread"; import {parseEvent} from '../../../editor/deserialize'; import {findEditableEvent} from '../../../utils/EventUtils'; import SendHistoryManager from "../../../SendHistoryManager"; -import {getCommand} from '../../../SlashCommands'; +import {CommandCategories, getCommand} from '../../../SlashCommands'; import * as sdk from '../../../index'; import Modal from '../../../Modal'; import {_t, _td} from '../../../languageHandler'; @@ -287,15 +287,22 @@ export default class SendMessageComposer extends React.Component { } return text + part.text; }, ""); - return [getCommand(this.props.room.roomId, commandText), commandText]; + const {cmd, args} = getCommand(commandText); + return [cmd, args, commandText]; } - async _runSlashCommand(fn) { - const cmd = fn(); - let error = cmd.error; - if (cmd.promise) { + async _runSlashCommand(cmd, args) { + const result = cmd.run(this.props.room.roomId, args); + let messageContent; + let error = result.error; + if (result.promise) { try { - await cmd.promise; + if (cmd.category === CommandCategories.messages) { + // The command returns a modified message that we need to pass on + messageContent = await result.promise; + } else { + await result.promise; + } } catch (err) { error = err; } @@ -304,7 +311,7 @@ export default class SendMessageComposer extends React.Component { console.error("Command failure: %s", error); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); // assume the error is a server error when the command is async - const isServerError = !!cmd.promise; + const isServerError = !!result.promise; const title = isServerError ? _td("Server error") : _td("Command error"); let errText; @@ -322,6 +329,7 @@ export default class SendMessageComposer extends React.Component { }); } else { console.log("Command success."); + if (messageContent) return messageContent; } } @@ -330,13 +338,22 @@ export default class SendMessageComposer extends React.Component { return; } + const replyToEvent = this.props.replyToEvent; let shouldSend = true; + let content; if (!containsEmote(this.model) && this._isSlashCommand()) { - const [cmd, commandText] = this._getSlashCommand(); + const [cmd, args, commandText] = this._getSlashCommand(); if (cmd) { - shouldSend = false; - this._runSlashCommand(cmd); + if (cmd.category === CommandCategories.messages) { + content = await this._runSlashCommand(cmd, args); + if (replyToEvent) { + addReplyToMessageContent(content, replyToEvent, this.props.permalinkCreator); + } + } else { + this._runSlashCommand(cmd, args); + shouldSend = false; + } } else { // ask the user if their unknown command should be sent as a message const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); @@ -371,11 +388,12 @@ export default class SendMessageComposer extends React.Component { this._sendQuickReaction(); } - const replyToEvent = this.props.replyToEvent; if (shouldSend) { const startTime = CountlyAnalytics.getTimestamp(); const {roomId} = this.props.room; - const content = createMessageContent(this.model, this.props.permalinkCreator, replyToEvent); + if (!content) { + content = createMessageContent(this.model, this.props.permalinkCreator, replyToEvent); + } // don't bother sending an empty message if (!content.body.trim()) return; From f29a8ef0f707a9c9a9168b7f1177dda771a802c9 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sun, 28 Feb 2021 20:12:36 +1300 Subject: [PATCH 009/163] Handle shift + letter combos --- src/KeyBindingsManager.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index ef5084c16c..e26950b862 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -264,8 +264,17 @@ const autocompleteBindings = (): KeyBinding[] => { * Note, this method is only exported for testing. */ export function isKeyComboMatch(ev: KeyboardEvent | React.KeyboardEvent, combo: KeyCombo, onMac: boolean): boolean { - if (combo.key !== undefined && ev.key !== combo.key) { - return false; + if (combo.key !== undefined) { + // When shift is pressed, letters are returned as upper case chars. In this case do a lower case comparison. + // This works for letter combos such as shift + U as well for none letter combos such as shift + Escape. + // If shift is not pressed, the toLowerCase conversion can be avoided. + if (ev.shiftKey) { + if (ev.key.toLowerCase() !== combo.key.toLowerCase()) { + return false; + } + } else if (ev.key !== combo.key) { + return false; + } } const comboCtrl = combo.ctrlKey ?? false; From 32ec8b7dc84af60811ef2d1155f4839fd3f79285 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sun, 28 Feb 2021 20:13:34 +1300 Subject: [PATCH 010/163] Add key bindings for RoomList, Room and Navigation --- src/KeyBindingsManager.ts | 244 +++++++++++++++++++++ src/components/structures/LoggedInView.tsx | 162 +++++++------- src/components/structures/RoomSearch.tsx | 33 +-- src/components/structures/RoomView.tsx | 32 ++- src/components/views/rooms/RoomSublist.tsx | 12 +- 5 files changed, 365 insertions(+), 118 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index e26950b862..b969982bda 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -6,6 +6,12 @@ export enum KeyBindingContext { MessageComposer = 'MessageComposer', /** Key bindings for text editing autocompletion */ AutoComplete = 'AutoComplete', + /** Left room list sidebar */ + RoomList = 'RoomList', + /** Current room view */ + Room = 'Room', + /** Shortcuts to navigate do various menus / dialogs / screens */ + Navigation = 'Navigation', } export enum KeyAction { @@ -51,6 +57,59 @@ export enum KeyAction { AutocompletePrevSelection = 'AutocompletePrevSelection', /** Move to the next autocomplete selection */ AutocompleteNextSelection = 'AutocompleteNextSelection', + + // Room list + + /** Clear room list filter field */ + RoomListClearSearch = 'RoomListClearSearch', + /** Navigate up/down in the room list */ + RoomListPrevRoom = 'RoomListPrevRoom', + /** Navigate down in the room list */ + RoomListNextRoom = 'RoomListNextRoom', + /** Select room from the room list */ + RoomListSelectRoom = 'RoomListSelectRoom', + /** Collapse room list section */ + RoomListCollapseSection = 'RoomListCollapseSection', + /** Expand room list section, if already expanded, jump to first room in the selection */ + RoomListExpandSection = 'RoomListExpandSection', + + // Room + + /** Jump to room search */ + RoomFocusRoomSearch = 'RoomFocusRoomSearch', + /** Scroll up in the timeline */ + RoomScrollUp = 'RoomScrollUp', + /** Scroll down in the timeline */ + RoomScrollDown = 'RoomScrollDown', + /** Dismiss read marker and jump to bottom */ + RoomDismissReadMarker = 'RoomDismissReadMarker', + /* Upload a file */ + RoomUploadFile = 'RoomUploadFile', + /* Search (must be enabled) */ + RoomSearch = 'RoomSearch', + /* Jump to the first (downloaded) message in the room */ + RoomJumpToFirstMessage = 'RoomJumpToFirstMessage', + /* Jump to the latest message in the room */ + RoomJumpToLatestMessage = 'RoomJumpToLatestMessage', + + // Navigation + + /** Toggle the room side panel */ + NavToggleRoomSidePanel = 'NavToggleRoomSidePanel', + /** Toggle the user menu */ + NavToggleUserMenu = 'NavToggleUserMenu', + /* Toggle the short cut help dialog */ + NavToggleShortCutDialog = 'NavToggleShortCutDialog', + /* Got to the Element home screen */ + NavGoToHome = 'NavGoToHome', + /* Select prev room */ + NavSelectPrevRoom = 'NavSelectPrevRoom', + /* Select next room */ + NavSelectNextRoom = 'NavSelectNextRoom', + /* Select prev room with unread messages*/ + NavSelectPrevUnreadRoom = 'NavSelectPrevUnreadRoom', + /* Select next room with unread messages*/ + NavSelectNextUnreadRoom = 'NavSelectNextUnreadRoom', } /** @@ -255,6 +314,188 @@ const autocompleteBindings = (): KeyBinding[] => { key: Key.ARROW_DOWN, }, }, + ]; +} + +const roomListBindings = (): KeyBinding[] => { + return [ + { + action: KeyAction.RoomListClearSearch, + keyCombo: { + key: Key.ESCAPE, + }, + }, + { + action: KeyAction.RoomListPrevRoom, + keyCombo: { + key: Key.ARROW_UP, + }, + }, + { + action: KeyAction.RoomListNextRoom, + keyCombo: { + key: Key.ARROW_DOWN, + }, + }, + { + action: KeyAction.RoomListSelectRoom, + keyCombo: { + key: Key.ENTER, + }, + }, + { + action: KeyAction.RoomListCollapseSection, + keyCombo: { + key: Key.ARROW_LEFT, + }, + }, + { + action: KeyAction.RoomListExpandSection, + keyCombo: { + key: Key.ARROW_RIGHT, + }, + }, + ]; +} + +const roomBindings = (): KeyBinding[] => { + const bindings = [ + { + action: KeyAction.RoomFocusRoomSearch, + keyCombo: { + key: Key.K, + ctrlOrCmd: true, + }, + }, + { + action: KeyAction.RoomScrollUp, + keyCombo: { + key: Key.PAGE_UP, + }, + }, + { + action: KeyAction.RoomScrollDown, + keyCombo: { + key: Key.PAGE_DOWN, + }, + }, + { + action: KeyAction.RoomDismissReadMarker, + keyCombo: { + key: Key.ESCAPE, + }, + }, + { + action: KeyAction.RoomUploadFile, + keyCombo: { + key: Key.U, + ctrlOrCmd: true, + shiftKey: true, + }, + }, + { + action: KeyAction.RoomJumpToFirstMessage, + keyCombo: { + key: Key.HOME, + ctrlKey: true, + }, + }, + { + action: KeyAction.RoomJumpToLatestMessage, + keyCombo: { + key: Key.END, + ctrlKey: true, + }, + }, + ]; + + if (SettingsStore.getValue('ctrlFForSearch')) { + bindings.push({ + action: KeyAction.RoomSearch, + keyCombo: { + key: Key.F, + ctrlOrCmd: true, + }, + }); + } + + return bindings; +} + +const navigationBindings = (): KeyBinding[] => { + return [ + { + action: KeyAction.NavToggleRoomSidePanel, + keyCombo: { + key: Key.PERIOD, + ctrlOrCmd: true, + }, + }, + { + action: KeyAction.NavToggleUserMenu, + // Ideally this would be CTRL+P for "Profile", but that's + // taken by the print dialog. CTRL+I for "Information" + // was previously chosen but conflicted with italics in + // composer, so CTRL+` it is + keyCombo: { + key: Key.BACKTICK, + ctrlOrCmd: true, + }, + }, + { + action: KeyAction.NavToggleShortCutDialog, + keyCombo: { + key: Key.SLASH, + ctrlOrCmd: true, + }, + }, + { + action: KeyAction.NavToggleShortCutDialog, + keyCombo: { + key: Key.SLASH, + ctrlOrCmd: true, + shiftKey: true, + }, + }, + { + action: KeyAction.NavGoToHome, + keyCombo: { + key: Key.H, + ctrlOrCmd: true, + altKey: true, + }, + }, + + { + action: KeyAction.NavSelectPrevRoom, + keyCombo: { + key: Key.ARROW_UP, + altKey: true, + }, + }, + { + action: KeyAction.NavSelectNextRoom, + keyCombo: { + key: Key.ARROW_DOWN, + altKey: true, + }, + }, + { + action: KeyAction.NavSelectPrevUnreadRoom, + keyCombo: { + key: Key.ARROW_UP, + altKey: true, + shiftKey: true, + }, + }, + { + action: KeyAction.NavSelectNextUnreadRoom, + keyCombo: { + key: Key.ARROW_DOWN, + altKey: true, + shiftKey: true, + }, + }, ] } @@ -323,6 +564,9 @@ export class KeyBindingsManager { contextBindings: Record = { [KeyBindingContext.MessageComposer]: messageComposerBindings, [KeyBindingContext.AutoComplete]: autocompleteBindings, + [KeyBindingContext.RoomList]: roomListBindings, + [KeyBindingContext.Room]: roomBindings, + [KeyBindingContext.Navigation]: navigationBindings, }; /** diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index c76cd7cee7..dd8bc1f3db 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -21,7 +21,7 @@ import * as PropTypes from 'prop-types'; import { MatrixClient } from 'matrix-js-sdk/src/client'; import { DragDropContext } from 'react-beautiful-dnd'; -import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isMac} from '../../Keyboard'; +import {Key} from '../../Keyboard'; import PageTypes from '../../PageTypes'; import CallMediaHandler from '../../CallMediaHandler'; import { fixupColorFonts } from '../../utils/FontManager'; @@ -55,6 +55,7 @@ import { IThreepidInvite } from "../../stores/ThreepidInviteStore"; import Modal from "../../Modal"; import { ICollapseConfig } from "../../resizer/distributors/collapse"; import HostSignupContainer from '../views/host_signup/HostSignupContainer'; +import { getKeyBindingsManager, KeyAction, KeyBindingContext } from '../../KeyBindingsManager'; // We need to fetch each pinned message individually (if we don't already have it) // so each pinned message may trigger a request. Limit the number per room for sanity. @@ -399,86 +400,54 @@ class LoggedInView extends React.Component { _onKeyDown = (ev) => { let handled = false; - const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev); - const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey; - const isModifier = ev.key === Key.ALT || ev.key === Key.CONTROL || ev.key === Key.META || ev.key === Key.SHIFT; - const modKey = isMac ? ev.metaKey : ev.ctrlKey; - switch (ev.key) { - case Key.PAGE_UP: - case Key.PAGE_DOWN: - if (!hasModifier && !isModifier) { - this._onScrollKeyPressed(ev); - handled = true; - } + const roomAction = getKeyBindingsManager().getAction(KeyBindingContext.Room, ev); + switch (roomAction) { + case KeyAction.RoomFocusRoomSearch: + dis.dispatch({ + action: 'focus_room_filter', + }); + handled = true; break; + case KeyAction.RoomScrollUp: + case KeyAction.RoomScrollDown: + case KeyAction.RoomJumpToFirstMessage: + case KeyAction.RoomJumpToLatestMessage: + this._onScrollKeyPressed(ev); + handled = true; + break; + case KeyAction.RoomSearch: + dis.dispatch({ + action: 'focus_search', + }); + handled = true; + break; + } + if (handled) { + ev.stopPropagation(); + ev.preventDefault(); + return; + } - case Key.HOME: - case Key.END: - if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) { - this._onScrollKeyPressed(ev); - handled = true; - } + const navAction = getKeyBindingsManager().getAction(KeyBindingContext.Navigation, ev); + switch (navAction) { + case KeyAction.NavToggleUserMenu: + dis.fire(Action.ToggleUserMenu); + handled = true; break; - case Key.K: - if (ctrlCmdOnly) { - dis.dispatch({ - action: 'focus_room_filter', - }); - handled = true; - } + case KeyAction.NavToggleShortCutDialog: + KeyboardShortcuts.toggleDialog(); + handled = true; break; - case Key.F: - if (ctrlCmdOnly && SettingsStore.getValue("ctrlFForSearch")) { - dis.dispatch({ - action: 'focus_search', - }); - handled = true; - } + case KeyAction.NavGoToHome: + dis.dispatch({ + action: 'view_home_page', + }); + Modal.closeCurrentModal("homeKeyboardShortcut"); + handled = true; break; - case Key.BACKTICK: - // Ideally this would be CTRL+P for "Profile", but that's - // taken by the print dialog. CTRL+I for "Information" - // was previously chosen but conflicted with italics in - // composer, so CTRL+` it is - - if (ctrlCmdOnly) { - dis.fire(Action.ToggleUserMenu); - handled = true; - } - break; - - case Key.SLASH: - if (isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev)) { - KeyboardShortcuts.toggleDialog(); - handled = true; - } - break; - - case Key.H: - if (ev.altKey && modKey) { - dis.dispatch({ - action: 'view_home_page', - }); - Modal.closeCurrentModal("homeKeyboardShortcut"); - handled = true; - } - break; - - case Key.ARROW_UP: - case Key.ARROW_DOWN: - if (ev.altKey && !ev.ctrlKey && !ev.metaKey) { - dis.dispatch({ - action: Action.ViewRoomDelta, - delta: ev.key === Key.ARROW_UP ? -1 : 1, - unread: ev.shiftKey, - }); - handled = true; - } - break; - - case Key.PERIOD: - if (ctrlCmdOnly && (this.props.page_type === "room_view" || this.props.page_type === "group_view")) { + case KeyAction.NavToggleRoomSidePanel: + if (this.props.page_type === "room_view" || this.props.page_type === "group_view") { dis.dispatch({ action: Action.ToggleRightPanel, type: this.props.page_type === "room_view" ? "room" : "group", @@ -486,16 +455,47 @@ class LoggedInView extends React.Component { handled = true; } break; - - default: - // if we do not have a handler for it, pass it to the platform which might - handled = PlatformPeg.get().onKeyDown(ev); + case KeyAction.NavSelectPrevRoom: + dis.dispatch({ + action: Action.ViewRoomDelta, + delta: -1, + unread: false, + }); + handled = true; + break; + case KeyAction.NavSelectNextRoom: + dis.dispatch({ + action: Action.ViewRoomDelta, + delta: 1, + unread: false, + }); + handled = true; + break; + case KeyAction.NavSelectPrevUnreadRoom: + dis.dispatch({ + action: Action.ViewRoomDelta, + delta: -1, + unread: true, + }); + break; + case KeyAction.NavSelectNextUnreadRoom: + dis.dispatch({ + action: Action.ViewRoomDelta, + delta: 1, + unread: true, + }); + break; } - + // if we do not have a handler for it, pass it to the platform which might + handled = PlatformPeg.get().onKeyDown(ev); if (handled) { ev.stopPropagation(); ev.preventDefault(); - } else if (!isModifier && !ev.altKey && !ev.ctrlKey && !ev.metaKey) { + return; + } + + const isModifier = ev.key === Key.ALT || ev.key === Key.CONTROL || ev.key === Key.META || ev.key === Key.SHIFT; + if (!isModifier && !ev.altKey && !ev.ctrlKey && !ev.metaKey) { // The above condition is crafted to _allow_ characters with Shift // already pressed (but not the Shift key down itself). diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx index a64e40bc65..2e900d2f0e 100644 --- a/src/components/structures/RoomSearch.tsx +++ b/src/components/structures/RoomSearch.tsx @@ -20,11 +20,11 @@ import classNames from "classnames"; import defaultDispatcher from "../../dispatcher/dispatcher"; import { _t } from "../../languageHandler"; import { ActionPayload } from "../../dispatcher/payloads"; -import { Key } from "../../Keyboard"; import AccessibleButton from "../views/elements/AccessibleButton"; import { Action } from "../../dispatcher/actions"; import RoomListStore from "../../stores/room-list/RoomListStore"; import { NameFilterCondition } from "../../stores/room-list/filters/NameFilterCondition"; +import { getKeyBindingsManager, KeyAction, KeyBindingContext } from "../../KeyBindingsManager"; interface IProps { isMinimized: boolean; @@ -106,18 +106,25 @@ export default class RoomSearch extends React.PureComponent { }; private onKeyDown = (ev: React.KeyboardEvent) => { - if (ev.key === Key.ESCAPE) { - this.clearInput(); - defaultDispatcher.fire(Action.FocusComposer); - } else if (ev.key === Key.ARROW_UP || ev.key === Key.ARROW_DOWN) { - this.props.onVerticalArrow(ev); - } else if (ev.key === Key.ENTER) { - const shouldClear = this.props.onEnter(ev); - if (shouldClear) { - // wrap in set immediate to delay it so that we don't clear the filter & then change room - setImmediate(() => { - this.clearInput(); - }); + const action = getKeyBindingsManager().getAction(KeyBindingContext.RoomList, ev); + switch (action) { + case KeyAction.RoomListClearSearch: + this.clearInput(); + defaultDispatcher.fire(Action.FocusComposer); + break; + case KeyAction.RoomListNextRoom: + case KeyAction.RoomListPrevRoom: + this.props.onVerticalArrow(ev); + break; + case KeyAction.RoomListSelectRoom: { + const shouldClear = this.props.onEnter(ev); + if (shouldClear) { + // wrap in set immediate to delay it so that we don't clear the filter & then change room + setImmediate(() => { + this.clearInput(); + }); + } + break; } } }; diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 7b72b7f33f..c09f1f7c45 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -41,7 +41,6 @@ import rateLimitedFunc from '../../ratelimitedfunc'; import * as ObjectUtils from '../../ObjectUtils'; import * as Rooms from '../../Rooms'; import eventSearch, { searchPagination } from '../../Searching'; -import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent, Key } from '../../Keyboard'; import MainSplit from './MainSplit'; import RightPanel from './RightPanel'; import RoomViewStore from '../../stores/RoomViewStore'; @@ -79,6 +78,7 @@ import Notifier from "../../Notifier"; import { showToast as showNotificationsToast } from "../../toasts/DesktopNotificationsToast"; import { RoomNotificationStateStore } from "../../stores/notifications/RoomNotificationStateStore"; import { Container, WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutStore"; +import { getKeyBindingsManager, KeyAction, KeyBindingContext } from '../../KeyBindingsManager'; const DEBUG = false; let debuglog = function(msg: string) {}; @@ -661,26 +661,20 @@ export default class RoomView extends React.Component { private onReactKeyDown = ev => { let handled = false; - switch (ev.key) { - case Key.ESCAPE: - if (!ev.altKey && !ev.ctrlKey && !ev.shiftKey && !ev.metaKey) { - this.messagePanel.forgetReadMarker(); - this.jumpToLiveTimeline(); - handled = true; - } + const action = getKeyBindingsManager().getAction(KeyBindingContext.Room, ev); + switch (action) { + case KeyAction.RoomDismissReadMarker: + this.messagePanel.forgetReadMarker(); + this.jumpToLiveTimeline(); + handled = true; break; - case Key.PAGE_UP: - if (!ev.altKey && !ev.ctrlKey && ev.shiftKey && !ev.metaKey) { - this.jumpToReadMarker(); - handled = true; - } + case KeyAction.RoomScrollUp: + this.jumpToReadMarker(); + handled = true; break; - case Key.U: // Mac returns lowercase - case Key.U.toUpperCase(): - if (isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev) && ev.shiftKey) { - dis.dispatch({ action: "upload_file" }, true); - handled = true; - } + case KeyAction.RoomUploadFile: + dis.dispatch({ action: "upload_file" }, true); + handled = true; break; } diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx index a2574bf60c..c0919090b0 100644 --- a/src/components/views/rooms/RoomSublist.tsx +++ b/src/components/views/rooms/RoomSublist.tsx @@ -51,6 +51,7 @@ import { objectExcluding, objectHasDiff } from "../../../utils/objects"; import TemporaryTile from "./TemporaryTile"; import { ListNotificationState } from "../../../stores/notifications/ListNotificationState"; import IconizedContextMenu from "../context_menus/IconizedContextMenu"; +import { getKeyBindingsManager, KeyAction, KeyBindingContext } from "../../../KeyBindingsManager"; const SHOW_N_BUTTON_HEIGHT = 28; // As defined by CSS const RESIZE_HANDLE_HEIGHT = 4; // As defined by CSS @@ -470,18 +471,19 @@ export default class RoomSublist extends React.Component { }; private onHeaderKeyDown = (ev: React.KeyboardEvent) => { - switch (ev.key) { - case Key.ARROW_LEFT: + const action = getKeyBindingsManager().getAction(KeyBindingContext.RoomList, ev); + switch (action) { + case KeyAction.RoomListCollapseSection: ev.stopPropagation(); if (this.state.isExpanded) { - // On ARROW_LEFT collapse the room sublist if it isn't already + // Collapse the room sublist if it isn't already this.toggleCollapsed(); } break; - case Key.ARROW_RIGHT: { + case KeyAction.RoomListExpandSection: { ev.stopPropagation(); if (!this.state.isExpanded) { - // On ARROW_RIGHT expand the room sublist if it isn't already + // Expand the room sublist if it isn't already this.toggleCollapsed(); } else if (this.sublistRef.current) { // otherwise focus the first room From 601be50b7127518c86e891f933c31d861fd83abb Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Mon, 1 Mar 2021 21:43:00 +1300 Subject: [PATCH 011/163] Split KeyAction into multiple enums This gives some additional type safety and makes enum member usage more clear. --- src/KeyBindingsManager.ts | 254 +++++++++--------- src/components/structures/LoggedInView.tsx | 34 +-- src/components/structures/RoomSearch.tsx | 12 +- src/components/structures/RoomView.tsx | 10 +- .../views/rooms/BasicMessageComposer.tsx | 32 +-- .../views/rooms/EditMessageComposer.js | 12 +- src/components/views/rooms/RoomSublist.tsx | 8 +- .../views/rooms/SendMessageComposer.js | 16 +- 8 files changed, 185 insertions(+), 193 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index b969982bda..d8c128a2bf 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -1,24 +1,8 @@ import { isMac, Key } from './Keyboard'; import SettingsStore from './settings/SettingsStore'; -export enum KeyBindingContext { - /** Key bindings for the chat message composer component */ - MessageComposer = 'MessageComposer', - /** Key bindings for text editing autocompletion */ - AutoComplete = 'AutoComplete', - /** Left room list sidebar */ - RoomList = 'RoomList', - /** Current room view */ - Room = 'Room', - /** Shortcuts to navigate do various menus / dialogs / screens */ - Navigation = 'Navigation', -} - -export enum KeyAction { - None = 'None', - - // SendMessageComposer actions: - +/** Actions for the chat message composer component */ +export enum MessageComposerAction { /** Send a message */ Send = 'Send', /** Go backwards through the send history and use the message in composer view */ @@ -46,70 +30,74 @@ export enum KeyAction { NewLine = 'NewLine', MoveCursorToStart = 'MoveCursorToStart', MoveCursorToEnd = 'MoveCursorToEnd', +} - // Autocomplete - +/** Actions for text editing autocompletion */ +export enum AutocompleteAction { /** Apply the current autocomplete selection */ - AutocompleteApply = 'AutocompleteApply', + ApplySelection = 'ApplySelection', /** Cancel autocompletion */ - AutocompleteCancel = 'AutocompleteCancel', + Cancel = 'Cancel', /** Move to the previous autocomplete selection */ - AutocompletePrevSelection = 'AutocompletePrevSelection', + PrevSelection = 'PrevSelection', /** Move to the next autocomplete selection */ - AutocompleteNextSelection = 'AutocompleteNextSelection', - - // Room list + NextSelection = 'NextSelection', +} +/** Actions for the left room list sidebar */ +export enum RoomListAction { /** Clear room list filter field */ - RoomListClearSearch = 'RoomListClearSearch', + ClearSearch = 'ClearSearch', /** Navigate up/down in the room list */ - RoomListPrevRoom = 'RoomListPrevRoom', + PrevRoom = 'PrevRoom', /** Navigate down in the room list */ - RoomListNextRoom = 'RoomListNextRoom', + NextRoom = 'NextRoom', /** Select room from the room list */ - RoomListSelectRoom = 'RoomListSelectRoom', + SelectRoom = 'SelectRoom', /** Collapse room list section */ - RoomListCollapseSection = 'RoomListCollapseSection', + CollapseSection = 'CollapseSection', /** Expand room list section, if already expanded, jump to first room in the selection */ - RoomListExpandSection = 'RoomListExpandSection', + ExpandSection = 'ExpandSection', +} - // Room - - /** Jump to room search */ - RoomFocusRoomSearch = 'RoomFocusRoomSearch', +/** Actions for the current room view */ +export enum RoomAction { + /** Jump to room search (search for a room)*/ + FocusRoomSearch = 'FocusRoomSearch', // TODO: move to NavigationAction? /** Scroll up in the timeline */ - RoomScrollUp = 'RoomScrollUp', + ScrollUp = 'ScrollUp', /** Scroll down in the timeline */ RoomScrollDown = 'RoomScrollDown', /** Dismiss read marker and jump to bottom */ - RoomDismissReadMarker = 'RoomDismissReadMarker', + DismissReadMarker = 'DismissReadMarker', /* Upload a file */ - RoomUploadFile = 'RoomUploadFile', - /* Search (must be enabled) */ - RoomSearch = 'RoomSearch', + UploadFile = 'UploadFile', + /* Focus search message in a room (must be enabled) */ + FocusSearch = 'FocusSearch', /* Jump to the first (downloaded) message in the room */ - RoomJumpToFirstMessage = 'RoomJumpToFirstMessage', + JumpToFirstMessage = 'JumpToFirstMessage', /* Jump to the latest message in the room */ - RoomJumpToLatestMessage = 'RoomJumpToLatestMessage', - - // Navigation + JumpToLatestMessage = 'JumpToLatestMessage', +} +/** Actions for navigating do various menus / dialogs / screens */ +export enum NavigationAction { /** Toggle the room side panel */ - NavToggleRoomSidePanel = 'NavToggleRoomSidePanel', + ToggleRoomSidePanel = 'ToggleRoomSidePanel', /** Toggle the user menu */ - NavToggleUserMenu = 'NavToggleUserMenu', + ToggleUserMenu = 'ToggleUserMenu', /* Toggle the short cut help dialog */ - NavToggleShortCutDialog = 'NavToggleShortCutDialog', + ToggleShortCutDialog = 'ToggleShortCutDialog', /* Got to the Element home screen */ - NavGoToHome = 'NavGoToHome', + GoToHome = 'GoToHome', /* Select prev room */ - NavSelectPrevRoom = 'NavSelectPrevRoom', + SelectPrevRoom = 'SelectPrevRoom', /* Select next room */ - NavSelectNextRoom = 'NavSelectNextRoom', + SelectNextRoom = 'SelectNextRoom', /* Select prev room with unread messages*/ - NavSelectPrevUnreadRoom = 'NavSelectPrevUnreadRoom', + SelectPrevUnreadRoom = 'SelectPrevUnreadRoom', /* Select next room with unread messages*/ - NavSelectNextUnreadRoom = 'NavSelectNextUnreadRoom', + SelectNextUnreadRoom = 'SelectNextUnreadRoom', } /** @@ -129,15 +117,15 @@ export type KeyCombo = { shiftKey?: boolean; } -export type KeyBinding = { - action: KeyAction; +export type KeyBinding = { + action: T; keyCombo: KeyCombo; } -const messageComposerBindings = (): KeyBinding[] => { - const bindings: KeyBinding[] = [ +const messageComposerBindings = (): KeyBinding[] => { + const bindings: KeyBinding[] = [ { - action: KeyAction.SelectPrevSendHistory, + action: MessageComposerAction.SelectPrevSendHistory, keyCombo: { key: Key.ARROW_UP, altKey: true, @@ -145,7 +133,7 @@ const messageComposerBindings = (): KeyBinding[] => { }, }, { - action: KeyAction.SelectNextSendHistory, + action: MessageComposerAction.SelectNextSendHistory, keyCombo: { key: Key.ARROW_DOWN, altKey: true, @@ -153,39 +141,39 @@ const messageComposerBindings = (): KeyBinding[] => { }, }, { - action: KeyAction.EditPrevMessage, + action: MessageComposerAction.EditPrevMessage, keyCombo: { key: Key.ARROW_UP, }, }, { - action: KeyAction.EditNextMessage, + action: MessageComposerAction.EditNextMessage, keyCombo: { key: Key.ARROW_DOWN, }, }, { - action: KeyAction.CancelEditing, + action: MessageComposerAction.CancelEditing, keyCombo: { key: Key.ESCAPE, }, }, { - action: KeyAction.FormatBold, + action: MessageComposerAction.FormatBold, keyCombo: { key: Key.B, ctrlOrCmd: true, }, }, { - action: KeyAction.FormatItalics, + action: MessageComposerAction.FormatItalics, keyCombo: { key: Key.I, ctrlOrCmd: true, }, }, { - action: KeyAction.FormatQuote, + action: MessageComposerAction.FormatQuote, keyCombo: { key: Key.GREATER_THAN, ctrlOrCmd: true, @@ -193,7 +181,7 @@ const messageComposerBindings = (): KeyBinding[] => { }, }, { - action: KeyAction.EditUndo, + action: MessageComposerAction.EditUndo, keyCombo: { key: Key.Z, ctrlOrCmd: true, @@ -201,14 +189,14 @@ const messageComposerBindings = (): KeyBinding[] => { }, // Note: the following two bindings also work with just HOME and END, add them here? { - action: KeyAction.MoveCursorToStart, + action: MessageComposerAction.MoveCursorToStart, keyCombo: { key: Key.HOME, ctrlOrCmd: true, }, }, { - action: KeyAction.MoveCursorToEnd, + action: MessageComposerAction.MoveCursorToEnd, keyCombo: { key: Key.END, ctrlOrCmd: true, @@ -217,7 +205,7 @@ const messageComposerBindings = (): KeyBinding[] => { ]; if (isMac) { bindings.push({ - action: KeyAction.EditRedo, + action: MessageComposerAction.EditRedo, keyCombo: { key: Key.Z, ctrlOrCmd: true, @@ -226,7 +214,7 @@ const messageComposerBindings = (): KeyBinding[] => { }); } else { bindings.push({ - action: KeyAction.EditRedo, + action: MessageComposerAction.EditRedo, keyCombo: { key: Key.Y, ctrlOrCmd: true, @@ -235,27 +223,27 @@ const messageComposerBindings = (): KeyBinding[] => { } if (SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend')) { bindings.push({ - action: KeyAction.Send, + action: MessageComposerAction.Send, keyCombo: { key: Key.ENTER, ctrlOrCmd: true, }, }); bindings.push({ - action: KeyAction.NewLine, + action: MessageComposerAction.NewLine, keyCombo: { key: Key.ENTER, }, }); } else { bindings.push({ - action: KeyAction.Send, + action: MessageComposerAction.Send, keyCombo: { key: Key.ENTER, }, }); bindings.push({ - action: KeyAction.NewLine, + action: MessageComposerAction.NewLine, keyCombo: { key: Key.ENTER, shiftKey: true, @@ -263,7 +251,7 @@ const messageComposerBindings = (): KeyBinding[] => { }); if (isMac) { bindings.push({ - action: KeyAction.NewLine, + action: MessageComposerAction.NewLine, keyCombo: { key: Key.ENTER, altKey: true, @@ -274,42 +262,42 @@ const messageComposerBindings = (): KeyBinding[] => { return bindings; } -const autocompleteBindings = (): KeyBinding[] => { +const autocompleteBindings = (): KeyBinding[] => { return [ { - action: KeyAction.AutocompleteApply, + action: AutocompleteAction.ApplySelection, keyCombo: { key: Key.TAB, }, }, { - action: KeyAction.AutocompleteApply, + action: AutocompleteAction.ApplySelection, keyCombo: { key: Key.TAB, ctrlKey: true, }, }, { - action: KeyAction.AutocompleteApply, + action: AutocompleteAction.ApplySelection, keyCombo: { key: Key.TAB, shiftKey: true, }, }, { - action: KeyAction.AutocompleteCancel, + action: AutocompleteAction.Cancel, keyCombo: { key: Key.ESCAPE, }, }, { - action: KeyAction.AutocompletePrevSelection, + action: AutocompleteAction.PrevSelection, keyCombo: { key: Key.ARROW_UP, }, }, { - action: KeyAction.AutocompleteNextSelection, + action: AutocompleteAction.NextSelection, keyCombo: { key: Key.ARROW_DOWN, }, @@ -317,40 +305,40 @@ const autocompleteBindings = (): KeyBinding[] => { ]; } -const roomListBindings = (): KeyBinding[] => { +const roomListBindings = (): KeyBinding[] => { return [ { - action: KeyAction.RoomListClearSearch, + action: RoomListAction.ClearSearch, keyCombo: { key: Key.ESCAPE, }, }, { - action: KeyAction.RoomListPrevRoom, + action: RoomListAction.PrevRoom, keyCombo: { key: Key.ARROW_UP, }, }, { - action: KeyAction.RoomListNextRoom, + action: RoomListAction.NextRoom, keyCombo: { key: Key.ARROW_DOWN, }, }, { - action: KeyAction.RoomListSelectRoom, + action: RoomListAction.SelectRoom, keyCombo: { key: Key.ENTER, }, }, { - action: KeyAction.RoomListCollapseSection, + action: RoomListAction.CollapseSection, keyCombo: { key: Key.ARROW_LEFT, }, }, { - action: KeyAction.RoomListExpandSection, + action: RoomListAction.ExpandSection, keyCombo: { key: Key.ARROW_RIGHT, }, @@ -358,35 +346,35 @@ const roomListBindings = (): KeyBinding[] => { ]; } -const roomBindings = (): KeyBinding[] => { +const roomBindings = (): KeyBinding[] => { const bindings = [ { - action: KeyAction.RoomFocusRoomSearch, + action: RoomAction.FocusRoomSearch, keyCombo: { key: Key.K, ctrlOrCmd: true, }, }, { - action: KeyAction.RoomScrollUp, + action: RoomAction.ScrollUp, keyCombo: { key: Key.PAGE_UP, }, }, { - action: KeyAction.RoomScrollDown, + action: RoomAction.RoomScrollDown, keyCombo: { key: Key.PAGE_DOWN, }, }, { - action: KeyAction.RoomDismissReadMarker, + action: RoomAction.DismissReadMarker, keyCombo: { key: Key.ESCAPE, }, }, { - action: KeyAction.RoomUploadFile, + action: RoomAction.UploadFile, keyCombo: { key: Key.U, ctrlOrCmd: true, @@ -394,14 +382,14 @@ const roomBindings = (): KeyBinding[] => { }, }, { - action: KeyAction.RoomJumpToFirstMessage, + action: RoomAction.JumpToFirstMessage, keyCombo: { key: Key.HOME, ctrlKey: true, }, }, { - action: KeyAction.RoomJumpToLatestMessage, + action: RoomAction.JumpToLatestMessage, keyCombo: { key: Key.END, ctrlKey: true, @@ -411,7 +399,7 @@ const roomBindings = (): KeyBinding[] => { if (SettingsStore.getValue('ctrlFForSearch')) { bindings.push({ - action: KeyAction.RoomSearch, + action: RoomAction.FocusSearch, keyCombo: { key: Key.F, ctrlOrCmd: true, @@ -422,17 +410,17 @@ const roomBindings = (): KeyBinding[] => { return bindings; } -const navigationBindings = (): KeyBinding[] => { +const navigationBindings = (): KeyBinding[] => { return [ { - action: KeyAction.NavToggleRoomSidePanel, + action: NavigationAction.ToggleRoomSidePanel, keyCombo: { key: Key.PERIOD, ctrlOrCmd: true, }, }, { - action: KeyAction.NavToggleUserMenu, + action: NavigationAction.ToggleUserMenu, // Ideally this would be CTRL+P for "Profile", but that's // taken by the print dialog. CTRL+I for "Information" // was previously chosen but conflicted with italics in @@ -443,14 +431,14 @@ const navigationBindings = (): KeyBinding[] => { }, }, { - action: KeyAction.NavToggleShortCutDialog, + action: NavigationAction.ToggleShortCutDialog, keyCombo: { key: Key.SLASH, ctrlOrCmd: true, }, }, { - action: KeyAction.NavToggleShortCutDialog, + action: NavigationAction.ToggleShortCutDialog, keyCombo: { key: Key.SLASH, ctrlOrCmd: true, @@ -458,7 +446,7 @@ const navigationBindings = (): KeyBinding[] => { }, }, { - action: KeyAction.NavGoToHome, + action: NavigationAction.GoToHome, keyCombo: { key: Key.H, ctrlOrCmd: true, @@ -467,21 +455,21 @@ const navigationBindings = (): KeyBinding[] => { }, { - action: KeyAction.NavSelectPrevRoom, + action: NavigationAction.SelectPrevRoom, keyCombo: { key: Key.ARROW_UP, altKey: true, }, }, { - action: KeyAction.NavSelectNextRoom, + action: NavigationAction.SelectNextRoom, keyCombo: { key: Key.ARROW_DOWN, altKey: true, }, }, { - action: KeyAction.NavSelectPrevUnreadRoom, + action: NavigationAction.SelectPrevUnreadRoom, keyCombo: { key: Key.ARROW_UP, altKey: true, @@ -489,7 +477,7 @@ const navigationBindings = (): KeyBinding[] => { }, }, { - action: KeyAction.NavSelectNextUnreadRoom, + action: NavigationAction.SelectNextUnreadRoom, keyCombo: { key: Key.ARROW_DOWN, altKey: true, @@ -551,38 +539,42 @@ export function isKeyComboMatch(ev: KeyboardEvent | React.KeyboardEvent, combo: return true; } - -export type KeyBindingsGetter = () => KeyBinding[]; - export class KeyBindingsManager { - /** - * Map of KeyBindingContext to a KeyBinding getter arrow function. - * - * Returning a getter function allowed to have dynamic bindings, e.g. when settings change the bindings can be - * recalculated. - */ - contextBindings: Record = { - [KeyBindingContext.MessageComposer]: messageComposerBindings, - [KeyBindingContext.AutoComplete]: autocompleteBindings, - [KeyBindingContext.RoomList]: roomListBindings, - [KeyBindingContext.Room]: roomBindings, - [KeyBindingContext.Navigation]: navigationBindings, - }; - /** * Finds a matching KeyAction for a given KeyboardEvent */ - getAction(context: KeyBindingContext, ev: KeyboardEvent | React.KeyboardEvent): KeyAction { - const bindings = this.contextBindings[context]?.(); - if (!bindings) { - return KeyAction.None; - } + private getAction(bindings: KeyBinding[], ev: KeyboardEvent | React.KeyboardEvent) + : T | undefined { const binding = bindings.find(it => isKeyComboMatch(ev, it.keyCombo, isMac)); if (binding) { return binding.action; } + return undefined; + } - return KeyAction.None; + getMessageComposerAction(ev: KeyboardEvent | React.KeyboardEvent): MessageComposerAction | undefined { + const bindings = messageComposerBindings(); + return this.getAction(bindings, ev); + } + + getAutocompleteAction(ev: KeyboardEvent | React.KeyboardEvent): AutocompleteAction | undefined { + const bindings = autocompleteBindings(); + return this.getAction(bindings, ev); + } + + getRoomListAction(ev: KeyboardEvent | React.KeyboardEvent): RoomListAction | undefined { + const bindings = roomListBindings(); + return this.getAction(bindings, ev); + } + + getRoomAction(ev: KeyboardEvent | React.KeyboardEvent): RoomAction | undefined { + const bindings = roomBindings(); + return this.getAction(bindings, ev); + } + + getNavigationAction(ev: KeyboardEvent | React.KeyboardEvent): NavigationAction | undefined { + const bindings = navigationBindings(); + return this.getAction(bindings, ev); } } diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index dd8bc1f3db..ce5df47138 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -55,7 +55,7 @@ import { IThreepidInvite } from "../../stores/ThreepidInviteStore"; import Modal from "../../Modal"; import { ICollapseConfig } from "../../resizer/distributors/collapse"; import HostSignupContainer from '../views/host_signup/HostSignupContainer'; -import { getKeyBindingsManager, KeyAction, KeyBindingContext } from '../../KeyBindingsManager'; +import { getKeyBindingsManager, NavigationAction, RoomAction } from '../../KeyBindingsManager'; // We need to fetch each pinned message individually (if we don't already have it) // so each pinned message may trigger a request. Limit the number per room for sanity. @@ -401,22 +401,22 @@ class LoggedInView extends React.Component { _onKeyDown = (ev) => { let handled = false; - const roomAction = getKeyBindingsManager().getAction(KeyBindingContext.Room, ev); + const roomAction = getKeyBindingsManager().getRoomAction(ev); switch (roomAction) { - case KeyAction.RoomFocusRoomSearch: + case RoomAction.FocusRoomSearch: dis.dispatch({ action: 'focus_room_filter', }); handled = true; break; - case KeyAction.RoomScrollUp: - case KeyAction.RoomScrollDown: - case KeyAction.RoomJumpToFirstMessage: - case KeyAction.RoomJumpToLatestMessage: + case RoomAction.ScrollUp: + case RoomAction.RoomScrollDown: + case RoomAction.JumpToFirstMessage: + case RoomAction.JumpToLatestMessage: this._onScrollKeyPressed(ev); handled = true; break; - case KeyAction.RoomSearch: + case RoomAction.FocusSearch: dis.dispatch({ action: 'focus_search', }); @@ -429,24 +429,24 @@ class LoggedInView extends React.Component { return; } - const navAction = getKeyBindingsManager().getAction(KeyBindingContext.Navigation, ev); + const navAction = getKeyBindingsManager().getNavigationAction(ev); switch (navAction) { - case KeyAction.NavToggleUserMenu: + case NavigationAction.ToggleUserMenu: dis.fire(Action.ToggleUserMenu); handled = true; break; - case KeyAction.NavToggleShortCutDialog: + case NavigationAction.ToggleShortCutDialog: KeyboardShortcuts.toggleDialog(); handled = true; break; - case KeyAction.NavGoToHome: + case NavigationAction.GoToHome: dis.dispatch({ action: 'view_home_page', }); Modal.closeCurrentModal("homeKeyboardShortcut"); handled = true; break; - case KeyAction.NavToggleRoomSidePanel: + case NavigationAction.ToggleRoomSidePanel: if (this.props.page_type === "room_view" || this.props.page_type === "group_view") { dis.dispatch({ action: Action.ToggleRightPanel, @@ -455,7 +455,7 @@ class LoggedInView extends React.Component { handled = true; } break; - case KeyAction.NavSelectPrevRoom: + case NavigationAction.SelectPrevRoom: dis.dispatch({ action: Action.ViewRoomDelta, delta: -1, @@ -463,7 +463,7 @@ class LoggedInView extends React.Component { }); handled = true; break; - case KeyAction.NavSelectNextRoom: + case NavigationAction.SelectNextRoom: dis.dispatch({ action: Action.ViewRoomDelta, delta: 1, @@ -471,14 +471,14 @@ class LoggedInView extends React.Component { }); handled = true; break; - case KeyAction.NavSelectPrevUnreadRoom: + case NavigationAction.SelectPrevUnreadRoom: dis.dispatch({ action: Action.ViewRoomDelta, delta: -1, unread: true, }); break; - case KeyAction.NavSelectNextUnreadRoom: + case NavigationAction.SelectNextUnreadRoom: dis.dispatch({ action: Action.ViewRoomDelta, delta: 1, diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx index 2e900d2f0e..7d127040eb 100644 --- a/src/components/structures/RoomSearch.tsx +++ b/src/components/structures/RoomSearch.tsx @@ -24,7 +24,7 @@ import AccessibleButton from "../views/elements/AccessibleButton"; import { Action } from "../../dispatcher/actions"; import RoomListStore from "../../stores/room-list/RoomListStore"; import { NameFilterCondition } from "../../stores/room-list/filters/NameFilterCondition"; -import { getKeyBindingsManager, KeyAction, KeyBindingContext } from "../../KeyBindingsManager"; +import { getKeyBindingsManager, RoomListAction } from "../../KeyBindingsManager"; interface IProps { isMinimized: boolean; @@ -106,17 +106,17 @@ export default class RoomSearch extends React.PureComponent { }; private onKeyDown = (ev: React.KeyboardEvent) => { - const action = getKeyBindingsManager().getAction(KeyBindingContext.RoomList, ev); + const action = getKeyBindingsManager().getRoomListAction(ev); switch (action) { - case KeyAction.RoomListClearSearch: + case RoomListAction.ClearSearch: this.clearInput(); defaultDispatcher.fire(Action.FocusComposer); break; - case KeyAction.RoomListNextRoom: - case KeyAction.RoomListPrevRoom: + case RoomListAction.NextRoom: + case RoomListAction.PrevRoom: this.props.onVerticalArrow(ev); break; - case KeyAction.RoomListSelectRoom: { + case RoomListAction.SelectRoom: { const shouldClear = this.props.onEnter(ev); if (shouldClear) { // wrap in set immediate to delay it so that we don't clear the filter & then change room diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index c09f1f7c45..680d717615 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -78,7 +78,7 @@ import Notifier from "../../Notifier"; import { showToast as showNotificationsToast } from "../../toasts/DesktopNotificationsToast"; import { RoomNotificationStateStore } from "../../stores/notifications/RoomNotificationStateStore"; import { Container, WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutStore"; -import { getKeyBindingsManager, KeyAction, KeyBindingContext } from '../../KeyBindingsManager'; +import { getKeyBindingsManager, RoomAction } from '../../KeyBindingsManager'; const DEBUG = false; let debuglog = function(msg: string) {}; @@ -661,18 +661,18 @@ export default class RoomView extends React.Component { private onReactKeyDown = ev => { let handled = false; - const action = getKeyBindingsManager().getAction(KeyBindingContext.Room, ev); + const action = getKeyBindingsManager().getRoomAction(ev); switch (action) { - case KeyAction.RoomDismissReadMarker: + case RoomAction.DismissReadMarker: this.messagePanel.forgetReadMarker(); this.jumpToLiveTimeline(); handled = true; break; - case KeyAction.RoomScrollUp: + case RoomAction.ScrollUp: this.jumpToReadMarker(); handled = true; break; - case KeyAction.RoomUploadFile: + case RoomAction.UploadFile: dis.dispatch({ action: "upload_file" }, true); handled = true; break; diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx index d0119ddc05..f5e561f15a 100644 --- a/src/components/views/rooms/BasicMessageComposer.tsx +++ b/src/components/views/rooms/BasicMessageComposer.tsx @@ -46,7 +46,7 @@ import {IDiff} from "../../../editor/diff"; import AutocompleteWrapperModel from "../../../editor/autocomplete"; import DocumentPosition from "../../../editor/position"; import {ICompletion} from "../../../autocomplete/Autocompleter"; -import { getKeyBindingsManager, KeyBindingContext, KeyAction } from '../../../KeyBindingsManager'; +import { AutocompleteAction, getKeyBindingsManager, MessageComposerAction } from '../../../KeyBindingsManager'; // matches emoticons which follow the start of a line or whitespace const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$'); @@ -421,21 +421,21 @@ export default class BasicMessageEditor extends React.Component private onKeyDown = (event: React.KeyboardEvent) => { const model = this.props.model; let handled = false; - const action = getKeyBindingsManager().getAction(KeyBindingContext.MessageComposer, event); + const action = getKeyBindingsManager().getMessageComposerAction(event); switch (action) { - case KeyAction.FormatBold: + case MessageComposerAction.FormatBold: this.onFormatAction(Formatting.Bold); handled = true; break; - case KeyAction.FormatItalics: + case MessageComposerAction.FormatItalics: this.onFormatAction(Formatting.Italics); handled = true; break; - case KeyAction.FormatQuote: + case MessageComposerAction.FormatQuote: this.onFormatAction(Formatting.Quote); handled = true; break; - case KeyAction.EditRedo: + case MessageComposerAction.EditRedo: if (this.historyManager.canRedo()) { const {parts, caret} = this.historyManager.redo(); // pass matching inputType so historyManager doesn't push echo @@ -444,7 +444,7 @@ export default class BasicMessageEditor extends React.Component } handled = true; break; - case KeyAction.EditUndo: + case MessageComposerAction.EditUndo: if (this.historyManager.canUndo()) { const {parts, caret} = this.historyManager.undo(this.props.model); // pass matching inputType so historyManager doesn't push echo @@ -453,18 +453,18 @@ export default class BasicMessageEditor extends React.Component } handled = true; break; - case KeyAction.NewLine: + case MessageComposerAction.NewLine: this.insertText("\n"); handled = true; break; - case KeyAction.MoveCursorToStart: + case MessageComposerAction.MoveCursorToStart: setSelection(this.editorRef.current, model, { index: 0, offset: 0, }); handled = true; break; - case KeyAction.MoveCursorToEnd: + case MessageComposerAction.MoveCursorToEnd: setSelection(this.editorRef.current, model, { index: model.parts.length - 1, offset: model.parts[model.parts.length - 1].text.length, @@ -478,30 +478,30 @@ export default class BasicMessageEditor extends React.Component return; } - const autocompleteAction = getKeyBindingsManager().getAction(KeyBindingContext.AutoComplete, event); + const autocompleteAction = getKeyBindingsManager().getAutocompleteAction(event); if (model.autoComplete && model.autoComplete.hasCompletions()) { const autoComplete = model.autoComplete; switch (autocompleteAction) { - case KeyAction.AutocompletePrevSelection: + case AutocompleteAction.PrevSelection: autoComplete.onUpArrow(event); handled = true; break; - case KeyAction.AutocompleteNextSelection: + case AutocompleteAction.NextSelection: autoComplete.onDownArrow(event); handled = true; break; - case KeyAction.AutocompleteApply: + case AutocompleteAction.ApplySelection: autoComplete.onTab(event); handled = true; break; - case KeyAction.AutocompleteCancel: + case AutocompleteAction.Cancel: autoComplete.onEscape(event); handled = true; break; default: return; // don't preventDefault on anything else } - } else if (autocompleteAction === KeyAction.AutocompleteApply) { + } else if (autocompleteAction === AutocompleteAction.ApplySelection) { this.tabCompleteName(event); handled = true; } else if (event.key === Key.BACKSPACE || event.key === Key.DELETE) { diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js index 8aa637f680..1cd2cc7f34 100644 --- a/src/components/views/rooms/EditMessageComposer.js +++ b/src/components/views/rooms/EditMessageComposer.js @@ -32,7 +32,7 @@ import BasicMessageComposer from "./BasicMessageComposer"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import {Action} from "../../../dispatcher/actions"; import CountlyAnalytics from "../../../CountlyAnalytics"; -import {getKeyBindingsManager, KeyAction, KeyBindingContext} from '../../../KeyBindingsManager'; +import {getKeyBindingsManager, MessageComposerAction} from '../../../KeyBindingsManager'; function _isReply(mxEvent) { const relatesTo = mxEvent.getContent()["m.relates_to"]; @@ -133,16 +133,16 @@ export default class EditMessageComposer extends React.Component { if (this._editorRef.isComposing(event)) { return; } - const action = getKeyBindingsManager().getAction(KeyBindingContext.MessageComposer, event); + const action = getKeyBindingsManager().getMessageComposerAction(event); switch (action) { - case KeyAction.Send: + case MessageComposerAction.Send: this._sendEdit(); event.preventDefault(); break; - case KeyAction.CancelEditing: + case MessageComposerAction.CancelEditing: this._cancelEdit(); break; - case KeyAction.EditPrevMessage: { + case MessageComposerAction.EditPrevMessage: { if (this._editorRef.isModified() || !this._editorRef.isCaretAtStart()) { return; } @@ -154,7 +154,7 @@ export default class EditMessageComposer extends React.Component { } break; } - case KeyAction.EditNextMessage: { + case MessageComposerAction.EditNextMessage: { if (this._editorRef.isModified() || !this._editorRef.isCaretAtEnd()) { return; } diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx index c0919090b0..25e3a34f34 100644 --- a/src/components/views/rooms/RoomSublist.tsx +++ b/src/components/views/rooms/RoomSublist.tsx @@ -51,7 +51,7 @@ import { objectExcluding, objectHasDiff } from "../../../utils/objects"; import TemporaryTile from "./TemporaryTile"; import { ListNotificationState } from "../../../stores/notifications/ListNotificationState"; import IconizedContextMenu from "../context_menus/IconizedContextMenu"; -import { getKeyBindingsManager, KeyAction, KeyBindingContext } from "../../../KeyBindingsManager"; +import { getKeyBindingsManager, RoomListAction } from "../../../KeyBindingsManager"; const SHOW_N_BUTTON_HEIGHT = 28; // As defined by CSS const RESIZE_HANDLE_HEIGHT = 4; // As defined by CSS @@ -471,16 +471,16 @@ export default class RoomSublist extends React.Component { }; private onHeaderKeyDown = (ev: React.KeyboardEvent) => { - const action = getKeyBindingsManager().getAction(KeyBindingContext.RoomList, ev); + const action = getKeyBindingsManager().getRoomListAction(ev); switch (action) { - case KeyAction.RoomListCollapseSection: + case RoomListAction.CollapseSection: ev.stopPropagation(); if (this.state.isExpanded) { // Collapse the room sublist if it isn't already this.toggleCollapsed(); } break; - case KeyAction.RoomListExpandSection: { + case RoomListAction.ExpandSection: { ev.stopPropagation(); if (!this.state.isExpanded) { // Expand the room sublist if it isn't already diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js index adfa38b56a..b5188b248b 100644 --- a/src/components/views/rooms/SendMessageComposer.js +++ b/src/components/views/rooms/SendMessageComposer.js @@ -46,7 +46,7 @@ import {CHAT_EFFECTS} from '../../../effects'; import CountlyAnalytics from "../../../CountlyAnalytics"; import {MatrixClientPeg} from "../../../MatrixClientPeg"; import EMOJI_REGEX from 'emojibase-regex'; -import {getKeyBindingsManager, KeyAction, KeyBindingContext} from '../../../KeyBindingsManager'; +import {getKeyBindingsManager, MessageComposerAction} from '../../../KeyBindingsManager'; function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) { const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent); @@ -143,23 +143,23 @@ export default class SendMessageComposer extends React.Component { if (this._editorRef.isComposing(event)) { return; } - const action = getKeyBindingsManager().getAction(KeyBindingContext.MessageComposer, event); + const action = getKeyBindingsManager().getMessageComposerAction(event); switch (action) { - case KeyAction.Send: + case MessageComposerAction.Send: this._sendMessage(); event.preventDefault(); break; - case KeyAction.SelectPrevSendHistory: - case KeyAction.SelectNextSendHistory: { + case MessageComposerAction.SelectPrevSendHistory: + case MessageComposerAction.SelectNextSendHistory: { // Try select composer history - const selected = this.selectSendHistory(action === KeyAction.SelectPrevSendHistory); + const selected = this.selectSendHistory(action === MessageComposerAction.SelectPrevSendHistory); if (selected) { // We're selecting history, so prevent the key event from doing anything else event.preventDefault(); } break; } - case KeyAction.EditPrevMessage: + case MessageComposerAction.EditPrevMessage: // selection must be collapsed and caret at start if (this._editorRef.isSelectionCollapsed() && this._editorRef.isCaretAtStart()) { const editEvent = findEditableEvent(this.props.room, false); @@ -173,7 +173,7 @@ export default class SendMessageComposer extends React.Component { } } break; - case KeyAction.CancelEditing: + case MessageComposerAction.CancelEditing: dis.dispatch({ action: 'reply_to_event', event: null, From ef7284e69d58fb463c36b50813c46d1348b8cb26 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Mon, 1 Mar 2021 22:15:05 +1300 Subject: [PATCH 012/163] Add missing JumpToOldestUnread action --- src/KeyBindingsManager.ts | 2 ++ src/components/structures/RoomView.tsx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index d8c128a2bf..00e16ce2ab 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -70,6 +70,8 @@ export enum RoomAction { RoomScrollDown = 'RoomScrollDown', /** Dismiss read marker and jump to bottom */ DismissReadMarker = 'DismissReadMarker', + /** Jump to oldest unread message */ + JumpToOldestUnread = 'JumpToOldestUnread', /* Upload a file */ UploadFile = 'UploadFile', /* Focus search message in a room (must be enabled) */ diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 680d717615..9c9dc232a9 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -668,7 +668,7 @@ export default class RoomView extends React.Component { this.jumpToLiveTimeline(); handled = true; break; - case RoomAction.ScrollUp: + case RoomAction.JumpToOldestUnread: this.jumpToReadMarker(); handled = true; break; From 1cfb0e99d43fb5cfe76142c8defa711da0237aed Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Mon, 1 Mar 2021 22:16:05 +1300 Subject: [PATCH 013/163] Add support for multiple key bindings provider - This can be used to provide custom key bindings - Move default key bindings into its own file --- src/KeyBindingsDefaults.ts | 384 ++++++++++++++++++++++++++++++++++ src/KeyBindingsManager.ts | 418 ++++--------------------------------- 2 files changed, 421 insertions(+), 381 deletions(-) create mode 100644 src/KeyBindingsDefaults.ts diff --git a/src/KeyBindingsDefaults.ts b/src/KeyBindingsDefaults.ts new file mode 100644 index 0000000000..ed98a06c7f --- /dev/null +++ b/src/KeyBindingsDefaults.ts @@ -0,0 +1,384 @@ +import { AutocompleteAction, IKeyBindingsProvider, KeyBinding, MessageComposerAction, NavigationAction, RoomAction, + RoomListAction } from "./KeyBindingsManager"; +import { isMac, Key } from "./Keyboard"; +import SettingsStore from "./settings/SettingsStore"; + +const messageComposerBindings = (): KeyBinding[] => { + const bindings: KeyBinding[] = [ + { + action: MessageComposerAction.SelectPrevSendHistory, + keyCombo: { + key: Key.ARROW_UP, + altKey: true, + ctrlKey: true, + }, + }, + { + action: MessageComposerAction.SelectNextSendHistory, + keyCombo: { + key: Key.ARROW_DOWN, + altKey: true, + ctrlKey: true, + }, + }, + { + action: MessageComposerAction.EditPrevMessage, + keyCombo: { + key: Key.ARROW_UP, + }, + }, + { + action: MessageComposerAction.EditNextMessage, + keyCombo: { + key: Key.ARROW_DOWN, + }, + }, + { + action: MessageComposerAction.CancelEditing, + keyCombo: { + key: Key.ESCAPE, + }, + }, + { + action: MessageComposerAction.FormatBold, + keyCombo: { + key: Key.B, + ctrlOrCmd: true, + }, + }, + { + action: MessageComposerAction.FormatItalics, + keyCombo: { + key: Key.I, + ctrlOrCmd: true, + }, + }, + { + action: MessageComposerAction.FormatQuote, + keyCombo: { + key: Key.GREATER_THAN, + ctrlOrCmd: true, + shiftKey: true, + }, + }, + { + action: MessageComposerAction.EditUndo, + keyCombo: { + key: Key.Z, + ctrlOrCmd: true, + }, + }, + // Note: the following two bindings also work with just HOME and END, add them here? + { + action: MessageComposerAction.MoveCursorToStart, + keyCombo: { + key: Key.HOME, + ctrlOrCmd: true, + }, + }, + { + action: MessageComposerAction.MoveCursorToEnd, + keyCombo: { + key: Key.END, + ctrlOrCmd: true, + }, + }, + ]; + if (isMac) { + bindings.push({ + action: MessageComposerAction.EditRedo, + keyCombo: { + key: Key.Z, + ctrlOrCmd: true, + shiftKey: true, + }, + }); + } else { + bindings.push({ + action: MessageComposerAction.EditRedo, + keyCombo: { + key: Key.Y, + ctrlOrCmd: true, + }, + }); + } + if (SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend')) { + bindings.push({ + action: MessageComposerAction.Send, + keyCombo: { + key: Key.ENTER, + ctrlOrCmd: true, + }, + }); + bindings.push({ + action: MessageComposerAction.NewLine, + keyCombo: { + key: Key.ENTER, + }, + }); + } else { + bindings.push({ + action: MessageComposerAction.Send, + keyCombo: { + key: Key.ENTER, + }, + }); + bindings.push({ + action: MessageComposerAction.NewLine, + keyCombo: { + key: Key.ENTER, + shiftKey: true, + }, + }); + if (isMac) { + bindings.push({ + action: MessageComposerAction.NewLine, + keyCombo: { + key: Key.ENTER, + altKey: true, + }, + }); + } + } + return bindings; +} + +const autocompleteBindings = (): KeyBinding[] => { + return [ + { + action: AutocompleteAction.ApplySelection, + keyCombo: { + key: Key.TAB, + }, + }, + { + action: AutocompleteAction.ApplySelection, + keyCombo: { + key: Key.TAB, + ctrlKey: true, + }, + }, + { + action: AutocompleteAction.ApplySelection, + keyCombo: { + key: Key.TAB, + shiftKey: true, + }, + }, + { + action: AutocompleteAction.Cancel, + keyCombo: { + key: Key.ESCAPE, + }, + }, + { + action: AutocompleteAction.PrevSelection, + keyCombo: { + key: Key.ARROW_UP, + }, + }, + { + action: AutocompleteAction.NextSelection, + keyCombo: { + key: Key.ARROW_DOWN, + }, + }, + ]; +} + +const roomListBindings = (): KeyBinding[] => { + return [ + { + action: RoomListAction.ClearSearch, + keyCombo: { + key: Key.ESCAPE, + }, + }, + { + action: RoomListAction.PrevRoom, + keyCombo: { + key: Key.ARROW_UP, + }, + }, + { + action: RoomListAction.NextRoom, + keyCombo: { + key: Key.ARROW_DOWN, + }, + }, + { + action: RoomListAction.SelectRoom, + keyCombo: { + key: Key.ENTER, + }, + }, + { + action: RoomListAction.CollapseSection, + keyCombo: { + key: Key.ARROW_LEFT, + }, + }, + { + action: RoomListAction.ExpandSection, + keyCombo: { + key: Key.ARROW_RIGHT, + }, + }, + ]; +} + +const roomBindings = (): KeyBinding[] => { + const bindings = [ + { + action: RoomAction.FocusRoomSearch, + keyCombo: { + key: Key.K, + ctrlOrCmd: true, + }, + }, + { + action: RoomAction.ScrollUp, + keyCombo: { + key: Key.PAGE_UP, + }, + }, + { + action: RoomAction.RoomScrollDown, + keyCombo: { + key: Key.PAGE_DOWN, + }, + }, + { + action: RoomAction.DismissReadMarker, + keyCombo: { + key: Key.ESCAPE, + }, + }, + { + action: RoomAction.JumpToOldestUnread, + keyCombo: { + key: Key.PAGE_UP, + shiftKey: true, + }, + }, + { + action: RoomAction.UploadFile, + keyCombo: { + key: Key.U, + ctrlOrCmd: true, + shiftKey: true, + }, + }, + { + action: RoomAction.JumpToFirstMessage, + keyCombo: { + key: Key.HOME, + ctrlKey: true, + }, + }, + { + action: RoomAction.JumpToLatestMessage, + keyCombo: { + key: Key.END, + ctrlKey: true, + }, + }, + ]; + + if (SettingsStore.getValue('ctrlFForSearch')) { + bindings.push({ + action: RoomAction.FocusSearch, + keyCombo: { + key: Key.F, + ctrlOrCmd: true, + }, + }); + } + + return bindings; +} + +const navigationBindings = (): KeyBinding[] => { + return [ + { + action: NavigationAction.ToggleRoomSidePanel, + keyCombo: { + key: Key.PERIOD, + ctrlOrCmd: true, + }, + }, + { + action: NavigationAction.ToggleUserMenu, + // Ideally this would be CTRL+P for "Profile", but that's + // taken by the print dialog. CTRL+I for "Information" + // was previously chosen but conflicted with italics in + // composer, so CTRL+` it is + keyCombo: { + key: Key.BACKTICK, + ctrlOrCmd: true, + }, + }, + { + action: NavigationAction.ToggleShortCutDialog, + keyCombo: { + key: Key.SLASH, + ctrlOrCmd: true, + }, + }, + { + action: NavigationAction.ToggleShortCutDialog, + keyCombo: { + key: Key.SLASH, + ctrlOrCmd: true, + shiftKey: true, + }, + }, + { + action: NavigationAction.GoToHome, + keyCombo: { + key: Key.H, + ctrlOrCmd: true, + altKey: true, + }, + }, + + { + action: NavigationAction.SelectPrevRoom, + keyCombo: { + key: Key.ARROW_UP, + altKey: true, + }, + }, + { + action: NavigationAction.SelectNextRoom, + keyCombo: { + key: Key.ARROW_DOWN, + altKey: true, + }, + }, + { + action: NavigationAction.SelectPrevUnreadRoom, + keyCombo: { + key: Key.ARROW_UP, + altKey: true, + shiftKey: true, + }, + }, + { + action: NavigationAction.SelectNextUnreadRoom, + keyCombo: { + key: Key.ARROW_DOWN, + altKey: true, + shiftKey: true, + }, + }, + ] +} + +export const defaultBindingProvider: IKeyBindingsProvider = { + getMessageComposerBindings: messageComposerBindings, + getAutocompleteBindings: autocompleteBindings, + getRoomListBindings: roomListBindings, + getRoomBindings: roomBindings, + getNavigationBindings: navigationBindings, +} diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index 00e16ce2ab..cf11fc711f 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -1,5 +1,5 @@ -import { isMac, Key } from './Keyboard'; -import SettingsStore from './settings/SettingsStore'; +import { defaultBindingProvider } from './KeyBindingsDefaults'; +import { isMac } from './Keyboard'; /** Actions for the chat message composer component */ export enum MessageComposerAction { @@ -124,371 +124,6 @@ export type KeyBinding = { keyCombo: KeyCombo; } -const messageComposerBindings = (): KeyBinding[] => { - const bindings: KeyBinding[] = [ - { - action: MessageComposerAction.SelectPrevSendHistory, - keyCombo: { - key: Key.ARROW_UP, - altKey: true, - ctrlKey: true, - }, - }, - { - action: MessageComposerAction.SelectNextSendHistory, - keyCombo: { - key: Key.ARROW_DOWN, - altKey: true, - ctrlKey: true, - }, - }, - { - action: MessageComposerAction.EditPrevMessage, - keyCombo: { - key: Key.ARROW_UP, - }, - }, - { - action: MessageComposerAction.EditNextMessage, - keyCombo: { - key: Key.ARROW_DOWN, - }, - }, - { - action: MessageComposerAction.CancelEditing, - keyCombo: { - key: Key.ESCAPE, - }, - }, - { - action: MessageComposerAction.FormatBold, - keyCombo: { - key: Key.B, - ctrlOrCmd: true, - }, - }, - { - action: MessageComposerAction.FormatItalics, - keyCombo: { - key: Key.I, - ctrlOrCmd: true, - }, - }, - { - action: MessageComposerAction.FormatQuote, - keyCombo: { - key: Key.GREATER_THAN, - ctrlOrCmd: true, - shiftKey: true, - }, - }, - { - action: MessageComposerAction.EditUndo, - keyCombo: { - key: Key.Z, - ctrlOrCmd: true, - }, - }, - // Note: the following two bindings also work with just HOME and END, add them here? - { - action: MessageComposerAction.MoveCursorToStart, - keyCombo: { - key: Key.HOME, - ctrlOrCmd: true, - }, - }, - { - action: MessageComposerAction.MoveCursorToEnd, - keyCombo: { - key: Key.END, - ctrlOrCmd: true, - }, - }, - ]; - if (isMac) { - bindings.push({ - action: MessageComposerAction.EditRedo, - keyCombo: { - key: Key.Z, - ctrlOrCmd: true, - shiftKey: true, - }, - }); - } else { - bindings.push({ - action: MessageComposerAction.EditRedo, - keyCombo: { - key: Key.Y, - ctrlOrCmd: true, - }, - }); - } - if (SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend')) { - bindings.push({ - action: MessageComposerAction.Send, - keyCombo: { - key: Key.ENTER, - ctrlOrCmd: true, - }, - }); - bindings.push({ - action: MessageComposerAction.NewLine, - keyCombo: { - key: Key.ENTER, - }, - }); - } else { - bindings.push({ - action: MessageComposerAction.Send, - keyCombo: { - key: Key.ENTER, - }, - }); - bindings.push({ - action: MessageComposerAction.NewLine, - keyCombo: { - key: Key.ENTER, - shiftKey: true, - }, - }); - if (isMac) { - bindings.push({ - action: MessageComposerAction.NewLine, - keyCombo: { - key: Key.ENTER, - altKey: true, - }, - }); - } - } - return bindings; -} - -const autocompleteBindings = (): KeyBinding[] => { - return [ - { - action: AutocompleteAction.ApplySelection, - keyCombo: { - key: Key.TAB, - }, - }, - { - action: AutocompleteAction.ApplySelection, - keyCombo: { - key: Key.TAB, - ctrlKey: true, - }, - }, - { - action: AutocompleteAction.ApplySelection, - keyCombo: { - key: Key.TAB, - shiftKey: true, - }, - }, - { - action: AutocompleteAction.Cancel, - keyCombo: { - key: Key.ESCAPE, - }, - }, - { - action: AutocompleteAction.PrevSelection, - keyCombo: { - key: Key.ARROW_UP, - }, - }, - { - action: AutocompleteAction.NextSelection, - keyCombo: { - key: Key.ARROW_DOWN, - }, - }, - ]; -} - -const roomListBindings = (): KeyBinding[] => { - return [ - { - action: RoomListAction.ClearSearch, - keyCombo: { - key: Key.ESCAPE, - }, - }, - { - action: RoomListAction.PrevRoom, - keyCombo: { - key: Key.ARROW_UP, - }, - }, - { - action: RoomListAction.NextRoom, - keyCombo: { - key: Key.ARROW_DOWN, - }, - }, - { - action: RoomListAction.SelectRoom, - keyCombo: { - key: Key.ENTER, - }, - }, - { - action: RoomListAction.CollapseSection, - keyCombo: { - key: Key.ARROW_LEFT, - }, - }, - { - action: RoomListAction.ExpandSection, - keyCombo: { - key: Key.ARROW_RIGHT, - }, - }, - ]; -} - -const roomBindings = (): KeyBinding[] => { - const bindings = [ - { - action: RoomAction.FocusRoomSearch, - keyCombo: { - key: Key.K, - ctrlOrCmd: true, - }, - }, - { - action: RoomAction.ScrollUp, - keyCombo: { - key: Key.PAGE_UP, - }, - }, - { - action: RoomAction.RoomScrollDown, - keyCombo: { - key: Key.PAGE_DOWN, - }, - }, - { - action: RoomAction.DismissReadMarker, - keyCombo: { - key: Key.ESCAPE, - }, - }, - { - action: RoomAction.UploadFile, - keyCombo: { - key: Key.U, - ctrlOrCmd: true, - shiftKey: true, - }, - }, - { - action: RoomAction.JumpToFirstMessage, - keyCombo: { - key: Key.HOME, - ctrlKey: true, - }, - }, - { - action: RoomAction.JumpToLatestMessage, - keyCombo: { - key: Key.END, - ctrlKey: true, - }, - }, - ]; - - if (SettingsStore.getValue('ctrlFForSearch')) { - bindings.push({ - action: RoomAction.FocusSearch, - keyCombo: { - key: Key.F, - ctrlOrCmd: true, - }, - }); - } - - return bindings; -} - -const navigationBindings = (): KeyBinding[] => { - return [ - { - action: NavigationAction.ToggleRoomSidePanel, - keyCombo: { - key: Key.PERIOD, - ctrlOrCmd: true, - }, - }, - { - action: NavigationAction.ToggleUserMenu, - // Ideally this would be CTRL+P for "Profile", but that's - // taken by the print dialog. CTRL+I for "Information" - // was previously chosen but conflicted with italics in - // composer, so CTRL+` it is - keyCombo: { - key: Key.BACKTICK, - ctrlOrCmd: true, - }, - }, - { - action: NavigationAction.ToggleShortCutDialog, - keyCombo: { - key: Key.SLASH, - ctrlOrCmd: true, - }, - }, - { - action: NavigationAction.ToggleShortCutDialog, - keyCombo: { - key: Key.SLASH, - ctrlOrCmd: true, - shiftKey: true, - }, - }, - { - action: NavigationAction.GoToHome, - keyCombo: { - key: Key.H, - ctrlOrCmd: true, - altKey: true, - }, - }, - - { - action: NavigationAction.SelectPrevRoom, - keyCombo: { - key: Key.ARROW_UP, - altKey: true, - }, - }, - { - action: NavigationAction.SelectNextRoom, - keyCombo: { - key: Key.ARROW_DOWN, - altKey: true, - }, - }, - { - action: NavigationAction.SelectPrevUnreadRoom, - keyCombo: { - key: Key.ARROW_UP, - altKey: true, - shiftKey: true, - }, - }, - { - action: NavigationAction.SelectNextUnreadRoom, - keyCombo: { - key: Key.ARROW_DOWN, - altKey: true, - shiftKey: true, - }, - }, - ] -} - /** * Helper method to check if a KeyboardEvent matches a KeyCombo * @@ -541,42 +176,63 @@ export function isKeyComboMatch(ev: KeyboardEvent | React.KeyboardEvent, combo: return true; } + +export type KeyBindingGetter = () => KeyBinding[]; + +export interface IKeyBindingsProvider { + getMessageComposerBindings: KeyBindingGetter; + getAutocompleteBindings: KeyBindingGetter; + getRoomListBindings: KeyBindingGetter; + getRoomBindings: KeyBindingGetter; + getNavigationBindings: KeyBindingGetter; +} + export class KeyBindingsManager { + /** + * List of key bindings providers. + * + * Key bindings from the first provider(s) in the list will have precedence over key bindings from later providers. + * + * To overwrite the default key bindings add a new providers before the default provider, e.g. a provider for + * customized key bindings. + */ + bindingsProviders: IKeyBindingsProvider[] = [ + defaultBindingProvider, + ]; + /** * Finds a matching KeyAction for a given KeyboardEvent */ - private getAction(bindings: KeyBinding[], ev: KeyboardEvent | React.KeyboardEvent) + private getAction(getters: KeyBindingGetter[], ev: KeyboardEvent | React.KeyboardEvent) : T | undefined { - const binding = bindings.find(it => isKeyComboMatch(ev, it.keyCombo, isMac)); - if (binding) { - return binding.action; + for (const getter of getters) { + const bindings = getter(); + const binding = bindings.find(it => isKeyComboMatch(ev, it.keyCombo, isMac)); + if (binding) { + return binding.action; + } } return undefined; } getMessageComposerAction(ev: KeyboardEvent | React.KeyboardEvent): MessageComposerAction | undefined { - const bindings = messageComposerBindings(); - return this.getAction(bindings, ev); + return this.getAction(this.bindingsProviders.map(it => it.getMessageComposerBindings), ev); } getAutocompleteAction(ev: KeyboardEvent | React.KeyboardEvent): AutocompleteAction | undefined { - const bindings = autocompleteBindings(); - return this.getAction(bindings, ev); + return this.getAction(this.bindingsProviders.map(it => it.getAutocompleteBindings), ev); } getRoomListAction(ev: KeyboardEvent | React.KeyboardEvent): RoomListAction | undefined { - const bindings = roomListBindings(); - return this.getAction(bindings, ev); + return this.getAction(this.bindingsProviders.map(it => it.getRoomListBindings), ev); } getRoomAction(ev: KeyboardEvent | React.KeyboardEvent): RoomAction | undefined { - const bindings = roomBindings(); - return this.getAction(bindings, ev); + return this.getAction(this.bindingsProviders.map(it => it.getRoomBindings), ev); } getNavigationAction(ev: KeyboardEvent | React.KeyboardEvent): NavigationAction | undefined { - const bindings = navigationBindings(); - return this.getAction(bindings, ev); + return this.getAction(this.bindingsProviders.map(it => it.getNavigationBindings), ev); } } From 0214397e27c9df533775b7039d659cbbc3a4ee89 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Wed, 3 Mar 2021 22:06:36 +1300 Subject: [PATCH 014/163] Fix handling of the platform onKeyDown Only call it if the event hasn't been handled yet. --- src/components/structures/LoggedInView.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index ce5df47138..b3607ec5b5 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -485,9 +485,10 @@ class LoggedInView extends React.Component { unread: true, }); break; + default: + // if we do not have a handler for it, pass it to the platform which might + handled = PlatformPeg.get().onKeyDown(ev); } - // if we do not have a handler for it, pass it to the platform which might - handled = PlatformPeg.get().onKeyDown(ev); if (handled) { ev.stopPropagation(); ev.preventDefault(); From 7b740857084a89f1b201874acf4690c21444d92e Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Wed, 3 Mar 2021 22:07:44 +1300 Subject: [PATCH 015/163] Add missing binding + remove invalid note HOME and END are going back to the start/end of the same line, i.e. they are different to the other bindings. --- src/KeyBindingsDefaults.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/KeyBindingsDefaults.ts b/src/KeyBindingsDefaults.ts index ed98a06c7f..f777f2c5f6 100644 --- a/src/KeyBindingsDefaults.ts +++ b/src/KeyBindingsDefaults.ts @@ -68,7 +68,6 @@ const messageComposerBindings = (): KeyBinding[] => { ctrlOrCmd: true, }, }, - // Note: the following two bindings also work with just HOME and END, add them here? { action: MessageComposerAction.MoveCursorToStart, keyCombo: { @@ -165,6 +164,14 @@ const autocompleteBindings = (): KeyBinding[] => { shiftKey: true, }, }, + { + action: AutocompleteAction.ApplySelection, + keyCombo: { + key: Key.TAB, + ctrlKey: true, + shiftKey: true, + }, + }, { action: AutocompleteAction.Cancel, keyCombo: { From dadeb68bbfceade031150be13f3bfdb6e9ae0f6d Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Fri, 5 Mar 2021 22:02:18 +1300 Subject: [PATCH 016/163] Fix spelling --- src/KeyBindingsDefaults.ts | 2 +- src/KeyBindingsManager.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/KeyBindingsDefaults.ts b/src/KeyBindingsDefaults.ts index f777f2c5f6..847867ae4f 100644 --- a/src/KeyBindingsDefaults.ts +++ b/src/KeyBindingsDefaults.ts @@ -382,7 +382,7 @@ const navigationBindings = (): KeyBinding[] => { ] } -export const defaultBindingProvider: IKeyBindingsProvider = { +export const defaultBindingsProvider: IKeyBindingsProvider = { getMessageComposerBindings: messageComposerBindings, getAutocompleteBindings: autocompleteBindings, getRoomListBindings: roomListBindings, diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index cf11fc711f..725bfd65f1 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -1,4 +1,4 @@ -import { defaultBindingProvider } from './KeyBindingsDefaults'; +import { defaultBindingsProvider } from './KeyBindingsDefaults'; import { isMac } from './Keyboard'; /** Actions for the chat message composer component */ @@ -197,7 +197,7 @@ export class KeyBindingsManager { * customized key bindings. */ bindingsProviders: IKeyBindingsProvider[] = [ - defaultBindingProvider, + defaultBindingsProvider, ]; /** From efc5d413c48162687a8e21688f628646ccdb49a4 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Fri, 5 Mar 2021 22:13:47 +1300 Subject: [PATCH 017/163] Fix missing import (from earlier merge conflict) --- src/components/views/rooms/SendMessageComposer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js index 0c0495fe20..1902498914 100644 --- a/src/components/views/rooms/SendMessageComposer.js +++ b/src/components/views/rooms/SendMessageComposer.js @@ -47,6 +47,7 @@ import CountlyAnalytics from "../../../CountlyAnalytics"; import {MatrixClientPeg} from "../../../MatrixClientPeg"; import EMOJI_REGEX from 'emojibase-regex'; import {getKeyBindingsManager, MessageComposerAction} from '../../../KeyBindingsManager'; +import SettingsStore from '../../../settings/SettingsStore'; function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) { const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent); From 71d63f016a94439e8604c3fcdebc1245a29bd92e Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sat, 6 Mar 2021 14:17:53 +1300 Subject: [PATCH 018/163] Fix tests that mock incomplete key events --- src/KeyBindingsManager.ts | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index 725bfd65f1..681dc7d879 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -147,30 +147,35 @@ export function isKeyComboMatch(ev: KeyboardEvent | React.KeyboardEvent, combo: const comboAlt = combo.altKey ?? false; const comboShift = combo.shiftKey ?? false; const comboMeta = combo.metaKey ?? false; + // Tests mock events may keep the modifiers undefined; convert them to booleans + const evCtrl = ev.ctrlKey ?? false; + const evAlt = ev.altKey ?? false; + const evShift = ev.shiftKey ?? false; + const evMeta = ev.metaKey ?? false; // When ctrlOrCmd is set, the keys need do evaluated differently on PC and Mac if (combo.ctrlOrCmd) { if (onMac) { - if (!ev.metaKey - || ev.ctrlKey !== comboCtrl - || ev.altKey !== comboAlt - || ev.shiftKey !== comboShift) { + if (!evMeta + || evCtrl !== comboCtrl + || evAlt !== comboAlt + || evShift !== comboShift) { return false; } } else { - if (!ev.ctrlKey - || ev.metaKey !== comboMeta - || ev.altKey !== comboAlt - || ev.shiftKey !== comboShift) { + if (!evCtrl + || evMeta !== comboMeta + || evAlt !== comboAlt + || evShift !== comboShift) { return false; } } return true; } - if (ev.metaKey !== comboMeta - || ev.ctrlKey !== comboCtrl - || ev.altKey !== comboAlt - || ev.shiftKey !== comboShift) { + if (evMeta !== comboMeta + || evCtrl !== comboCtrl + || evAlt !== comboAlt + || evShift !== comboShift) { return false; } From 06181221a143ead1d73ee6d5d0d49362f3883682 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sun, 7 Mar 2021 19:05:36 +1300 Subject: [PATCH 019/163] Add copyright headers --- src/KeyBindingsDefaults.ts | 16 ++++++++++++++++ src/KeyBindingsManager.ts | 16 ++++++++++++++++ test/KeyBindingsManager-test.ts | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/src/KeyBindingsDefaults.ts b/src/KeyBindingsDefaults.ts index 847867ae4f..fd00a2ff53 100644 --- a/src/KeyBindingsDefaults.ts +++ b/src/KeyBindingsDefaults.ts @@ -1,3 +1,19 @@ +/* +Copyright 2021 Clemens Zeidler + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + import { AutocompleteAction, IKeyBindingsProvider, KeyBinding, MessageComposerAction, NavigationAction, RoomAction, RoomListAction } from "./KeyBindingsManager"; import { isMac, Key } from "./Keyboard"; diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index 681dc7d879..7e996b2730 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -1,3 +1,19 @@ +/* +Copyright 2021 Clemens Zeidler + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + import { defaultBindingsProvider } from './KeyBindingsDefaults'; import { isMac } from './Keyboard'; diff --git a/test/KeyBindingsManager-test.ts b/test/KeyBindingsManager-test.ts index 28204be9c8..41614b61fa 100644 --- a/test/KeyBindingsManager-test.ts +++ b/test/KeyBindingsManager-test.ts @@ -1,3 +1,19 @@ +/* +Copyright 2021 Clemens Zeidler + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + import { isKeyComboMatch, KeyCombo } from '../src/KeyBindingsManager'; const assert = require('assert'); From a8a8741c06a9942038fe1f40b75b708b28410732 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Fri, 12 Mar 2021 19:40:28 +1300 Subject: [PATCH 020/163] Make FocusRoomSearch a NavigationAction --- src/KeyBindingsDefaults.ts | 18 +++++++++--------- src/KeyBindingsManager.ts | 4 ++-- src/components/structures/LoggedInView.tsx | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/KeyBindingsDefaults.ts b/src/KeyBindingsDefaults.ts index fd00a2ff53..0e9d14ea8f 100644 --- a/src/KeyBindingsDefaults.ts +++ b/src/KeyBindingsDefaults.ts @@ -251,14 +251,7 @@ const roomListBindings = (): KeyBinding[] => { } const roomBindings = (): KeyBinding[] => { - const bindings = [ - { - action: RoomAction.FocusRoomSearch, - keyCombo: { - key: Key.K, - ctrlOrCmd: true, - }, - }, + const bindings: KeyBinding[] = [ { action: RoomAction.ScrollUp, keyCombo: { @@ -323,6 +316,13 @@ const roomBindings = (): KeyBinding[] => { const navigationBindings = (): KeyBinding[] => { return [ + { + action: NavigationAction.FocusRoomSearch, + keyCombo: { + key: Key.K, + ctrlOrCmd: true, + }, + }, { action: NavigationAction.ToggleRoomSidePanel, keyCombo: { @@ -395,7 +395,7 @@ const navigationBindings = (): KeyBinding[] => { shiftKey: true, }, }, - ] + ]; } export const defaultBindingsProvider: IKeyBindingsProvider = { diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index 7e996b2730..73940e0371 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -78,8 +78,6 @@ export enum RoomListAction { /** Actions for the current room view */ export enum RoomAction { - /** Jump to room search (search for a room)*/ - FocusRoomSearch = 'FocusRoomSearch', // TODO: move to NavigationAction? /** Scroll up in the timeline */ ScrollUp = 'ScrollUp', /** Scroll down in the timeline */ @@ -100,6 +98,8 @@ export enum RoomAction { /** Actions for navigating do various menus / dialogs / screens */ export enum NavigationAction { + /** Jump to room search (search for a room)*/ + FocusRoomSearch = 'FocusRoomSearch', /** Toggle the room side panel */ ToggleRoomSidePanel = 'ToggleRoomSidePanel', /** Toggle the user menu */ diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index dcc140148d..9360ab4e9e 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -449,12 +449,6 @@ class LoggedInView extends React.Component { const roomAction = getKeyBindingsManager().getRoomAction(ev); switch (roomAction) { - case RoomAction.FocusRoomSearch: - dis.dispatch({ - action: 'focus_room_filter', - }); - handled = true; - break; case RoomAction.ScrollUp: case RoomAction.RoomScrollDown: case RoomAction.JumpToFirstMessage: @@ -477,6 +471,12 @@ class LoggedInView extends React.Component { const navAction = getKeyBindingsManager().getNavigationAction(ev); switch (navAction) { + case NavigationAction.FocusRoomSearch: + dis.dispatch({ + action: 'focus_room_filter', + }); + handled = true; + break; case NavigationAction.ToggleUserMenu: dis.fire(Action.ToggleUserMenu); handled = true; From 86e13eeba6219d2946fdc39e527f8e80ed0a9af1 Mon Sep 17 00:00:00 2001 From: libexus Date: Fri, 12 Mar 2021 17:04:10 +0000 Subject: [PATCH 021/163] Translated using Weblate (German) Currently translated at 96.7% (2795 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 65e08ae4c3..945d07bfbd 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -2971,7 +2971,7 @@ "You've reached the maximum number of simultaneous calls.": "Du hast die maximale Anzahl gleichzeitiger Anrufe erreicht.", "Too Many Calls": "Zu viele Anrufe", "Call failed because webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen, weil nicht auf die Webcam oder der das Mikrofon zugegriffen werden konnte. Prüfe nach, ob:", - "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf ist fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon eingesteckt und richtig eingestellt ist.", + "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf hat fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon angesteckt und richtig konfiguriert ist.", "You have no visible notifications.": "Du hast keine sichtbaren Benachrichtigungen.", "%(name)s on hold": "%(name)s wird gehalten", "You held the call Switch": "Du hältst den Anruf Wechseln", @@ -3078,5 +3078,18 @@ "Value in this room": "Wert in diesem Raum", "Settings Explorer": "Einstellungs-Explorer", "Values at explicit levels": "Werte für explizite Levels", - "Settable at room": "Für den Raum einstellbar" + "Settable at room": "Für den Raum einstellbar", + "Room name": "Raumname", + "%(count)s members|other": "%(count)s Mitglieder", + "Accept Invite": "Einladung akzeptieren", + "Save changes": "Änderungen speichern", + "Undo": "Rückgängig", + "Save Changes": "Änderungen Speichern", + "View dev tools": "Entwicklereinstellungen anzeigen", + "Apply": "Anwenden", + "Create a new room": "Neuen Raum erstellen", + "Suggested Rooms": "Vorgeschlagene Räume", + "Add existing room": "Bereits existierenden Raum hinzufügen", + "Send message": "Nachricht senden", + "New room": "Neuer Raum" } From 4e267da6add6299652122e270a238dc68f118e53 Mon Sep 17 00:00:00 2001 From: Sven Grewe Date: Fri, 12 Mar 2021 16:57:30 +0000 Subject: [PATCH 022/163] Translated using Weblate (German) Currently translated at 96.7% (2795 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 945d07bfbd..291e180eeb 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1317,7 +1317,7 @@ "Enter a new identity server": "Gib einen neuen Identitätsserver ein", "Clear personal data": "Persönliche Daten löschen", "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Wenn du die Verbindung zu deinem Identitätsserver trennst, heißt das, dass du nicht mehr von anderen Benutzern gefunden werden und auch andere nicht mehr per E-Mail oder Telefonnummer einladen kannst.", - "Please ask the administrator of your homeserver (%(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Bitte frage die Administration deines Heimservers (%(homeserverDomain)s) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.", + "Please ask the administrator of your homeserver (%(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Bitte frage den Administrator deines Heimservers (%(homeserverDomain)s) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.", "Disconnect from the identity server ?": "Verbindung zum Identitätsserver trennen?", "Add Email Address": "E-Mail-Adresse hinzufügen", "Add Phone Number": "Telefonnummer hinzufügen", @@ -1416,7 +1416,7 @@ "View rules": "Regeln öffnen", "You are currently subscribed to:": "Du abonnierst momentan:", "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer:innen gedacht.", - "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem Touch das primäre Eingabegerät ist", + "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem das Tasten die primäre Eingabemöglichkeit ist", "Whether you're using %(brand)s as an installed Progressive Web App": "Ob du %(brand)s als installierte progressive Web-App verwendest", "Your user agent": "Dein User-Agent", "If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Nutzers nicht beenden können.", @@ -1633,11 +1633,11 @@ "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im HTML-Format, ohne sie als Markdown zu darzustellen", "Show rooms with unread notifications first": "Räume mit ungelesenen Benachrichtigungen zuerst zeigen", "Show shortcuts to recently viewed rooms above the room list": "Kurzbefehle zu den kürzlich gesichteten Räumen über der Raumliste anzeigen", - "Use Single Sign On to continue": "Single-Sign-On zum Fortfahren nutzen", - "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte E-Mail-Adresse mit Single Sign-On, um deine Identität nachzuweisen.", - "Single Sign On": "Single Sign-On", + "Use Single Sign On to continue": "Einmal-Anmeldung zum Fortfahren nutzen", + "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte E-Mail-Adresse mit der Einmal-Anmeldung, um deine Identität nachzuweisen.", + "Single Sign On": "Einmal-Anmeldung", "Confirm adding email": "Hinzugefügte E-Mail-Addresse bestätigen", - "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte Telefonnummer, indem du deine Identität mittels Single Sign-On nachweist.", + "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte Telefonnummer, indem du deine Identität mittels der Einmal-Anmeldung nachweist.", "Click the button below to confirm adding this phone number.": "Klicke unten die Schaltfläche, um die hinzugefügte Telefonnummer zu bestätigen.", "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.", "%(name)s is requesting verification": "%(name)s fordert eine Verifizierung an", From 442122564fcdcc47390d0fb26db708c965cad8dc Mon Sep 17 00:00:00 2001 From: "@a2sc:matrix.org" Date: Wed, 10 Mar 2021 21:46:14 +0000 Subject: [PATCH 023/163] Translated using Weblate (German) Currently translated at 96.7% (2795 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 291e180eeb..52d92186d2 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -3091,5 +3091,24 @@ "Suggested Rooms": "Vorgeschlagene Räume", "Add existing room": "Bereits existierenden Raum hinzufügen", "Send message": "Nachricht senden", - "New room": "Neuer Raum" + "New room": "Neuer Raum", + "Share invite link": "Einladungslink teilen", + "Click to copy": "Klicken um zu kopieren", + "Collapse space panel": "Space-Feld zuklappen", + "Expand space panel": "Space-Feld aufweiten", + "Creating...": "Erstelle...", + "You can change these at any point.": "Du kannst diese jederzeit ändern.", + "Your private space": "Dein privater Space", + "Your public space": "Dein öffentlicher Space", + "You can change this later": "Du kannst dies später ändern", + "Invite only, best for yourself or teams": "Nur Einladen - am Besten für dich selbst oder Teams", + "Open space for anyone, best for communities": "Öffne den Space für alle - am Besten für Communities", + "Private": "Privat", + "Public": "Öffentlich", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces sind ein neuer Weg Räume und Leute zu gruppieren. Um einen bestehenden Space zu betreten brauchst du eine Einladung", + "Create a space": "Einen Space erstellen", + "Delete": "Löschen", + "This homeserver has been blocked by its administrator.": "Dieser Heimserver wurde von ihrer Administration geblockt.", + "You're already in a call with this person.": "Du bist schon in einem Anruf mit dieser Person.", + "Already in call": "Schon im Anruf" } From 7854cef727d3c0e653970a0d830519a212c098b8 Mon Sep 17 00:00:00 2001 From: Sven Grewe Date: Fri, 12 Mar 2021 17:47:17 +0000 Subject: [PATCH 024/163] Translated using Weblate (German) Currently translated at 96.7% (2795 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 52d92186d2..fd416391ab 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -131,7 +131,7 @@ "Jun": "Jun", "Jul": "Juli", "Aug": "Aug", - "Sep": "Sept", + "Sep": "Sep", "Oct": "Okt", "Nov": "Nov", "Dec": "Dez", @@ -181,7 +181,7 @@ "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben.", "Usage": "Verwendung", "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.", - "You need to be able to invite users to do that.": "Du musst die Berechtigung \"Benutzer:innen einladen\" haben, um diese Aktion ausführen zu können.", + "You need to be able to invite users to do that.": "Du musst die Berechtigung \"Benutzer einladen\" haben, um diese Aktion ausführen zu können.", "You need to be logged in.": "Du musst angemeldet sein.", "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum", "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.", @@ -285,7 +285,7 @@ "Error decrypting video": "Video-Entschlüsselung fehlgeschlagen", "Import room keys": "Raum-Schlüssel importieren", "File to import": "Zu importierende Datei", - "Failed to invite the following users to the %(roomName)s room:": "Folgende Benutzer:innen konnten nicht in den Raum \"%(roomName)s\" eingeladen werden:", + "Failed to invite the following users to the %(roomName)s room:": "Folgende Benutzer konnten nicht in den Raum \"%(roomName)s\" eingeladen werden:", "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Bist du sicher, dass du dieses Ereignis entfernen (löschen) möchtest? Wenn du die Änderung eines Raum-Namens oder eines Raum-Themas löscht, kann dies dazu führen, dass die ursprüngliche Änderung rückgängig gemacht wird.", "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Dieser Prozess erlaubt es dir, die Schlüssel für die in verschlüsselten Räumen empfangenen Nachrichten in eine lokale Datei zu exportieren. In Zukunft wird es möglich sein, diese Datei in einen anderen Matrix-Client zu importieren, sodass dieser Client diese Nachrichten ebenfalls entschlüsseln kann.", "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Mit der exportierten Datei kann jeder, der diese Datei lesen kann, jede verschlüsselte Nachricht entschlüsseln, die für dich lesbar ist. Du solltest die Datei also unbedingt sicher verwahren. Um den Vorgang sicherer zu gestalten, solltest du unten eine Passphrase eingeben, die dazu verwendet wird, die exportierten Daten zu verschlüsseln. Anschließend wird es nur möglich sein, die Daten zu importieren, wenn dieselbe Passphrase verwendet wird.", @@ -416,7 +416,7 @@ "You are now ignoring %(userId)s": "%(userId)s wird jetzt ignoriert", "You are no longer ignoring %(userId)s": "%(userId)s wird nicht mehr ignoriert", "Leave": "Verlassen", - "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht in die Gruppe %(groupId)s eingeladen werden:", + "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer konnten nicht in die Gruppe %(groupId)s eingeladen werden:", "Leave %(groupName)s?": "%(groupName)s verlassen?", "Add a Room": "Raum hinzufügen", "Add a User": "Benutzer:in hinzufügen", @@ -430,7 +430,7 @@ "Banned by %(displayName)s": "Verbannt von %(displayName)s", "Description": "Beschreibung", "Unable to accept invite": "Einladung kann nicht angenommen werden", - "Failed to invite users to %(groupId)s": "Benutzer:innen konnten nicht in %(groupId)s eingeladen werden", + "Failed to invite users to %(groupId)s": "Benutzer konnten nicht in %(groupId)s eingeladen werden", "Unable to reject invite": "Einladung konnte nicht abgelehnt werden", "Who would you like to add to this summary?": "Wen möchtest zu dieser Übersicht hinzufügen?", "Add to summary": "Zur Übersicht hinzufügen", @@ -469,7 +469,7 @@ "Which rooms would you like to add to this community?": "Welche Räume sollen zu dieser Community hinzugefügt werden?", "Add rooms to the community": "Räume zur Community hinzufügen", "Add to community": "Zur Community hinzufügen", - "Failed to invite users to community": "Benutzer:innen konnten nicht in die Community eingeladen werden", + "Failed to invite users to community": "Benutzer konnten nicht in die Community eingeladen werden", "Communities": "Communities", "Invalid community ID": "Ungültige Community-ID", "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID", @@ -628,7 +628,7 @@ "Your language of choice": "Deine ausgewählte Sprache", "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ob du den Richtext-Modus des Editors benutzt oder nicht", "Your homeserver's URL": "Deine Homeserver-URL", - "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s", + "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s", "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der/die letze Nutzer:in mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.", "Community IDs cannot be empty.": "Community-IDs können nicht leer sein.", "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.", @@ -925,7 +925,7 @@ "You do not have permission to invite people to this room.": "Du hast keine Berechtigung um Personen in diesen Raum einzuladen.", "User %(user_id)s does not exist": "Benutzer:in %(user_id)s existiert nicht", "Unknown server error": "Unbekannter Serverfehler", - "Failed to invite users to the room:": "Konnte Benutzer:innen nicht in den Raum einladen:", + "Failed to invite users to the room:": "Konnte Benutzer nicht in den Raum einladen:", "Short keyboard patterns are easy to guess": "Kurze Tastaturmuster sind einfach zu erraten", "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Zeige eine Erinnerung um die Sichere Nachrichten-Wiederherstellung in verschlüsselten Räumen zu aktivieren", "Messages containing @room": "Nachrichten, die \"@room\" enthalten", @@ -1330,7 +1330,7 @@ "If you can't find the room you're looking for, ask for an invite or Create a new room.": "Wenn du den gesuchten Raum nicht finden kannst, frage nach einer Einladung für den Raum oder Erstelle einen neuen Raum.", "Alternatively, you can try to use the public server at turn.matrix.org, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativ kannst du versuchen, den öffentlichen Server unter turn.matrix.org zu verwenden. Allerdings wird dieser nicht so zuverlässig sein und du teilst deine IP-Adresse mit diesem Server. Du kannst dies auch in den Einstellungen konfigurieren.", "This action requires accessing the default identity server to validate an email address or phone number, but the server does not have any terms of service.": "Diese Handlung erfordert es, auf den Standard-Identitätsserver zuzugreifen, um eine E-Mail Adresse oder Telefonnummer zu validieren, aber der Server hat keine Nutzungsbedingungen.", - "Only continue if you trust the owner of the server.": "Fahre nur fort, wenn du dem/r Besitzer:in des Servers vertraust.", + "Only continue if you trust the owner of the server.": "Fahre nur fort, wenn du dem Besitzer des Servers vertraust.", "Trust": "Vertrauen", "Custom (%(level)s)": "Benutzerdefinierte (%(level)s)", "Sends a message as plain text, without interpreting it as markdown": "Verschickt eine Nachricht in Rohtext, ohne sie als Markdown darzustellen", @@ -1496,9 +1496,9 @@ "Enter your password to sign in and regain access to your account.": "Gib dein Passwort ein, um dich anzumelden und wieder Zugang zu deinem Konto zu erhalten.", "Sign in and regain access to your account.": "Melden dich an und erhalte wieder Zugang zu deinem Konto.", "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du kannst dich nicht bei deinem Konto anmelden. Bitte kontaktiere deine Homeserver-Administration für weitere Informationen.", - "Sign In or Create Account": "Anmelden oder Account erstellen", - "Use your account or create a new one to continue.": "Benutze deinen Account oder erstellen einen neuen, um fortzufahren.", - "Create Account": "Account erstellen", + "Sign In or Create Account": "Anmelden oder Konto erstellen", + "Use your account or create a new one to continue.": "Benutze dein Konto oder erstelle ein neues, um fortzufahren.", + "Create Account": "Konto erstellen", "Show typing notifications": "Zeige Tipp-Benachrichtigungen", "Order rooms by name": "Sortiere Räume nach Name", "When rooms are upgraded": "Wenn Räume verbessert werden", @@ -2971,7 +2971,7 @@ "You've reached the maximum number of simultaneous calls.": "Du hast die maximale Anzahl gleichzeitiger Anrufe erreicht.", "Too Many Calls": "Zu viele Anrufe", "Call failed because webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen, weil nicht auf die Webcam oder der das Mikrofon zugegriffen werden konnte. Prüfe nach, ob:", - "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf hat fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon angesteckt und richtig konfiguriert ist.", + "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf ist fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon angesteckt und richtig konfiguriert ist.", "You have no visible notifications.": "Du hast keine sichtbaren Benachrichtigungen.", "%(name)s on hold": "%(name)s wird gehalten", "You held the call Switch": "Du hältst den Anruf Wechseln", @@ -3040,8 +3040,8 @@ "Use app for a better experience": "Nutze die App für eine bessere Erfahrung", "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Wir haben deinen Browser gebeten, sich zu merken, bei welchem Homeserver du dich anmeldest, aber dein Browser hat dies leider vergessen. Gehe zur Anmeldeseite und versuche es erneut.", "Show stickers button": "Sticker-Schaltfläche anzeigen", - "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver hat deinen Anmeldeversuch abgelehnt. Dies könnte daran liegen, dass der Prozess einfach zu lange dauert. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administration.", - "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver war nicht erreichbar und konnte dich nicht anmelden. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administration.", + "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver hat deinen Anmeldeversuch abgelehnt. Dies könnte daran liegen, dass der Prozess einfach zu lange dauert. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administrator.", + "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver war nicht erreichbar und konnte dich nicht anmelden. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deinem Homeserver-Administrator.", "We couldn't log you in": "Wir konnten dich nicht anmelden", "Windows": "Fenster", "Screens": "Bildschirme", From 3e50b12548ae6a42c826bb45bc3617fa196303a4 Mon Sep 17 00:00:00 2001 From: libexus Date: Fri, 12 Mar 2021 17:18:45 +0000 Subject: [PATCH 025/163] Translated using Weblate (German) Currently translated at 96.7% (2795 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index fd416391ab..1780708e55 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -108,7 +108,7 @@ "This email address was not found": "Diese E-Mail-Adresse konnte nicht gefunden werden", "The remote side failed to pick up": "Die Gegenstelle konnte nicht abheben", "This phone number is already in use": "Diese Telefonnummer wird bereits verwendet", - "Unable to capture screen": "Der Bildschirm konnte nicht aufgenommen werden", + "Unable to capture screen": "Der Bildschirm kann nicht aufgenommen werden", "Unable to enable Notifications": "Benachrichtigungen konnten nicht aktiviert werden", "Upload Failed": "Upload fehlgeschlagen", "VoIP is unsupported": "VoIP wird nicht unterstützt", @@ -129,7 +129,7 @@ "Apr": "April", "May": "Mai", "Jun": "Jun", - "Jul": "Juli", + "Jul": "Jul", "Aug": "Aug", "Sep": "Sep", "Oct": "Okt", @@ -1233,7 +1233,7 @@ "Want more than a community? Get your own server": "Du möchtest mehr als eine Community? Hol dir deinen eigenen Server", "Could not load user profile": "Konnte Nutzerprofil nicht laden", "Your Matrix account on %(serverName)s": "Dein Matrixkonto auf %(serverName)s", - "Name or Matrix ID": "Name oder Matrix ID", + "Name or Matrix ID": "Name oder Matrix-ID", "Your %(brand)s is misconfigured": "Dein %(brand)s ist falsch konfiguriert", "You cannot modify widgets in this room.": "Du darfst in diesem Raum keine Widgets verändern.", "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Ob du die \"Breadcrumbs\"-Funktion nutzt oder nicht (Avatare oberhalb der Raumliste)", From 228070f53377c8e9f0cc45be8b782c36980fcc3d Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sat, 13 Mar 2021 21:53:58 +1300 Subject: [PATCH 026/163] Fix comment style + improve comments --- src/KeyBindingsManager.ts | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/KeyBindingsManager.ts b/src/KeyBindingsManager.ts index 73940e0371..45ef97b121 100644 --- a/src/KeyBindingsManager.ts +++ b/src/KeyBindingsManager.ts @@ -29,7 +29,7 @@ export enum MessageComposerAction { EditPrevMessage = 'EditPrevMessage', /** Start editing the user's next sent message */ EditNextMessage = 'EditNextMessage', - /** Cancel editing a message or cancel replying to a message*/ + /** Cancel editing a message or cancel replying to a message */ CancelEditing = 'CancelEditing', /** Set bold format the current selection */ @@ -44,7 +44,9 @@ export enum MessageComposerAction { EditRedo = 'EditRedo', /** Insert new line */ NewLine = 'NewLine', + /** Move the cursor to the start of the message */ MoveCursorToStart = 'MoveCursorToStart', + /** Move the cursor to the end of the message */ MoveCursorToEnd = 'MoveCursorToEnd', } @@ -60,7 +62,7 @@ export enum AutocompleteAction { NextSelection = 'NextSelection', } -/** Actions for the left room list sidebar */ +/** Actions for the room list sidebar */ export enum RoomListAction { /** Clear room list filter field */ ClearSearch = 'ClearSearch', @@ -86,35 +88,35 @@ export enum RoomAction { DismissReadMarker = 'DismissReadMarker', /** Jump to oldest unread message */ JumpToOldestUnread = 'JumpToOldestUnread', - /* Upload a file */ + /** Upload a file */ UploadFile = 'UploadFile', - /* Focus search message in a room (must be enabled) */ + /** Focus search message in a room (must be enabled) */ FocusSearch = 'FocusSearch', - /* Jump to the first (downloaded) message in the room */ + /** Jump to the first (downloaded) message in the room */ JumpToFirstMessage = 'JumpToFirstMessage', - /* Jump to the latest message in the room */ + /** Jump to the latest message in the room */ JumpToLatestMessage = 'JumpToLatestMessage', } -/** Actions for navigating do various menus / dialogs / screens */ +/** Actions for navigating do various menus, dialogs or screens */ export enum NavigationAction { - /** Jump to room search (search for a room)*/ + /** Jump to room search (search for a room) */ FocusRoomSearch = 'FocusRoomSearch', /** Toggle the room side panel */ ToggleRoomSidePanel = 'ToggleRoomSidePanel', /** Toggle the user menu */ ToggleUserMenu = 'ToggleUserMenu', - /* Toggle the short cut help dialog */ + /** Toggle the short cut help dialog */ ToggleShortCutDialog = 'ToggleShortCutDialog', - /* Got to the Element home screen */ + /** Got to the Element home screen */ GoToHome = 'GoToHome', - /* Select prev room */ + /** Select prev room */ SelectPrevRoom = 'SelectPrevRoom', - /* Select next room */ + /** Select next room */ SelectNextRoom = 'SelectNextRoom', - /* Select prev room with unread messages*/ + /** Select prev room with unread messages */ SelectPrevUnreadRoom = 'SelectPrevUnreadRoom', - /* Select next room with unread messages*/ + /** Select next room with unread messages */ SelectNextUnreadRoom = 'SelectNextUnreadRoom', } From 7f141276fffd3a6873a3dfa7282b202a723b851c Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Mon, 15 Mar 2021 22:56:56 -0400 Subject: [PATCH 027/163] initial work on room history key sharing, take 2 --- src/components/views/dialogs/InviteDialog.tsx | 55 +++++++++++++++++-- src/i18n/strings/en_EN.json | 2 + src/settings/Settings.ts | 6 ++ 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx index 5b936e822c..fa87826c09 100644 --- a/src/components/views/dialogs/InviteDialog.tsx +++ b/src/components/views/dialogs/InviteDialog.tsx @@ -42,6 +42,7 @@ import {UIFeature} from "../../../settings/UIFeature"; import CountlyAnalytics from "../../../CountlyAnalytics"; import {Room} from "matrix-js-sdk/src/models/room"; import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; +import {getAddressType} from "../../../UserAddress"; // we have a number of types defined from the Matrix spec which can't reasonably be altered here. /* eslint-disable camelcase */ @@ -676,14 +677,15 @@ export default class InviteDialog extends React.PureComponent { + _inviteUsers = async () => { const startTime = CountlyAnalytics.getTimestamp(); this.setState({busy: true}); this._convertFilter(); const targets = this._convertFilter(); const targetIds = targets.map(t => t.userId); - const room = MatrixClientPeg.get().getRoom(this.props.roomId); + const cli = MatrixClientPeg.get(); + const room = cli.getRoom(this.props.roomId); if (!room) { console.error("Failed to find the room to invite users to"); this.setState({ @@ -693,12 +695,34 @@ export default class InviteDialog extends React.PureComponent { + try { + const result = await inviteMultipleToRoom(this.props.roomId, targetIds) CountlyAnalytics.instance.trackSendInvite(startTime, this.props.roomId, targetIds.length); if (!this._shouldAbortAfterInviteError(result)) { // handles setting error message too this.props.onFinished(); } - }).catch(err => { + + if (cli.isRoomEncrypted(this.props.roomId) && + SettingsStore.getValue("feature_room_history_key_sharing")) { + const visibilityEvent = room.currentState.getStateEvents( + "m.room.history_visibility", "", + ); + const visibility = visibilityEvent && visibilityEvent.getContent() && + visibilityEvent.getContent().history_visibility; + if (visibility == "world_readable" || visibility == "shared") { + const invitedUsers = []; + for (const [addr, state] of Object.entries(result.states)) { + if (state === "invited" && getAddressType(addr) === "mx-user-id") { + invitedUsers.push(addr); + } + } + console.log("Sharing history with", invitedUsers); + cli.sendSharedHistoryKeys( + this.props.roomId, invitedUsers, + ); + } + } + } catch (err) { console.error(err); this.setState({ busy: false, @@ -706,7 +730,7 @@ export default class InviteDialog extends React.PureComponent { @@ -1187,10 +1211,12 @@ export default class InviteDialog extends React.PureComponent; const identityServersEnabled = SettingsStore.getValue(UIFeature.IdentityServer); - const userId = MatrixClientPeg.get().getUserId(); + const cli = MatrixClientPeg.get(); + const userId = cli.getUserId(); if (this.props.kind === KIND_DM) { title = _t("Direct Messages"); @@ -1281,6 +1307,22 @@ export default class InviteDialog extends React.PureComponent + {_t("Note: Decryption keys for old messages will be shared with invited users.")} + ; + } + } } else if (this.props.kind === KIND_CALL_TRANSFER) { title = _t("Transfer"); buttonText = _t("Transfer"); @@ -1314,6 +1356,7 @@ export default class InviteDialog extends React.PureComponent + {keySharingWarning} {this._renderIdentityServerWarning()}
{this.state.errorText}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 38460a5f6e..dc808cb8bd 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -791,6 +791,7 @@ "Show message previews for reactions in DMs": "Show message previews for reactions in DMs", "Show message previews for reactions in all rooms": "Show message previews for reactions in all rooms", "Offline encrypted messaging using dehydrated devices": "Offline encrypted messaging using dehydrated devices", + "Share decryption keys for room history when inviting users": "Share decryption keys for room history when inviting users", "Enable advanced debugging for the room list": "Enable advanced debugging for the room list", "Show info about bridges in room settings": "Show info about bridges in room settings", "Font size": "Font size", @@ -2153,6 +2154,7 @@ "Go": "Go", "Invite someone using their name, email address, username (like ) or share this room.": "Invite someone using their name, email address, username (like ) or share this room.", "Invite someone using their name, username (like ) or share this room.": "Invite someone using their name, username (like ) or share this room.", + "Note: Decryption keys for old messages will be shared with invited users.": "Note: Decryption keys for old messages will be shared with invited users.", "Transfer": "Transfer", "a new master key signature": "a new master key signature", "a new cross-signing key signature": "a new cross-signing key signature", diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts index 43210021e5..77b0f187c7 100644 --- a/src/settings/Settings.ts +++ b/src/settings/Settings.ts @@ -214,6 +214,12 @@ export const SETTINGS: {[setting: string]: ISetting} = { supportedLevels: LEVELS_FEATURE, default: false, }, + "feature_room_history_key_sharing": { + isFeature: true, + displayName: _td("Share decryption keys for room history when inviting users"), + supportedLevels: LEVELS_FEATURE, + default: false, + }, "advancedRoomListLogging": { // TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231 displayName: _td("Enable advanced debugging for the room list"), From 8008b6023d69a21ca338b3b502afb6a76d9266be Mon Sep 17 00:00:00 2001 From: libexus Date: Tue, 16 Mar 2021 10:12:51 +0000 Subject: [PATCH 028/163] Translated using Weblate (German) Currently translated at 96.7% (2795 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 130 ++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 64 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 1780708e55..0981cf3f3d 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -60,7 +60,7 @@ "Notifications": "Benachrichtigungen", "": "", "No users have specific privileges in this room": "Keine Nutzer:innen haben in diesem Raum privilegierte Berechtigungen", - "Only people who have been invited": "Nur Personen, die eingeladen wurden", + "Only people who have been invited": "Eingeladene Personen", "Password": "Passwort", "Permissions": "Berechtigungen", "Phone": "Telefon", @@ -95,7 +95,7 @@ "Voice call": "Sprachanruf", "VoIP conference finished.": "VoIP-Konferenz wurde beendet.", "VoIP conference started.": "VoIP-Konferenz gestartet.", - "Who can access this room?": "Wer hat Zugang zu diesem Raum?", + "Who can access this room?": "Wer kann diesen Raum betreten?", "Who can read history?": "Wer kann den bisherigen Chatverlauf lesen?", "You do not have permission to post to this room": "Du hast keine Berechtigung, in diesem Raum etwas zu senden", "Call Timeout": "Anruf-Timeout", @@ -103,7 +103,7 @@ "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast", "Failure to create room": "Raumerstellung fehlgeschlagen", "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s hat keine Berechtigung, um Benachrichtigungen zu senden - bitte Browser-Einstellungen überprüfen", - "%(brand)s was not given permission to send notifications - please try again": "%(brand)s hat keine Berechtigung für das Senden von Benachrichtigungen erhalten - bitte erneut versuchen", + "%(brand)s was not given permission to send notifications - please try again": "%(brand)s hat keine Berechtigung für das Senden von Benachrichtigungen erhalten - Bitte versuche es erneut", "This email address is already in use": "Diese E-Mail-Adresse wird bereits verwendet", "This email address was not found": "Diese E-Mail-Adresse konnte nicht gefunden werden", "The remote side failed to pick up": "Die Gegenstelle konnte nicht abheben", @@ -159,7 +159,7 @@ "%(targetName)s left the room.": "%(targetName)s hat den Raum verlassen.", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raum-Mitglieder sichtbar gemacht (ab dem Zeitpunkt, an dem sie eingeladen wurden).", "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raum-Mitglieder sichtbar gemacht (ab dem Zeitpunkt, an dem sie beigetreten sind).", - "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle Raum-Mitglieder.", + "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raummitglieder sichtbar gemacht.", "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf für alle sichtbar gemacht.", "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf für Unbekannte sichtbar gemacht (%(visibility)s).", "Missing room_id in request": "Fehlende room_id in Anfrage", @@ -177,7 +177,7 @@ "%(senderName)s set a profile picture.": "%(senderName)s hat ein Profilbild gesetzt.", "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s hat den Anzeigenamen geändert in %(displayName)s.", "This room is not recognised.": "Dieser Raum wurde nicht erkannt.", - "To use it, just wait for autocomplete results to load and tab through them.": "Um diese Funktion zu nutzen, warte einfach auf die Ergebnisse der Autovervollständigung und benutze dann die TAB-Taste zum Durchblättern.", + "To use it, just wait for autocomplete results to load and tab through them.": "Um diese Funktion zu nutzen, warte auf die Ergebnisse der Autovervollständigung und benutze dann die TAB-Taste zum Durchblättern.", "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben.", "Usage": "Verwendung", "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.", @@ -185,7 +185,7 @@ "You need to be logged in.": "Du musst angemeldet sein.", "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum", "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.", - "Sent messages will be stored until your connection has returned.": "Gesendete Nachrichten werden gespeichert, bis die Internetverbindung wiederhergestellt wird.", + "Sent messages will be stored until your connection has returned.": "Nachrichten werden gespeichert und gesendet, wenn die Internetverbindung wiederhergestellt ist.", "Active call": "Aktiver Anruf", "click to reveal": "anzeigen", "Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s", @@ -390,7 +390,7 @@ "Add a widget": "Widget hinzufügen", "Allow": "Erlauben", "Delete widget": "Widget entfernen", - "Define the power level of a user": "Berechtigungsstufe einer/s Benutzer!n setzen", + "Define the power level of a user": "Berechtigungsstufe einer/s Benutzer:in setzen", "Edit": "Bearbeiten", "Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntax-Hervorhebung aktivieren", "To get started, please pick a username!": "Um zu starten, wähle bitte einen Nutzernamen!", @@ -425,7 +425,7 @@ "Unignore": "Nicht mehr ignorieren", "Unignored user": "Benutzer:in nicht mehr ignoriert", "Ignored user": "Benutzer:in ignoriert", - "Stops ignoring a user, showing their messages going forward": "Beendet das Ignorieren eines Benutzers, nachfolgende Nachrichten werden wieder angezeigt", + "Stops ignoring a user, showing their messages going forward": "Benutzer:in nicht mehr ignorieren und neue Nachrichten wieder anzeigen", "Ignores a user, hiding their messages from you": "Ignoriert eine:n Benutzer:in und verbirgt dessen/deren Nachrichten", "Banned by %(displayName)s": "Verbannt von %(displayName)s", "Description": "Beschreibung", @@ -504,7 +504,7 @@ "Delete Widget": "Widget löschen", "Mention": "Erwähnen", "Invite": "Einladen", - "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer:innen in diesem Raum. Möchtest du dieses Widget wirklich löschen?", + "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer:innen in diesem Raum. Möchtest du es wirklich löschen?", "Mirror local video feed": "Lokalen Video-Feed spiegeln", "Failed to withdraw invitation": "Die Einladung konnte nicht zurückgezogen werden", "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-IDs dürfen nur die folgenden Zeichen enthalten: a-z, 0-9, or '=_-./'", @@ -575,7 +575,7 @@ "%(items)s and %(count)s others|one": "%(items)s und ein weiteres Raummitglied", "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Eine E-Mail wurde an %(emailAddress)s gesendet. Folge dem in der E-Mail enthaltenen Link und klicke dann unten.", "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Die Sichtbarkeit von '%(roomName)s' in %(groupId)s konnte nicht aktualisiert werden.", - "Visibility in Room List": "Sichtbarkeit in Raum-Liste", + "Visibility in Room List": "Sichtbarkeit in Raumliste", "Visible to everyone": "Für alle sichtbar", "Only visible to community members": "Nur für Community-Mitglieder sichtbar", "Community Invites": "Community-Einladungen", @@ -588,7 +588,7 @@ "Enable inline URL previews by default": "URL-Vorschau standardmäßig aktivieren", "Enable URL previews for this room (only affects you)": "URL-Vorschau für diesen Raum aktivieren (betrifft nur dich)", "Enable URL previews by default for participants in this room": "URL-Vorschau standardmäßig für Mitglieder dieses Raumes aktivieren", - "Please note you are logging into the %(hs)s server, not matrix.org.": "Hinweis: Du bist im Begriff, dich auf dem %(hs)s-Server anzumelden, nicht auf matrix.org.", + "Please note you are logging into the %(hs)s server, not matrix.org.": "Du meldest dich gerade am %(hs)s-Server an, nicht auf matrix.org.", "There's no one else here! Would you like to invite others or stop warning about the empty room?": "Sonst ist hier aktuell niemand. Möchtest du Benutzer einladen oder die Warnmeldung bezüglich des leeren Raums deaktivieren?", "URL previews are disabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig deaktiviert.", "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig aktiviert.", @@ -754,7 +754,7 @@ "Logs sent": "Logs gesendet", "Back": "Zurück", "Reply": "Antworten", - "Show message in desktop notification": "Nachricht in der Desktop-Benachrichtigung anzeigen", + "Show message in desktop notification": "Nachrichteninhalt in der Desktopbenachrichtigung anzeigen", "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Fehlerberichte enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast sowie Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.", "Unhide Preview": "Vorschau wieder anzeigen", "Unable to join network": "Es ist nicht möglich, dem Netzwerk beizutreten", @@ -809,7 +809,7 @@ "Terms and Conditions": "Geschäftsbedingungen", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.", "Review terms and conditions": "Geschäftsbedingungen anzeigen", - "Share Link to User": "Link zum/r Benutzer:in teilen", + "Share Link to User": "Link zu Benutzer:in teilen", "Share room": "Raum teilen", "Share Room": "Raum teilen", "Link to most recent message": "Link zur aktuellsten Nachricht", @@ -834,7 +834,7 @@ "This event could not be displayed": "Dieses Ereignis konnte nicht angezeigt werden", "A call is currently being placed!": "Ein Anruf wurde schon gestartet!", "Permission Required": "Berechtigung benötigt", - "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung ein Konferenzgespräch in diesem Raum zu starten", + "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung, ein Konferenzgespräch in diesem Raum zu starten", "Failed to remove widget": "Widget konnte nicht entfernt werden", "An error ocurred whilst trying to remove the widget from the room": "Ein Fehler trat auf während versucht wurde, das Widget aus diesem Raum zu entfernen", "System Alerts": "System-Benachrichtigung", @@ -862,7 +862,7 @@ "Upgrade this room to version %(version)s": "Diesen Raum zur Version %(version)s aufrüsten", "Forces the current outbound group session in an encrypted room to be discarded": "Erzwingt, dass die aktuell ausgehende Gruppen-Sitzung in einem verschlüsseltem Raum verworfen wird", "Unable to connect to Homeserver. Retrying...": "Verbindung mit Heimserver nicht möglich. Versuche erneut...", - "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s setzte die Hauptadresse zu diesem Raum auf %(address)s.", + "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s hat die Hauptadresse zu diesem Raum auf %(address)s gesetzt.", "%(senderName)s removed the main address for this room.": "%(senderName)s entfernte die Hauptadresse von diesem Raum.", "Before submitting logs, you must create a GitHub issue to describe your problem.": "Bevor du Log-Dateien übermittelst, musst du ein GitHub-Issue erstellen um dein Problem zu beschreiben.", "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Nutzer:innen erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!", @@ -897,8 +897,8 @@ "No backup found!": "Keine Schlüsselsicherung gefunden!", "This looks like a valid recovery key!": "Dies sieht wie ein gültiger Wiederherstellungsschlüssel aus!", "Not a valid recovery key": "Kein valider Wiederherstellungsschlüssel", - "There was an error joining the room": "Es gab einen Fehler beim Raum-Beitreten", - "Use a few words, avoid common phrases": "Benutze einige Worte, vermeide gängige Phrasen", + "There was an error joining the room": "Fehler beim Betreten des Raumes", + "Use a few words, avoid common phrases": "Benutze einige Worte und vermeide gängige Phrasen", "No need for symbols, digits, or uppercase letters": "Kein Bedarf an Symbolen, Zahlen oder Großbuchstaben", "Avoid repeated words and characters": "Vermeide wiederholte Worte und Zeichen", "Avoid sequences": "Vermeide Sätze", @@ -911,18 +911,18 @@ "Predictable substitutions like '@' instead of 'a' don't help very much": "Vorhersagbare Ersetzungen wie '@' anstelle von 'a' helfen nicht viel", "Add another word or two. Uncommon words are better.": "Füge ein weiteres Wort - oder mehr - hinzu. Ungewöhnliche Worte sind besser.", "Repeats like \"aaa\" are easy to guess": "Wiederholungen wie \"aaa\" sind einfach zu erraten", - "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Wiederholungen wie \"abcabcabc\" sind nur leicht schwerer zu raten als \"abc\"", + "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Wiederholungen wie \"abcabcabc\" sind fast so schnell zu erraten wie \"abc\"", "Sequences like abc or 6543 are easy to guess": "Sequenzen wie \"abc\" oder \"6543\" sind leicht zu raten", "Recent years are easy to guess": "Kürzlich vergangene Jahre sind einfach zu raten", - "Dates are often easy to guess": "Daten sind oft einfach zu erraten", - "This is a top-10 common password": "Dies ist unter den Top 10 der üblichen Passwörter", + "Dates are often easy to guess": "Ein Datum ist leicht zu erraten", + "This is a top-10 common password": "Dies ist unter den Top 10 der häufigsten Passwörter", "This is a top-100 common password": "Dies ist unter den Top 100 der üblichen Passwörter", "This is a very common password": "Dies ist ein recht bekanntes Passwort", "This is similar to a commonly used password": "Dies ist ähnlich zu einem oft genutzten Passwort", "A word by itself is easy to guess": "Ein Wort alleine ist einfach zu erraten", "Names and surnames by themselves are easy to guess": "Namen und Familiennamen alleine sind einfach zu erraten", "Common names and surnames are easy to guess": "Häufige Namen und Familiennamen sind einfach zu erraten", - "You do not have permission to invite people to this room.": "Du hast keine Berechtigung um Personen in diesen Raum einzuladen.", + "You do not have permission to invite people to this room.": "Du kannst keine Personen in diesen Raum einladen.", "User %(user_id)s does not exist": "Benutzer:in %(user_id)s existiert nicht", "Unknown server error": "Unbekannter Serverfehler", "Failed to invite users to the room:": "Konnte Benutzer nicht in den Raum einladen:", @@ -962,7 +962,7 @@ "Go to Settings": "Gehe zu Einstellungen", "Sign in with single sign-on": "Melde dich mit „Single Sign-On“ an", "Unrecognised address": "Nicht erkannte Adresse", - "User %(user_id)s may or may not exist": "Existenz des/der Benutzers/in %(user_id)s unsicher", + "User %(user_id)s may or may not exist": "Unklar, ob Benutzer:in %(user_id)s existiert", "Prompt before sending invites to potentially invalid matrix IDs": "Nachfragen, bevor Einladungen zu möglichen ungültigen Matrix-IDs gesendet werden", "The following users may not exist": "Eventuell existieren folgende Benutzer:innen nicht", "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Profile für die unteren Matrix IDs wurden nicht gefunden - willst Du sie trotzdem einladen?", @@ -979,7 +979,7 @@ "Render simple counters in room header": "Einfache Zähler in Raum-Kopfzeile anzeigen", "Enable Emoji suggestions while typing": "Emoji-Vorschläge während der Eingabe aktivieren", "Show a placeholder for removed messages": "Zeigt einen Platzhalter für gelöschte Nachrichten an", - "Show join/leave messages (invites/kicks/bans unaffected)": "Betreten-/Verlassen-Nachrichten zeigen (betrifft nicht Einladungen/Kicks/Bans)", + "Show join/leave messages (invites/kicks/bans unaffected)": "Nachrichten beim Betreten oder Verlassen von Benutzern anzeigen (betrifft nicht Einladungen/Kicks/Bans)", "Show avatar changes": "Avatar-Änderungen anzeigen", "Show display name changes": "Anzeigenamen-Änderungen anzeigen", "Send typing notifications": "Tipp-Benachrichtigungen senden", @@ -1018,8 +1018,8 @@ "Theme": "Design", "Account management": "Benutzerkontenverwaltung", "For help with using %(brand)s, click here.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke hier.", - "For help with using %(brand)s, click here or start a chat with our bot using the button below.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke hier oder beginne einen Chat mit unserem Bot, indem du den unteren Button klickst.", - "Chat with %(brand)s Bot": "Chatte mit dem %(brand)s Bot", + "For help with using %(brand)s, click here or start a chat with our bot using the button below.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke hier oder beginne einen Chat mit unserem Bot. Klicke dazu auf den unteren Knopf.", + "Chat with %(brand)s Bot": "Chatte mit dem %(brand)s-Bot", "Help & About": "Hilfe & Über", "Bug reporting": "Fehler melden", "FAQ": "Häufige Fragen", @@ -1030,9 +1030,9 @@ "Room list": "Raumliste", "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Die Datei '%(fileName)s' überschreitet die maximale Größe für Uploads auf diesem Heimserver", "This room has no topic.": "Dieser Raum hat kein Thema.", - "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s machte den Raum für jeden, der den Link kennt öffentlich.", + "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s hat den Raum für jeden, der den Link kennt, öffentlich gemacht.", "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s hat den Raum auf eingeladene Benutzer beschränkt.", - "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s änderte die Zutrittsregel auf '%(rule)s'", + "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s hat die Zutrittsregel auf '%(rule)s' geändert", "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s erlaubte Gäste diesem Raum beizutreten.", "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s hat Gästen verboten, diesem Raum beizutreten.", "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s änderte den Gastzugriff auf '%(rule)s'", @@ -1103,14 +1103,14 @@ "Timeline": "Chatverlauf", "Autocomplete delay (ms)": "Verzögerung zur Autovervollständigung (ms)", "Roles & Permissions": "Rollen & Berechtigungen", - "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Änderungen daran, wer den Chatverlauf lesen kann werden nur zukünftige Nachrichten in diesem Raum angewendet. Die Sichtbarkeit des existierenden Verlaufs bleibt unverändert.", + "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Änderungen an der Sichtbarkeit des Chatverlaufs gelten nur für zukünftige Nachrichten. Die Sichtbarkeit des existierenden Verlaufs bleibt unverändert.", "Security & Privacy": "Sicherheit & Datenschutz", "Encryption": "Verschlüsselung", "Once enabled, encryption cannot be disabled.": "Sobald aktiviert, kann die Verschlüsselung nicht mehr deaktiviert werden.", "Encrypted": "Verschlüsselt", "Ignored users": "Ignorierte Benutzer", "Key backup": "Schlüsselsicherung", - "Gets or sets the room topic": "Frage das Thema des Raums ab oder setze es", + "Gets or sets the room topic": "Raumthema anzeigen oder ändern", "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diese Nutzer:in, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.", "Missing media permissions, click the button below to request.": "Fehlende Medienberechtigungen. Drücke auf den Knopf unten, um sie anzufordern.", "Request media permissions": "Medienberechtigungen anfordern", @@ -1191,9 +1191,9 @@ "Join millions for free on the largest public server": "Schließe dich kostenlos auf dem größten öffentlichen Server Millionen von Menschen an", "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Stellt ¯\\_(ツ)_/¯ einer Klartextnachricht voran", "Changes your display nickname in the current room only": "Ändert den Anzeigenamen ausschließlich für den aktuellen Raum", - "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktivierte Abzeichen der Gruppen %(groups)s für diesen Raum.", - "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s deaktivierte Abzeichen der Gruppen %(groups)s in diesem Raum.", - "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktivierte Abzeichen von %(newGroups)s und deaktivierte die Abzeichen von %(oldGroups)s in diesem Raum.", + "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s hat Abzeichen der Gruppen %(groups)s für diesen Raum aktiviert.", + "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s hat Abzeichen der Gruppen %(groups)s in diesem Raum deaktiviert.", + "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s hat Abzeichen von %(newGroups)s aktiviert und von %(oldGroups)s deaktiviert.", "User %(userId)s is already in the room": "Nutzer:in %(userId)s ist bereits im Raum", "The user must be unbanned before they can be invited.": "Die Verbannung des/der Nutzer:in muss aufgehoben werden, bevor er/sie eingeladen werden kann.", "Show read receipts sent by other users": "Zeige Lesebestätigungen anderer Benutzer", @@ -1206,7 +1206,7 @@ "Change history visibility": "Ändere Sichtbarkeit der Historie", "Change permissions": "Ändere Berechtigungen", "Change topic": "Ändere das Thema", - "Modify widgets": "Ändere Widgets", + "Modify widgets": "Widgets bearbeiten", "Default role": "Standard Rolle", "Send messages": "Nachrichten senden", "Invite users": "Benutzer:innen einladen", @@ -1255,8 +1255,8 @@ "Ask your %(brand)s admin to check your config for incorrect or duplicate entries.": "Wende dich an deinen %(brand)s Admin um deine Konfiguration auf ungültige oder doppelte Einträge zu überprüfen.", "Unexpected error resolving identity server configuration": "Ein unerwarteter Fehler ist beim Laden der Identitätsserver-Konfiguration aufgetreten", "Cannot reach identity server": "Der Identitätsserver ist nicht erreichbar", - "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Du kannst dich registrieren, aber manche Funktionen werden nicht verfügbar sein bis der Identitätsserver wieder online ist. Wenn diese Warnmeldung weiterhin angezeigt wird, überprüfe deine Konfiguration oder kontaktiere deinen Server-Administrator.", - "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Du kannst dein Passwort zurücksetzen, aber manche Funktionen werden nicht verfügbar sein, bis der Identitätsserver wieder online ist. Wenn du diese Warnmeldung weiterhin siehst, überprüfe deine Konfiguration oder kontaktiere deinen Server-Administrator.", + "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Du kannst dich registrieren, aber manche Funktionen werden erst wieder verfügbar sein, wenn der Identitätsserver wieder online ist. Wenn diese Warnmeldung weiterhin angezeigt wird, überprüfe deine Konfiguration oder kontaktiere die Server-Administration.", + "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Du kannst dein Passwort zurücksetzen, aber manche Funktionen werden nicht verfügbar sein, bis der Identitätsserver wieder online ist. Wenn du diese Warnmeldung weiterhin siehst, überprüfe deine Konfiguration oder kontaktiere die Server-Administration.", "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Du kannst dich einloggen, aber manche Funktionen werden nicht verfügbar sein bis der Identitätsserver wieder online ist. Wenn du diese Warnmeldung weiterhin siehst, überprüfe deine Konfiguration oder kontaktiere deinen Server-Administrator.", "No homeserver URL provided": "Keine Heimserver-URL angegeben", "Unexpected error resolving homeserver configuration": "Ein unerwarteter Fehler ist beim Laden der Heimserver-Konfiguration aufgetreten", @@ -1300,14 +1300,14 @@ "You do not have the required permissions to use this command.": "Du hast nicht die erforderlichen Berechtigungen, um diesen Befehl zu verwenden.", "Multiple integration managers": "Mehrere Integrationsmanager", "Public Name": "Öffentlicher Name", - "Identity Server URL must be HTTPS": "Die Identity Server-URL muss HTTPS sein", + "Identity Server URL must be HTTPS": "Die Identity-Server-URL über HTTPS erreichbar sein", "Could not connect to Identity Server": "Verbindung zum Identitätsserver konnte nicht hergestellt werden", "Checking server": "Server wird überprüft", "Identity server has no terms of service": "Der Identitätsserver hat keine Nutzungsbedingungen", "Disconnect": "Trennen", "Identity Server": "Identitätsserver", "Use an identity server": "Benutze einen Identitätsserver", - "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Benutze einen Identitätsserver, um andere mittels E-Mail einzuladen. Klicke auf fortfahren, um den Standard-Identitätsserver (%(defaultIdentityServerName)s) zu benutzen oder gehe in die Einstellung und gib einen anderen Server an.", + "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Benutze einen Identitätsserver, um andere mittels E-Mail einzuladen. Klicke auf fortfahren, um den Standard-Identitätsserver (%(defaultIdentityServerName)s) zu benutzen oder ändere ihn in den Einstellungen.", "ID": "ID", "Not a valid Identity Server (status code %(code)s)": "Kein gültiger Identitätsserver (status code %(code)s)", "Terms of service not accepted or the identity server is invalid.": "Die Nutzungsbedingungen wurden nicht akzeptiert oder der Identitätsserver ist ungültig.", @@ -1316,7 +1316,7 @@ "Do not use an identity server": "Keinen Identitätsserver verwenden", "Enter a new identity server": "Gib einen neuen Identitätsserver ein", "Clear personal data": "Persönliche Daten löschen", - "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Wenn du die Verbindung zu deinem Identitätsserver trennst, heißt das, dass du nicht mehr von anderen Benutzern gefunden werden und auch andere nicht mehr per E-Mail oder Telefonnummer einladen kannst.", + "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Wenn du die Verbindung zu deinem Identitätsserver trennst, kannst du nicht mehr von anderen Benutzern gefunden werden und andere nicht mehr per E-Mail oder Telefonnummer einladen.", "Please ask the administrator of your homeserver (%(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Bitte frage den Administrator deines Heimservers (%(homeserverDomain)s) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.", "Disconnect from the identity server ?": "Verbindung zum Identitätsserver trennen?", "Add Email Address": "E-Mail-Adresse hinzufügen", @@ -1341,11 +1341,11 @@ "My Ban List": "Meine Bannliste", "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzer:innen und Servern, die du blockiert hast - verlasse diesen Raum nicht!", "Accept to continue:": "Akzeptiere , um fortzufahren:", - "Change identity server": "Wechsle den Identitätsserver", + "Change identity server": "Identitätsserver wechseln", "You should remove your personal data from identity server before disconnecting. Unfortunately, identity server is currently offline or cannot be reached.": "Du solltest deine persönlichen Daten vom Identitätsserver entfernen, bevor du die Verbindung trennst. Leider ist der Identitätsserver derzeit offline oder kann nicht erreicht werden.", "You should:": "Du solltest:", "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "Überprüfe deinen Browser auf Erweiterungen, die den Identitätsserver blockieren könnten (z.B. Privacy Badger)", - "Error upgrading room": "Fehler beim Raum-Aufrüsten", + "Error upgrading room": "Fehler beim Aktualisieren des Raumes", "Double check that your server supports the room version chosen and try again.": "Überprüfe nochmal ob dein Server die ausgewählte Raumversion unterstützt und versuche es nochmal.", "%(senderName)s placed a voice call.": "%(senderName)s hat einen Sprachanruf getätigt.", "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hat einen Sprachanruf getätigt. (Nicht von diesem Browser unterstützt)", @@ -1374,7 +1374,7 @@ "Later": "Später", "Review": "Überprüfen", "Verify": "Verifizieren", - "Decline (%(counter)s)": "Ablehnen (%(counter)s)", + "Decline (%(counter)s)": "(%(counter)s) ablehnen", "not found": "nicht gefunden", "rooms.": "Räumen zu speichern.", "Manage": "Verwalten", @@ -1437,7 +1437,7 @@ "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du erhältst keine Push-Benachrichtigungen zu anderen Sitzungen, bis du dich wieder bei diesen anmeldest", "Notification sound": "Benachrichtigungston", "Set a new custom sound": "Setze einen neuen benutzerdefinierten Ton", - "Browse": "Durchsuche", + "Browse": "Durchsuchen", "Direct Messages": "Direktnachrichten", "You can use /help to list available commands. Did you mean to send this as a message?": "Du kannst /help benutzen, um verfügbare Befehle aufzulisten. Willst du dies als Nachricht senden?", "Direct message": "Direktnachricht", @@ -1507,7 +1507,7 @@ "Compare unique emoji": "Vergleiche einzigartige Emojis", "Start": "Starte", "Discovery": "Kontakte", - "Done": "Erledigt", + "Done": "Fertig", "Trusted": "Vertrauenswürdig", "Not trusted": "Nicht vertrauenswürdig", "%(count)s verified sessions|one": "1 verifizierte Sitzung", @@ -1530,8 +1530,8 @@ "Explore": "Erkunde", "Explore rooms": "Räume erkunden", "Maximize apps": "Apps maximieren", - "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Dein bereitgestellter Signaturschlüssel passt zu dem Schlüssel, der von %(userId)s's Sitzung %(deviceId)s empfangen wurde. Sitzung wird als verifiziert markiert.", - "Match system theme": "An System-Design anpassen", + "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Dein bereitgestellter Signaturschlüssel passt zum Schlüssel, der von %(userId)s's Sitzung %(deviceId)s empfangen wurde. Sitzung wird als verifiziert markiert.", + "Match system theme": "An Systemdesign anpassen", "Verify this session by completing one of the following:": "Verifiziere diese Sitzung, indem du eine der folgenden Aktionen ausführst:", "Your homeserver does not support session management.": "Dein Heimserver unterstützt keine Sitzungsverwaltung.", "Unable to load session list": "Sitzungsliste kann nicht geladen werden", @@ -1562,7 +1562,7 @@ "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?", "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse 2%(addresses)s für diesen Raum hinzugefügt.", "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.", - "Displays information about a user": "Zeigt Informationen über ein/e Benutzer!n", + "Displays information about a user": "Zeigt Informationen über Benutzer:in", "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.", "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.", "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt.", @@ -1654,7 +1654,7 @@ "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs", "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer:in, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.", "a few seconds from now": "in ein paar Sekunden", - "Manually verify all remote sessions": "Verifiziere alle Remotesitzungen", + "Manually verify all remote sessions": "Alle Remotesitzungen manuell verifizieren", "Confirm the emoji below are displayed on both sessions, in the same order:": "Bestätige, dass die unten angezeigten Emojis auf beiden Sitzungen in der selben Reihenfolge angezeigt werden:", "Verify this session by confirming the following number appears on its screen.": "Verfiziere diese Sitzung, indem du bestätigst, dass die folgende Nummer auf ihrem Bildschirm erscheint.", "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Warte auf deine andere Sitzung,%(deviceName)s /%(deviceId)s), um zu verfizieren…", @@ -1724,7 +1724,7 @@ "Upgrade this room to the recommended room version": "Aktualisiere diesen Raum auf die empfohlene Raumversion", "this room": "Dieser Raum", "View older messages in %(roomName)s.": "Zeige alte Nachrichten in %(roomName)s.", - "Send a bug report with logs": "Sende einen Fehlerbericht mit Logs", + "Send a bug report with logs": "Einen Fehlerbericht mit Logs senden", "Verify all your sessions to ensure your account & messages are safe": "Verifiziere alle deine Sitzungen, um dein Konto und deine Nachrichten zu schützen", "Verify your other session using one of the options below.": "Verifiziere deine andere Sitzung mit einer der folgenden Optionen.", "You signed in to a new session without verifying it:": "Du hast dich in einer neuen Sitzung angemeldet ohne sie zu verifizieren:", @@ -2186,7 +2186,7 @@ "Font scaling": "Schriftskalierung", "Font size": "Schriftgröße", "IRC display name width": "Breite des IRC Anzeigenamens", - "Size must be a number": "Größe muss eine Zahl sein", + "Size must be a number": "Schriftgröße muss eine Zahl sein", "Custom font size can only be between %(min)s pt and %(max)s pt": "Eigene Schriftgröße kann nur eine Zahl zwischen %(min)s pt und %(max)s pt sein", "Use between %(min)s pt and %(max)s pt": "Verwende eine Zahl zwischen %(min)s pt und %(max)s pt", "Appearance": "Erscheinungsbild", @@ -2197,8 +2197,8 @@ "Room name or address": "Raumname oder -adresse", "Joins room with given address": "Tritt dem Raum unter der angegebenen Adresse bei", "Unrecognised room address:": "Unbekannte Raumadresse:", - "Help us improve %(brand)s": "Hilf uns %(brand)s zu verbessern", - "Send anonymous usage data which helps us improve %(brand)s. This will use a cookie.": "Hilf uns %(brand)s zu verbessern, indem du anonyme Nutzungsdaten schickst. Dies wird ein Cookie verwenden.", + "Help us improve %(brand)s": "Hilf uns, %(brand)s zu verbessern", + "Send anonymous usage data which helps us improve %(brand)s. This will use a cookie.": "Hilf uns, %(brand)s zu verbessern, indem du anonyme Nutzungsdaten schickst. Dies wird ein Cookie verwenden.", "I want to help": "Ich möchte helfen", "Your homeserver has exceeded its user limit.": "Dein Heimserver hat das Benutzerlimit erreicht.", "Your homeserver has exceeded one of its resource limits.": "Dein Heimserver hat eine seiner Ressourcengrenzen erreicht.", @@ -2322,7 +2322,7 @@ "You changed the room topic": "Du hast das Raumthema geändert", "%(senderName)s changed the room topic": "%(senderName)s hat das Raumthema geändert", "New spinner design": "Neue Warteanimation", - "Use a more compact ‘Modern’ layout": "Verwende ein kompakteres 'modernes' Layout", + "Use a more compact ‘Modern’ layout": "Kompakteres 'modernes' Layout verwenden", "Message deleted on %(date)s": "Nachricht am %(date)s gelöscht", "Wrong file type": "Falscher Dateityp", "Wrong Recovery Key": "Falscher Wiederherstellungsschlüssel", @@ -2338,7 +2338,7 @@ "Use your account to sign in to the latest version": "Melde dich mit deinem Account in der neuesten Version an", "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s", "Enable advanced debugging for the room list": "Erweiterte Fehlersuche für die Raumliste aktivieren", - "Enable experimental, compact IRC style layout": "Kompaktes, experimentelles Layout im IRC-Stil aktivieren", + "Enable experimental, compact IRC style layout": "Kompaktes Layout im IRC-Stil verwenden(experimentell)", "User menu": "Benutzermenü", "%(brand)s Web": "%(brand)s Web", "%(brand)s Desktop": "%(brand)s Desktop", @@ -2469,8 +2469,8 @@ "About": "Über", "%(count)s people|other": "%(count)s Personen", "%(count)s people|one": "%(count)s Person", - "Show files": "Dateien anzeigen", - "Room settings": "Raum-Einstellungen", + "Show files": "Gesendete Dateien", + "Room settings": "Raumeinstellungen", "Take a picture": "Foto aufnehmen", "Pin to room": "An Raum anheften", "You can only pin 2 apps at a time": "Du kannst nur 2 Apps gleichzeitig anheften", @@ -2556,7 +2556,7 @@ "Takes the call in the current room off hold": "Beendet das Halten des Anrufs", "Places the call in the current room on hold": "Den aktuellen Anruf halten", "Uzbekistan": "Usbekistan", - "Send stickers into this room": "Stickers in diesen Raum senden", + "Send stickers into this room": "Sticker in diesen Raum senden", "Send stickers into your active room": "Sticker in deinen aktiven Raum senden", "Change which room you're viewing": "Ändern, welchen Raum du siehst", "Change the topic of this room": "Das Thema von diesem Raum ändern", @@ -2571,7 +2571,7 @@ "See when the avatar changes in this room": "Sehen wenn der Avatar sich in diesem Raum ändert", "Change the avatar of your active room": "Den Avatar deines aktiven Raums ändern", "See when the avatar changes in your active room": "Sehen wenn ein Avatar in deinem aktiven Raum geändert wird", - "Send stickers to this room as you": "Einen Sticker in diesen Raum als du senden", + "Send stickers to this room as you": "Einen Sticker in diesen Raum senden", "See when a sticker is posted in this room": "Sehe wenn ein Sticker in diesen Raum gesendet wird", "Send stickers to your active room as you": "Einen Sticker als du in deinen aktiven Raum senden", "See when anyone posts a sticker to your active room": "Sehen, wenn jemand einen Sticker in deinen aktiven Raum sendet", @@ -2581,7 +2581,7 @@ "See %(eventType)s events posted to this room": "In diesem Raum gesendete %(eventType)s-Events anzeigen", "Send %(eventType)s events as you in your active room": "%(eventType)s-Events als du in deinem aktiven Raum senden", "See %(eventType)s events posted to your active room": "In deinem aktiven Raum gesendete %(eventType)s-Events anzeigen", - "The %(capability)s capability": "Die %(capability)s Fähigkeit", + "The %(capability)s capability": "Die %(capability)s-Fähigkeit", "Send messages as you in this room": "Nachrichten als du in diesem Raum senden", "Send messages as you in your active room": "Eine Nachricht als du in deinen aktiven Raum senden", "See messages posted to this room": "In diesen Raum gesendete Nachrichten anzeigen", @@ -2592,7 +2592,7 @@ "See text messages posted to your active room": "In deinen aktiven Raum gesendete Textnachrichten anzeigen", "Send emotes as you in this room": "Emojis als du in diesen Raum senden", "Send emotes as you in your active room": "Emojis als du in deinen aktiven Raum senden", - "See emotes posted to this room": "In diesem Raum gesendete Emojis anzeigen", + "See emotes posted to this room": "In diesen Raum gesendete Emojis anzeigen", "See emotes posted to your active room": "In deinen aktiven Raum gesendete Emojis anzeigen", "See videos posted to your active room": "In deinen aktiven Raum gesendete Videos anzeigen", "See videos posted to this room": "In diesen Raum gesendete Videos anzeigen", @@ -2619,7 +2619,7 @@ "Use Command + Enter to send a message": "Benutze Betriebssystemtaste + Enter um eine Nachricht zu senden", "Use Ctrl + Enter to send a message": "Benutze Strg + Enter um eine Nachricht zu senden", "Call Paused": "Anruf pausiert", - "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von den Räumen %(rooms)s zu speichern.", + "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von %(rooms)s Räumen zu speichern.", "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten vom Raum %(rooms)s zu speichern.", "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur ihr zwei seid in dieser Konversation, außer einer von euch lädt jemanden neues ein.", "This is the beginning of your direct message history with .": "Dies ist der Beginn deiner Direktnachrichtenhistorie mit .", @@ -2968,7 +2968,7 @@ "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Stellt ┬──┬ ノ( ゜-゜ノ) einer Klartextnachricht voran", "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Stellt (╯°□°）╯︵ ┻━┻ einer Klartextnachricht voran", "Effects": "Effekte", - "You've reached the maximum number of simultaneous calls.": "Du hast die maximale Anzahl gleichzeitiger Anrufe erreicht.", + "You've reached the maximum number of simultaneous calls.": "Du hast die maximale Anzahl gleichzeitig möglicher Anrufe erreicht.", "Too Many Calls": "Zu viele Anrufe", "Call failed because webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen, weil nicht auf die Webcam oder der das Mikrofon zugegriffen werden konnte. Prüfe nach, ob:", "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf ist fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon angesteckt und richtig konfiguriert ist.", @@ -3004,7 +3004,7 @@ "Dial pad": "Wähltastatur", "There was an error looking up the phone number": "Beim Suchen der Telefonnummer ist ein Fehler aufgetreten", "Change which room, message, or user you're viewing": "Ändere welchen Raum, Nachricht oder Nutzer:in du siehst", - "Unable to look up phone number": "Telefonnummer kann nicht gesucht werden", + "Unable to look up phone number": "Telefonnummer konnte nicht gefunden werden", "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "In dieser Sitzung wurde festgestellt, dass deine Sicherheitsphrase und dein Schlüssel für sichere Nachrichten entfernt wurden.", "A new Security Phrase and key for Secure Messages have been detected.": "Eine neue Sicherheitsphrase und ein neuer Schlüssel für sichere Nachrichten wurden erkannt.", "Make a copy of your Security Key": "Mache eine Kopie von deinem Sicherheitsschlüssel", @@ -3040,7 +3040,7 @@ "Use app for a better experience": "Nutze die App für eine bessere Erfahrung", "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Wir haben deinen Browser gebeten, sich zu merken, bei welchem Homeserver du dich anmeldest, aber dein Browser hat dies leider vergessen. Gehe zur Anmeldeseite und versuche es erneut.", "Show stickers button": "Sticker-Schaltfläche anzeigen", - "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver hat deinen Anmeldeversuch abgelehnt. Dies könnte daran liegen, dass der Prozess einfach zu lange dauert. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administrator.", + "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver hat deinen Anmeldeversuch abgelehnt. Vielleicht dauert der Prozess einfach zu lange. Bitte versuche es erneut. Wenn dies öfters passiert, wende dich bitte an deine Homeserver-Administration.", "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver war nicht erreichbar und konnte dich nicht anmelden. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deinem Homeserver-Administrator.", "We couldn't log you in": "Wir konnten dich nicht anmelden", "Windows": "Fenster", @@ -3110,5 +3110,7 @@ "Delete": "Löschen", "This homeserver has been blocked by its administrator.": "Dieser Heimserver wurde von ihrer Administration geblockt.", "You're already in a call with this person.": "Du bist schon in einem Anruf mit dieser Person.", - "Already in call": "Schon im Anruf" + "Already in call": "Schon im Anruf", + "Invite people": "Personen einladen", + "Jump to the bottom of the timeline when you send a message": "Nach dem Senden einer Nachricht im Chatverlauf nach unten scrollen" } From c2f6b5a13b6ebef634fdea0d25ad4949d14ee073 Mon Sep 17 00:00:00 2001 From: Sven Grewe Date: Fri, 12 Mar 2021 17:56:31 +0000 Subject: [PATCH 029/163] Translated using Weblate (German) Currently translated at 96.7% (2795 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 0981cf3f3d..7ee639ff16 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -12,10 +12,10 @@ "Name": "Name", "Session ID": "Sitzungs-ID", "Displays action": "Zeigt Aktionen an", - "Bans user with given id": "Verbannt den/die Benutzer:in mit der angegebenen ID", + "Bans user with given id": "Verbannt den Benutzer mit der angegebenen ID", "Deops user with given id": "Setzt das Berechtigungslevel des/der Benutzer:in mit der angegebenen ID zurück", - "Invites user with given id to current room": "Lädt den/die Benutzer:in mit der angegebenen ID in den aktuellen Raum ein", - "Kicks user with given id": "Benutzer:in mit der angegebenen ID kicken", + "Invites user with given id to current room": "Lädt den Benutzer mit der angegebenen ID in den aktuellen Raum ein", + "Kicks user with given id": "Benutzer mit der angegebenen ID kicken", "Changes your display nickname": "Ändert deinen Anzeigenamen", "Change Password": "Passwort ändern", "Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse", @@ -426,7 +426,7 @@ "Unignored user": "Benutzer:in nicht mehr ignoriert", "Ignored user": "Benutzer:in ignoriert", "Stops ignoring a user, showing their messages going forward": "Benutzer:in nicht mehr ignorieren und neue Nachrichten wieder anzeigen", - "Ignores a user, hiding their messages from you": "Ignoriert eine:n Benutzer:in und verbirgt dessen/deren Nachrichten", + "Ignores a user, hiding their messages from you": "Ignoriert einen Benutzer und verbirgt dessen Nachrichten", "Banned by %(displayName)s": "Verbannt von %(displayName)s", "Description": "Beschreibung", "Unable to accept invite": "Einladung kann nicht angenommen werden", @@ -1243,7 +1243,7 @@ "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Momentan ist es nicht möglich mit einer Datei zu antworten. Möchtest Du die Datei hochladen ohne zu antworten?", "The file '%(fileName)s' failed to upload.": "Die Datei \"%(fileName)s\" konnte nicht hochgeladen werden.", "Changes your avatar in this current room only": "Ändert deinen Avatar für diesen Raum", - "Unbans user with given ID": "Hebt die Verbannung des/der Benutzer:in mit der angegebenen ID auf", + "Unbans user with given ID": "Entbannt den Benutzer mit der angegebenen ID", "Sends the given message coloured as a rainbow": "Sendet die Nachricht in Regenbogenfarben", "Adds a custom widget by URL to the room": "Fügt ein Benutzer-Widget über eine URL zum Raum hinzu", "Please supply a https:// or http:// widget URL": "Bitte gib eine https:// oder http:// Widget-URL an", From 15c546cdbc24bc7f342498c530968b3feef59c41 Mon Sep 17 00:00:00 2001 From: "@a2sc:matrix.org" Date: Fri, 12 Mar 2021 17:50:26 +0000 Subject: [PATCH 030/163] Translated using Weblate (German) Currently translated at 96.7% (2795 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 7ee639ff16..18872070c9 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -416,7 +416,7 @@ "You are now ignoring %(userId)s": "%(userId)s wird jetzt ignoriert", "You are no longer ignoring %(userId)s": "%(userId)s wird nicht mehr ignoriert", "Leave": "Verlassen", - "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer konnten nicht in die Gruppe %(groupId)s eingeladen werden:", + "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht in die Gruppe %(groupId)s eingeladen werden:", "Leave %(groupName)s?": "%(groupName)s verlassen?", "Add a Room": "Raum hinzufügen", "Add a User": "Benutzer:in hinzufügen", @@ -430,7 +430,7 @@ "Banned by %(displayName)s": "Verbannt von %(displayName)s", "Description": "Beschreibung", "Unable to accept invite": "Einladung kann nicht angenommen werden", - "Failed to invite users to %(groupId)s": "Benutzer konnten nicht in %(groupId)s eingeladen werden", + "Failed to invite users to %(groupId)s": "Benutzer:innen konnten nicht in %(groupId)s eingeladen werden", "Unable to reject invite": "Einladung konnte nicht abgelehnt werden", "Who would you like to add to this summary?": "Wen möchtest zu dieser Übersicht hinzufügen?", "Add to summary": "Zur Übersicht hinzufügen", @@ -469,7 +469,7 @@ "Which rooms would you like to add to this community?": "Welche Räume sollen zu dieser Community hinzugefügt werden?", "Add rooms to the community": "Räume zur Community hinzufügen", "Add to community": "Zur Community hinzufügen", - "Failed to invite users to community": "Benutzer konnten nicht in die Community eingeladen werden", + "Failed to invite users to community": "Benutzer:innen konnten nicht in die Community eingeladen werden", "Communities": "Communities", "Invalid community ID": "Ungültige Community-ID", "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID", From 097c2d8be0ca1dabca2d024347c72f9002901769 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 11 Mar 2021 21:28:40 -0700 Subject: [PATCH 031/163] Add labs flag for voice messages --- src/i18n/strings/en_EN.json | 1 + src/settings/Settings.ts | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 07d292a0e7..1a66e0cfee 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -783,6 +783,7 @@ "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s", "Change notification settings": "Change notification settings", "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.", + "Send and receive voice messages": "Send and receive voice messages", "Render LaTeX maths in messages": "Render LaTeX maths in messages", "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.", "New spinner design": "New spinner design", diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts index 4f589ba49a..b718ddd8d2 100644 --- a/src/settings/Settings.ts +++ b/src/settings/Settings.ts @@ -128,6 +128,12 @@ export const SETTINGS: {[setting: string]: ISetting} = { default: false, controller: new ReloadOnChangeController(), }, + "feature_voice_messages": { + isFeature: true, + displayName: _td("Send and receive voice messages"), + supportedLevels: LEVELS_FEATURE, + default: false, + }, "feature_latex_maths": { isFeature: true, displayName: _td("Render LaTeX maths in messages"), From be2e30df0d891b4df7fb78778c723a3b45b3fb1a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 11 Mar 2021 22:05:47 -0700 Subject: [PATCH 032/163] Add an early voice recorder utility class --- package.json | 1 + src/@types/global.d.ts | 2 + src/index.js | 2 + src/voice/VoiceRecorder.ts | 116 +++++++++++++++++++++++++++++++++++++ yarn.lock | 5 ++ 5 files changed, 126 insertions(+) create mode 100644 src/voice/VoiceRecorder.ts diff --git a/package.json b/package.json index f8b4287197..a4b425d0cc 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,7 @@ "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-widget-api": "^0.1.0-beta.13", "minimist": "^1.2.5", + "opus-recorder": "^8.0.3", "pako": "^2.0.3", "parse5": "^6.0.1", "png-chunks-extract": "^1.0.0", diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts index 4aa6df5488..051e5cc429 100644 --- a/src/@types/global.d.ts +++ b/src/@types/global.d.ts @@ -39,6 +39,7 @@ import {ModalWidgetStore} from "../stores/ModalWidgetStore"; import { WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore"; import VoipUserMapper from "../VoipUserMapper"; import {SpaceStoreClass} from "../stores/SpaceStore"; +import {VoiceRecorder} from "../voice/VoiceRecorder"; declare global { interface Window { @@ -70,6 +71,7 @@ declare global { mxModalWidgetStore: ModalWidgetStore; mxVoipUserMapper: VoipUserMapper; mxSpaceStore: SpaceStoreClass; + mxVoiceRecorder: typeof VoiceRecorder; } interface Document { diff --git a/src/index.js b/src/index.js index 008e15ad90..1ef760dab9 100644 --- a/src/index.js +++ b/src/index.js @@ -28,3 +28,5 @@ export function resetSkin() { export function getComponent(componentName) { return Skinner.getComponent(componentName); } + +import "./voice/VoiceRecorder"; // TODO: @@ REMOVE diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts new file mode 100644 index 0000000000..2764d94174 --- /dev/null +++ b/src/voice/VoiceRecorder.ts @@ -0,0 +1,116 @@ +/* +Copyright 2021 The Matrix.org Foundation C.I.C. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import * as Recorder from 'opus-recorder'; +import encoderPath from 'opus-recorder/dist/encoderWorker.min.js'; +import {MatrixClient} from "matrix-js-sdk/src/client"; +import CallMediaHandler from "../CallMediaHandler"; +import {sleep} from "../utils/promise"; + +export class VoiceRecorder { + private recorder = new Recorder({ + encoderPath, // magic from webpack + mediaTrackConstraints: { + deviceId: CallMediaHandler.getAudioInput(), + }, + encoderSampleRate: 16000, // we could go down to 12khz, but we lose quality + encoderApplication: 2048, // voice (default is "audio") + streamPages: true, // so we can have a live EQ for the user + encoderFrameSize: 10, // we want updates fairly regularly for the UI + }); + private buffer = new Uint8Array(0); + private mxc: string; + private recording = false; + + public constructor(private client: MatrixClient) { + this.recorder.ondataavailable = (a: ArrayBuffer) => { + // TODO: @@ We'll have to decode each frame and convert it to an EQ to observe + console.log(a); + const buf = new Uint8Array(a); + const newBuf = new Uint8Array(this.buffer.length + buf.length); + newBuf.set(this.buffer, 0); + newBuf.set(buf, this.buffer.length); + this.buffer = newBuf; + }; + } + + public get isSupported(): boolean { + return !!Recorder.isRecordingSupported(); + } + + public get hasRecording(): boolean { + return this.buffer.length > 0; + } + + public get mxcUri(): string { + if (!this.mxc) { + throw new Error("Recording has not been uploaded yet"); + } + return this.mxc; + } + + public async start(): Promise { + if (this.mxc || this.hasRecording) { + throw new Error("Recording already prepared"); + } + if (this.recording) { + throw new Error("Recording already in progress"); + } + return this.recorder.start().then(() => this.recording = true); + } + + public async stop(): Promise { + if (!this.recording) { + throw new Error("No recording to stop"); + } + return new Promise(resolve => { + this.recorder.stop().then(() => { + this.recording = false; + return this.recorder.close(); + }).then(() => resolve(this.buffer)); + }); + } + + public async upload(): Promise { + if (!this.hasRecording) { + throw new Error("No recording available to upload"); + } + + if (this.mxc) return this.mxc; + + this.mxc = await this.client.uploadContent(new Blob([this.buffer], { + type: "audio/ogg", + }), { + onlyContentUri: false, // to stop the warnings in the console + }).then(r => r['content_uri']); + return this.mxc; + } + + // TODO: @@ REMOVE + public async test() { + this.start() + .then(() => sleep(5000)) + .then(() => this.stop()) + .then(() => this.upload()) + .then(() => this.client.sendMessage("!HKjSnKDluFnCCnjayl:localhost", { + body: "Voice message", + msgtype: "m.audio", // TODO + url: this.mxc, + })); + } +} + +window.mxVoiceRecorder = VoiceRecorder; diff --git a/yarn.lock b/yarn.lock index 58686248f7..1763a42e75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6096,6 +6096,11 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" +opus-recorder@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.3.tgz#f7b44f8f68500c9b96a15042a69f915fd9c1716d" + integrity sha512-8vXGiRwlJAavT9D3yYzukNVXQ8vEcKHcsQL/zXO24DQtJ0PLXvoPHNQPJrbMCdB4ypJgWDExvHF4JitQDL7dng== + os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" From b5d32d92f31a9d65f02ae048c55360aef9e58296 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 15 Mar 2021 22:16:58 -0600 Subject: [PATCH 033/163] Wire up a simple record button --- .../views/rooms/_BasicMessageComposer.scss | 5 ++ res/css/views/rooms/_MessageComposer.scss | 4 + res/img/voip/mic-on-mask.svg | 3 + .../views/rooms/BasicMessageComposer.tsx | 3 + src/components/views/rooms/MessageComposer.js | 31 ++++++-- .../views/rooms/SendMessageComposer.js | 2 + .../views/rooms/VoiceRecordComposerTile.tsx | 74 +++++++++++++++++++ src/i18n/strings/en_EN.json | 1 + src/voice/VoiceRecorder.ts | 12 +++ 9 files changed, 130 insertions(+), 5 deletions(-) create mode 100644 res/img/voip/mic-on-mask.svg create mode 100644 src/components/views/rooms/VoiceRecordComposerTile.tsx diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss index e126e523a6..4f58c08617 100644 --- a/res/css/views/rooms/_BasicMessageComposer.scss +++ b/res/css/views/rooms/_BasicMessageComposer.scss @@ -66,6 +66,11 @@ limitations under the License. } } } + + &.mx_BasicMessageComposer_input_disabled { + pointer-events: none; + cursor: not-allowed; + } } .mx_BasicMessageComposer_AutoCompleteWrapper { diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss index dea1b58741..e6c0cc3f46 100644 --- a/res/css/views/rooms/_MessageComposer.scss +++ b/res/css/views/rooms/_MessageComposer.scss @@ -227,6 +227,10 @@ limitations under the License. mask-image: url('$(res)/img/element-icons/room/composer/attach.svg'); } +.mx_MessageComposer_voiceMessage::before { + mask-image: url('$(res)/img/voip/mic-on-mask.svg'); +} + .mx_MessageComposer_emoji::before { mask-image: url('$(res)/img/element-icons/room/composer/emoji.svg'); } diff --git a/res/img/voip/mic-on-mask.svg b/res/img/voip/mic-on-mask.svg new file mode 100644 index 0000000000..418316b164 --- /dev/null +++ b/res/img/voip/mic-on-mask.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx index 5ab2b82a32..223a7a5395 100644 --- a/src/components/views/rooms/BasicMessageComposer.tsx +++ b/src/components/views/rooms/BasicMessageComposer.tsx @@ -93,6 +93,7 @@ interface IProps { placeholder?: string; label?: string; initialCaret?: DocumentOffset; + disabled?: boolean; onChange?(); onPaste?(event: ClipboardEvent, model: EditorModel): boolean; @@ -672,6 +673,7 @@ export default class BasicMessageEditor extends React.Component }); const classes = classNames("mx_BasicMessageComposer_input", { "mx_BasicMessageComposer_input_shouldShowPillAvatar": this.state.showPillAvatar, + "mx_BasicMessageComposer_input_disabled": this.props.disabled, }); const shortcuts = { @@ -704,6 +706,7 @@ export default class BasicMessageEditor extends React.Component aria-expanded={Boolean(this.state.autoComplete)} aria-activedescendant={completionIndex >= 0 ? generateCompletionDomId(completionIndex) : undefined} dir="auto" + aria-disabled={this.props.disabled} />
); } diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js index ccf097c4fd..2efda53bc2 100644 --- a/src/components/views/rooms/MessageComposer.js +++ b/src/components/views/rooms/MessageComposer.js @@ -33,6 +33,7 @@ import WidgetStore from "../../../stores/WidgetStore"; import {UPDATE_EVENT} from "../../../stores/AsyncStore"; import ActiveWidgetStore from "../../../stores/ActiveWidgetStore"; import {replaceableComponent} from "../../../utils/replaceableComponent"; +import VoiceRecordComposerTile from "./VoiceRecordComposerTile"; function ComposerAvatar(props) { const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar'); @@ -187,6 +188,7 @@ export default class MessageComposer extends React.Component { hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room), joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room), isComposerEmpty: true, + haveRecording: false, }; } @@ -325,6 +327,10 @@ export default class MessageComposer extends React.Component { }); } + onVoiceUpdate = (haveRecording: boolean) => { + this.setState({haveRecording}); + }; + render() { const controls = [ this.state.me ? : null, @@ -346,17 +352,32 @@ export default class MessageComposer extends React.Component { permalinkCreator={this.props.permalinkCreator} replyToEvent={this.props.replyToEvent} onChange={this.onChange} - />, - , - , + // TODO: TravisR - Disabling the composer doesn't work + disabled={this.state.haveRecording} + /> ); + if (!this.state.haveRecording) { + controls.push( + , + , + ); + } + if (SettingsStore.getValue(UIFeature.Widgets) && - SettingsStore.getValue("MessageComposerInput.showStickersButton")) { + SettingsStore.getValue("MessageComposerInput.showStickersButton") && + !this.state.haveRecording) { controls.push(); } - if (!this.state.isComposerEmpty) { + if (SettingsStore.getValue("feature_voice_messages")) { + controls.push(); + } + + if (!this.state.isComposerEmpty || this.state.haveRecording) { controls.push( , ); diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js index ba3076c07d..aed1bb36fe 100644 --- a/src/components/views/rooms/SendMessageComposer.js +++ b/src/components/views/rooms/SendMessageComposer.js @@ -120,6 +120,7 @@ export default class SendMessageComposer extends React.Component { permalinkCreator: PropTypes.object.isRequired, replyToEvent: PropTypes.object, onChange: PropTypes.func, + disabled: PropTypes.bool, }; static contextType = MatrixClientContext; @@ -556,6 +557,7 @@ export default class SendMessageComposer extends React.Component { label={this.props.placeholder} placeholder={this.props.placeholder} onPaste={this._onPaste} + disabled={this.props.disabled} /> ); diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx new file mode 100644 index 0000000000..9ba3764524 --- /dev/null +++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx @@ -0,0 +1,74 @@ +/* +Copyright 2021 The Matrix.org Foundation C.I.C. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; +import {_t} from "../../../languageHandler"; +import React from "react"; +import {VoiceRecorder} from "../../../voice/VoiceRecorder"; +import {Room} from "matrix-js-sdk/src/models/room"; +import {MatrixClientPeg} from "../../../MatrixClientPeg"; + +interface IProps { + room: Room; + onRecording: (haveRecording: boolean) => void; +} + +interface IState { + recorder?: VoiceRecorder; +} + +export default class VoiceRecordComposerTile extends React.PureComponent { + public constructor(props) { + super(props); + + this.state = { + recorder: null, // not recording by default + }; + } + + private onStartVoiceMessage = async () => { + if (this.state.recorder) { + await this.state.recorder.stop(); + const mxc = await this.state.recorder.upload(); + MatrixClientPeg.get().sendMessage(this.props.room.roomId, { + body: "Voice message", + msgtype: "m.audio", // TODO + url: mxc, + }); + this.setState({recorder: null}); + this.props.onRecording(false); + return; + } + const recorder = new VoiceRecorder(MatrixClientPeg.get()); + await recorder.start(); + this.props.onRecording(true); + // TODO: Run through EQ component + recorder.rawData.onUpdate((frame) => { + console.log('@@ FRAME', frame); + }); + this.setState({recorder}); + }; + + public render() { + return ( + + ); + } +} diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 1a66e0cfee..4654cb1f99 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1636,6 +1636,7 @@ "Invited by %(sender)s": "Invited by %(sender)s", "Jump to first unread message.": "Jump to first unread message.", "Mark all as read": "Mark all as read", + "Record a voice message": "Record a voice message", "Error updating main address": "Error updating main address", "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.", "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.", diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index 2764d94174..df6621d00b 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -19,6 +19,7 @@ import encoderPath from 'opus-recorder/dist/encoderWorker.min.js'; import {MatrixClient} from "matrix-js-sdk/src/client"; import CallMediaHandler from "../CallMediaHandler"; import {sleep} from "../utils/promise"; +import {SimpleObservable} from "matrix-widget-api"; export class VoiceRecorder { private recorder = new Recorder({ @@ -34,6 +35,7 @@ export class VoiceRecorder { private buffer = new Uint8Array(0); private mxc: string; private recording = false; + private observable: SimpleObservable; public constructor(private client: MatrixClient) { this.recorder.ondataavailable = (a: ArrayBuffer) => { @@ -44,9 +46,15 @@ export class VoiceRecorder { newBuf.set(this.buffer, 0); newBuf.set(buf, this.buffer.length); this.buffer = newBuf; + this.observable.update(buf); // send the frame over the observable }; } + public get rawData(): SimpleObservable { + if (!this.recording) throw new Error("No observable when not recording"); + return this.observable; + } + public get isSupported(): boolean { return !!Recorder.isRecordingSupported(); } @@ -69,6 +77,10 @@ export class VoiceRecorder { if (this.recording) { throw new Error("Recording already in progress"); } + if (this.observable) { + this.observable.close(); + } + this.observable = new SimpleObservable(); return this.recorder.start().then(() => this.recording = true); } From b770253c887e93f54273ed225eb38330e76eaa47 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Thu, 11 Mar 2021 05:53:46 +0000 Subject: [PATCH 034/163] Translated using Weblate (Chinese (Traditional)) Currently translated at 99.9% (2887 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 117 +++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 64dab74139..e7d94be8e2 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -3090,5 +3090,120 @@ "Setting ID": "設定 ID", "Failed to save settings": "儲存設定失敗", "Settings Explorer": "設定瀏覽程式", - "Show chat effects (animations when receiving e.g. confetti)": "顯示聊天效果（當收到如五彩紙屑時顯示動畫）" + "Show chat effects (animations when receiving e.g. confetti)": "顯示聊天效果（當收到如五彩紙屑時顯示動畫）", + "Original event source": "原始活動來源", + "Decrypted event source": "解密活動來源", + "We'll create rooms for each of them. You can add existing rooms after setup.": "我們將為每個專案建立聊天室。您可以在設定完成後新增既有的聊天室。", + "What projects are you working on?": "您正在從事哪些專案？", + "We'll create rooms for each topic.": "我們將為每個主題建立聊天室。", + "What are some things you want to discuss?": "您想討論什麼？", + "Inviting...": "邀請……", + "Invite by username": "透過使用者名稱邀請", + "Invite your teammates": "邀請您的隊友", + "Failed to invite the following users to your space: %(csvUsers)s": "無法邀請以下使用者加入您的空間：%(csvUsers)s", + "A private space for you and your teammates": "專為您與您的隊友設計的私人空間", + "Me and my teammates": "我與我的隊友", + "A private space just for you": "專為您設計的私人空間", + "Just Me": "只有我", + "Ensure the right people have access to the space.": "確定適合的人才能存取空間。", + "Who are you working with?": "您與誰一起工作？", + "Finish": "結束", + "At the moment only you can see it.": "目前只有您可以看見它。", + "Creating rooms...": "正在建立聊天室……", + "Skip for now": "現在跳過", + "Failed to create initial space rooms": "建立初始空間聊天室失敗", + "Room name": "聊天室名稱", + "Support": "支援", + "Random": "隨機", + "Welcome to ": "歡迎加入 ", + "Your private space ": "您的私人空間 ", + "Your public space ": "您的公開空間 ", + "You have been invited to ": "您被邀請到 ", + " invited you to ": " 邀請您到 ", + "%(count)s members|one": "%(count)s 位成員", + "%(count)s members|other": "%(count)s 位成員", + "Your server does not support showing space hierarchies.": "您的伺服器不支援顯示空間的層次結構。", + "Default Rooms": "預設聊天室", + "Add existing rooms & spaces": "新增既有聊天室與空間", + "Accept Invite": "接受邀請", + "Find a room...": "尋找聊天室……", + "Manage rooms": "管理聊天室", + "Promoted to users": "升級為使用者", + "Save changes": "儲存變更", + "You're in this room": "您在此聊天室中", + "You're in this space": "您在此空間中", + "No permissions": "無權限", + "Remove from Space": "從空間移除", + "Undo": "復原", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "未傳送您的訊息，因為此家伺服器已被其管理員封鎖。請聯絡您的服務管理員以繼續使用服務。", + "Are you sure you want to leave the space '%(spaceName)s'?": "您確定您要離開空間「%(spaceName)s」？", + "This space is not public. You will not be able to rejoin without an invite.": "此空間並非公開。在無邀請的情況下，您將無法重新加入。", + "Start audio stream": "開始音訊串流", + "Failed to start livestream": "開始直播串流失敗", + "Unable to start audio streaming.": "無法開始音訊串流。", + "Save Changes": "儲存變更", + "Saving...": "正在儲存……", + "View dev tools": "檢視開發者工具", + "Leave Space": "離開空間", + "Make this space private": "將此空間設為私人", + "Edit settings relating to your space.": "編輯關於您空間的設定。", + "Space settings": "空間設定", + "Failed to save space settings.": "無法儲存空間設定。", + "Invite someone using their name, username (like ) or share this space.": "使用某人的名字、使用者名稱（如 ）邀請他們，或分享此空間。", + "Invite someone using their name, email address, username (like ) or share this space.": "使用某人的名字、電子郵件地址、使用者名稱（如 ）邀請他們，或分享此空間。", + "Unnamed Space": "未命名空間", + "Invite to %(spaceName)s": "邀請至 %(spaceName)s", + "Failed to add rooms to space": "新增聊天室到空間失敗", + "Apply": "套用", + "Applying...": "正在套用……", + "Create a new room": "建立新聊天室", + "Don't want to add an existing room?": "不想新增既有的聊天室？", + "Spaces": "空間", + "Filter your rooms and spaces": "過濾您的聊天室與空間", + "Add existing spaces/rooms": "新增既有空間／聊天室", + "Space selection": "空間選取", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "如果您將自己降級，您將無法撤銷此變更，而且如果您是空間中的最後一個高權限使用者，將無法再取得這類權限。", + "Empty room": "空聊天室", + "Suggested Rooms": "建議的聊天室", + "Explore space rooms": "探索空間聊天室", + "You do not have permissions to add rooms to this space": "您無權在此空間中新增聊天室", + "Add existing room": "新增既有的聊天室", + "You do not have permissions to create new rooms in this space": "您無權在此空間中建立新聊天室", + "Send message": "傳送訊息", + "Invite to this space": "邀請至此空間", + "Your message was sent": "您的訊息已傳送", + "Encrypting your message...": "正在加密的您訊息……", + "Sending your message...": "正在傳送您的訊息……", + "Spell check dictionaries": "拼字檢查字典", + "Space options": "空間選項", + "Space Home": "空間首頁", + "New room": "新聊天室", + "Leave space": "離開空間", + "Invite people": "邀請夥伴", + "Share your public space": "分享您的公開空間", + "Invite members": "邀請成員", + "Invite by email or username": "透過電子郵件或使用者名稱邀請", + "Share invite link": "分享邀請連結", + "Click to copy": "點擊複製", + "Collapse space panel": "折疊空間面板", + "Expand space panel": "展開空間面板", + "Creating...": "正在建立……", + "You can change these at any point.": "您隨時可以更改它們。", + "Give it a photo, name and description to help you identify it.": "給它一張照片、名字與描述來協助您識別它。", + "Your private space": "您的私人空間", + "Your public space": "您的公開空間", + "You can change this later": "您之後仍可變更", + "Invite only, best for yourself or teams": "僅邀請，最適合您自己或團隊", + "Private": "私人", + "Open space for anyone, best for communities": "對所有人開放的空間，最適合社群", + "Public": "公開", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "空間是將聊天室與人們分組的新方法。要加入既有的空間，您需要邀請", + "Create a space": "建立空間", + "Delete": "刪除", + "Jump to the bottom of the timeline when you send a message": "傳送訊息時，跳到時間軸底部", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "空間原型。與社群、社群 v2 以及自訂標籤不相容。需要相容的家伺服器才能使用某些功能。", + "This homeserver has been blocked by it's administrator.": "此家伺服器已被其管理員封鎖。", + "This homeserver has been blocked by its administrator.": "此家伺服器已被其管理員封鎖。", + "You're already in a call with this person.": "您已與此人通話。", + "Already in call": "已在通話中" } From dafa8786a1e17b7238a07c058b5e2be10131b32d Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 16 Mar 2021 23:01:37 -0600 Subject: [PATCH 035/163] Fix comments --- src/components/views/rooms/VoiceRecordComposerTile.tsx | 8 ++++---- src/index.js | 2 -- src/voice/VoiceRecorder.ts | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx index 9ba3764524..d15328eb5a 100644 --- a/src/components/views/rooms/VoiceRecordComposerTile.tsx +++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx @@ -55,10 +55,10 @@ export default class VoiceRecordComposerTile extends React.PureComponent { - console.log('@@ FRAME', frame); - }); + // TODO: @@ TravisR: Run through EQ component + // recorder.rawData.onUpdate((frame) => { + // console.log('@@ FRAME', frame); + // }); this.setState({recorder}); }; diff --git a/src/index.js b/src/index.js index 1ef760dab9..008e15ad90 100644 --- a/src/index.js +++ b/src/index.js @@ -28,5 +28,3 @@ export function resetSkin() { export function getComponent(componentName) { return Skinner.getComponent(componentName); } - -import "./voice/VoiceRecorder"; // TODO: @@ REMOVE diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index df6621d00b..e968627fe3 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -39,7 +39,7 @@ export class VoiceRecorder { public constructor(private client: MatrixClient) { this.recorder.ondataavailable = (a: ArrayBuffer) => { - // TODO: @@ We'll have to decode each frame and convert it to an EQ to observe + // TODO: @@ TravisR: We'll have to decode each frame and convert it to an EQ to observe console.log(a); const buf = new Uint8Array(a); const newBuf = new Uint8Array(this.buffer.length + buf.length); @@ -111,7 +111,7 @@ export class VoiceRecorder { return this.mxc; } - // TODO: @@ REMOVE + // TODO: @@ TravisR: REMOVE public async test() { this.start() .then(() => sleep(5000)) From 9aa5348c7fd059ffc1e32f3821e04b5b0ea7345e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 16 Mar 2021 23:43:59 -0600 Subject: [PATCH 036/163] Show a stop button to stop the recording --- res/css/_components.scss | 5 +-- .../views/rooms/_VoiceRecordComposerTile.scss | 36 +++++++++++++++++++ .../legacy-light/css/_legacy-light.scss | 3 ++ res/themes/light/css/_light.scss | 3 ++ .../views/rooms/VoiceRecordComposerTile.tsx | 20 +++++++++-- src/i18n/strings/en_EN.json | 1 + src/voice/VoiceRecorder.ts | 2 +- 7 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 res/css/views/rooms/_VoiceRecordComposerTile.scss diff --git a/res/css/_components.scss b/res/css/_components.scss index d894688cac..9c895490b3 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -111,8 +111,8 @@ @import "./views/elements/_AddressSelector.scss"; @import "./views/elements/_AddressTile.scss"; @import "./views/elements/_DesktopBuildsNotice.scss"; -@import "./views/elements/_DirectorySearchBox.scss"; @import "./views/elements/_DesktopCapturerSourcePicker.scss"; +@import "./views/elements/_DirectorySearchBox.scss"; @import "./views/elements/_Dropdown.scss"; @import "./views/elements/_EditableItemList.scss"; @import "./views/elements/_ErrorBoundary.scss"; @@ -211,13 +211,13 @@ @import "./views/rooms/_SendMessageComposer.scss"; @import "./views/rooms/_Stickers.scss"; @import "./views/rooms/_TopUnreadMessagesBar.scss"; +@import "./views/rooms/_VoiceRecordComposerTile.scss"; @import "./views/rooms/_WhoIsTypingTile.scss"; @import "./views/settings/_AvatarSetting.scss"; @import "./views/settings/_CrossSigningPanel.scss"; @import "./views/settings/_DevicesPanel.scss"; @import "./views/settings/_E2eAdvancedPanel.scss"; @import "./views/settings/_EmailAddresses.scss"; -@import "./views/settings/_SpellCheckLanguages.scss"; @import "./views/settings/_IntegrationManager.scss"; @import "./views/settings/_Notifications.scss"; @import "./views/settings/_PhoneNumbers.scss"; @@ -225,6 +225,7 @@ @import "./views/settings/_SecureBackupPanel.scss"; @import "./views/settings/_SetIdServer.scss"; @import "./views/settings/_SetIntegrationManager.scss"; +@import "./views/settings/_SpellCheckLanguages.scss"; @import "./views/settings/_UpdateCheckButton.scss"; @import "./views/settings/tabs/_SettingsTab.scss"; @import "./views/settings/tabs/room/_GeneralRoomSettingsTab.scss"; diff --git a/res/css/views/rooms/_VoiceRecordComposerTile.scss b/res/css/views/rooms/_VoiceRecordComposerTile.scss new file mode 100644 index 0000000000..469a3de66a --- /dev/null +++ b/res/css/views/rooms/_VoiceRecordComposerTile.scss @@ -0,0 +1,36 @@ +/* +Copyright 2021 The Matrix.org Foundation C.I.C. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_VoiceRecordComposerTile_stop { + // 28px plus a 2px border makes this a 32px square (as intended) + width: 28px; + height: 28px; + border: 2px solid $voice-record-stop-border-color; + border-radius: 32px; + margin-right: 16px; // between us and the send button + position: relative; + + &::after { + content: ''; + width: 14px; + height: 14px; + position: absolute; + top: 6px; + left: 6px; + border-radius: 2px; + background-color: $voice-record-stop-symbol-color; + } +} diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index 9ad154dd93..d7ee496d80 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -189,6 +189,9 @@ $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%) $groupFilterPanel-divider-color: $roomlist-header-color; $space-button-outline-color: #E3E8F0; +$voice-record-stop-border-color: #E3E8F0; +$voice-record-stop-symbol-color: $warning-color; + $roomtile-preview-color: #9e9e9e; $roomtile-default-badge-bg-color: #61708b; $roomtile-selected-bg-color: #fff; diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 25fbd0201b..577204ef0c 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -180,6 +180,9 @@ $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%) $groupFilterPanel-divider-color: $roomlist-header-color; $space-button-outline-color: #E3E8F0; +$voice-record-stop-border-color: #E3E8F0; +$voice-record-stop-symbol-color: $warning-color; + $roomtile-preview-color: $secondary-fg-color; $roomtile-default-badge-bg-color: #61708b; $roomtile-selected-bg-color: #FFF; diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx index d15328eb5a..3b31075de2 100644 --- a/src/components/views/rooms/VoiceRecordComposerTile.tsx +++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx @@ -20,6 +20,7 @@ import React from "react"; import {VoiceRecorder} from "../../../voice/VoiceRecorder"; import {Room} from "matrix-js-sdk/src/models/room"; import {MatrixClientPeg} from "../../../MatrixClientPeg"; +import classNames from "classnames"; interface IProps { room: Room; @@ -40,12 +41,13 @@ export default class VoiceRecordComposerTile extends React.PureComponent { + // TODO: @@ TravisR: We do not want to auto-send on stop. if (this.state.recorder) { await this.state.recorder.stop(); const mxc = await this.state.recorder.upload(); MatrixClientPeg.get().sendMessage(this.props.room.roomId, { body: "Voice message", - msgtype: "m.audio", // TODO + msgtype: "m.audio", // TODO @@ url: mxc, }); this.setState({recorder: null}); @@ -63,11 +65,23 @@ export default class VoiceRecordComposerTile extends React.PureComponent ); } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 4654cb1f99..74100ed4b0 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1637,6 +1637,7 @@ "Jump to first unread message.": "Jump to first unread message.", "Mark all as read": "Mark all as read", "Record a voice message": "Record a voice message", + "Stop & send recording": "Stop & send recording", "Error updating main address": "Error updating main address", "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.", "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.", diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index e968627fe3..1e59e451bd 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -119,7 +119,7 @@ export class VoiceRecorder { .then(() => this.upload()) .then(() => this.client.sendMessage("!HKjSnKDluFnCCnjayl:localhost", { body: "Voice message", - msgtype: "m.audio", // TODO + msgtype: "m.audio", // TODO @@ url: this.mxc, })); } From 1dc2427128910a9e6cd5355758153490b62b778a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 16 Mar 2021 23:44:39 -0600 Subject: [PATCH 037/163] Remove test function --- src/voice/VoiceRecorder.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index 1e59e451bd..9080c35b91 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -18,7 +18,6 @@ import * as Recorder from 'opus-recorder'; import encoderPath from 'opus-recorder/dist/encoderWorker.min.js'; import {MatrixClient} from "matrix-js-sdk/src/client"; import CallMediaHandler from "../CallMediaHandler"; -import {sleep} from "../utils/promise"; import {SimpleObservable} from "matrix-widget-api"; export class VoiceRecorder { @@ -110,19 +109,6 @@ export class VoiceRecorder { }).then(r => r['content_uri']); return this.mxc; } - - // TODO: @@ TravisR: REMOVE - public async test() { - this.start() - .then(() => sleep(5000)) - .then(() => this.stop()) - .then(() => this.upload()) - .then(() => this.client.sendMessage("!HKjSnKDluFnCCnjayl:localhost", { - body: "Voice message", - msgtype: "m.audio", // TODO @@ - url: this.mxc, - })); - } } window.mxVoiceRecorder = VoiceRecorder; From f0d5edbc37b20e1421c4471617e0946a03b7fbbf Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 16 Mar 2021 23:48:47 -0600 Subject: [PATCH 038/163] Render voice messages as audio messages for now --- src/components/views/messages/MessageEvent.js | 4 ++++ src/components/views/rooms/VoiceRecordComposerTile.tsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index 866e0f521d..28c2f8f9b9 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -71,6 +71,10 @@ export default class MessageEvent extends React.Component { 'm.file': sdk.getComponent('messages.MFileBody'), 'm.audio': sdk.getComponent('messages.MAudioBody'), 'm.video': sdk.getComponent('messages.MVideoBody'), + + // TODO: @@ TravisR: Use labs flag determination. + // MSC: https://github.com/matrix-org/matrix-doc/pull/2516 + 'org.matrix.msc2516.voice': sdk.getComponent('messages.MAudioBody'), }; const evTypes = { 'm.sticker': sdk.getComponent('messages.MStickerBody'), diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx index 3b31075de2..a1d0e8c12f 100644 --- a/src/components/views/rooms/VoiceRecordComposerTile.tsx +++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx @@ -47,7 +47,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent Date: Tue, 16 Mar 2021 23:50:03 -0600 Subject: [PATCH 039/163] Remove debugging --- src/voice/VoiceRecorder.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index 9080c35b91..66eb64b424 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -39,7 +39,6 @@ export class VoiceRecorder { public constructor(private client: MatrixClient) { this.recorder.ondataavailable = (a: ArrayBuffer) => { // TODO: @@ TravisR: We'll have to decode each frame and convert it to an EQ to observe - console.log(a); const buf = new Uint8Array(a); const newBuf = new Uint8Array(this.buffer.length + buf.length); newBuf.set(this.buffer, 0); From 51dca8d13d670c8fe9bfe5676f8726d0210bc5ac Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 16 Mar 2021 23:54:33 -0600 Subject: [PATCH 040/163] Fix positioning of stop square --- res/css/views/rooms/_VoiceRecordComposerTile.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/css/views/rooms/_VoiceRecordComposerTile.scss b/res/css/views/rooms/_VoiceRecordComposerTile.scss index 469a3de66a..bb36991b4f 100644 --- a/res/css/views/rooms/_VoiceRecordComposerTile.scss +++ b/res/css/views/rooms/_VoiceRecordComposerTile.scss @@ -28,8 +28,8 @@ limitations under the License. width: 14px; height: 14px; position: absolute; - top: 6px; - left: 6px; + top: 7px; + left: 7px; border-radius: 2px; background-color: $voice-record-stop-symbol-color; } From 69f90ee97eef64af7b23a8b91d1c53536b810012 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 16 Mar 2021 23:55:07 -0600 Subject: [PATCH 041/163] Label labs flag as in development --- src/i18n/strings/en_EN.json | 2 +- src/settings/Settings.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 74100ed4b0..625a2e7334 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -783,7 +783,7 @@ "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s", "Change notification settings": "Change notification settings", "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.", - "Send and receive voice messages": "Send and receive voice messages", + "Send and receive voice messages (in development)": "Send and receive voice messages (in development)", "Render LaTeX maths in messages": "Render LaTeX maths in messages", "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.", "New spinner design": "New spinner design", diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts index b718ddd8d2..b38dee6e1a 100644 --- a/src/settings/Settings.ts +++ b/src/settings/Settings.ts @@ -130,7 +130,7 @@ export const SETTINGS: {[setting: string]: ISetting} = { }, "feature_voice_messages": { isFeature: true, - displayName: _td("Send and receive voice messages"), + displayName: _td("Send and receive voice messages (in development)"), supportedLevels: LEVELS_FEATURE, default: false, }, From c7b72bc4c43c26b438f4a5de07a8ecaea2a0a390 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 16 Mar 2021 23:57:27 -0600 Subject: [PATCH 042/163] Appease the linter --- src/components/views/rooms/MessageComposer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js index 2efda53bc2..13f934c626 100644 --- a/src/components/views/rooms/MessageComposer.js +++ b/src/components/views/rooms/MessageComposer.js @@ -354,7 +354,7 @@ export default class MessageComposer extends React.Component { onChange={this.onChange} // TODO: TravisR - Disabling the composer doesn't work disabled={this.state.haveRecording} - /> + />, ); if (!this.state.haveRecording) { From 0f09eb3214984ceb256c30e3c222033edd8854c6 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 17 Mar 2021 00:09:56 -0600 Subject: [PATCH 043/163] Add more notes --- src/components/views/rooms/BasicMessageComposer.tsx | 2 ++ src/components/views/rooms/MessageComposer.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx index 223a7a5395..1a95b4366a 100644 --- a/src/components/views/rooms/BasicMessageComposer.tsx +++ b/src/components/views/rooms/BasicMessageComposer.tsx @@ -673,6 +673,8 @@ export default class BasicMessageEditor extends React.Component }); const classes = classNames("mx_BasicMessageComposer_input", { "mx_BasicMessageComposer_input_shouldShowPillAvatar": this.state.showPillAvatar, + + // TODO: @@ TravisR: This doesn't work properly. The composer resets in a strange way. "mx_BasicMessageComposer_input_disabled": this.props.disabled, }); diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js index 13f934c626..b7078766fb 100644 --- a/src/components/views/rooms/MessageComposer.js +++ b/src/components/views/rooms/MessageComposer.js @@ -352,7 +352,7 @@ export default class MessageComposer extends React.Component { permalinkCreator={this.props.permalinkCreator} replyToEvent={this.props.replyToEvent} onChange={this.onChange} - // TODO: TravisR - Disabling the composer doesn't work + // TODO: @@ TravisR - Disabling the composer doesn't work disabled={this.state.haveRecording} />, ); From c848499f9fc7f83f564d9038c45a77325fe3eccd Mon Sep 17 00:00:00 2001 From: Sven Grewe Date: Tue, 16 Mar 2021 13:56:23 +0000 Subject: [PATCH 044/163] Translated using Weblate (German) Currently translated at 96.7% (2795 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 206 ++++++++++++++++++------------------ 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 18872070c9..a8b2ac7878 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -13,7 +13,7 @@ "Session ID": "Sitzungs-ID", "Displays action": "Zeigt Aktionen an", "Bans user with given id": "Verbannt den Benutzer mit der angegebenen ID", - "Deops user with given id": "Setzt das Berechtigungslevel des/der Benutzer:in mit der angegebenen ID zurück", + "Deops user with given id": "Setzt das Berechtigungslevel beim Benutzer mit der angegebenen ID zurück", "Invites user with given id to current room": "Lädt den Benutzer mit der angegebenen ID in den aktuellen Raum ein", "Kicks user with given id": "Benutzer mit der angegebenen ID kicken", "Changes your display nickname": "Ändert deinen Anzeigenamen", @@ -59,13 +59,13 @@ "Moderator": "Moderator", "Notifications": "Benachrichtigungen", "": "", - "No users have specific privileges in this room": "Keine Nutzer:innen haben in diesem Raum privilegierte Berechtigungen", + "No users have specific privileges in this room": "Keine Nutzer haben in diesem Raum privilegierte Berechtigungen", "Only people who have been invited": "Eingeladene Personen", "Password": "Passwort", "Permissions": "Berechtigungen", "Phone": "Telefon", "Please check your email and click on the link it contains. Once this is done, click continue.": "Bitte prüfe deinen E-Mail-Posteingang und klicke auf den in der E-Mail enthaltenen Link. Anschließend auf \"Fortsetzen\" klicken.", - "Privileged Users": "Privilegierte Nutzer:innen", + "Privileged Users": "Privilegierte Benutzer", "Profile": "Profil", "Reject invitation": "Einladung ablehnen", "Remove": "Entfernen", @@ -89,7 +89,7 @@ "unknown error code": "Unbekannter Fehlercode", "Upload avatar": "Profilbild hochladen", "Upload file": "Datei hochladen", - "Users": "Nutzer:innen", + "Users": "Benutzer", "Verification Pending": "Verifizierung ausstehend", "Video call": "Videoanruf", "Voice call": "Sprachanruf", @@ -228,7 +228,7 @@ "Tried to load a specific point in this room's timeline, but was unable to find it.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden, der Punkt konnte jedoch nicht gefunden werden.", "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Gespräch zu sein, bist du sicher, dass du aufhören willst?", "You seem to be uploading files, are you sure you want to quit?": "Du scheinst Dateien hochzuladen. Bist du sicher schließen zu wollen?", - "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der/die Nutzer!n dasselbe Berechtigungsstufe wie du selbst erhalten wird.", + "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kannst diese Änderung nicht rückgängig machen, da der Nutzer dieselbe Berechtigungsstufe wie du selbst erhalten wird.", "Room": "Raum", "Cancel": "Abbrechen", "Click to unmute video": "Klicken, um die Video-Stummschaltung zu deaktivieren", @@ -390,7 +390,7 @@ "Add a widget": "Widget hinzufügen", "Allow": "Erlauben", "Delete widget": "Widget entfernen", - "Define the power level of a user": "Berechtigungsstufe einer/s Benutzer:in setzen", + "Define the power level of a user": "Berechtigungsstufe einers Benutzers setzen", "Edit": "Bearbeiten", "Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntax-Hervorhebung aktivieren", "To get started, please pick a username!": "Um zu starten, wähle bitte einen Nutzernamen!", @@ -416,31 +416,31 @@ "You are now ignoring %(userId)s": "%(userId)s wird jetzt ignoriert", "You are no longer ignoring %(userId)s": "%(userId)s wird nicht mehr ignoriert", "Leave": "Verlassen", - "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht in die Gruppe %(groupId)s eingeladen werden:", + "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer konnten nicht in die Gruppe %(groupId)s eingeladen werden:", "Leave %(groupName)s?": "%(groupName)s verlassen?", "Add a Room": "Raum hinzufügen", - "Add a User": "Benutzer:in hinzufügen", + "Add a User": "Benutzer hinzufügen", "You have entered an invalid address.": "Du hast eine ungültige Adresse eingegeben.", "Matrix ID": "Matrix-ID", "Unignore": "Nicht mehr ignorieren", - "Unignored user": "Benutzer:in nicht mehr ignoriert", - "Ignored user": "Benutzer:in ignoriert", - "Stops ignoring a user, showing their messages going forward": "Benutzer:in nicht mehr ignorieren und neue Nachrichten wieder anzeigen", + "Unignored user": "Benutzer nicht mehr ignoriert", + "Ignored user": "Benutzer ignoriert", + "Stops ignoring a user, showing their messages going forward": "Benutzer nicht mehr ignorieren und neue Nachrichten wieder anzeigen", "Ignores a user, hiding their messages from you": "Ignoriert einen Benutzer und verbirgt dessen Nachrichten", "Banned by %(displayName)s": "Verbannt von %(displayName)s", "Description": "Beschreibung", "Unable to accept invite": "Einladung kann nicht angenommen werden", - "Failed to invite users to %(groupId)s": "Benutzer:innen konnten nicht in %(groupId)s eingeladen werden", + "Failed to invite users to %(groupId)s": "Benutzer konnten nicht in %(groupId)s eingeladen werden", "Unable to reject invite": "Einladung konnte nicht abgelehnt werden", "Who would you like to add to this summary?": "Wen möchtest zu dieser Übersicht hinzufügen?", "Add to summary": "Zur Übersicht hinzufügen", - "Failed to add the following users to the summary of %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht zur Übersicht von %(groupId)s hinzugefügt werden:", + "Failed to add the following users to the summary of %(groupId)s:": "Die folgenden Benutzer konnten nicht zur Übersicht von %(groupId)s hinzugefügt werden:", "Which rooms would you like to add to this summary?": "Welche Räume möchtest du zu dieser Übersicht hinzufügen?", "Failed to add the following rooms to the summary of %(groupId)s:": "Die folgenden Räume konnten nicht zur Übersicht von %(groupId)s hinzugefügt werden:", "Failed to remove the room from the summary of %(groupId)s": "Der Raum konnte nicht aus der Übersicht von %(groupId)s entfernt werden", "The room '%(roomName)s' could not be removed from the summary.": "Der Raum '%(roomName)s' konnte nicht aus der Übersicht entfernt werden.", - "Failed to remove a user from the summary of %(groupId)s": "Benutzer:in konnte nicht aus der Übersicht von %(groupId)s entfernt werden", - "The user '%(displayName)s' could not be removed from the summary.": "Der Benutzer:in '%(displayName)s' konnte nicht aus der Übersicht entfernt werden.", + "Failed to remove a user from the summary of %(groupId)s": "Benutzer konnte nicht aus der Übersicht von %(groupId)s entfernt werden", + "The user '%(displayName)s' could not be removed from the summary.": "Der Benutzer '%(displayName)s' konnte nicht aus der Übersicht entfernt werden.", "Unknown": "Unbekannt", "Failed to add the following rooms to %(groupId)s:": "Die folgenden Räume konnten nicht zu %(groupId)s hinzugefügt werden:", "Matrix Room ID": "Matrix-Raum-ID", @@ -469,7 +469,7 @@ "Which rooms would you like to add to this community?": "Welche Räume sollen zu dieser Community hinzugefügt werden?", "Add rooms to the community": "Räume zur Community hinzufügen", "Add to community": "Zur Community hinzufügen", - "Failed to invite users to community": "Benutzer:innen konnten nicht in die Community eingeladen werden", + "Failed to invite users to community": "Benutzer konnten nicht in die Community eingeladen werden", "Communities": "Communities", "Invalid community ID": "Ungültige Community-ID", "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID", @@ -485,26 +485,26 @@ "Community ID": "Community-ID", "example": "Beispiel", "Add rooms to the community summary": "Fügt Räume zur Community-Übersicht hinzu", - "Add users to the community summary": "Füge Benutzer:innen zur Community-Übersicht hinzu", + "Add users to the community summary": "Füge Benutzer zur Community-Übersicht hinzu", "Failed to update community": "Aktualisieren der Community fehlgeschlagen", "Leave Community": "Community verlassen", "Add rooms to this community": "Räume zu dieser Community hinzufügen", "%(inviter)s has invited you to join this community": "%(inviter)s hat dich in diese Community eingeladen", "You are a member of this community": "Du bist Mitglied dieser Community", - "You are an administrator of this community": "Du bist ein:e Administrator:in dieser Community", + "You are an administrator of this community": "Du bist ein Administrator dieser Community", "Community %(groupId)s not found": "Community '%(groupId)s' nicht gefunden", "Failed to load %(groupId)s": "'%(groupId)s' konnte nicht geladen werden", "Error whilst fetching joined communities": "Fehler beim Laden beigetretener Communities", "Create a new community": "Neue Community erstellen", "Your Communities": "Deine Communities", "You're not currently a member of any communities.": "Du gehörst aktuell keiner Community an.", - "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erstelle eine Community, um Benutzer:innen und Räume miteinander zu verbinden! Erstelle zusätzlich eine eigene Homepage, um deinen individuellen Bereich im Matrix-Universum zu gestalten.", + "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erstelle eine Community, um Benutzer und Räume miteinander zu verbinden! Erstelle zusätzlich eine eigene Homepage, um deinen individuellen Bereich im Matrix-Universum zu gestalten.", "Something went wrong whilst creating your community": "Beim Erstellen deiner Community ist ein Fehler aufgetreten", "And %(count)s more...|other": "Und %(count)s weitere...", "Delete Widget": "Widget löschen", "Mention": "Erwähnen", "Invite": "Einladen", - "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer:innen in diesem Raum. Möchtest du es wirklich löschen?", + "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer in diesem Raum. Möchtest du es wirklich löschen?", "Mirror local video feed": "Lokalen Video-Feed spiegeln", "Failed to withdraw invitation": "Die Einladung konnte nicht zurückgezogen werden", "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-IDs dürfen nur die folgenden Zeichen enthalten: a-z, 0-9, or '=_-./'", @@ -550,17 +550,17 @@ "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)shaben das Profilbild geändert", "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)shat das Profilbild %(count)s-mal geändert", "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)shat das Profilbild geändert", - "Disinvite this user?": "Einladung für diese:n Benutzer:in zurückziehen?", - "Kick this user?": "Diese:n Benutzer:in kicken?", - "Unban this user?": "Verbannung für diese:n Benutzer:in aufheben?", - "Ban this user?": "Diese:n Benutzer:in verbannen?", + "Disinvite this user?": "Einladung für diesen Benutzer zurückziehen?", + "Kick this user?": "Diesen Benutzer kicken?", + "Unban this user?": "Verbannung für diesen Benutzer aufheben?", + "Ban this user?": "Diesen Benutzer verbannen?", "Members only (since the point in time of selecting this option)": "Nur Mitglieder (ab dem Zeitpunkt, an dem diese Option ausgewählt wird)", "Members only (since they were invited)": "Nur Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden)", "Members only (since they joined)": "Nur Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind)", "An email has been sent to %(emailAddress)s": "Eine E-Mail wurde an %(emailAddress)s gesendet", "A text message has been sent to %(msisdn)s": "Eine Textnachricht wurde an %(msisdn)s gesendet", - "Disinvite this user from community?": "Community-Einladung für diese:n Benutzer:in zurückziehen?", - "Remove this user from community?": "Diese:n Benutzer:in aus der Community entfernen?", + "Disinvite this user from community?": "Community-Einladung für diesen Benutzer zurückziehen?", + "Remove this user from community?": "Diesen Benutzer aus der Community entfernen?", "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)shaben ihre Einladungen %(count)s-mal abgelehnt", "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)shat die Einladung %(count)s-mal abgelehnt", "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)shat die Einladung abgelehnt", @@ -629,7 +629,7 @@ "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ob du den Richtext-Modus des Editors benutzt oder nicht", "Your homeserver's URL": "Deine Homeserver-URL", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s", - "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der/die letze Nutzer:in mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.", "Community IDs cannot be empty.": "Community-IDs können nicht leer sein.", "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.", "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum-, Nutzer- oder Gruppen-ID enthält, werden diese Daten entfernt bevor sie an den Server gesendet werden.", @@ -644,7 +644,7 @@ "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Um einen Filter zu setzen, ziehe ein Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken, um nur die Räume und Personen aus der Community zu sehen.", "Clear filter": "Filter zurücksetzen", "Key request sent.": "Schlüssel-Anfragen gesendet.", - "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer:innen. Sie enthalten keine Nachrichten.", + "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.", "Submit debug logs": "Fehlerberichte einreichen", "Code": "Code", "Opens the Developer Tools dialog": "Öffnet die Entwickler-Werkzeuge", @@ -799,17 +799,17 @@ "Send analytics data": "Analysedaten senden", "e.g. %(exampleValue)s": "z.B. %(exampleValue)s", "Muted Users": "Stummgeschaltete Benutzer", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Dies wird deinen Account permanent unbenutzbar machen. Du wirst nicht in der Lage sein, dich anzumelden und keiner wird dieselbe Benutzer-ID erneut registrieren können. Alle Räume, in denen der Account ist, werden verlassen und deine Account-Daten werden vom Identitätsserver gelöscht. Diese Aktion ist unumkehrbar.", - "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Standardmäßig werden die von dir gesendeten Nachrichten beim Deaktiveren nicht gelöscht. Wenn du dies von uns möchtest, aktivere das Auswalfeld unten.", + "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Dies wird deinen Konto permanent unbenutzbar machen. Du wirst nicht in der Lage sein, dich anzumelden und keiner wird dieselbe Benutzer-ID erneut registrieren können. Alle Räume, in denen der Account ist, werden verlassen und deine Account-Daten werden vom Identitätsserver gelöscht. Diese Aktion ist unumkehrbar.", + "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Standardmäßig werden die von dir gesendeten Nachrichten beim Deaktiveren nicht gelöscht. Wenn du dies von uns möchtest, aktivere das Auswahlfeld unten.", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Die Sichtbarkeit der Nachrichten in Matrix ist vergleichbar mit E-Mails: Wenn wir deine Nachrichten vergessen heißt das, dass diese nicht mit neuen oder nicht registrierten Nutzern teilen werden, aber registrierte Nutzer, die bereits zugriff haben, werden Zugriff auf ihre Kopie behalten.", - "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Account deaktiviert wird. (Warnung: Zukünftige Nutzer:innen werden eine unvollständige Konversation sehen)", + "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Konto deaktiviert wird. (Warnung: Zukünftige Nutzer werden eine unvollständige Konversation sehen)", "To continue, please enter your password:": "Um fortzufahren, bitte Passwort eingeben:", "Can't leave Server Notices room": "Du kannst den Raum für Server-Notizen nicht verlassen", "This room is used for important messages from the Homeserver, so you cannot leave it.": "Du kannst diesen Raum nicht verlassen, da dieser Raum für wichtige Nachrichten vom Heimserver verwendet wird.", "Terms and Conditions": "Geschäftsbedingungen", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.", "Review terms and conditions": "Geschäftsbedingungen anzeigen", - "Share Link to User": "Link zu Benutzer:in teilen", + "Share Link to User": "Link zum Benutzer teilen", "Share room": "Raum teilen", "Share Room": "Raum teilen", "Link to most recent message": "Link zur aktuellsten Nachricht", @@ -828,7 +828,7 @@ "The password field must not be blank.": "Das Passwort-Feld darf nicht leer sein.", "Call in Progress": "Gespräch läuft", "A call is already in progress!": "Ein Gespräch läuft bereits!", - "You can't send any messages until you review and agree to our terms and conditions.": "Du kannst keine Nachrichten senden bis du die unsere Geschläftsbedingungen gelesen und akzeptiert hast.", + "You can't send any messages until you review and agree to our terms and conditions.": "Du kannst keine Nachrichten senden bis du unsere Geschäftsbedingungen gelesen und akzeptiert hast.", "Demote yourself?": "Selbst zurückstufen?", "Demote": "Zurückstufen", "This event could not be displayed": "Dieses Ereignis konnte nicht angezeigt werden", @@ -865,7 +865,7 @@ "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s hat die Hauptadresse zu diesem Raum auf %(address)s gesetzt.", "%(senderName)s removed the main address for this room.": "%(senderName)s entfernte die Hauptadresse von diesem Raum.", "Before submitting logs, you must create a GitHub issue to describe your problem.": "Bevor du Log-Dateien übermittelst, musst du ein GitHub-Issue erstellen um dein Problem zu beschreiben.", - "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Nutzer:innen erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!", + "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Nutzer erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!", "Updating %(brand)s": "Aktualisiere %(brand)s", "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "Du hast zuvor %(brand)s auf %(host)s ohne das verzögerte Laden von Mitgliedern genutzt. In dieser Version war das verzögerte Laden deaktiviert. Da die lokal zwischengespeicherten Daten zwischen diesen Einstellungen nicht kompatibel sind, muss %(brand)s dein Konto neu synchronisieren.", "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Wenn %(brand)s mit der alten Version in einem anderen Tab geöffnet ist, schließe dies bitte, da das parallele Nutzen von %(brand)s auf demselben Host mit aktivierten und deaktivierten verzögertem Laden, Probleme verursachen wird.", @@ -873,7 +873,7 @@ "Clear cache and resync": "Zwischenspeicher löschen und erneut synchronisieren", "Please review and accept the policies of this homeserver:": "Bitte sieh dir alle Bedingungen dieses Heimservers an und akzeptiere sie:", "Add some now": "Jemanden jetzt hinzufügen", - "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du bist ein:e Administrator:in dieser Community. Du wirst nicht erneut hinzutreten können, wenn du nicht von einem/r anderen Administrator:in eingeladen wirst.", + "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du bist ein Administrator dieser Community. Du wirst nicht erneut hinzutreten können, wenn du nicht von einem anderen Administrator eingeladen wirst.", "Open Devtools": "Entwicklerwerkzeuge öffnen", "Show developer tools": "Zeige Entwicklerwerkzeuge", "Unable to load! Check your network connectivity and try again.": "Konnte nicht geladen werden! Überprüfe die Netzwerkverbindung und versuche es erneut.", @@ -923,7 +923,7 @@ "Names and surnames by themselves are easy to guess": "Namen und Familiennamen alleine sind einfach zu erraten", "Common names and surnames are easy to guess": "Häufige Namen und Familiennamen sind einfach zu erraten", "You do not have permission to invite people to this room.": "Du kannst keine Personen in diesen Raum einladen.", - "User %(user_id)s does not exist": "Benutzer:in %(user_id)s existiert nicht", + "User %(user_id)s does not exist": "Benutzer %(user_id)s existiert nicht", "Unknown server error": "Unbekannter Serverfehler", "Failed to invite users to the room:": "Konnte Benutzer nicht in den Raum einladen:", "Short keyboard patterns are easy to guess": "Kurze Tastaturmuster sind einfach zu erraten", @@ -957,14 +957,14 @@ "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Ohne Sichere Nachrichten-Wiederherstellung einzurichten, wirst du deine sichere Nachrichtenhistorie verlieren, wenn du dich abmeldest.", "If you don't want to set this up now, you can later in Settings.": "Wenn du dies jetzt nicht einrichten willst, kannst du dies später in den Einstellungen tun.", "New Recovery Method": "Neue Wiederherstellungsmethode", - "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Wenn du die neue Wiederherstellungsmethode nicht festgelegt hast, versucht ein/e Angreifer!n möglicherweise, auf dein Konto zuzugreifen. Ändere dein Kontopasswort und lege sofort eine neue Wiederherstellungsmethode in den Einstellungen fest.", + "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Wenn du die neue Wiederherstellungsmethode nicht festgelegt hast, versucht ein Angreifer möglicherweise, auf dein Konto zuzugreifen. Ändere dein Kontopasswort und lege sofort eine neue Wiederherstellungsmethode in den Einstellungen fest.", "Set up Secure Messages": "Richte sichere Nachrichten ein", "Go to Settings": "Gehe zu Einstellungen", "Sign in with single sign-on": "Melde dich mit „Single Sign-On“ an", "Unrecognised address": "Nicht erkannte Adresse", - "User %(user_id)s may or may not exist": "Unklar, ob Benutzer:in %(user_id)s existiert", + "User %(user_id)s may or may not exist": "Unklar, ob Benutzer %(user_id)s existiert", "Prompt before sending invites to potentially invalid matrix IDs": "Nachfragen, bevor Einladungen zu möglichen ungültigen Matrix-IDs gesendet werden", - "The following users may not exist": "Eventuell existieren folgende Benutzer:innen nicht", + "The following users may not exist": "Eventuell existieren folgende Benutzer nicht", "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Profile für die unteren Matrix IDs wurden nicht gefunden - willst Du sie trotzdem einladen?", "Invite anyway and never warn me again": "Trotzdem einladen und mich nicht mehr warnen", "Invite anyway": "Trotzdem einladen", @@ -989,10 +989,10 @@ "Messages containing my username": "Nachrichten, die meinen Benutzernamen enthalten", "The other party cancelled the verification.": "Die Gegenstelle hat die Überprüfung abgebrochen.", "Verified!": "Verifiziert!", - "You've successfully verified this user.": "Du hast diese:n Benutzer:in erfolgreich verifiziert.", - "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Sichere Nachrichten mit diesem/r Benutzer:in sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.", + "You've successfully verified this user.": "Du hast diesen Benutzer erfolgreich verifiziert.", + "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.", "Got It": "Verstanden", - "Verify this user by confirming the following number appears on their screen.": "Verifiziere diese Nutzer:in, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.", + "Verify this user by confirming the following number appears on their screen.": "Verifiziere diesen Nutzer, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.", "Yes": "Ja", "No": "Nein", "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Wir haben dir eine E-Mail geschickt, um deine Adresse zu überprüfen. Bitte folge den Anweisungen dort und klicke dann auf die Schaltfläche unten.", @@ -1111,7 +1111,7 @@ "Ignored users": "Ignorierte Benutzer", "Key backup": "Schlüsselsicherung", "Gets or sets the room topic": "Raumthema anzeigen oder ändern", - "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diese Nutzer:in, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.", + "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diesen Nutzer, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.", "Missing media permissions, click the button below to request.": "Fehlende Medienberechtigungen. Drücke auf den Knopf unten, um sie anzufordern.", "Request media permissions": "Medienberechtigungen anfordern", "Main address": "Primäre Adresse", @@ -1194,8 +1194,8 @@ "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s hat Abzeichen der Gruppen %(groups)s für diesen Raum aktiviert.", "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s hat Abzeichen der Gruppen %(groups)s in diesem Raum deaktiviert.", "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s hat Abzeichen von %(newGroups)s aktiviert und von %(oldGroups)s deaktiviert.", - "User %(userId)s is already in the room": "Nutzer:in %(userId)s ist bereits im Raum", - "The user must be unbanned before they can be invited.": "Die Verbannung des/der Nutzer:in muss aufgehoben werden, bevor er/sie eingeladen werden kann.", + "User %(userId)s is already in the room": "Nutzer %(userId)s ist bereits im Raum", + "The user must be unbanned before they can be invited.": "Nutzer müssen entbannt werden, bevor sie eingeladen werden können.", "Show read receipts sent by other users": "Zeige Lesebestätigungen anderer Benutzer", "Scissors": "Scheren", "Upgrade to your own domain": "Upgrade zu deiner eigenen Domain", @@ -1209,10 +1209,10 @@ "Modify widgets": "Widgets bearbeiten", "Default role": "Standard Rolle", "Send messages": "Nachrichten senden", - "Invite users": "Benutzer:innen einladen", + "Invite users": "Benutzer einladen", "Change settings": "Einstellungen ändern", - "Kick users": "Benutzer:innen kicken", - "Ban users": "Benutzer:innen verbannen", + "Kick users": "Benutzer kicken", + "Ban users": "Benutzer verbannen", "Remove messages": "Nachrichten löschen", "Notify everyone": "Jeden benachrichtigen", "Send %(eventType)s events": "%(eventType)s-Ereignisse senden", @@ -1339,7 +1339,7 @@ "Try out new ways to ignore people (experimental)": "Versuche neue Möglichkeiten, um Menschen zu ignorieren (experimentell)", "Send read receipts for messages (requires compatible homeserver to disable)": "Lesebestätigungen für Nachrichten senden (Deaktivieren erfordert einen kompatiblen Heimserver)", "My Ban List": "Meine Bannliste", - "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzer:innen und Servern, die du blockiert hast - verlasse diesen Raum nicht!", + "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzer und Servern, die du blockiert hast - verlasse diesen Raum nicht!", "Accept to continue:": "Akzeptiere , um fortzufahren:", "Change identity server": "Identitätsserver wechseln", "You should remove your personal data from identity server before disconnecting. Unfortunately, identity server is currently offline or cannot be reached.": "Du solltest deine persönlichen Daten vom Identitätsserver entfernen, bevor du die Verbindung trennst. Leider ist der Identitätsserver derzeit offline oder kann nicht erreicht werden.", @@ -1384,7 +1384,7 @@ "Cannot connect to integration manager": "Verbindung zum Integrationsmanager fehlgeschlagen", "The integration manager is offline or it cannot reach your homeserver.": "Der Integrationsmanager ist offline oder er kann den Heimserver nicht erreichen.", "not stored": "nicht gespeichert", - "Backup has a signature from unknown user with ID %(deviceId)s": "Die Sicherung hat eine Signatur von unbekanntem/r Nutzer:in mit ID %(deviceId)s", + "Backup has a signature from unknown user with ID %(deviceId)s": "Die Sicherung hat eine Signatur von unbekanntem Nutzer mit ID %(deviceId)s", "Backup key stored: ": "Backup Schlüssel gespeichert: ", "Clear notifications": "Benachrichtigungen löschen", "Disconnect from the identity server and connect to instead?": "Vom Identitätsserver trennen, und stattdessen eine Verbindung zu aufbauen?", @@ -1415,7 +1415,7 @@ "Unsubscribe": "Deabonnieren", "View rules": "Regeln öffnen", "You are currently subscribed to:": "Du abonnierst momentan:", - "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer:innen gedacht.", + "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht.", "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem das Tasten die primäre Eingabemöglichkeit ist", "Whether you're using %(brand)s as an installed Progressive Web App": "Ob du %(brand)s als installierte progressive Web-App verwendest", "Your user agent": "Dein User-Agent", @@ -1445,7 +1445,7 @@ "Recently Direct Messaged": "Kürzlich direkt verschickt", "Go": "Los", "Command Help": "Befehl Hilfe", - "To help us prevent this in future, please send us logs.": "Um uns zu helfen, dies in Zukunft zu vermeiden, sende uns bitte Logs.", + "To help us prevent this in future, please send us logs.": "Um uns zu helfen, dies in Zukunft zu vermeiden, sende uns bitte die Protokolldateien.", "Notification settings": "Benachrichtigungseinstellungen", "Help": "Hilf uns", "Filter": "Filtern", @@ -1454,8 +1454,8 @@ "Go Back": "Zurückgehen", "Notification Autocomplete": "Benachrichtigung Autovervollständigen", "If disabled, messages from encrypted rooms won't appear in search results.": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen.", - "This user has not verified all of their sessions.": "Diese:r Benutzer:in hat nicht alle seine/ihre Sitzungen verifiziert.", - "You have verified this user. This user has verified all of their sessions.": "Du hast diese/n Nutzer:in verifiziert. Er/Sie hat alle seine/ihre Sitzungen verifiziert.", + "This user has not verified all of their sessions.": "Dieser Benutzer hat nicht alle seine Sitzungen verifiziert.", + "You have verified this user. This user has verified all of their sessions.": "Du hast diesen Nutzer verifiziert. Der Nutzer hat alle seine Sitzungen verifiziert.", "Your key share request has been sent - please check your other sessions for key share requests.": "Deine Schlüsselanfrage wurde gesendet - sieh in deinen anderen Sitzungen nach der Schlüsselanfrage.", "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Schlüsselanfragen werden automatisch an deine anderen Sitzungen gesendet. Wenn du sie abgelehnt oder ignoriert hast, klicke hier, um die Schlüssel erneut anzufordern.", "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Wenn deine anderen Sitzungen nicht über den Schlüssel für diese Nachricht verfügen, kannst du die Nachricht nicht entschlüsseln.", @@ -1490,7 +1490,7 @@ "Use bots, bridges, widgets and sticker packs": "Benutze Bots, Bridges, Widgets und Sticker-Packs", "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Wenn du dein Passwort änderst, werden alle Ende-zu-Ende-Verschlüsselungsschlüssel für alle deine Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist. Richte ein Schlüssel-Backup ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzst.", "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Du wurdest von allen Sitzungen abgemeldet und erhälst keine Push-Benachrichtigungen mehr. Um die Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.", - "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisiere diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie dir Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer:innen als vertrauenswürdig markiert.", + "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisiere diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie dir Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert.", "Sign out and remove encryption keys?": "Abmelden und Verschlüsselungsschlüssel entfernen?", "Sign in to your Matrix account on ": "Melde dich bei deinem Matrix-Konto auf an", "Enter your password to sign in and regain access to your account.": "Gib dein Passwort ein, um dich anzumelden und wieder Zugang zu deinem Konto zu erhalten.", @@ -1562,18 +1562,18 @@ "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?", "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse 2%(addresses)s für diesen Raum hinzugefügt.", "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.", - "Displays information about a user": "Zeigt Informationen über Benutzer:in", + "Displays information about a user": "Zeigt Informationen über Benutzer", "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.", "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.", "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt.", "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt.", "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.", "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadressen für diesen Raum geändert.", - "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Benutzer:innen, die %(glob)s entsprechen", + "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Benutzer, die %(glob)s entsprechen", "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Räume, die %(glob)s entsprechen", "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Server, die %(glob)s entsprechen", "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel, die %(glob)s entspricht", - "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Nutzer:innen, die aufgrund von %(reason)s %(glob)s entsprechen", + "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Benutzer, die aufgrund von %(reason)s %(glob)s entsprechen", "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Räume, die aufgrund von %(reason)s %(glob)s entsprechen", "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen", "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht", @@ -1584,7 +1584,7 @@ "Do you want to chat with %(user)s?": "Möchtest du mit %(user)s chatten?", " wants to chat": " möchte mit dir chatten", "Start chatting": "Chat starten", - "Reject & Ignore user": "Ablehnen & Nutzer:in ignorieren", + "Reject & Ignore user": "Ablehnen und Nutzer ignorieren", "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s", "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Räume von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s", "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Auf den Server turn.matrix.org zurückgreifen, falls deine Heimserver keine Anruf-Assistenz anbietet (deine IP-Adresse wird während eines Anrufs geteilt)", @@ -1643,7 +1643,7 @@ "%(name)s is requesting verification": "%(name)s fordert eine Verifizierung an", "Failed to set topic": "Das Festlegen des Themas ist fehlgeschlagen", "Command failed": "Befehl fehlgeschlagen", - "Could not find user in room": "Benutzer:in konnte nicht im Raum gefunden werden", + "Could not find user in room": "Benutzer konnte nicht im Raum gefunden werden", "Click the button below to confirm adding this email address.": "Klicke unten auf die Schaltfläche, um die hinzugefügte E-Mail-Adresse zu bestätigen.", "Confirm adding phone number": "Hinzugefügte Telefonnummer bestätigen", "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s", @@ -1652,7 +1652,7 @@ "Manually Verify by Text": "Verifiziere manuell mit einem Text", "Interactively verify by Emoji": "Verifiziere interaktiv mit Emojis", "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs", - "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer:in, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.", + "Ask this user to verify their session, or manually verify it below.": "Bitte diesen Nutzer, seine Sitzung zu verifizieren, oder verifiziere diese unten manuell.", "a few seconds from now": "in ein paar Sekunden", "Manually verify all remote sessions": "Alle Remotesitzungen manuell verifizieren", "Confirm the emoji below are displayed on both sessions, in the same order:": "Bestätige, dass die unten angezeigten Emojis auf beiden Sitzungen in der selben Reihenfolge angezeigt werden:", @@ -1702,15 +1702,15 @@ "Error adding ignored user/server": "Fehler beim Hinzufügen eines ignorierten Nutzers/Servers", "None": "Keine", "Ban list rules - %(roomName)s": "Verbotslistenregeln - %(roomName)s", - "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, @bot:* would ignore all users that have the name 'bot' on any server.": "Füge hier Benutzer!nnen und Server hinzu, die du ignorieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde @bot: * alle Benutzer:innen ignorieren, die auf einem Server den Namen 'bot' haben.", - "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Das Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer:innen und Server ausgeblendet.", + "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, @bot:* would ignore all users that have the name 'bot' on any server.": "Füge hier die Benutzer und Server hinzu, die du ignorieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde @bot: * alle Benutzer ignorieren, die auf einem Server den Namen 'bot' haben.", + "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Das Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer und Server ausgeblendet.", "Personal ban list": "Persönliche Sperrliste", - "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Deine persönliche Sperrliste enthält alle Benutzer:innen/Server, von denen du persönlich keine Nachrichten sehen willst. Nachdem du den ersten Benutzer/Server ignoriert hast, wird in der Raumliste \"Meine Sperrliste\" angezeigt - bleibe in diesem Raum, um die Sperrliste aufrecht zu halten.", + "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Deine persönliche Sperrliste enthält alle Benutzer/Server, von denen du persönlich keine Nachrichten sehen willst. Nachdem du den ersten Benutzer/Server ignoriert hast, wird in der Raumliste \"Meine Sperrliste\" angezeigt - bleibe in diesem Raum, um die Sperrliste aufrecht zu halten.", "Server or user ID to ignore": "Zu ignorierende Server- oder Benutzer-ID", "eg: @bot:* or example.org": "z.B. @bot:* oder example.org", "Subscribed lists": "Abonnierte Listen", "Subscribing to a ban list will cause you to join it!": "Eine Verbotsliste abonnieren bedeutet ihr beizutreten!", - "If this isn't what you want, please use a different tool to ignore users.": "Wenn dies nicht das ist, was du willst, verwende ein anderes Tool, um Benutzer:innen zu ignorieren.", + "If this isn't what you want, please use a different tool to ignore users.": "Wenn dies nicht das ist, was du willst, verwende ein anderes Tool, um Benutzer zu ignorieren.", "Subscribe": "Abonnieren", "Always show the window menu bar": "Fenstermenüleiste immer anzeigen", "Show tray icon and minimize window to it on close": "Taskleistensymbol anzeigen und Fenster beim Schließen dorthin minimieren", @@ -1728,7 +1728,7 @@ "Verify all your sessions to ensure your account & messages are safe": "Verifiziere alle deine Sitzungen, um dein Konto und deine Nachrichten zu schützen", "Verify your other session using one of the options below.": "Verifiziere deine andere Sitzung mit einer der folgenden Optionen.", "You signed in to a new session without verifying it:": "Du hast dich in einer neuen Sitzung angemeldet ohne sie zu verifizieren:", - "Other users may not trust it": "Andere Benutzer:innen vertrauen ihr vielleicht nicht", + "Other users may not trust it": "Andere Benutzer vertrauen ihr vielleicht nicht", "Upgrade": "Hochstufen", "Verify the new login accessing your account: %(name)s": "Verifiziere die neue Anmeldung an deinem Konto: %(name)s", "From %(deviceName)s (%(deviceId)s)": "Von %(deviceName)s (%(deviceId)s)", @@ -1759,7 +1759,7 @@ " to store messages from ": " um Nachrichten von ", "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with search components added.": "%(brand)s benötigt weitere Komponenten um verschlüsselte Nachrichten lokal zu durchsuchen. Wenn du diese Funktion testen möchtest kannst du dir deine eigene Version von %(brand)s Desktop mit der integrierten Suchfunktion bauen.", "Backup has a valid signature from this user": "Die Sicherung hat eine gültige Signatur dieses Benutzers", - "Backup has a invalid signature from this user": "Die Sicherung hat eine ungültige Signatur von diesem/r Benutzer!n", + "Backup has a invalid signature from this user": "Die Sicherung hat eine ungültige Signatur von diesem Benutzer", "Backup has a valid signature from verified session ": "Die Sicherung hat eine gültige Signatur von einer verifizierten Sitzung ", "Backup has a valid signature from unverified session ": "Die Sicherung hat eine gültige Signatur von einer nicht verifizierten Sitzung ", "Backup has an invalid signature from verified session ": "Die Sicherung hat eine ungültige Signatur von einer verifizierten Sitzung ", @@ -1781,7 +1781,7 @@ "Complete": "Abschließen", "Revoke": "Widerrufen", "Share": "Teilen", - "You have not verified this user.": "Du hast diese:n Nutzer:in nicht verifiziert.", + "You have not verified this user.": "Du hast diesen Nutzer nicht verifiziert.", "Everyone in this room is verified": "Alle in diesem Raum sind verifiziert", "Mod": "Mod", "Invite only": "Nur auf Einladung", @@ -1789,10 +1789,10 @@ "No recent messages by %(user)s found": "Keine neuen Nachrichten von %(user)s gefunden", "Try scrolling up in the timeline to see if there are any earlier ones.": "Versuche nach oben zu scrollen, um zu sehen ob sich dort frühere Nachrichten befinden.", "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Dies kann bei vielen Nachrichten einige Zeit dauern. Bitte lade die Anwendung in dieser Zeit nicht neu.", - "Deactivate user?": "Nutzer!n deaktivieren?", - "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Beim Deaktivieren wird dieser/s Nutzer!n/s abgemeldet und ein erneutes Anmelden verhindert. Zusätzlich wird sie/er aus allen Räumen entfernt. Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher, dass du diese/n Nutzer!n deaktivieren willst?", - "Deactivate user": "Nutzer!n deaktivieren", - "Failed to deactivate user": "Deaktivieren des/der Nutzer!n fehlgeschlagen", + "Deactivate user?": "Benutzer deaktivieren?", + "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Beim Deaktivieren wird der Benutzer abgemeldet und ein erneutes Anmelden verhindert. Zusätzlich wird er aus allen Räumen entfernt. Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher dass du diesen Benutzer deaktivieren willst?", + "Deactivate user": "Benutzer deaktivieren", + "Failed to deactivate user": "Deaktivieren des Benutzers fehlgeschlagen", "Send a reply…": "Sende eine Antwort…", "Send a message…": "Sende eine Nachricht…", "Bold": "Fett", @@ -1806,7 +1806,7 @@ "Re-join": "Wieder beitreten", "You were banned from %(roomName)s by %(memberName)s": "Du wurdest von %(memberName)s aus %(roomName)s verbannt", "Something went wrong with your invite to %(roomName)s": "Bei deiner Einladung zu %(roomName)s ist ein Fehler aufgetreten", - "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Während der Verifizierung deiner Einladung ist ein Fehler (%(errcode)s) aufgetreten. Du kannst diese Information einem/r Raum-Administrator:in weitergeben.", + "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Während der Verifizierung deiner Einladung ist ein Fehler (%(errcode)s) aufgetreten. Du kannst diese Information einem Raum-Administrator weitergeben.", "You can only join it with a working invite.": "Du kannst nur mit einer gültigen Einladung beitreten.", "Try to join anyway": "Dennoch versuchen beizutreten", "You can still join it because this is a public room.": "Du kannst dennoch beitreten, da es ein öffentlicher Raum ist.", @@ -1817,7 +1817,7 @@ "Share this email in Settings to receive invites directly in %(brand)s.": "Teile diese E-Mail-Adresse in den Einstellungen um Einladungen direkt in %(brand)s zu erhalten.", "%(roomName)s can't be previewed. Do you want to join it?": "Vorschau von %(roomName)s kann nicht angezeigt werden. Möchtest du den Raum betreten?", "This room doesn't exist. Are you sure you're at the right place?": "Dieser Raum existiert nicht. Bist du sicher, dass du hier richtig bist?", - "Try again later, or ask a room admin to check if you have access.": "Versuche es später erneut oder bitte eine/n Raum-Administrator:in zu prüfen, ob du berechtigt bist.", + "Try again later, or ask a room admin to check if you have access.": "Versuche es später erneut oder bitte einen Raum-Administrator zu prüfen, ob du berechtigt bist.", "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please submit a bug report.": "%(errcode)s wurde, beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, erstelle bitte einen Fehlerbericht.", "%(count)s unread messages including mentions.|other": "%(count)s ungelesene Nachrichten einschließlich Erwähnungen.", "%(count)s unread messages including mentions.|one": "1 ungelesene Erwähnung.", @@ -1836,33 +1836,33 @@ "Mark all as read": "Alle als gelesen markieren", "Local address": "Lokale Adresse", "Published Addresses": "Öffentliche Adresse", - "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Öffentliche Adressen können von jedem/r verwendet werden, um den Raum zu betreten. Um eine Adresse zu veröffentlichen musst du zunächst eine lokale Adresse anlegen.", + "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Öffentliche Adressen können von jedem verwendet werden, um den Raum zu betreten. Um eine Adresse zu veröffentlichen musst du zunächst eine lokale Adresse anlegen.", "Other published addresses:": "Andere öffentliche Adressen:", "No other published addresses yet, add one below": "Keine anderen öffentlichen Adressen vorhanden, füge unten eine hinzu", "New published address (e.g. #alias:server)": "Neue öffentliche Adresse (z.B. #alias:server)", "Local Addresses": "Lokale Adressen", - "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Erstelle Adressen für diesen Raum, damit andere Nutzer:innen den Raum auf deinem Heimserver (%(localDomain)s) finden können", + "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Erstelle Adressen für diesen Raum, damit andere Benutzer den Raum auf deinem Heimserver (%(localDomain)s) finden können", "Waiting for you to accept on your other session…": "Warte auf die Bestätigung in deiner anderen Sitzung…", "Waiting for %(displayName)s to accept…": "Warte auf die Annahme von %(displayName)s …", "Accepting…": "Annehmen…", "Start Verification": "Starte Verifikation", "Messages in this room are end-to-end encrypted.": "Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt.", - "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der/die Empfänger:in haben die Schlüssel, um sie zu entschlüsseln.", + "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der Empfänger habt die Schlüssel, um sie zu entschlüsseln.", "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In verschlüsselten Räumen sind deine Nachrichten verschlüsselt und nur du und der Empfänger habt die Schlüssel um sie zu entschlüsseln.", - "Verify User": "Nutzer!n verifizieren", - "For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit, verifiziere diese/n Nutzer!n, durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.", + "Verify User": "Nutzer verifizieren", + "For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit, verifiziere diesen Nutzer, durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.", "Your messages are not secure": "Deine Nachrichten sind nicht sicher", "One of the following may be compromised:": "Eines der folgenden könnte kompromittiert sein:", "Your homeserver": "Dein Heimserver", - "The homeserver the user you’re verifying is connected to": "Der Heimserver, an dem der/die zu verifizierende Nutzer:in angemeldet ist", + "The homeserver the user you’re verifying is connected to": "Der Heimserver, an dem der zu verifizierende Nutzer angemeldet ist", "Yours, or the other users’ internet connection": "Deine oder die Internetverbindung des Gegenüber", "Yours, or the other users’ session": "Deine Sitzung oder die des Gegenüber", "%(role)s in %(roomName)s": "%(role)s in %(roomName)s", "This client does not support end-to-end encryption.": "Diese Anwendung unterstützt keine Ende-zu-Ende-Verschlüsselung.", "Verify by scanning": "Verifizierung durch QR-Code-Scannen", "If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obigen Code nicht scannen kannst, verifiziere stattdessen durch den Emoji-Vergleich.", - "Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer:innen in einem Raum um die vollständige Sicherheit zu gewährleisten.", - "In encrypted rooms, verify all users to ensure it’s secure.": "Verifiziere alle Benutzer:innen in verschlüsselten Räumen um die vollständige Sicherheit zu gewährleisten.", + "Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer in einem Raum um die vollständige Sicherheit zu gewährleisten.", + "In encrypted rooms, verify all users to ensure it’s secure.": "Verifiziere alle Benutzer in verschlüsselten Räumen um die vollständige Sicherheit zu gewährleisten.", "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Du hast %(deviceName)s (%(deviceId)s) erfolgreich verifiziert!", "Verified": "Verifiziert", "Start verification again from the notification.": "Starte die Verifikation aus der Benachrichtigung erneut.", @@ -1875,7 +1875,7 @@ "Compare emoji": "Vergleiche Emojis", "Message Actions": "Nachrichtenaktionen", "Show image": "Bild anzeigen", - "You have ignored this user, so their message is hidden. Show anyways.": "Du hast diese/n Nutzer!n ignoriert, sodass seine/ihre Nachricht ausgeblendet ist. Dennoch anzeigen.", + "You have ignored this user, so their message is hidden. Show anyways.": "Du ignorierst diesen Benutzer, deshalb werden seine Nachrichten nicht angezeigt. Trotzdem anzeigen.", "You accepted": "Du hast angenommen", "You declined": "Du hast abgelehnt", "You cancelled": "Du hast abgebrochen", @@ -1954,10 +1954,10 @@ "Verification Requests": "Verifizierungsanfrage", "Integrations are disabled": "Integrationen sind deaktiviert", "Integrations not allowed": "Integrationen sind nicht erlaubt", - "Failed to invite the following users to chat: %(csvUsers)s": "Einladen der folgenden Nutzer:innen fehlgeschlagen: %(csvUsers)s", - "Something went wrong trying to invite the users.": "Beim Einladen der Nutzer:innen lief etwas schief.", - "Failed to find the following users": "Folgenden Nutzer:innen konnten nicht gefunden werden", - "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Folgende Nutzer:innen konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s", + "Failed to invite the following users to chat: %(csvUsers)s": "Einladen der folgenden Nutzer fehlgeschlagen: %(csvUsers)s", + "Something went wrong trying to invite the users.": "Beim Einladen der Nutzer lief etwas schief.", + "Failed to find the following users": "Folgenden Nutzer konnten nicht gefunden werden", + "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Folgende Nutzer konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s", "a new master key signature": "Eine neue Hauptschlüssel Signatur", "a new cross-signing key signature": "Eine neue Cross-Signing-Schlüsselsignatur", "a device cross-signing signature": "Eine Geräte Schlüssel Signatur", @@ -1986,7 +1986,7 @@ "If you didn’t sign in to this session, your account may be compromised.": "Wenn du dich nicht bei dieser Sitzung angemeldet hast, ist dein Konto möglicherweise gefährdet.", "This wasn't me": "Das war ich nicht", "Please fill why you're reporting.": "Bitte gib an, weshalb du einen Fehler meldest.", - "Automatically invite users": "Nutzer:innen automatisch einladen", + "Automatically invite users": "Nutzer automatisch einladen", "Upgrade private room": "Privaten Raum aktualisieren", "Upgrade public room": "Öffentlichen Raum aktualisieren", "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "Dies wirkt sich normalerweise nur darauf aus, wie der Raum auf dem Server verarbeitet wird. Wenn du Probleme mit deinem %(brand)s hast, melde bitte einen Bug.", @@ -2052,8 +2052,8 @@ "Continue with previous account": "Mit vorherigen Konto fortfahren", "Log in to your new account.": "Mit deinem neuen Konto anmelden.", "You can now close this window or log in to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich mit deinem neuen Konto anmelden.", - "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer:innen sehen sie als vertrauenswürdig an.", - "Your new session is now verified. Other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Andere Benutzer:innen sehen sie als vertrauenswürdig an.", + "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an.", + "Your new session is now verified. Other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Andere Benutzer sehen sie als vertrauenswürdig an.", "well formed": "wohlgeformt", "If you don't want to use to discover and be discoverable by existing contacts you know, enter another identity server below.": "Wenn du nicht verwenden willst, um Kontakte zu finden und von anderen gefunden zu werden, trage unten einen anderen Identitätsserver ein.", "To report a Matrix-related security issue, please read the Matrix.org Security Disclosure Policy.": "Um ein Matrix-bezogenes Sicherheitsproblem zu melden, lies bitte die Matrix.org Sicherheitsrichtlinien.", @@ -2069,12 +2069,12 @@ "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s haben %(count)s mal nichts geändert", "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Cross-Signing-Schlüsseln ist dauerhaft. Jeder, mit dem du dich verifiziert hast, bekommt Sicherheitswarnungen angezeigt. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du ein Cross-Signing durchführen kannst.", "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Das Löschen aller Daten aus dieser Sitzung ist dauerhaft. Verschlüsselte Nachrichten gehen verloren, sofern deine Schlüssel nicht gesichert wurden.", - "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diese/e Nutzer!n verifizierst werden seine/ihre Sitzungen für dich und deine Sitzungen für ihn/sie als vertrauenswürdig markiert.", + "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.", "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet.", "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen.", "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein %(brand)s erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator.", "We couldn't create your DM. Please check the users you want to invite and try again.": "Wir konnten deine Direktnachricht nicht erstellen. Bitte überprüfe den Benutzer, den du einladen möchtest, und versuche es erneut.", - "We couldn't invite those users. Please check the users you want to invite and try again.": "Wir konnten diese Benutzer:innen nicht einladen. Bitte überprüfe sie und versuche es erneut.", + "We couldn't invite those users. Please check the users you want to invite and try again.": "Wir konnten diese Benutzer nicht einladen. Bitte überprüfe sie und versuche es erneut.", "Start a conversation with someone using their name, username (like ) or email address.": "Starte eine Unterhaltung mit jemandem indem du seinen Namen, Benutzernamen (z.B. ) oder E-Mail-Adresse eingibst.", "Invite someone using their name, username (like ), email address or share this room.": "Lade jemanden mit seinem Namen, Benutzernamen (z.B. ) oder E-Mail-Adresse ein oder teile diesen Raum.", "Upload completed": "Hochladen abgeschlossen", @@ -2096,7 +2096,7 @@ "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Die Sicherung konnte nicht mit dem angegebenen Wiederherstellungsschlüssel entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungsschlüssel eingegeben hast.", "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Die Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden: Bitte überprüfe ob du die richtige Wiederherstellungspassphrase eingegeben hast.", "Nice, strong password!": "Super, ein starkes Passwort!", - "Other users can invite you to rooms using your contact details": "Andere Benutzer:innen können dich mit deinen Kontaktdaten in Räume einladen", + "Other users can invite you to rooms using your contact details": "Andere Benutzer können dich mit deinen Kontaktdaten in Räume einladen", "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Lege eine E-Mail für die Kontowiederherstellung fest. Verwende optional E-Mail oder Telefon, um von Anderen gefunden zu werden.", "Explore Public Rooms": "Öffentliche Räume erkunden", "If you've joined lots of rooms, this might take a while": "Du bist einer Menge Räumen beigetreten, das kann eine Weile dauern", @@ -2174,7 +2174,7 @@ "Toggle this dialog": "Diesen Dialog ein-/ausblenden", "Move autocomplete selection up/down": "Auto-Vervollständigung nach oben/unten verschieben", "Opens chat with the given user": "Öffnet einen Chat mit diesem Benutzer", - "Sends a message to the given user": "Sendet diesem/r Benutzer:in eine Nachricht", + "Sends a message to the given user": "Sendet diesem Benutzer eine Nachricht", "Waiting for your other session to verify…": "Warte auf die Verifikation deiner anderen Sitzungen…", "You've successfully verified your device!": "Du hast dein Gerät erfolgreich verifiziert!", "QR Code": "QR-Code", @@ -2443,8 +2443,8 @@ "Invite people to join %(communityName)s": "Lade Leute ein %(communityName)s beizutreten", "An image will help people identify your community.": "Ein Bild hilft anderen, deine Community zu Identifizieren.", "Use this when referencing your community to others. The community ID cannot be changed.": "Verwende dies, um deine Community von andere referenzieren zu lassen. Die Community-ID kann später nicht geändert werden.", - "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Private Räume können nur auf Einladung gefunden und betreten werden. Öffentliche Räume können von jedem/r gefunden und betreten werden.", - "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Private Räume können nur auf Einladung gefunden und betreten werden. Öffentliche Räume können von jedem/r in dieser Community gefunden und betreten werden.", + "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Private Räume können nur auf Einladung gefunden und betreten werden. Öffentliche Räume können von jedem gefunden und betreten werden.", + "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Private Räume können nur auf Einladung gefunden und betreten werden. Öffentliche Räume können von jedem in dieser Community gefunden und betreten werden.", "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Du solltest dies aktivieren, wenn der Raum nur für die Zusammenarbeit mit internen Teams auf deinem Heimserver verwendet wird. Dies kann später nicht mehr geändert werden.", "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Du solltest dies deaktivieren, wenn der Raum für die Zusammenarbeit mit externen Teams auf deren Home-Server verwendet wird. Dies kann später nicht mehr geändert werden.", "Block anyone not part of %(serverName)s from ever joining this room.": "Blockiere alle, die nicht Teil von %(serverName)s sind, diesen Raum jemals zu betreten.", @@ -2503,7 +2503,7 @@ "Your server requires encryption to be enabled in private rooms.": "Für deinen Server muss die Verschlüsselung in privaten Räumen aktiviert sein.", "Start a conversation with someone using their name or username (like ).": "Starte ein Gespräch unter Verwendung des Namen oder Benutzernamens des Gegenübers (z. B. ).", "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click here": "Das wird sie nicht zu %(communityName)s einladen. Um jemand zu %(communityName)s einzuladen, klicke hier", - "Invite someone using their name, username (like ) or share this room.": "Lade jemand mittels seinem/ihrem Namen oder Benutzernamen (z.B. ) ein, oder teile diesem Raum.", + "Invite someone using their name, username (like ) or share this room.": "Lade jemand mit Hilfe des Benutzernamens (z.B. ) oder Personennamens ein, oder teile diesem Raum.", "Unable to set up keys": "Schlüssel können nicht eingerichtet werden", "Use the Desktop app to see all encrypted files": "Nutze die Desktop-App um alle verschlüsselten Dateien zu sehen", "Use the Desktop app to search encrypted messages": "Nutze die Desktop-App um verschlüsselte Nachrichten zu suchen", @@ -2638,8 +2638,8 @@ "Please go into as much detail as you like, so we can track down the problem.": "Bitte nenne so viele Details wie du möchtest, sodass wir das Problem finden können.", "Comment": "Kommentar", "There are two ways you can provide feedback and help us improve %(brand)s.": "Es gibt zwei Wege wie du Feedback geben kannst und uns helfen kannst %(brand)s zu verbessern.", - "Please view existing bugs on Github first. No match? Start a new one.": "Bitte wirf einen Blick auf existierende Bugs auf Github. Keinen gefunden? Erstelle einen neuen.", - "PRO TIP: If you start a bug, please submit debug logs to help us track down the problem.": "PRO TIPP: Wenn du einen Bug meldest, füge bitte Debug-Logs hinzu um uns zu helfen das Problem zu finden.", + "Please view existing bugs on Github first. No match? Start a new one.": "Bitte wirf einen Blick auf existierende Programmfehler auf Github. Keinen gefunden? Erstelle einen neuen.", + "PRO TIP: If you start a bug, please submit debug logs to help us track down the problem.": "PRO TIPP: Wenn du einen Programmfehler meldest, füge bitte Debug-Logs hinzu um uns zu helfen das Problem zu finden.", "Invite by email": "Via Email einladen", "Start a conversation with someone using their name, email address or username (like ).": "Beginne eine Konversation mit jemanden unter Benutzung des Namens, der Email-Adresse oder der Matrix-ID (wie ).", "Invite someone using their name, email address, username (like ) or share this room.": "Lade jemanden unter Benutzung seines Namens, E-Mailaddresse oder Benutzername (siehe ) ein, oder teile diesen Raum.", @@ -2937,7 +2937,7 @@ "Other homeserver": "Anderer Homeserver", "Sign into your homeserver": "Melde dich bei deinem Homeserver an", "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org ist der größte öffentliche Homeserver der Welt und daher ein guter Ort für viele.", - "Just a heads up, if you don't add an email and forget your password, you could permanently lose access to your account.": "Aufgepasst: Wenn du keine E-Mail-Adresse angibst und dein Passwort vergisst, kannst du den Zugriff auf deinen Account dauerhaft verlieren.", + "Just a heads up, if you don't add an email and forget your password, you could permanently lose access to your account.": "Aufgepasst: Wenn du keine E-Mail-Adresse angibst und dein Passwort vergisst, kannst du den Zugriff auf deinen Konto dauerhaft verlieren.", "Continuing without email": "Ohne E-Mail fortfahren", "Reason (optional)": "Grund (optional)", "Continue with %(provider)s": "Mit %(provider)s fortfahren", @@ -2979,7 +2979,7 @@ "Sends the given message with snowfall": "Sendet die gewählte Nachricht mit Schneeflocken", "Transfer": "Übertragen", "Failed to transfer call": "Anruf-Übertragung fehlgeschlagen", - "A call can only be transferred to a single user.": "Ein Anruf kann nur auf eine:n einzelne:n Nutzer:in übertragen werden.", + "A call can only be transferred to a single user.": "Ein Anruf kann nur auf einen einzelnen Nutzer übertragen werden.", "Set up with a Security Key": "Mit einem Sicherheitsschlüssel einrichten", "Use Security Key": "Sicherheitsschlüssel benutzen", "Use Security Key or Phrase": "Sicherheitsschlüssel oder -phrase benutzen", @@ -3003,7 +3003,7 @@ "Workspace: ": "Arbeitsraum: ", "Dial pad": "Wähltastatur", "There was an error looking up the phone number": "Beim Suchen der Telefonnummer ist ein Fehler aufgetreten", - "Change which room, message, or user you're viewing": "Ändere welchen Raum, Nachricht oder Nutzer:in du siehst", + "Change which room, message, or user you're viewing": "Ändere welchen Raum, Nachricht oder Nutzer du siehst", "Unable to look up phone number": "Telefonnummer konnte nicht gefunden werden", "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "In dieser Sitzung wurde festgestellt, dass deine Sicherheitsphrase und dein Schlüssel für sichere Nachrichten entfernt wurden.", "A new Security Phrase and key for Secure Messages have been detected.": "Eine neue Sicherheitsphrase und ein neuer Schlüssel für sichere Nachrichten wurden erkannt.", @@ -3057,7 +3057,7 @@ "You should know": "Du solltest wissen", "Privacy Policy": "Datenschutz-Richtlinie", "Cookie Policy": "Cookie-Richtlinie", - "Learn more in our , and .": "Erfahren mehr in unserer , und .", + "Learn more in our , and .": "Erfahre mehr in unserer , und .", "Failed to connect to your homeserver. Please close this dialog and try again.": "Verbindung zum Homeserver fehlgeschlagen. Bitte schließe diesen Dialog and versuche es erneut.", "Abort": "Abbrechen", "Upgrade to %(hostSignupBrand)s": "Zu %(hostSignupBrand)s upgraden", From 31ce93655a508aee2b37ff199d2c62d8373801f8 Mon Sep 17 00:00:00 2001 From: panoschal Date: Sat, 13 Mar 2021 12:28:45 +0000 Subject: [PATCH 045/163] Translated using Weblate (Greek) Currently translated at 29.4% (852 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/el/ --- src/i18n/strings/el.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index 9bbef87a69..8700abbff1 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -114,7 +114,7 @@ "New passwords must match each other.": "Οι νέοι κωδικοί πρόσβασης πρέπει να ταιριάζουν.", "(not supported by this browser)": "(δεν υποστηρίζεται από τον περιηγητή)", "": "<δεν υποστηρίζεται>", - "No more results": "Δεν υπάρχουν αποτελέσματα", + "No more results": "Δεν υπάρχουν άλλα αποτελέσματα", "No results": "Κανένα αποτέλεσμα", "OK": "Εντάξει", "olm version:": "Έκδοση olm:", @@ -921,5 +921,9 @@ "Your user agent": "Η συσκευή σας", "Confirm adding phone number": "Επιβεβαιώστε την προσθήκη του τηλεφωνικού αριθμού", "Click the button below to confirm adding this email address.": "Πιέστε το κουμπί από κάτω για να επιβεβαιώσετε την προσθήκη της διεύθυνσης ηλ. ταχυδρομείου.", - "Confirm adding email": "Επιβεβαιώστε την προσθήκη διεύθυνσης ηλ. ταχυδρομείου" + "Confirm adding email": "Επιβεβαιώστε την προσθήκη διεύθυνσης ηλ. ταχυδρομείου", + "Done": "Τέλος", + "Not Trusted": "Μη Έμπιστο", + "You're already in a call with this person.": "Είστε ήδη σε κλήση με αυτόν τον χρήστη.", + "Already in call": "Ήδη σε κλήση" } From 3fd446c7b13dc65a8da3740bf579c8a215863dca Mon Sep 17 00:00:00 2001 From: iaiz Date: Tue, 16 Mar 2021 13:21:21 +0000 Subject: [PATCH 046/163] Translated using Weblate (Spanish) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/ --- src/i18n/strings/es.json | 401 +++++++++++++++++++++++++-------------- 1 file changed, 258 insertions(+), 143 deletions(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 4b50d59f2a..3965433b8c 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -8,8 +8,8 @@ "Always show message timestamps": "Siempre mostrar las marcas temporales de mensajes", "Authentication": "Autenticación", "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s", - "and %(count)s others...|other": "y otros %(count)s...", - "and %(count)s others...|one": "y otro más...", + "and %(count)s others...|other": "y otros %(count)s…", + "and %(count)s others...|one": "y otro más…", "A new password must be entered.": "Debes ingresar una contraseña nueva.", "%(senderName)s answered the call.": "%(senderName)s contestó la llamada.", "An error has occurred.": "Un error ha ocurrido.", @@ -59,12 +59,12 @@ "Error": "Error", "Error decrypting attachment": "Error al descifrar adjunto", "Existing Call": "Llamada Existente", - "Export E2E room keys": "Exportar claves de salas con Cifrado de Extremo a Extremo", + "Export E2E room keys": "Exportar claves de salas con cifrado de extremo a extremo", "Failed to ban user": "Bloqueo del usuario falló", "Failed to change password. Is your password correct?": "No se ha podido cambiar la contraseña. ¿Has escrito tu contraseña actual correctamente?", "Failed to change power level": "Falló al cambiar de nivel de acceso", "Failed to forget room %(errCode)s": "No se pudo olvidar la sala %(errCode)s", - "Failed to join room": "No se pudo unir a la sala", + "Failed to join room": "No se ha podido entrar a la sala", "Failed to kick": "No se ha podido echar", "Failed to leave room": "No se pudo salir de la sala", "Failed to load timeline position": "Fallo al cargar el historial", @@ -84,21 +84,21 @@ "Forget room": "Olvidar sala", "For security, this session has been signed out. Please sign in again.": "Por seguridad, esta sesión ha sido cerrada. Por favor inicia sesión nuevamente.", "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s", - "Guests cannot join this room even if explicitly invited.": "Invitados no pueden unirse a esta sala aun cuando han sido invitados explícitamente.", + "Guests cannot join this room even if explicitly invited.": "Los invitados no pueden unirse a esta sala incluso si se les invita explícitamente.", "Hangup": "Colgar", "Historical": "Historial", "Homeserver is": "El servidor base es", "Identity Server is": "El Servidor de Identidad es", "I have verified my email address": "He verificado mi dirección de correo electrónico", - "Import E2E room keys": "Importar claves de salas con Cifrado de Extremo a Extremo", + "Import E2E room keys": "Importar claves de salas con cifrado de extremo a extremo", "Incorrect verification code": "Verificación de código incorrecta", "Invalid Email Address": "Dirección de Correo Electrónico Inválida", "Invalid file%(extra)s": "Archivo inválido %(extra)s", "%(senderName)s invited %(targetName)s.": "%(senderName)s invitó a %(targetName)s.", "Invites": "Invitaciones", "Invites user with given id to current room": "Invita al usuario con la ID dada a la sala actual", - "Sign in with": "Quiero iniciar sesión con", - "Join Room": "Unirse a la Sala", + "Sign in with": "Iniciar sesión con", + "Join Room": "Unirme a la Sala", "%(targetName)s joined the room.": "%(targetName)s se unió a la sala.", "%(senderName)s kicked %(targetName)s.": "%(senderName)s echó a %(targetName)s.", "Kick": "Echar", @@ -141,7 +141,7 @@ "%(senderName)s made future room history visible to anyone.": "%(senderName)s hizo visible el historial futuro de la sala para cualquier persona.", "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hizo visible el historial futuro de la sala para desconocido (%(visibility)s).", "Something went wrong!": "¡Algo ha fallado!", - "Please select the destination room for this message": "Por favor, seleccione la sala destino para este mensaje", + "Please select the destination room for this message": "Por favor, selecciona la sala de destino para este mensaje", "Create new room": "Crear nueva sala", "Start chat": "Iniciar conversación", "New Password": "Contraseña nueva", @@ -168,7 +168,7 @@ "Search": "Buscar", "Search failed": "Falló la búsqueda", "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s el %(dateTime)s", - "Send Reset Email": "Enviar Correo Electrónico de Restauración", + "Send Reset Email": "Enviar correo electrónico de restauración", "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s envió una imagen.", "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s invitó a %(targetDisplayName)s a unirse a la sala.", "Server error": "Error del servidor", @@ -180,7 +180,7 @@ "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s estableció %(displayName)s como su nombre público.", "Settings": "Ajustes", "Signed Out": "Desconectado", - "Sign in": "Conectar", + "Sign in": "Iniciar sesión", "Sign out": "Cerrar sesión", "%(count)s of your messages have not been sent.|other": "Algunos de tus mensajes no han sido enviados.", "Someone": "Alguien", @@ -228,7 +228,7 @@ "Profile": "Perfil", "Public Chat": "Sala pública", "Reason": "Motivo", - "Register": "Registrar", + "Register": "Crear cuenta", "%(targetName)s rejected the invitation.": "%(targetName)s rechazó la invitación.", "Reject invitation": "Rechazar invitación", "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eliminó su nombre público (%(oldDisplayName)s).", @@ -240,7 +240,7 @@ "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s no tiene permiso para enviarte notificaciones - por favor, comprueba los ajustes de tu navegador", "%(brand)s was not given permission to send notifications - please try again": "No le has dado permiso a %(brand)s para enviar notificaciones. Por favor, inténtalo de nuevo", "%(brand)s version:": "Versión de %(brand)s:", - "Room %(roomId)s not visible": "La sala %(roomId)s no está visible", + "Room %(roomId)s not visible": "La sala %(roomId)s no es visible", "Searches DuckDuckGo for results": "Busca resultados en DuckDuckGo", "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas temporales en formato de 12 horas (ej. 2:30pm)", "This email address is already in use": "Esta dirección de correo electrónico ya está en uso", @@ -345,7 +345,7 @@ "Jun": "Jun", "Jul": "Jul", "Aug": "Ago", - "Add rooms to this community": "Agregar salas a esta comunidad", + "Add rooms to this community": "Añadir salas a esta comunidad", "Call Failed": "Llamada fallida", "Sep": "Sep", "Oct": "Oct", @@ -360,7 +360,7 @@ "Your language of choice": "Idioma elegido", "Your homeserver's URL": "La URL de tu servidor base", "The information being sent to us to help make %(brand)s better includes:": "La información que se nos envía para ayudarnos a mejorar %(brand)s incluye:", - "Whether or not you're using the Richtext mode of the Rich Text Editor": "Estés utilizando o no el modo de Texto Enriquecido del Editor de Texto Enriquecido", + "Whether or not you're using the Richtext mode of the Rich Text Editor": "Estés utilizando o no el modo de texto enriquecido del editor de texto enriquecido", "Who would you like to add to this community?": "¿A quién te gustaría añadir a esta comunidad?", "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Advertencia: cualquier persona que añadas a una comunidad será públicamente visible a cualquiera que conozca la ID de la comunidad", "Invite new community members": "Invita nuevos miembros a la comunidad", @@ -417,7 +417,7 @@ "Collecting app version information": "Recolectando información de la versión de la aplicación", "Keywords": "Palabras clave", "Enable notifications for this account": "Activar notificaciones para esta cuenta", - "Invite to this community": "Invitar a esta comunidad", + "Invite to this community": "Invitar a la comunidad", "Messages containing keywords": "Mensajes que contienen palabras clave", "Error saving email notification preferences": "Error al guardar las preferencias de notificación por email", "Tuesday": "Martes", @@ -444,16 +444,16 @@ "Collecting logs": "Recolectando registros", "You must specify an event type!": "Debes especificar un tipo de evento!", "(HTTP status %(httpStatus)s)": "(estado HTTP %(httpStatus)s)", - "Invite to this room": "Invitar a esta sala", + "Invite to this room": "Invitar a la sala", "Send": "Enviar", "Send logs": "Enviar registros", "All messages": "Todos los mensajes", "Call invitation": "Cuando me inviten a una llamada", "Thank you!": "¡Gracias!", - "Downloading update...": "Descargando actualizaciones...", + "Downloading update...": "Descargando actualización…", "State Key": "Clave de estado", "Failed to send custom event.": "Ha fallado el envio del evento personalizado.", - "What's new?": "¿Qué hay de nuevo?", + "What's new?": "Novedades", "Notify me for anything else": "Notificarme para cualquier otra cosa", "When I'm invited to a room": "Cuando me inviten a una sala", "Can't update user notification settings": "No se puede actualizar los ajustes de notificaciones del usuario", @@ -467,7 +467,7 @@ "Logs sent": "Registros enviados", "Back": "Atrás", "Reply": "Responder", - "Show message in desktop notification": "Mostrar mensaje en la notificación del escritorio", + "Show message in desktop notification": "Mostrar mensaje en las notificaciones de escritorio", "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Los registros de depuración contienen datos de uso de la aplicación como nombre de usuario, ID o alias de las salas o grupos que hayas visitado (y nombres de usuario de otros usuarios). No contienen mensajes.", "Unhide Preview": "Mostrar vista previa", "Unable to join network": "No se puede unir a la red", @@ -496,7 +496,7 @@ "Unable to fetch notification target list": "No se puede obtener la lista de destinos de notificación", "Quote": "Citar", "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!": "En su navegador actual, la apariencia y comportamiento de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!", - "Checking for an update...": "Comprobando actualizaciones...", + "Checking for an update...": "Comprobando actualizaciones…", "Every page you use in the app": "Cada página que utilizas en la aplicación", "Your device resolution": "La resolución de tu dispositivo", "Which officially provided instance you are using, if any": "Qué instancia proporcionada oficialmente estás utilizando, si estás utilizando alguna", @@ -520,7 +520,7 @@ "Failed to invite users to %(groupId)s": "No se pudo invitar usuarios a %(groupId)s", "Failed to add the following rooms to %(groupId)s:": "No se pudieron añadir las siguientes salas a %(groupId)s:", "Restricted": "Restringido", - "Missing roomId.": "Falta el Id de sala.", + "Missing roomId.": "Falta el ID de sala.", "Ignores a user, hiding their messages from you": "Ignora a un usuario, ocultando sus mensajes", "Ignored user": "Usuario ignorado", "You are now ignoring %(userId)s": "Ahora ignoras a %(userId)s", @@ -538,11 +538,11 @@ "Message Pinning": "Mensajes anclados", "Always show encryption icons": "Mostrar siempre iconos de cifrado", "Automatically replace plain text Emoji": "Reemplazar automáticamente texto por Emojis", - "Mirror local video feed": "Clonar transmisión de video local", + "Mirror local video feed": "Invertir horizontalmente el vídeo local (espejo)", "Send analytics data": "Enviar datos de análisis de estadísticas", "Enable inline URL previews by default": "Activar vistas previas de URLs en línea por defecto", - "Enable URL previews for this room (only affects you)": "Activar vista previa de URL en esta sala (te afecta a ti)", - "Enable URL previews by default for participants in this room": "Activar vista previa de URL por defecto para los participantes en esta sala", + "Enable URL previews for this room (only affects you)": "Activar vista previa de URLs en esta sala (solo para ti)", + "Enable URL previews by default for participants in this room": "Activar vista previa de URLs por defecto para los participantes en esta sala", "Enable widget screenshots on supported widgets": "Activar capturas de pantalla de widget en los widgets soportados", "Drop file here to upload": "Soltar aquí el fichero a subir", " (unsupported)": " (no soportado)", @@ -569,7 +569,7 @@ "Send an encrypted message…": "Enviar un mensaje cifrado…", "Jump to message": "Ir al mensaje", "No pinned messages.": "No hay mensajes anclados.", - "Loading...": "Cargando...", + "Loading...": "Cargando…", "Pinned Messages": "Mensajes anclados", "%(duration)ss": "%(duration)ss", "%(duration)sm": "%(duration)sm", @@ -598,15 +598,15 @@ "Hide Stickers": "Ocultar Pegatinas", "Show Stickers": "Pegatinas", "Invalid community ID": "ID de comunidad inválida", - "'%(groupId)s' is not a valid community ID": "'%(groupId)s' no es una ID de comunidad válida", + "'%(groupId)s' is not a valid community ID": "«%(groupId)s no es una ID de comunidad válida", "Flair": "Insignia", "Showing flair for these communities:": "Mostrar insignias de las siguientes comunidades:", "This room is not showing flair for any communities": "Esta sala no está mostrando insignias de ninguna comunidad", "New community ID (e.g. +foo:%(localDomain)s)": "Nueva ID de comunidad (ej. +foo:%(localDomain)s)", - "URL previews are enabled by default for participants in this room.": "La vista previa de URL se activa por defecto en los participantes de esta sala.", - "URL previews are disabled by default for participants in this room.": "La vista previa se desactiva por defecto para los participantes de esta sala.", - "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "En salas cifradas como ésta, la vista previa de las URL se desactiva por defecto para asegurar que el servidor base (donde se generan) no puede recopilar información de los enlaces que veas en esta sala.", - "URL Previews": "Vista previa de URL", + "URL previews are enabled by default for participants in this room.": "La vista previa de URLs se activa por defecto en los participantes de esta sala.", + "URL previews are disabled by default for participants in this room.": "La vista previa de URLs se desactiva por defecto para los participantes de esta sala.", + "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "En salas cifradas como ésta, la vista previa de las URLs se desactiva por defecto para asegurar que el servidor base (donde se generan) no pueda recopilar información de los enlaces que veas en esta sala.", + "URL Previews": "Vista previa de URLs", "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Cuando alguien incluye una URL en su mensaje, se mostrará una vista previa para ofrecer información sobre el enlace, que incluirá el título, descripción, y una imagen del sitio web.", "Error decrypting audio": "Error al descifrar el sonido", "Error decrypting image": "Error al descifrar imagen", @@ -617,12 +617,12 @@ "Copied!": "¡Copiado!", "Failed to copy": "Falló la copia", "Add an Integration": "Añadir una Integración", - "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Estás a punto de ir a un sitio de terceros de modo que pueda autenticar su cuenta para usarla con %(integrationsUrl)s. ¿Quieres continuar?", + "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Estás a punto de ir a un sitio externo para que puedas iniciar sesión con tu cuenta y usarla en %(integrationsUrl)s. ¿Quieres seguir?", "An email has been sent to %(emailAddress)s": "Se envió un correo electrónico a %(emailAddress)s", "Please check your email to continue registration.": "Por favor consulta tu correo electrónico para continuar con el registro.", "Token incorrect": "Token incorrecto", "A text message has been sent to %(msisdn)s": "Se envió un mensaje de texto a %(msisdn)s", - "Please enter the code it contains:": "Por favor introduzca el código que contiene:", + "Please enter the code it contains:": "Por favor, escribe el código que contiene:", "Code": "Código", "The email field must not be blank.": "El campo de correo electrónico no debe estar en blanco.", "The phone number field must not be blank.": "El campo de número telefónico no debe estar en blanco.", @@ -634,12 +634,12 @@ "Failed to withdraw invitation": "Falló la retirada de la invitación", "Failed to remove user from community": "Falló la eliminación de este usuario de la comunidad", "Filter community members": "Filtrar miembros de la comunidad", - "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "¿Seguro que quieres eliminar a '%(roomName)s' de %(groupId)s?", + "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "¿Seguro que quieres eliminar a «%(roomName)s de %(groupId)s?", "Removing a room from the community will also remove it from the community page.": "Al eliminar una sala de la comunidad también se eliminará de su página.", "Failed to remove room from community": "Falló la eliminación de la sala de la comunidad", - "Failed to remove '%(roomName)s' from %(groupId)s": "Falló la eliminación de '%(roomName)s' de %(groupId)s", - "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "La visibilidad de '%(roomName)s' en %(groupId)s no se pudo actualizar.", - "Visibility in Room List": "Visibilidad en la Lista de Salas", + "Failed to remove '%(roomName)s' from %(groupId)s": "Ha fallado la eliminación de «%(roomName)s» de %(groupId)s", + "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "La visibilidad de «%(roomName)s» en %(groupId)s no se ha podido actualizar.", + "Visibility in Room List": "Visibilidad en la lista de salas", "Visible to everyone": "Visible a todo el mundo", "Only visible to community members": "Sólo visible a los miembros de la comunidad", "Filter community rooms": "Filtrar salas de la comunidad", @@ -665,8 +665,8 @@ "%(oneUser)sleft %(count)s times|one": "%(oneUser)s salió", "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s se unieron y fueron %(count)s veces", "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s se unieron y fueron", - "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s se unió y fue %(count)s veces", - "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s se unió y fue", + "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s se unió y se fue %(count)s veces", + "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s se unió y se fue", "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s se fueron y volvieron a unirse %(count)s veces", "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s se fueron y volvieron a unirse", "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s se fue y volvió a unirse %(count)s veces", @@ -709,18 +709,18 @@ "expand": "expandir", "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "No se pudo cargar el evento al que se respondió, bien porque no existe o no tiene permiso para verlo.", "In reply to ": "En respuesta a ", - "And %(count)s more...|other": "Y %(count)s más...", + "And %(count)s more...|other": "Y %(count)s más…", "ex. @bob:example.com": "ej. @bob:ejemplo.com", "Add User": "Agregar Usuario", "Matrix ID": "ID de Matrix", - "Matrix Room ID": "ID de Sala de Matrix", + "Matrix Room ID": "ID de sala de Matrix", "email address": "dirección de correo electrónico", "You have entered an invalid address.": "No ha introducido una dirección correcta.", "Try using one of the following valid address types: %(validTypesList)s.": "Intente usar uno de los tipos de direcciones válidos: %(validTypesList)s.", "Confirm Removal": "Confirmar eliminación", "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "¿Seguro que quieres eliminar este evento? Ten en cuenta que, si borras un cambio de nombre o tema de sala, podrías deshacer el cambio.", "Community IDs cannot be empty.": "Las IDs de comunidad no pueden estar vacías.", - "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Las IDs de comunidad sólo pueden contener caracteres a-z, 0-9, ó '=_-./'", + "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Las IDs de comunidad solo pueden contener caracteres de la «a» a la «z» excluyendo la «ñ», dígitos o «=_-./»", "Something went wrong whilst creating your community": "Algo fue mal mientras se creaba la comunidad", "Create Community": "Crear Comunidad", "Community Name": "Nombre de Comunidad", @@ -756,22 +756,22 @@ "Collapse Reply Thread": "Colapsar Hilo de Respuestas", "There are no visible files in this room": "No hay archivos visibles en esta sala", "

HTML for your community's page

\n

\n Use the long description to introduce new members to the community, or distribute\n some important links\n

\n

\n You can even use 'img' tags\n

\n": "HTML para la página de tu comunidad. Usa la descripción larga para su presentación, o distribuir enlaces de interés. Puedes incluso usar etiquetas 'img'\n", - "Add rooms to the community summary": "Agregar salas al resumen de la comunidad", - "Which rooms would you like to add to this summary?": "¿Cuáles salas desea agregar a este resumen?", - "Add to summary": "Agregar a resumen", + "Add rooms to the community summary": "Añadir salas al resumen de la comunidad", + "Which rooms would you like to add to this summary?": "¿Cuáles salas quieres añadir a este resumen?", + "Add to summary": "Añadir al resumen", "Failed to add the following rooms to the summary of %(groupId)s:": "Falló la agregación de las salas siguientes al resumen de %(groupId)s:", - "Add a Room": "Agregar una Sala", + "Add a Room": "Añadir una sala", "Failed to remove the room from the summary of %(groupId)s": "Falló la eliminación de la sala del resumen de %(groupId)s", - "The room '%(roomName)s' could not be removed from the summary.": "La sala '%(roomName)s' no se pudo eliminar del resumen.", - "Add users to the community summary": "Agregar usuario al resumen de la comunidad", - "Who would you like to add to this summary?": "¿A quién le gustaría agregar a este resumen?", + "The room '%(roomName)s' could not be removed from the summary.": "La sala «%(roomName)s no se pudo eliminar del resumen.", + "Add users to the community summary": "Añadir usuario al resumen de la comunidad", + "Who would you like to add to this summary?": "¿A quién te gustaría añadir a este resumen?", "Failed to add the following users to the summary of %(groupId)s:": "Falló la adición de los usuarios siguientes al resumen de %(groupId)s:", - "Add a User": "Agregar un usuario", + "Add a User": "Añadir un usuario", "Failed to remove a user from the summary of %(groupId)s": "Falló la eliminación de un usuario del resumen de %(groupId)s", - "The user '%(displayName)s' could not be removed from the summary.": "No se pudo eliminar al usuario '%(displayName)s' del resumen.", + "The user '%(displayName)s' could not be removed from the summary.": "No se ha podido eliminar al usuario «%(displayName)s» del resumen.", "Failed to upload image": "No se pudo cargar la imagen", "Failed to update community": "Falló la actualización de la comunidad", - "Unable to accept invite": "No se pudo aceptar la invitación", + "Unable to accept invite": "No se ha podido aceptar la invitación", "Unable to join community": "No se pudo unir a comunidad", "Leave Community": "Salir de la Comunidad", "Leave %(groupName)s?": "¿Salir de %(groupName)s?", @@ -810,7 +810,7 @@ "You can't send any messages until you review and agree to our terms and conditions.": "No puedes enviar ningún mensaje hasta que revises y estés de acuerdo con nuestros términos y condiciones.", "%(count)s of your messages have not been sent.|one": "No se ha enviado tu mensaje.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Reenviar todo o cancelar todo ahora. También puedes seleccionar mensajes individuales para reenviar o cancelar.", - "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Reenviar mensaje o cancelar mensaje ahora.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Reenviar mensaje o cancelar el envío ahora.", "Connectivity to the server has been lost.": "Se ha perdido la conexión con el servidor.", "Sent messages will be stored until your connection has returned.": "Los mensajes enviados se almacenarán hasta que vuelva la conexión.", "Active call": "Llamada activa", @@ -861,7 +861,7 @@ "The room upgrade could not be completed": "La actualización de la sala no pudo ser completada", "Upgrade this room to version %(version)s": "Actualiza esta sala a la versión %(version)s", "Legal": "Legal", - "Unable to connect to Homeserver. Retrying...": "No ha sido posible conectarse al servidor base. Volviendo a intentar...", + "Unable to connect to Homeserver. Retrying...": "No ha sido posible conectarse al servidor base. Volviéndolo a intentar…", "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s estableció la dirección principal para esta sala como %(address)s.", "%(senderName)s removed the main address for this room.": "%(senderName)s eliminó la dirección principal para esta sala.", "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s ahora utiliza de 3 a 5 veces menos memoria, porque solo carga información sobre otros usuarios cuando es necesario. Por favor, ¡aguarda mientras volvemos a sincronizar con el servidor!", @@ -879,7 +879,7 @@ "Phone numbers": "Números de teléfono", "Email addresses": "Correos electrónicos", "Language and region": "Idioma y región", - "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "El fichero %(fileName)s supera el tamaño límite del servidor para subidas", + "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "El archivo «%(fileName)s» supera el tamaño límite del servidor para subidas", "Unable to load! Check your network connectivity and try again.": "No se ha podido cargar. Comprueba tu conexión de red e inténtalo de nuevo.", "Failed to invite users to the room:": "Fallo al invitar usuarios a la sala:", "Upgrades a room to a new version": "Actualiza una sala a una nueva versión", @@ -907,9 +907,9 @@ "Capitalization doesn't help very much": "Las mayúsculas no ayudan mucho", "All-uppercase is almost as easy to guess as all-lowercase": "Todo en mayúsculas es tan inseguro como todo en minúsculas", "Reversed words aren't much harder to guess": "Las palabras al revés no son muy dificiles de adivinar", - "Predictable substitutions like '@' instead of 'a' don't help very much": "Sustituciones predecibles como ''@' en vez de 'a' no ayudan mucho", + "Predictable substitutions like '@' instead of 'a' don't help very much": "Sustituciones predecibles como «@ en vez de 'a' no ayudan mucho", "Add another word or two. Uncommon words are better.": "Añade una o dos palabras más. Palabras raras mejor.", - "Repeats like \"aaa\" are easy to guess": "Repetición como 'aaa' son muy fáciles de adivinar", + "Repeats like \"aaa\" are easy to guess": "Los caracteres repetidos como «aaa» son muy fáciles de adivinar", "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Repeticiones como \"abcabcabc\" son solo ligeramente más difíciles de adivinar que \"abc\"", "Sequences like abc or 6543 are easy to guess": "Secuencias como abc or 6543 son faciles de adivinar", "Recent years are easy to guess": "Años recientes son fáciles de adivinar", @@ -923,7 +923,7 @@ "Common names and surnames are easy to guess": "Nombres y apellidos comunes son fáciles de adivinar", "Straight rows of keys are easy to guess": "Palabras formadas por secuencias de teclas alineadas son fáciles de adivinar", "Short keyboard patterns are easy to guess": "Patrones de tecleo cortos son fáciles de adivinar", - "There was an error joining the room": "Hubo un error al unirse a la sala", + "There was an error joining the room": "Ha ocurrido un error al unirse a la sala", "Custom user status messages": "Mensajes de estado de usuario personalizados", "Group & filter rooms by custom tags (refresh to apply changes)": "Agrupa y filtra salas por etiquetas personalizadas (refresca para aplicar cambios)", "Render simple counters in room header": "Muestra contadores simples en la cabecera de la sala", @@ -936,7 +936,7 @@ "Show avatars in user and room mentions": "Mostrar avatares en menciones a usuarios y salas", "Enable big emoji in chat": "Activar emojis grandes en el chat", "Send typing notifications": "Enviar notificaciones de tecleo", - "Allow Peer-to-Peer for 1:1 calls": "Permitir conexión de pares en llamadas individuales", + "Allow Peer-to-Peer for 1:1 calls": "Permitir conexiones «peer-to-peer en llamadas individuales", "Prompt before sending invites to potentially invalid matrix IDs": "Pedir confirmación antes de enviar invitaciones a IDs de matrix que parezcan inválidas", "Show developer tools": "Mostrar herramientas de desarrollador", "Messages containing my username": "Mensajes que contengan mi nombre", @@ -979,7 +979,7 @@ "Pizza": "Pizza", "Cake": "Tarta", "Heart": "Corazón", - "Smiley": "Sonriente", + "Smiley": "Emoticono", "Robot": "Robot", "Hat": "Sombrero", "Glasses": "Gafas", @@ -1021,7 +1021,7 @@ "Unable to load key backup status": "No se pudo cargar el estado de la copia de la clave", "Restore from Backup": "Restaurar desde copia", "Back up your keys before signing out to avoid losing them.": "Haz copia de tus claves antes de salir para evitar perderlas.", - "Backing up %(sessionsRemaining)s keys...": "Haciendo copia de %(sessionsRemaining)s claves...", + "Backing up %(sessionsRemaining)s keys...": "Haciendo copia de %(sessionsRemaining)s claves…", "All keys backed up": "Se han copiado todas las claves", "Backup version: ": "Versión de la copia: ", "Algorithm: ": "Algoritmo: ", @@ -1032,11 +1032,11 @@ "Phone Number": "Número de teléfono", "Profile picture": "Foto de perfil", "Display Name": "Nombre a mostrar", - "Internal room ID:": "ID de Sala Interna:", + "Internal room ID:": "ID de sala Interna:", "Open Devtools": "Abrir devtools", "General": "General", "Room Addresses": "Direcciones de sala", - "Set a new account password...": "Elegir una nueva contraseña para la cuenta...", + "Set a new account password...": "Cambiar la contraseña de tu cuenta…", "Account management": "Gestión de la cuenta", "Deactivating your account is a permanent action - be careful!": "Desactivar tu cuenta es permanente. ¡Cuidado!", "Credits": "Créditos", @@ -1083,7 +1083,7 @@ "Incompatible Database": "Base de datos incompatible", "Continue With Encryption Disabled": "Seguir con cifrado desactivado", "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica a este usuario para marcarlo como de confianza. Confiar en usuarios aporta tranquilidad en los mensajes cifrados de extremo a extremo.", - "Waiting for partner to confirm...": "Esperando que confirme el compañero...", + "Waiting for partner to confirm...": "Esperando que confirme la otra parte…", "Incoming Verification Request": "Petición de verificación entrante", "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s cambió la regla para unirse a %(rule)s", "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s cambió el acceso para invitados a %(rule)s", @@ -1095,7 +1095,7 @@ "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no las «migas de pan» (iconos sobre la lista de salas)", "Replying With Files": "Respondiendo con archivos", "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "En este momento no es posible responder con un archivo. ¿Te gustaría subir el archivo sin responder?", - "The file '%(fileName)s' failed to upload.": "La subida del archivo '%(fileName)s' ha fallado.", + "The file '%(fileName)s' failed to upload.": "La subida del archivo «%(fileName)s ha fallado.", "The server does not support the room version specified.": "El servidor no soporta la versión de sala especificada.", "Name or Matrix ID": "Nombre o ID de Matrix", "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Añade ¯\\_(ツ)_/¯ al principio de un mensaje de texto plano", @@ -1151,11 +1151,11 @@ "Add Phone Number": "Añadir número de teléfono", "Identity server has no terms of service": "El servidor de identidad no tiene términos de servicio", "This action requires accessing the default identity server to validate an email address or phone number, but the server does not have any terms of service.": "Esta acción necesita acceder al servidor de identidad por defecto para validar un correo o un teléfono, pero el servidor no tiene términos de servicio.", - "Only continue if you trust the owner of the server.": "Continúe solamente si confía en el propietario del servidor.", - "Trust": "Confianza", + "Only continue if you trust the owner of the server.": "Continúa solamente si confías en el propietario del servidor.", + "Trust": "Confiar", "Custom (%(level)s)": "Personalizado (%(level)s)", "Error upgrading room": "Fallo al mejorar la sala", - "Double check that your server supports the room version chosen and try again.": "Asegúrese de que su servidor soporta la versión de sala elegida y pruebe otra vez.", + "Double check that your server supports the room version chosen and try again.": "Asegúrate de que tu servidor es compatible con la versión de sala elegida y prueba de nuevo.", "%(senderName)s placed a voice call.": "%(senderName)s hizo una llamada de voz.", "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hizo una llamada de voz. (no soportada por este navegador)", "%(senderName)s placed a video call.": "%(senderName)s hizo una llamada de vídeo.", @@ -1168,10 +1168,10 @@ "My Ban List": "Mi lista de baneos", "This is your list of users/servers you have blocked - don't leave the room!": "Esta es la lista de usuarios y/o servidores que has bloqueado. ¡No te salgas de la sala!", "Decline (%(counter)s)": "Declinar (%(counter)s)", - "Accept to continue:": "Aceptar para continuar:", + "Accept to continue:": ", acepta para continuar:", "ID": "ID", "Public Name": "Nombre público", - "Connecting to integration manager...": "Conectando al gestor de integraciones...", + "Connecting to integration manager...": "Conectando al gestor de integraciones…", "Cannot connect to integration manager": "No se puede conectar al gestor de integraciones", "The integration manager is offline or it cannot reach your homeserver.": "El gestor de integraciones está desconectado o no puede conectar con su servidor.", "%(count)s unread messages including mentions.|other": "%(count)s mensajes sin leer incluyendo menciones.", @@ -1184,7 +1184,7 @@ "You have %(count)s unread notifications in a prior version of this room.|other": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.", "You have %(count)s unread notifications in a prior version of this room.|one": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.", "Setting up keys": "Configurando claves", - "Verify this session": "Verificar esta sesión", + "Verify this session": "Verifica esta sesión", "Encryption upgrade available": "Mejora de cifrado disponible", "Set up encryption": "Configurar la encriptación", "Verifies a user, session, and pubkey tuple": "Verifica a un usuario, sesión y tupla de clave pública", @@ -1246,9 +1246,9 @@ "Are you sure you want to sign out?": "¿Estás seguro de que quieres salir?", "Message edits": "Ediciones del mensaje", "New session": "Nueva sesión", - "Use this session to verify your new one, granting it access to encrypted messages:": "Usa esta sesión para verificar la nueva, dándole acceso a mensajes cifrados:", + "Use this session to verify your new one, granting it access to encrypted messages:": "Usa esta sesión para verificar la nueva, dándole acceso a los mensajes cifrados:", "If you didn’t sign in to this session, your account may be compromised.": "Si no te conectaste a esta sesión, es posible que tu cuenta haya sido comprometida.", - "This wasn't me": "No fui yo", + "This wasn't me": "No he sido yo", "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Si encuentras algún error o quieres compartir una opinión, por favor, contacta con nosotros en GitHub.", "Report bugs & give feedback": "Reportar errores y compartir mi opinión", "Please fill why you're reporting.": "Por favor, explica por qué estás reportando.", @@ -1274,7 +1274,7 @@ "Be found by phone or email": "Ser encontrado por teléfono o email", "Use bots, bridges, widgets and sticker packs": "Usar robots, puentes, widgets, o packs de pegatinas", "Terms of Service": "Términos de servicio", - "To continue you need to accept the terms of this service.": "Para continuar necesitas aceptar estos términos de servicio.", + "To continue you need to accept the terms of this service.": "Para continuar, necesitas aceptar estos términos de servicio.", "Service": "Servicio", "Summary": "Resumen", "Document": "Documento", @@ -1293,7 +1293,7 @@ "Remember my selection for this widget": "Recordar mi selección para este widget", "Deny": "Rechazar", "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Tu contraseña ha sido cambiada satisfactoriamente. No recibirás notificaciones push en otras sesiones hasta que te conectes de nuevo a ellas", - "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Aceptar los Términos de Servicio del servidor de identidad %(serverName)s para poder ser descubierto por dirección de email o número de teléfono.", + "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Acepta los términos de servicio del servidor de identidad %(serverName)s para poder ser encontrado por dirección de correo electrónico o número de teléfono.", "Discovery": "Descubrimiento", "Deactivate account": "Desactivar cuenta", "Clear cache and reload": "Limpiar caché y recargar", @@ -1314,7 +1314,7 @@ "⚠ These settings are meant for advanced users.": "⚠ Estas opciones son indicadas para usuarios avanzados.", "Personal ban list": "Lista de bloqueo personal", "Server or user ID to ignore": "Servidor o ID de usuario a ignorar", - "eg: @bot:* or example.org": "p. ej.: @bot:* o ejemplo.org", + "eg: @bot:* or example.org": "ej.: @bot:* o ejemplo.org", "Your user agent": "Tu agente de usuario", "If you cancel now, you won't complete verifying the other user.": "Si cancelas ahora, no completarás la verificación del otro usuario.", "If you cancel now, you won't complete verifying your other session.": "Si cancelas ahora, no completarás la verificación de tu otra sesión.", @@ -1350,12 +1350,12 @@ "Never send encrypted messages to unverified sessions in this room from this session": "No enviar nunca mensajes cifrados a sesiones sin verificar en esta sala desde esta sesión", "Enable message search in encrypted rooms": "Activar la búsqueda de mensajes en salas cifradas", "How fast should messages be downloaded.": "Con qué rapidez deben ser descargados los mensajes.", - "Verify this session by completing one of the following:": "Verifica esta sesión completando uno de los siguientes:", + "Verify this session by completing one of the following:": "Verifica esta sesión de una de las siguientes formas:", "Scan this unique code": "Escanea este código único", "or": "o", - "Compare unique emoji": "Comparar emoji único", - "Compare a unique set of emoji if you don't have a camera on either device": "Comparar un conjunto de emojis si no tienes cámara en ninguno de los dispositivos", - "Start": "Inicio", + "Compare unique emoji": "Comparar iconos", + "Compare a unique set of emoji if you don't have a camera on either device": "Comparar un conjunto de iconos si no tienes cámara en ninguno de los dispositivos", + "Start": "Empezar", "Waiting for %(displayName)s to verify…": "Esperando la verificación de %(displayName)s…", "Review": "Revise", "in secret storage": "en almacén secreto", @@ -1472,9 +1472,9 @@ "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permitir el servidor de respaldo de asistencia de llamadas turn.matrix.org cuando tu servidor base no lo ofrezca (tu dirección IP se compartiría durante una llamada)", "Send read receipts for messages (requires compatible homeserver to disable)": "Enviar recibos de lectura de mensajes (requiere un servidor local compatible para desactivarlo)", "Manually verify all remote sessions": "Verificar manualmente todas las sesiones remotas", - "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirma que los emoji de abajo se muestran en el mismo orden en ambas sesiones:", + "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirma que los iconos de abajo se muestran en el mismo orden en ambas sesiones:", "Verify this session by confirming the following number appears on its screen.": "Verifica esta sesión confirmando que el siguiente número aparece en su pantalla.", - "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Esperando a que su otra sesión, %(deviceName)s (%(deviceId)s), verifica…", + "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Esperando a que la otra sesión lo verifique también %(deviceName)s (%(deviceId)s)…", "Cancelling…": "Anulando…", "Verify all your sessions to ensure your account & messages are safe": "Verifica todas tus sesiones abiertas para asegurarte de que tu cuenta y tus mensajes estén seguros", "Set up": "Configurar", @@ -1515,12 +1515,12 @@ "This session is not backing up your keys, but you do have an existing backup you can restore from and add to going forward.": "Esta sesión no ha creado una copia de seguridad de tus llaves, pero tienes una copia de seguridad existente de la que puedes restaurar y añadir para proceder.", "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Conecte esta sesión a la copia de seguridad de las claves antes de firmar y así evitar perder las claves que sólo existen en esta sesión.", "Connect this session to Key Backup": "Conecte esta sesión a la copia de respaldo de tu clave", - "Backup has a valid signature from this user": "La copia de seguridad tiene una firma de valido de este usuario", - "Backup has a invalid signature from this user": "La copia de seguridad tiene una firma de no_valida de este usuario", - "Backup has a signature from unknown user with ID %(deviceId)s": "La copia de seguridad tiene una firma de desconocido del usuario con ID %(deviceId)s", + "Backup has a valid signature from this user": "La copia de seguridad tiene una firma válida de este usuario", + "Backup has a invalid signature from this user": "La copia de seguridad tiene una firma inválida de este usuario", + "Backup has a signature from unknown user with ID %(deviceId)s": "La copia de seguridad tiene una firma desconocida del usuario con ID %(deviceId)s", "Backup has a signature from unknown session with ID %(deviceId)s": "La copia de seguridad tiene una firma de desconocido de la sesión con ID %(deviceId)s", "Backup has a valid signature from this session": "La copia de seguridad tiene una firma válida de esta sesión", - "Backup has an invalid signature from this session": "La copia de seguridad tiene una firma no_válida de esta sesión", + "Backup has an invalid signature from this session": "La copia de seguridad tiene una firma inválida de esta sesión", "Backup has a valid signature from verified session ": "La copia de seguridad tiene una firma válida de verificada sesión ", "Backup has a valid signature from unverified session ": "La copia de seguridad tiene una firma de válida de sesión no verificada ", "Backup has an invalid signature from verified session ": "La copia de seguridad tiene una firma de no válida de sesión verificada ", @@ -1574,7 +1574,7 @@ "This room isn’t bridging messages to any platforms. Learn more.": "Esta sala no está haciendo puente con ninguna plataforma. Aprende más", "Bridges": "Puentes", "Uploaded sound": "Sonido subido", - "Reset": "Resetear", + "Reset": "Restablecer", "Unable to revoke sharing for email address": "No se logró revocar el compartir para la dirección de correo electrónico", "Unable to share email address": "No se logró compartir la dirección de correo electrónico", "Click the link in the email you received to verify and then click continue again.": "Haz clic en el enlace del correo electrónico para verificar, y luego nuevamente haz clic en continuar.", @@ -1585,7 +1585,7 @@ "Please enter verification code sent via text.": "Por favor, introduce el código de verificación enviado por SMS.", "Discovery options will appear once you have added a phone number above.": "Las opciones de descubrimiento aparecerán una vez que haya añadido un número de teléfono arriba.", "Remove %(phone)s?": "¿Eliminar %(phone)s?", - "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Se ha enviado un mensaje de texto a +%(msisdn)s. Por favor, introduzca el código de verificación que contiene.", + "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Se ha enviado un mensaje de texto a +%(msisdn)s. Por favor, escribe el código de verificación que contiene.", "This user has not verified all of their sessions.": "Este usuario no ha verificado todas sus sesiones.", "You have not verified this user.": "No has verificado a este usuario.", "You have verified this user. This user has verified all of their sessions.": "Usted ha verificado este usuario. Este usuario ha verificado todas sus sesiones.", @@ -1609,9 +1609,9 @@ "e.g. my-room": "p.ej. mi-sala", "Some characters not allowed": "Algunos caracteres no están permitidos", "Sign in with single sign-on": "Ingresar con un Registro Único", - "Enter a server name": "Introduzca un nombre de servidor", + "Enter a server name": "Introduce un nombre de servidor", "Looks good": "Se ve bien", - "Can't find this server or its room list": "No puedo encontrar este servidor o su lista de salas", + "Can't find this server or its room list": "No se ha podido encontrar este servidor o su lista de salas", "All rooms": "Todas las salas", "Your server": "Tu", "Are you sure you want to remove %(serverName)s": "¿Estás seguro de querer eliminar %(serverName)s?", @@ -1620,15 +1620,15 @@ "Add a new server": "Añadir un nuevo servidor", "Enter the name of a new server you want to explore.": "Introduce el nombre de un nuevo servidor que quieras explorar.", "Server name": "Nombre del servidor", - "Add a new server...": "Añade un nuevo servidor ...", + "Add a new server...": "Añadir otro servidor…", "%(networkName)s rooms": "%(networkName)s sala", "Matrix rooms": "Salas de Matrix", "Use an identity server to invite by email. Use the default (%(defaultIdentityServerName)s) or manage in Settings.": "Usar un servidor de identidad para invitar vía correo electrónico. . Usar (%(defaultIdentityServerName)s)o seleccione en Ajustes.", "Use an identity server to invite by email. Manage in Settings.": "Utilice un servidor de identidad para invitar por correo electrónico. Gestionar en Ajustes.", "Close dialog": "Cerrar diálogo", - "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Por favor, díganos qué salió mal o, mejor aún, cree un reporte de GitHub que describa el problema.", + "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Por favor, cuéntanos qué ha ido mal o, mejor aún, cree una incidencia en GitHub que describa el problema.", "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Recordatorio: Su navegador no es compatible, por lo que su experiencia puede ser impredecible.", - "GitHub issue": "reporte GitHub", + "GitHub issue": "Incidencia de GitHub", "Notes": "Notas", "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Si hay algún contexto adicional que ayude a analizar el tema, como por ejemplo lo que estaba haciendo en ese momento, nombre (ID) de sala, nombre (ID)de usuario, etc., por favor incluya esas cosas aquí.", "Removing…": "Quitando…", @@ -1638,14 +1638,14 @@ "Clear all data in this session?": "¿Borrar todos los datos en esta sesión?", "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "La eliminación de todos los datos de esta sesión es definitiva. Los mensajes cifrados se perderán, a menos que se haya hecho una copia de seguridad de sus claves.", "Clear all data": "Borrar todos los datos", - "Please enter a name for the room": "Por favor, introduzca un nombre para la sala", + "Please enter a name for the room": "Elige un nombre para la sala", "This room is private, and can only be joined by invitation.": "Esta sala es privada, y sólo se puede acceder a ella por invitación.", "Enable end-to-end encryption": "Activar el cifrado de extremo a extremo", "You can’t disable this later. Bridges & most bots won’t work yet.": "No puedes desactivar esto después. Los puentes y la mayoría de los bots no funcionarán todavía.", "Create a public room": "Crear una sala pública", "Create a private room": "Crear una sala privada", "Topic (optional)": "Tema (opcional)", - "Make this room public": "Haz la sala pública", + "Make this room public": "Hacer la sala pública", "Hide advanced": "Ocultar ajustes avanzados", "Show advanced": "Mostrar ajustes avanzados", "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Evitar que usuarios de otros servidores Matrix se unan a esta sala (¡Este ajuste no puede ser cambiada más tarde!)", @@ -1692,7 +1692,7 @@ "You can only join it with a working invite.": "Sólo puedes unirte con una invitación que funciona.", "Try to join anyway": "Intentar unirse de todas formas", "You can still join it because this is a public room.": "Todavía puedes unirte, ya que es una sala pública.", - "Join the discussion": "Unirse a la sala", + "Join the discussion": "Unirme a la Sala", "Do you want to chat with %(user)s?": "¿Quieres chatear con %(user)s?", "Do you want to join %(roomName)s?": "¿Quieres unirte a %(roomName)s?", " invited you": " te ha invitado", @@ -1746,8 +1746,8 @@ "This room is running room version , which this homeserver has marked as unstable.": "Esta sala está ejecutando la versión de sala , la cual ha sido marcado por este servidor base como inestable.", "Unknown Command": "Comando desconocido", "Unrecognised command: %(commandText)s": "Comando no reconocido: %(commandText)s", - "You can use /help to list available commands. Did you mean to send this as a message?": "Puedes usar /ayuda para listar los comandos disponibles. ¿Querías enviarlo como un mensaje?", - "Hint: Begin your message with // to start it with a slash.": "Sugerencia: Comienza tu mensaje con // para que inicie con una barra inclinada.", + "You can use /help to list available commands. Did you mean to send this as a message?": "Puedes usar /help para ver los comandos disponibles. ¿Querías enviarlo como mensaje?", + "Hint: Begin your message with // to start it with a slash.": "Sugerencia: empieza tu mensaje con // para que inicie con una barra inclinada.", "Send as message": "Enviar como mensaje", "Failed to connect to integration manager": "Error al conectarse con el administrador de integración", "Failed to revoke invite": "Error al revocar la invitación", @@ -1760,7 +1760,7 @@ "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Hubo un error al actualizar la dirección alternativa de la sala. Posiblemente el servidor no lo permita o se produjo un error temporal.", "Local address": "Dirección local", "Published Addresses": "Direcciones publicadas", - "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Las direcciones publicadas pueden ser usadas por cualquier usuario en cualquier servidor para unirse a tu salas. Para publicar una dirección, primero hay que establecerla como dirección local.", + "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Las direcciones publicadas pueden ser usadas por cualquier usuario en cualquier servidor para unirse. Para publicar una dirección, primero hay que añadirla como dirección local.", "Other published addresses:": "Otras direcciones publicadas:", "No other published addresses yet, add one below": "Todavía no hay direcciones publicadas, puedes añadir una más abajo", "New published address (e.g. #alias:server)": "Nueva dirección publicada (p.ej.. #alias:server)", @@ -1806,7 +1806,7 @@ "Almost there! Is %(displayName)s showing the same shield?": "¡Ya casi está! ¿Está %(displayName)s mostrando el mismo escudo?", "Verify all users in a room to ensure it's secure.": "Verifica a todos los usuarios de una sala para asegurar que es segura.", "In encrypted rooms, verify all users to ensure it’s secure.": "En las salas cifrar, verificar a todos los usuarios para asegurarse de son seguras.", - "You've successfully verified %(deviceName)s (%(deviceId)s)!": "¡Has verificado con éxito los %(deviceName)s (%(deviceId)s)!", + "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Has verificado con éxito %(deviceName)s (%(deviceId)s)", "You've successfully verified %(displayName)s!": "¡Has verificado con éxito a %(displayName)s!", "Verified": "Verificado", "Got it": "Aceptar", @@ -1825,7 +1825,7 @@ "React": "Reaccionar", "Message Actions": "Acciones de mensaje", "Show image": "Mostrar imagen", - "You have ignored this user, so their message is hidden. Show anyways.": "Ha ignorado a este usuario, así que su mensaje se ha ocultado. Mostrar de todos modos.", + "You have ignored this user, so their message is hidden. Show anyways.": "Ha ignorado a esta cuenta, así que su mensaje está oculto. Ver de todos modos.", "You verified %(name)s": "Has verificado a %(name)s", "You cancelled verifying %(name)s": "Has cancelado la verificación de %(name)s", "%(name)s cancelled verifying": "%(name)s canceló la verificación", @@ -1847,7 +1847,7 @@ "Message deleted by %(name)s": "Mensaje eliminado por %(name)s", "Edited at %(date)s. Click to view edits.": "Editado el día %(date)s. Haz clic para ver las ediciones.", "edited": "editado", - "Can't load this message": "No puedo cargar este mensaje", + "Can't load this message": "No se ha podido cargar este mensaje", "Submit logs": "Enviar registros", "Frequently Used": "Frecuente", "Smileys & People": "Caritas y personas", @@ -1866,7 +1866,7 @@ "Your user ID": "Tu ID de usuario", "Your theme": "Su tema", "%(brand)s URL": "URL de %(brand)s", - "Room ID": "Identidad (ID) de la sala", + "Room ID": "ID de la sala", "Widget ID": "ID del widget", "Using this widget may share data with %(widgetDomain)s & your Integration Manager.": "Usar este widget puede resultar en que se compartan datos con %(widgetDomain)s y su administrador de integración.", "Using this widget may share data with %(widgetDomain)s.": "Usar este widget puede resultar en que se compartan datos con %(widgetDomain)s.", @@ -1881,7 +1881,7 @@ "Cancelled signature upload": "Subida de firma cancelada", "Unable to upload": "No se puede subir", "Signature upload success": "Subida de firma exitosa", - "Signature upload failed": "Subida de firma falló", + "Signature upload failed": "Subida de firma ha fallado", "Confirm by comparing the following with the User Settings in your other session:": "Confirme comparando lo siguiente con los ajustes de usuario de su otra sesión:", "Confirm this user's session by comparing the following with their User Settings:": "Confirma la sesión de este usuario comparando lo siguiente con su configuración:", "If they don't match, the security of your communication may be compromised.": "Si no coinciden, la seguridad de su comunicación puede estar comprometida.", @@ -1892,7 +1892,7 @@ "The internet connection either session is using": "La conexión a Internet usado por cualquiera de las dos sesiones", "We recommend you change your password and recovery key in Settings immediately": "Le recomendamos que cambie inmediatamente su contraseña y su clave de recuperación en Configuración", "To help avoid duplicate issues, please view existing issues first (and add a +1) or create a new issue if you can't find it.": "Para ayudar a evitar la duplicación de entradas, por favor ver primero los entradas existentes (y añadir un +1) o, si no lo encuentra, crear una nueva entrada .", - "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reportar este mensaje enviará su único 'event ID' al administrador de tu servidor base. Si los mensajes en esta sala están cifrados, el administrador de tu servidor no podrá leer el texto del mensaje ni ver ningún archivo o imagen.", + "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reportar este mensaje enviará su único «event ID al administrador de tu servidor base. Si los mensajes en esta sala están cifrados, el administrador de tu servidor no podrá leer el texto del mensaje ni ver ningún archivo o imagen.", "Command Help": "Ayuda del comando", "Integration Manager": "Administrador de integración", "Verify other session": "Verificar otra sesión", @@ -1904,7 +1904,7 @@ "This looks like a valid recovery key!": "¡Esto tiene pinta de una llave de recuperación válida!", "Not a valid recovery key": "Clave de recuperación no válida", "Restoring keys from backup": "Restaurando las claves desde copia de seguridad", - "Fetching keys from server...": "Obteniendo las claves desde el servidor...", + "Fetching keys from server...": "Obteniendo las claves desde el servido…", "%(completed)s of %(total)s keys restored": "%(completed)s de %(total)s llaves restauradas", "Unable to load backup status": "No se puede cargar el estado de la copia de seguridad", "Recovery key mismatch": "No coincide la clave de recuperación", @@ -1931,7 +1931,7 @@ "Clear status": "Borrar estado", "Update status": "Actualizar estado", "Set status": "Cambiar estado", - "Set a new status...": "Elegir un estado nuevo...", + "Set a new status...": "Elegir un nuevo estado…", "Hide": "Ocultar", "Help": "Ayuda", "Reload": "Recargar", @@ -1954,12 +1954,12 @@ "Not sure of your password? Set a new one": "¿No estás seguro de tu contraseña? Escoge una nueva", "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No se ha configurado ningún servidor de identidad, por lo que no se puede añadir una dirección de correo electrónico para restablecer la contraseña en el futuro.", "Use an email address to recover your account": "Utilice una dirección de correo electrónico para recuperar su cuenta", - "Enter email address (required on this homeserver)": "Introduzca una dirección de correo electrónico (requerida en este servidor)", + "Enter email address (required on this homeserver)": "Introduce una dirección de correo electrónico (obligatorio en este servidor)", "Doesn't look like a valid email address": "No parece una dirección de correo electrónico válida", - "Enter password": "Introduzca su contraseña", + "Enter password": "Escribe tu contraseña", "Password is allowed, but unsafe": "Contraseña permitida, pero no es segura", "Nice, strong password!": "¡Fantástico, una contraseña fuerte!", - "Keep going...": "Continúa...", + "Keep going...": "Continuar…", "Passwords don't match": "Las contraseñas no coinciden", "Other users can invite you to rooms using your contact details": "Otros usuarios pueden invitarte las salas utilizando tus datos de contacto", "Enter phone number (required on this homeserver)": "Introduce un número de teléfono (es obligatorio en este servidor base)", @@ -1986,15 +1986,15 @@ "Sign in to your Matrix account on ": "Inicie sesión en su cuenta de Matrix en ", "Sign in with SSO": "Ingrese con SSO", "Please install Chrome, Firefox, or Safari for the best experience.": "Por favor, instale Chrome, Firefox, o Safari para la mejor experiencia.", - "Couldn't load page": "No pude cargar la página", + "Couldn't load page": "No se ha podido cargar la página", "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Eres un administrador de esta comunidad. No podrás volver a unirte sin una invitación de otro administrador.", "Want more than a community? Get your own server": "¿Quieres más que una comunidad? Obtenga su propio servidor", "This homeserver does not support communities": "Este servidor base no permite las comunidades", "Welcome to %(appName)s": "Te damos la bienvenida a %(appName)s", "Liberate your communication": "Libera tu comunicación", "Send a Direct Message": "Envía un mensaje directo", - "Explore Public Rooms": "Explorar salas públicas", - "Create a Group Chat": "Crear un chat grupal", + "Explore Public Rooms": "Explora las salas públicas", + "Create a Group Chat": "Crea un chat grupal", "Explore": "Explorar", "Filter": "Filtrar", "Filter rooms…": "Filtrar salas…", @@ -2020,7 +2020,7 @@ "Your Matrix account on %(serverName)s": "Su cuenta de Matrix en %(serverName)s", "Your Matrix account on ": "Su cuenta de Matrix en ", "No identity server is configured: add one in server settings to reset your password.": "No hay ningún servidor de identidad configurado: añada uno en la configuración del servidor para poder restablecer su contraseña.", - "Sign in instead": "Regístrese", + "Sign in instead": "Iniciar sesión", "A verification email will be sent to your inbox to confirm setting your new password.": "Se enviará un correo electrónico de verificación a su bandeja de entrada para confirmar la configuración de su nueva contraseña.", "Your password has been reset.": "Su contraseña ha sido restablecida.", "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Ha cerrado todas las sesiones y ya no recibirá más notificaciones push. Para volver a activar las notificaciones, inicie sesión de nuevo en cada dispositivo.", @@ -2038,7 +2038,7 @@ "Room name or address": "Nombre o dirección de la sala", "Address (optional)": "Dirección (opcional)", "Help us improve %(brand)s": "Ayúdanos a mejorar %(brand)s", - "Send anonymous usage data which helps us improve %(brand)s. This will use a cookie.": "Enviar información anónima de uso nos ayudaría bastante a mejorar %(brand)s. Esto cuenta como utilizar una cookie.", + "Send anonymous usage data which helps us improve %(brand)s. This will use a cookie.": "Enviar información anónima de uso nos ayuda a mejorar %(brand)s. Esto usará una cookie.", "I want to help": "Quiero ayudar", "Ok": "Ok", "Set password": "Establecer contraseña", @@ -2102,7 +2102,7 @@ "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototipo de comunidades v2. Requiere un servidor compatible. Altamente experimental - usar con precuación.", "Font size": "Tamaño del texto", "Use custom size": "Usar un tamaño personalizado", - "Use a more compact ‘Modern’ layout": "Usar un diseño más 'moderno' y compacto", + "Use a more compact ‘Modern’ layout": "Usar un diseño más «moderno y compacto", "Use a system font": "Usar una fuente del sistema", "System font name": "Nombre de la fuente", "Enable experimental, compact IRC style layout": "Activar el diseño experimental de IRC compacto", @@ -2115,7 +2115,7 @@ "Your server isn't responding to some requests.": "Tú servidor no esta respondiendo a ciertas solicitudes.", "There are advanced notifications which are not shown here.": "Hay configuraciones avanzadas que no se muestran aquí.", "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Puede que las hayas configurado en otro cliente además de %(brand)s. No puedes cambiarlas en %(brand)s pero sus efectos siguen aplicándose.", - "New version available. Update now.": "Nueva versión disponible. Actualiza ahora.", + "New version available. Update now.": "Nueva versión disponible. Actualizar ahora.", "Hey you. You're the best!": "Oye, tú. ¡Eres genial!", "Size must be a number": "El tamaño debe ser un dígito", "Custom font size can only be between %(min)s pt and %(max)s pt": "El tamaño de la fuente solo puede estar entre los valores %(min)s y %(max)s", @@ -2123,7 +2123,7 @@ "Message layout": "Diseño del mensaje", "Compact": "Compacto", "Modern": "Moderno", - "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Introduce el nombre de la fuente instalada en tu sistema y %(brand)s intentará utilizarla.", + "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Escribe el nombre de la fuente instalada en tu sistema y %(brand)s intentará usarla.", "Customise your appearance": "Personaliza la apariencia", "Appearance Settings only affect this %(brand)s session.": "Cambiar las opciones de apariencia solo afecta a esta sesión de %(brand)s.", "Please verify the room ID or address and try again.": "Por favor, verifica la ID o dirección de esta sala e inténtalo de nuevo.", @@ -2150,7 +2150,7 @@ "Cross-signing is ready for use.": "La firma cruzada está lista para su uso.", "Cross-signing is not set up.": "La firma cruzada no está configurada.", "Master private key:": "Clave privada maestra:", - "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use %(brand)s Desktop for encrypted messages to appear in search results.": "%(brand)s no puede almacenar en caché de forma segura mensajes cifrados localmente mientras se ejecuta en un navegador web. Utilizar %(brand)s Escritorio para que los mensajes cifrados aparezcan en los resultados de búsqueda.", + "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use %(brand)s Desktop for encrypted messages to appear in search results.": "%(brand)s no puede almacenar en caché de forma segura mensajes cifrados localmente mientras se ejecuta en un navegador web. Usa %(brand)s Escritorio para que los mensajes cifrados aparezcan en los resultados de búsqueda.", "Backup version:": "Versión de respaldo:", "Algorithm:": "Algoritmo:", "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.": "Haga una copia de seguridad de sus claves de cifrado con los datos de su cuenta en caso de que pierda el acceso a sus sesiones. Sus claves estarán protegidas con una clave de recuperación única.", @@ -2214,7 +2214,7 @@ "This address is already in use": "Esta dirección ya está en uso", "Preparing to download logs": "Preparándose para descargar registros", "Download logs": "Descargar registros", - "Add another email": "Agregar otro correo electrónico", + "Add another email": "Añadir otro correo electrónico", "People you know on %(brand)s": "Gente que conoces %(brand)s", "Show": "Mostrar", "Send %(count)s invites|other": "Enviar %(count)s invitaciones", @@ -2226,10 +2226,10 @@ "You can change this later if needed.": "Puede cambiar esto más tarde si es necesario.", "What's the name of your community or team?": "¿Cuál es el nombre de tu comunidad o equipo?", "Enter name": "Introduce un nombre", - "Add image (optional)": "Agregar imagen (opcional)", + "Add image (optional)": "Añadir imagen (opcional)", "An image will help people identify your community.": "Una imagen ayudará a las personas a identificar su comunidad.", - "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Las salas privadas se pueden encontrar y unirse solo con invitación. Cualquier persona puede encontrar y unirse a las salas públicas.", - "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Las salas privadas se pueden encontrar y unirse solo con invitación. Cualquier persona de esta comunidad puede encontrar salas públicas y unirse a ellas.", + "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Las salas privadas solo se pueden encontrar y unirse con invitación. Cualquier persona puede encontrar y unirse a las salas públicas.", + "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Las salas privadas solo se pueden encontrar y unirse con invitación. Cualquier persona de esta comunidad puede encontrar salas públicas y unirse a ellas.", "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Puedes activar esto si la sala solo se usará para colaborar con equipos internos en tu servidor base. No se puede cambiar después.", "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Puedes desactivar esto si la sala se utilizará para colaborar con equipos externos que tengan su propio servidor base. Esto no se puede cambiar después.", "Create a room in %(communityName)s": "Crea una sala en %(communityName)s", @@ -2243,7 +2243,7 @@ "May include members not in %(communityName)s": "Puede incluir miembros que no están en %(communityName)s", "Start a conversation with someone using their name, username (like ) or email address. This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click here.": "Inicie una conversación con alguien usando su nombre, nombre de usuario (como) o dirección de correo electrónico. Esto no los invitará a %(communityName)s Para invitar a alguien a %(communityName)s, haga clic aquí.", "You're all caught up.": "Estás al día.", - "Server isn't responding": "El servidor no responde", + "Server isn't responding": "El servidor no está respondiendo", "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Su servidor no responde a algunas de sus solicitudes. A continuación se presentan algunas de las razones más probables.", "The server (%(serverName)s) took too long to respond.": "El servidor (%(serverName)s) tardó demasiado en responder.", "Your firewall or anti-virus is blocking the request.": "Tu firewall o antivirus está bloqueando la solicitud.", @@ -2283,15 +2283,15 @@ "Feedback": "Realimentación", "Community settings": "Configuración de la comunidad", "User settings": "Ajustes de usuario", - "Switch to light mode": "Cambiar al modo claro", + "Switch to light mode": "Cambiar al tema claro", "Switch to dark mode": "Cambiar al tema oscuro", "Switch theme": "Cambiar tema", "User menu": "Menú del Usuario", "Community and user menu": "Menú de comunidad y usuario", "Failed to perform homeserver discovery": "No se ha podido realizar el descubrimiento del servidor base", - "Syncing...": "Sincronizando ...", - "Signing In...": "Iniciando sesión...", - "If you've joined lots of rooms, this might take a while": "Si se ha unido a muchas salas, esto puede llevar un tiempo", + "Syncing...": "Sincronizando…", + "Signing In...": "Iniciando sesión…", + "If you've joined lots of rooms, this might take a while": "Si te has unido a muchas salas, esto puede llevar un tiempo", "Create account": "Crear una cuenta", "Unable to query for supported registration methods.": "No se pueden consultar los métodos de registro admitidos.", "Registration has been disabled on this homeserver.": "Se han desactivado los registros en este servidor base.", @@ -2345,7 +2345,7 @@ "Great! This recovery passphrase looks strong enough.": "¡Excelente! Esta frase de contraseña de recuperación parece lo suficientemente sólida.", "That matches!": "¡Eso combina!", "Use a different passphrase?": "¿Utiliza una frase de contraseña diferente?", - "That doesn't match.": "Eso no coincide.", + "That doesn't match.": "No coincide.", "Go back to set it again.": "Regrese para configurarlo nuevamente.", "Enter your recovery passphrase a second time to confirm it.": "Ingrese su contraseña de recuperación por segunda vez para confirmarla.", "Confirm your recovery passphrase": "Confirma tu contraseña de recuperación", @@ -2379,7 +2379,7 @@ "Set up Secure Message Recovery": "Configurar la recuperación segura de mensajes", "Secure your backup with a recovery passphrase": "Asegure su copia de seguridad con una frase de contraseña de recuperación", "Make a copy of your recovery key": "Haz una copia de tu clave de recuperación", - "Starting backup...": "Iniciando copia de seguridad ...", + "Starting backup...": "Empezando copia de seguridad…", "Success!": "¡Éxito!", "Create key backup": "Crear copia de seguridad de claves", "Unable to create key backup": "No se puede crear una copia de seguridad de la clave", @@ -2416,9 +2416,9 @@ "Ctrl": "Ctrl", "Toggle Bold": "Alternar negrita", "Toggle Italics": "Alternar cursiva", - "Toggle Quote": "Alternar Entrecomillar", + "Toggle Quote": "Alternar cita", "New line": "Nueva línea", - "Navigate recent messages to edit": "Navegar por mensajes recientes para editar", + "Navigate recent messages to edit": "Navegar entre mensajes recientes para editar", "Jump to start/end of the composer": "Saltar al inicio o final del editor", "Navigate composer history": "Navegar por el historial del editor", "Cancel replying to a message": "Cancelar la respuesta a un mensaje", @@ -2428,14 +2428,14 @@ "Dismiss read marker and jump to bottom": "Descartar el marcador de lectura y saltar al final", "Jump to oldest unread message": "Ir al mensaje no leído más antiguo", "Upload a file": "Cargar un archivo", - "Jump to room search": "Ir a la búsqueda de Salas", + "Jump to room search": "Ir a la búsqueda de salas", "Navigate up/down in the room list": "Navegar hacia arriba/abajo en la lista de salas", "Select room from the room list": "Seleccionar sala de la lista de salas", "Collapse room list section": "Contraer la sección de lista de salas", "Expand room list section": "Expandir la sección de la lista de salas", "Clear room list filter field": "Borrar campo de filtro de lista de salas", - "Previous/next unread room or DM": "Sala o DM anterior/siguiente sin leer", - "Previous/next room or DM": "Sala anterior/siguiente o DM", + "Previous/next unread room or DM": "Sala o mensaje directo anterior/siguiente sin leer", + "Previous/next room or DM": "Sala anterior/siguiente o mensaje directo", "Toggle the top left menu": "Alternar el menú superior izquierdo", "Close dialog or context menu": "Cerrar cuadro de diálogo o menú contextual", "Activate selected button": "Activar botón seleccionado", @@ -2499,7 +2499,7 @@ "Great, that'll help people know it's you": "Genial, ayudará a que la gente sepa que eres tú", "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s o %(usernamePassword)s", "Please enter your Security Phrase a second time to confirm.": "Por favor, escribe tu frase de seguridad una segunda vez para confirmarla.", - "Repeat your Security Phrase...": "Repite tu frase de seguridad...", + "Repeat your Security Phrase...": "Repite tu frase de seguridad…", "Your Security Key": "Tu clave de seguridad", "Your Security Key has been copied to your clipboard, paste it to:": "Tu clave de seguridad ha sido copiada a tu portapapeles, pégala en:", "Your Security Key is in your Downloads folder.": "Tu clave de seguridad está en tu carpeta de Descargas.", @@ -2508,7 +2508,7 @@ "Make a copy of your Security Key": "Haz una copia de tu clave de seguridad", "A new Security Phrase and key for Secure Messages have been detected.": "Se ha detectado una nueva frase de seguridad y clave para mensajes seguros.", "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Esta sesión ha detectado que tu frase de seguridad y clave para mensajes seguros ha sido eliminada.", - "Search (must be enabled)": "Buscar (debe estar activado)", + "Search (must be enabled)": "Buscar (si está activado)", "Zimbabwe": "Zimbabue", "Yemen": "Yemen", "Wallis & Futuna": "Wallis y Futuna", @@ -2573,7 +2573,7 @@ "Slovenia": "Eslovenia", "Slovakia": "Eslovaquia", "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Puedes usar la opción de editar el servidor para iniciar sesión en otros servidores de Matrix indicando una URL de servidor base diferente. Esto te permitirá usar Element con una cuenta de Matrix que ye exista en un servidor base diferente.", - "We call the places where you can host your account ‘homeservers’.": "Llamamos a los sitios donde puedes alojar tu cuenta «servidores base».", + "We call the places where you can host your account ‘homeservers’.": "Llamamos «servidores base» a los sitios donde puedes alojar tu cuenta.", "Use email to optionally be discoverable by existing contacts.": "También puedes usarlo para que tus contactos te encuentren fácilmente.", "Add an email to be able to reset your password.": "Añade un correo para poder restablecer tu contraseña si te olvidas.", "Continue with %(ssoButtons)s": "Continuar con %(ssoButtons)s", @@ -2693,7 +2693,7 @@ "New here? Create an account": "¿Primera vez? Crea una cuenta", "Got an account? Sign in": "¿Ya tienes una cuenta? Iniciar sesión", "Filter rooms and people": "Filtrar salas y personas", - "You have no visible notifications.": "No tienes notificaciones visibles.", + "You have no visible notifications.": "No tienes notificaciones pendientes.", "%(creator)s created this DM.": "%(creator)s creó este mensaje directo.", "You do not have permission to create rooms in this community.": "No tienes permisos para crear salas en esta comunidad.", "Cannot create rooms in this community": "No puedes crear salas en esta comunidad", @@ -2727,8 +2727,8 @@ "Learn more": "Más información", "Use your preferred Matrix homeserver if you have one, or host your own.": "Usa tu servidor base de Matrix de confianza o aloja el tuyo propio.", "Other homeserver": "Otro servidor base", - "Sign into your homeserver": "Iniciar sesión en tu servidor base", - "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org es el mayor servidor base del mundo, por lo que es un buen sitio para muchos.", + "Sign into your homeserver": "Inicia sesión en tu servidor base", + "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org es el mayor servidor base del mundo, por lo que es un buen sitio para empezar.", "Specify a homeserver": "Especificar un servidor base", "Invalid URL": "URL inválida", "Unable to validate homeserver": "No se ha podido validar el servidor base", @@ -2963,7 +2963,7 @@ "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "No se ha podido acceder al almacenamiento seguro. Por favor, comprueba que la frase de seguridad es correcta.", "Just a heads up, if you don't add an email and forget your password, you could permanently lose access to your account.": "Ten en cuenta que, si no añades un correo electrónico y olvidas tu contraseña, podrías perder accceso para siempre a tu cuenta.", "We recommend you change your password and Security Key in Settings immediately": "Te recomendamos que cambies tu contraseña y clave de seguridad en ajustes inmediatamente", - "Invite someone using their name, email address, username (like ) or share this room.": "Invitar a alguien usando su nombre, dirección de correo, nombre de usuario (ej.: ) o compartiendo esta sala.", + "Invite someone using their name, email address, username (like ) or share this room.": "Invitar a alguien usando su nombre, dirección de correo, nombre de usuario (ej.: ) o compartiendo la sala.", "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click here": "Esto no les invitará a %(communityName)s. Para invitar a alguien a %(communityName)s, haz clic aquí", "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Al continuar con el proceso de configuración, %(hostSignupBrand)s podrá acceder a tu cuenta para comprobar las direcciones de correo verificadas. Los datos no se almacenan.", "Failed to connect to your homeserver. Please close this dialog and try again.": "No se ha podido conectar con tu servidor base. Por favor, cierra este mensaje e inténtalo de nuevo.", @@ -3026,5 +3026,120 @@ "Settings Explorer": "Explorador de ajustes", "Windows": "Ventanas", "Share your screen": "Compartir pantalla", - "Screens": "Pantallas" + "Screens": "Pantallas", + "Inviting...": "Invitando…", + "Creating rooms...": "Creando salas…", + "Find a room...": "Encontrar una sala…", + "Saving...": "Guardando…", + "Applying...": "Aplicando…", + "Encrypting your message...": "Cifrando tu mensaje…", + "Sending your message...": "Enviando tu mensaje…", + "Creating...": "Creando…", + "Promoted to users": "Ascendidos a usuarios", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "No podrás deshacer esto, ya que te estás quitando tus permisos. Si eres la última persona con permisos en este usuario, no será posible recuperarlos.", + "Jump to the bottom of the timeline when you send a message": "Saltar abajo del todo cuando envíes un mensaje", + "Your private space ": "Tu espacio privado ", + "Welcome to ": "Te damos la bienvenida a ", + "Already in call": "Ya en una llamada", + "Original event source": "Fuente original del evento", + "Decrypted event source": "Descifrar fuente del evento", + "We'll create rooms for each of them. You can add existing rooms after setup.": "Crearemos salas para cada uno de ellos. Puedes añadir salas ya existentes después de la configuración.", + "What projects are you working on?": "¿En qué proyectos estáis trabajando?", + "We'll create rooms for each topic.": "Crearemos una sala para cada tema.", + "What are some things you want to discuss?": "¿De qué cosas quieres hablar?", + "Invite by username": "Invitar por nombre de usuario", + "Invite your teammates": "Invita a tu equipo", + "Failed to invite the following users to your space: %(csvUsers)s": "La invitación a este espacio de los siguientes usuarios ha fallado: %(csvUsers)s", + "A private space for you and your teammates": "Un espacio privado para ti y tu equipo", + "Me and my teammates": "Yo y mi equipo", + "A private space just for you": "Un espacio privado solo para ti", + "Just Me": "Solo yo", + "Ensure the right people have access to the space.": "Asegúrate de que las personas adecuadas tienen acceso a este espacio.", + "Who are you working with?": "¿Con quién estás trabajando?", + "Finish": "Terminar", + "At the moment only you can see it.": "En este momento solo tú lo puedes ver.", + "Skip for now": "Omitir por ahora", + "Failed to create initial space rooms": "No se han podido crear las salas iniciales del espacio", + "Room name": "Nombre de la sala", + "Support": "Ayuda", + "Random": "Al azar", + "Your public space ": "Tu espacio público ", + "You have been invited to ": "Te han invitado a ", + " invited you to ": " te ha invitado a ", + "%(count)s members|one": "%(count)s miembro", + "%(count)s members|other": "%(count)s miembros", + "Your server does not support showing space hierarchies.": "Este servidor no soporta mostrar jerarquías de espacios.", + "Default Rooms": "Salas por defecto", + "Add existing rooms & spaces": "Añadir salas y espacios ya existentes", + "Accept Invite": "Aceptar invitación", + "Manage rooms": "Gestionar salas", + "Save changes": "Guardar cambios", + "You're in this room": "Estás en esta sala", + "You're in this space": "Eres parte de este espacio", + "No permissions": "Sin permisos", + "Remove from Space": "Quitar del espacio", + "Undo": "Deshacer", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "Tu mensaje no ha sido enviado porque este servidor base ha sido bloqueado por su administración. Por favor, ponte en contacto con ellos para continuar usando el servicio.", + "Are you sure you want to leave the space '%(spaceName)s'?": "¿Salir del espacio «%(spaceName)s»?", + "This space is not public. You will not be able to rejoin without an invite.": "Este espacio es privado. No podrás volverte a unir sin una invitación.", + "Start audio stream": "Empezar retransmisión de audio", + "Failed to start livestream": "No se ha podido empezar la retransmisión", + "Unable to start audio streaming.": "No se ha podido empezar la retransmisión del audio.", + "Save Changes": "Guardar cambios", + "View dev tools": "Ver herramientas de desarrollador", + "Leave Space": "Salir del espacio", + "Make this space private": "Hacer este espacio privado", + "Edit settings relating to your space.": "Editar ajustes relacionados con tu espacio.", + "Space settings": "Ajustes del espacio", + "Failed to save space settings.": "No se han podido guardar los ajustes del espacio.", + "Invite someone using their name, email address, username (like ) or share this space.": "Invita a más gente usando su nombre, correo electrónico, nombre de usuario (ej.: ) o compartiendo este espacio.", + "Invite someone using their name, username (like ) or share this space.": "Invita a más gente usando su nombre, nombre de usuario (ej.: ) o compartiendo este espacio.", + "Unnamed Space": "Espacio sin nombre", + "Invite to %(spaceName)s": "Invitar a %(spaceName)s", + "Failed to add rooms to space": "No se han podido añadir las salas al espacio", + "Apply": "Aplicar", + "Create a new room": "Crea una nueva", + "Don't want to add an existing room?": "¿No quieres añadir una sala que ya exista?", + "Spaces": "Espacios", + "Filter your rooms and spaces": "Filtra tus salas y espacios", + "Add existing spaces/rooms": "Añadir espacios o salas ya existentes", + "Space selection": "Selección de espacio", + "Empty room": "Sala vacía", + "Suggested Rooms": "Salas sugeridas", + "Explore space rooms": "Explorar las salas del espacio", + "You do not have permissions to add rooms to this space": "No tienes permisos para añadir salas a este espacio", + "Add existing room": "Añadir sala ya existente", + "You do not have permissions to create new rooms in this space": "No tienes permisos para crear nuevas salas en este espacio", + "Send message": "Enviar mensaje", + "Invite to this space": "Invitar a este espacio", + "Your message was sent": "Mensaje enviado", + "Spell check dictionaries": "Diccionarios de comprobación de ortografía", + "Space options": "Opciones del espacio", + "Space Home": "Inicio del espacio", + "New room": "Nueva sala", + "Leave space": "Salir del espacio", + "Invite people": "Invitar a gente", + "Share your public space": "Comparte tu espacio público", + "Invite members": "Invitar a gente", + "Invite by email or username": "Invitar usando correo electrónico o nombre de usuario", + "Share invite link": "Compartir enlace de invitación", + "Click to copy": "Haz clic para copiar", + "Collapse space panel": "Colapsar panel del espacio", + "Expand space panel": "Expandir panel del espacio", + "You can change these at any point.": "Puedes cambiar todo esto cuando quieras.", + "Give it a photo, name and description to help you identify it.": "Añádele una foto, nombre o descripción que te ayude a identificarlo.", + "Your private space": "Tu espacio privado", + "Your public space": "Tu espacio público", + "You can change this later": "Puedes cambiar esto más adelante", + "Invite only, best for yourself or teams": "Solo con invitación, mejor para ti o para equipos", + "Private": "Privado", + "Open space for anyone, best for communities": "Espacio abierto para todo el mundo, la mejor opción para comunidades", + "Public": "Público", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Los espacios son la manera de agrupar salas y gente. Para unirte a un espacio ya existente, necesitarás que te inviten", + "Create a space": "Crear un espacio", + "Delete": "Borrar", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototipo de espacios. No compatible con comunidades, comunidades v2 o etiquetas personalizadas. Necesita un servidor base compatible para algunas funcionalidades.", + "This homeserver has been blocked by its administrator.": "Este servidor base ha sido bloqueado por su administración.", + "This homeserver has been blocked by it's administrator.": "Este servidor base ha sido bloqueado por su administración.", + "You're already in a call with this person.": "Ya estás en una llamada con esta persona." } From ab6e1c6fb033cfce0fc56fc61e854ae9a76b214e Mon Sep 17 00:00:00 2001 From: Thibault Martin Date: Sun, 14 Mar 2021 17:27:38 +0000 Subject: [PATCH 047/163] Translated using Weblate (French) Currently translated at 99.9% (2887 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 151 ++++++++++++++++++++++++++++++++++----- 1 file changed, 132 insertions(+), 19 deletions(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index dc6a70bc24..6fcc0323d7 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -40,7 +40,7 @@ "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s a changé le rang de %(powerLevelDiffText)s.", "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s.", "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en « %(topic)s ».", - "Changes your display nickname": "Change votre nom d’affichage", + "Changes your display nickname": "Modifie votre nom d’affichage", "Click here to fix": "Cliquer ici pour réparer", "Click to mute audio": "Cliquer pour couper le son", "Click to mute video": "Cliquer ici pour couper la vidéo", @@ -636,7 +636,7 @@ "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n’est pas public. Vous ne pourrez pas y revenir sans invitation.", "Community IDs cannot be empty.": "Les identifiants de communauté ne peuvent pas être vides.", "In reply to ": "En réponse à ", - "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom d’affichage en %(displayName)s.", + "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a modifié son nom d’affichage en %(displayName)s.", "Failed to set direct chat tag": "Échec de l’ajout de l’étiquette discussion directe", "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l’étiquette %(tagName)s du salon", "Failed to add tag %(tagName)s to room": "Échec de l’ajout de l’étiquette %(tagName)s au salon", @@ -714,7 +714,7 @@ "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utilise de nombreuses fonctionnalités avancées du navigateur, certaines ne sont pas disponibles ou expérimentales dans votre navigateur actuel.", "Developer Tools": "Outils de développement", "Remember, you can always set an email address in user settings if you change your mind.": "Souvenez-vous que vous pourrez toujours définir une adresse e-mail dans les paramètres de l'utilisateur si vous changez d’avis.", - "Explore Account Data": "Explorer les données du compte", + "Explore Account Data": "Parcourir les données du compte", "Remove from Directory": "Supprimer du répertoire", "Saturday": "Samedi", "I understand the risks and wish to continue": "Je comprends les risques et souhaite continuer", @@ -1012,7 +1012,7 @@ "Developer options": "Options de développeur", "General": "Général", "Room Addresses": "Adresses du salon", - "Set a new account password...": "Définir un nouveau mot de passe du compte…", + "Set a new account password...": "Définir un nouveau mot de passe pour ce compte…", "Email addresses": "Adresses e-mail", "Phone numbers": "Numéros de téléphone", "Language and region": "Langue et région", @@ -1189,7 +1189,7 @@ "Allow Peer-to-Peer for 1:1 calls": "Autoriser les connexions pair-à-pair pour les appels individuels", "Credits": "Crédits", "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Si vous avez rencontré des problèmes ou si vous souhaitez partager votre avis, dites-le nous sur GitHub.", - "Changes your display nickname in the current room only": "Change votre nom d’affichage seulement dans le salon actuel", + "Changes your display nickname in the current room only": "Modifie votre nom d’affichage seulement dans le salon actuel", "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s a activé le badge pour %(groups)s dans ce salon.", "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s a désactivé le badge pour %(groups)s dans ce salon.", "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s a activé le badge pour %(newGroups)s et désactivé le badge pour %(oldGroups)s dans ce salon.", @@ -1281,7 +1281,7 @@ "Upload Error": "Erreur d’envoi", "The server does not support the room version specified.": "Le serveur ne prend pas en charge la version de salon spécifiée.", "Name or Matrix ID": "Nom ou identifiant Matrix", - "Changes your avatar in this current room only": "Change votre avatar seulement dans le salon actuel", + "Changes your avatar in this current room only": "Modifie votre avatar seulement dans le salon actuel", "Unbans user with given ID": "Révoque le bannissement de l’utilisateur ayant l’identifiant fourni", "Sends the given message coloured as a rainbow": "Envoie le message coloré aux couleurs de l’arc-en-ciel", "Sends the given emote coloured as a rainbow": "Envoie la réaction colorée aux couleurs de l’arc-en-ciel", @@ -1383,7 +1383,7 @@ "Resend %(unsentCount)s reaction(s)": "Renvoyer %(unsentCount)s réaction(s)", "Resend removal": "Renvoyer la suppression", "Your homeserver doesn't seem to support this feature.": "Il semble que votre serveur d’accueil ne prenne pas en charge cette fonctionnalité.", - "Changes your avatar in all rooms": "Change votre avatar dans tous les salons", + "Changes your avatar in all rooms": "Modifie votre avatar dans tous les salons", "You're signed out": "Vous êtes déconnecté", "Clear all data": "Supprimer toutes les données", "Removing…": "Suppression…", @@ -1504,7 +1504,7 @@ "Find a room…": "Trouver un salon…", "Find a room… (e.g. %(exampleRoom)s)": "Trouver un salon… (par ex. %(exampleRoom)s)", "If you can't find the room you're looking for, ask for an invite or Create a new room.": "Si vous ne trouvez pas le salon que vous cherchez, demandez une invitation ou créez un nouveau salon.", - "Explore rooms": "Explorer les salons", + "Explore rooms": "Parcourir les salons", "Verify the link in your inbox": "Vérifiez le lien dans votre boîte de réception", "Complete": "Terminer", "Please fill why you're reporting.": "Dites-nous pourquoi vous envoyez un signalement.", @@ -1514,7 +1514,7 @@ "Report Content": "Signaler le contenu", "Read Marker lifetime (ms)": "Durée de vie du repère de lecture (ms)", "Read Marker off-screen lifetime (ms)": "Durée de vie du repère de lecture en dehors de l’écran (ms)", - "Changes the avatar of the current room": "Change l’avatar du salon actuel", + "Changes the avatar of the current room": "Modifie l’avatar du salon actuel", "e.g. my-room": "par ex. mon-salon", "Close dialog": "Fermer la boîte de dialogue", "Please enter a name for the room": "Veuillez renseigner un nom pour le salon", @@ -2003,7 +2003,7 @@ "Remove server": "Supprimer le serveur", "Matrix": "Matrix", "Add a new server": "Ajouter un nouveau serveur", - "Enter the name of a new server you want to explore.": "Saisissez le nom du nouveau serveur que vous voulez explorer.", + "Enter the name of a new server you want to explore.": "Saisissez le nom du nouveau serveur que vous voulez parcourir.", "Server name": "Nom du serveur", "Add a new server...": "Ajouter un nouveau serveur…", "%(networkName)s rooms": "%(networkName)s salons", @@ -2060,7 +2060,7 @@ "Confirm by comparing the following with the User Settings in your other session:": "Confirmez en comparant ceci avec les paramètres utilisateurs de votre autre session :", "Confirm this user's session by comparing the following with their User Settings:": "Confirmez la session de cet utilisateur en comparant ceci avec ses paramètres utilisateur :", "If they don't match, the security of your communication may be compromised.": "S’ils ne correspondent pas, la sécurité de vos communications est peut-être compromise.", - "Navigate composer history": "Explorer l’historique du compositeur", + "Navigate composer history": "Parcourir l’historique du compositeur", "Previous/next unread room or DM": "Salon ou conversation privée non lu précédent/suivant", "Previous/next room or DM": "Salon ou conversation privée précédent/suivant", "Toggle right panel": "Afficher/masquer le panneau de droite", @@ -2129,7 +2129,7 @@ "Delete sessions|one": "Supprimer la session", "Enable end-to-end encryption": "Activer le chiffrement de bout en bout", "You can’t disable this later. Bridges & most bots won’t work yet.": "Vous ne pourrez pas le désactiver plus tard. Les passerelles et la plupart des robots ne fonctionneront pas pour le moment.", - "Failed to set topic": "Échec du changement de sujet", + "Failed to set topic": "Échec de la modification du sujet", "Command failed": "La commande a échoué", "Could not find user in room": "Impossible de trouver l’utilisateur dans le salon", "Syncing...": "Synchronisation…", @@ -2472,11 +2472,11 @@ "Room Info": "Informations sur le salon", "%(count)s results|one": "%(count)s résultat", "%(count)s results|other": "%(count)s résultats", - "Explore all public rooms": "Explorer tous les salons publics", + "Explore all public rooms": "Parcourir tous les salons publics", "Can't see what you’re looking for?": "Vous ne trouvez pas ce que vous cherchez ?", "Custom Tag": "Étiquette personnalisée", - "Explore public rooms": "Explorer les salons publics", - "Explore community rooms": "Explorer les salons de la communauté", + "Explore public rooms": "Parcourir les salons publics", + "Explore community rooms": "Parcourir les salons de la communauté", "Show Widgets": "Afficher les widgets", "Hide Widgets": "Masquer les widgets", "Remove messages sent by others": "Supprimer les messages envoyés par d’autres", @@ -2493,7 +2493,7 @@ "Starting camera...": "Allumage de la caméra ...", "Call connecting...": "Connexion à l'appel …", "Calling...": "Appel en cours …", - "Explore rooms in %(communityName)s": "Explorer les salons dans %(communityName)s", + "Explore rooms in %(communityName)s": "Parcourir les salons de %(communityName)s", "You have no visible notifications in this room.": "Vous n'avez pas de notification visible dans ce salon.", "You’re all caught up": "Vous êtes à jour", "You do not have permission to create rooms in this community.": "Vous n’avez pas la permission de créer des salons dans cette communauté.", @@ -2897,7 +2897,7 @@ "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Les messages ici sont chiffrés de bout en bout. Quand les gens joignent, vous pouvez les vérifier dans leur profil, tapez simplement sur leur avatar.", "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Les messages ici sont chiffrés de bout en bout. Vérifiez %(displayName)s dans leur profil - tapez sur leur avatar.", "Role": "Rôle", - "Use the + to make a new room or explore existing ones below": "Utilisez le + pour créer un nouveau salon ou explorer ceux existant ci-dessous", + "Use the + to make a new room or explore existing ones below": "Utilisez le + pour créer un nouveau salon ou parcourir ceux existant ci-dessous", "This is the start of .": "C’est le début de .", "Add a photo, so people can easily spot your room.": "Ajoutez une photo afin que les gens repèrent facilement votre salon.", "%(displayName)s created this room.": "%(displayName)s a créé ce salon.", @@ -2906,7 +2906,7 @@ "Topic: %(topic)s ": "Sujet : %(topic)s ", "Topic: %(topic)s (edit)": "Sujet : %(topic)s (modifier)", "This is the beginning of your direct message history with .": "C’est le début de votre historique de messages privés avec .", - "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Vous n’êtes que tous les deux dans cette conversation, à moins que l’un de vous invite quelqu’un.", + "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Vous n’êtes que tous les deux dans cette conversation, à moins que l’un de vous invite quelqu’un à vous rejoindre.", "%(name)s on hold": "%(name)s est en attente", "Return to call": "Revenir à l’appel", "Fill Screen": "Remplir l’écran", @@ -3065,5 +3065,118 @@ "Setting ID": "Identifiant de paramètre", "Failed to save settings": "Échec lors de la sauvegarde des paramètres", "Settings Explorer": "Explorateur de paramètres", - "Show chat effects (animations when receiving e.g. confetti)": "Afficher les animations de conversation (animations lors de la réception par ex. de confettis)" + "Show chat effects (animations when receiving e.g. confetti)": "Afficher les animations de conversation (animations lors de la réception par ex. de confettis)", + "Invite someone using their name, username (like ) or share this space.": "Invitez quelqu’un grâce à son nom, nom d’utilisateur (tel que ) ou partagez cet espace.", + "Invite someone using their name, email address, username (like ) or share this space.": "Invitez quelqu’un grâce à son nom, adresse e-mail, nom d’utilisateur (tel que ) ou partagez cet espace.", + "Original event source": "Événement source original", + "Decrypted event source": "Événement source déchiffré", + "We'll create rooms for each of them. You can add existing rooms after setup.": "Nous allons créer un salon pour chacun d’entre eux. Vous pourrez ajouter des salons après l’initialisation.", + "What projects are you working on?": "Sur quels projets travaillez vous ?", + "We'll create rooms for each topic.": "Nous allons créer un salon pour chaque sujet.", + "What are some things you want to discuss?": "De quoi voulez vous discuter ?", + "Inviting...": "Invitation…", + "Invite by username": "Inviter par nom d’utilisateur", + "Invite your teammates": "Invitez votre équipe", + "Failed to invite the following users to your space: %(csvUsers)s": "Échec de l’invitation des utilisateurs suivants à votre espace : %(csvUsers)s", + "A private space for you and your teammates": "Un espace privé pour vous et votre équipe", + "Me and my teammates": "Moi et mon équipe", + "A private space just for you": "Un espace privé seulement pour vous", + "Just Me": "Seulement moi", + "Ensure the right people have access to the space.": "Vérifiez que les bonnes personnes ont accès à cet espace.", + "Who are you working with?": "Avec qui travaillez vous ?", + "Finish": "Finir", + "At the moment only you can see it.": "Pour l’instant vous seul pouvez le voir.", + "Creating rooms...": "Création des salons…", + "Skip for now": "Passer pour l’instant", + "Failed to create initial space rooms": "Échec de la création des salons initiaux de l’espace", + "Room name": "Nom du salon", + "Support": "Prise en charge", + "Random": "Aléatoire", + "Welcome to ": "Bienvenue dans ", + "Your private space ": "Votre espace privé ", + "Your public space ": "Votre espace public ", + "You have been invited to ": "Vous avez été invité dans ", + " invited you to ": " vous a invité dans ", + "%(count)s members|one": "%(count)s membre", + "%(count)s members|other": "%(count)s membres", + "Your server does not support showing space hierarchies.": "Votre serveur ne prend pas en charge l’affichage des hiérarchies d’espaces.", + "Default Rooms": "Salons par défaut", + "Add existing rooms & spaces": "Ajouter des salons et espaces existants", + "Accept Invite": "Accepter l’invitation", + "Find a room...": "Trouver un salon…", + "Manage rooms": "Gérer les salons", + "Save changes": "Enregistrer les modifications", + "You're in this room": "Vous faites partie de ce salon", + "You're in this space": "Vous faites partie de cet espace", + "No permissions": "Aucune permission", + "Remove from Space": "Supprimer de l’espace", + "Undo": "Annuler", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "Votre message n’a pas été envoyé car ce serveur d’accueil a été banni par son administrateur. Merci de contacter votre administrateur de service pour poursuivre l’usage de ce service.", + "Are you sure you want to leave the space '%(spaceName)s'?": "Êtes vous sûr de vouloir quitter l’espace « %(spaceName)s » ?", + "This space is not public. You will not be able to rejoin without an invite.": "Cet espace n’est pas public. Vous ne pourrez pas le rejoindre sans invitation.", + "Start audio stream": "Démarrer une diffusion audio", + "Failed to start livestream": "Échec lors du démarrage de la diffusion en direct", + "Unable to start audio streaming.": "Impossible de démarrer la diffusion audio.", + "Save Changes": "Enregistrer les modifications", + "Saving...": "Enregistrement…", + "View dev tools": "Afficher les outils de développement", + "Leave Space": "Quitter l’espace", + "Make this space private": "Rendre cet espace privé", + "Edit settings relating to your space.": "Modifiez les paramètres de votre espace.", + "Space settings": "Paramètres de l’espace", + "Failed to save space settings.": "Échec de l’enregistrement des paramètres.", + "Unnamed Space": "Espace sans nom", + "Invite to %(spaceName)s": "Inviter à %(spaceName)s", + "Failed to add rooms to space": "Échec de l’ajout des salons à l’espace", + "Apply": "Appliquer", + "Applying...": "Application…", + "Create a new room": "Créer un nouveau salon", + "Don't want to add an existing room?": "Vous ne voulez pas ajouter de salon existant ?", + "Spaces": "Espaces", + "Filter your rooms and spaces": "Filtrez vos salons et espaces", + "Add existing spaces/rooms": "Ajouter des espaces/salons existants", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Vous ne pourrez pas annuler ce changement puisque vous vous rétrogradez. Si vous êtes le dernier utilisateur a privilèges de cet espace, il deviendra impossible d’en reprendre contrôle.", + "Empty room": "Salon vide", + "Suggested Rooms": "Salons suggérés", + "Explore space rooms": "Parcourir les salons de cet espace", + "You do not have permissions to add rooms to this space": "Vous n’avez pas la permission d’ajouter des salons à cet espace", + "Add existing room": "Ajouter un salon existant", + "You do not have permissions to create new rooms in this space": "Vous n’avez pas la permission de créer de nouveaux salons dans cet espace", + "Send message": "Envoyer le message", + "Invite to this space": "Inviter dans cet espace", + "Your message was sent": "Votre message a été envoyé", + "Encrypting your message...": "Chiffrement de votre message…", + "Sending your message...": "Envoi de votre message…", + "Spell check dictionaries": "Dictionnaires de correction orthographique", + "Space options": "Options de l’espace", + "Space Home": "Accueil de l’espace", + "New room": "Nouveau salon", + "Leave space": "Quitter l’espace", + "Invite people": "Inviter des personnes", + "Share your public space": "Partager votre espace public", + "Invite members": "Inviter des membres", + "Invite by email or username": "Inviter par e-mail ou nom d’utilisateur", + "Share invite link": "Partager le lien d’invitation", + "Click to copy": "Cliquez pour copier", + "Collapse space panel": "Réduire le panneau de l’espace", + "Expand space panel": "Développer le panneau de l’espace", + "Creating...": "Création…", + "You can change these at any point.": "Vous pouvez les changer à n’importe quel moment.", + "Give it a photo, name and description to help you identify it.": "Définissez une photo, un nom et une description pour vous aider à le retrouver.", + "Your private space": "Votre espace privé", + "Your public space": "Votre espace public", + "You can change this later": "Vous pouvez changer ceci plus tard", + "Invite only, best for yourself or teams": "Sur invitation, idéal pour vous-même ou les équipes", + "Private": "Privé", + "Open space for anyone, best for communities": "Espace ouvert à tous, idéal pour les communautés", + "Public": "Public", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Les espaces sont un nouveau moyen de grouper les salons et les personnes. Une invitation est nécessaire pour rejoindre un espace existant", + "Create a space": "Créer un espace", + "Delete": "Supprimer", + "Jump to the bottom of the timeline when you send a message": "Sauter en bas du fil de discussion lorsque vous envoyez un message", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototype d’espaces. Incompatible avec les communautés, les communautés v2 et les étiquettes personnalisées. Nécessite un serveur d’accueil compatible pour certaines fonctionnalités.", + "This homeserver has been blocked by it's administrator.": "Ce serveur d’accueil a été banni par ses administrateurs.", + "This homeserver has been blocked by its administrator.": "Ce serveur d’accueil a été banni par ses administrateurs.", + "You're already in a call with this person.": "Vous êtes déjà en cours d’appel avec cette personne.", + "Already in call": "Déjà en cours d’appel" } From 1d15a3596dcf58f31b5c49d66a6bd08ee7b90abe Mon Sep 17 00:00:00 2001 From: Szimszon Date: Mon, 15 Mar 2021 17:07:45 +0000 Subject: [PATCH 048/163] Translated using Weblate (Hungarian) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 119 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index d0f8cc3b69..e5901ef9a3 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -11,7 +11,7 @@ "Notifications": "Értesítések", "Operation failed": "Sikertelen művelet", "powered by Matrix": "a gépházban: Matrix", - "Remove": "Kitakarás", + "Remove": "Eltávolítás", "Settings": "Beállítások", "unknown error code": "ismeretlen hibakód", "Accept": "Elfogad", @@ -3082,5 +3082,120 @@ "Setting ID": "Beállítás azon.", "Failed to save settings": "A beállítások elmentése nem sikerült", "Settings Explorer": "Beállítás Böngésző", - "Show chat effects (animations when receiving e.g. confetti)": "Csevegés effektek megjelenítése (mint a konfetti animáció)" + "Show chat effects (animations when receiving e.g. confetti)": "Csevegés effektek megjelenítése (mint a konfetti animáció)", + "Original event source": "Eredeti esemény forráskód", + "Decrypted event source": "Visszafejtett esemény forráskód", + "We'll create rooms for each of them. You can add existing rooms after setup.": "Mindegyikhez készítünk egy szobát. A beállítás után hozzá tud adni meglévő szobákat.", + "What projects are you working on?": "Milyen projekteken dolgozik?", + "We'll create rooms for each topic.": "Minden témához készítünk egy szobát.", + "What are some things you want to discuss?": "Mik azok amiket meg szeretnének beszélni?", + "Inviting...": "Meghívás…", + "Invite by username": "Meghívás felhasználónévvel", + "Invite your teammates": "Csoporttársak meghívása", + "Failed to invite the following users to your space: %(csvUsers)s": "Az alábbi felhasználókat nem sikerült meghívni a térbe: %(csvUsers)s", + "A private space for you and your teammates": "Privát tér önnek és a csoporttársainak", + "Me and my teammates": "Én és a csoporttársaim", + "A private space just for you": "Privát tér csak önnek", + "Just Me": "Csak én", + "Ensure the right people have access to the space.": "Biztosítsa, hogy a térhez a megfelelő embereknek van hozzáférése.", + "Who are you working with?": "Kivel dolgozik együtt?", + "Finish": "Befejez", + "At the moment only you can see it.": "Jelenleg csak ön láthatja.", + "Creating rooms...": "Szobák létrehozása…", + "Skip for now": "Kihagy egyenlőre", + "Failed to create initial space rooms": "Térhez tartozó kezdő szobákat nem sikerült elkészíteni", + "Room name": "Szoba neve", + "Support": "Támogatás", + "Random": "Véletlen", + "Welcome to ": "Üdvözlöm itt: ", + "Your private space ": "Privát tere: ", + "Your public space ": "Nyilvános tere: ", + "You have been invited to ": "Meghívták ide: ", + " invited you to ": " meghívta ide: ", + "%(count)s members|one": "%(count)s tag", + "%(count)s members|other": "%(count)s tag", + "Your server does not support showing space hierarchies.": "A szervere nem támogatja a terek hierarchiáinak a megjelenítését.", + "Default Rooms": "Alapértelmezett szobák", + "Add existing rooms & spaces": "Létező szobák és terek hozzáadása", + "Accept Invite": "Meghívó elfogadása", + "Find a room...": "Szoba keresése…", + "Manage rooms": "Szobák kezelése", + "Promoted to users": "A felhasználók figyelmébe ajánlva", + "Save changes": "Változások mentése", + "You're in this room": "Ebben a szobában van", + "You're in this space": "Ebben a térben van", + "No permissions": "Nincs jogosultság", + "Remove from Space": "Eltávolítás a térből", + "Undo": "Visszavon", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "Az üzenete nem került elküldésre mert az adminisztrátor megtiltotta ezen a Matrix szerveren. A szolgáltatás további igénybevétele végett kérjük vegye fel a kapcsolatot a szolgáltatás adminisztrátorával.", + "Are you sure you want to leave the space '%(spaceName)s'?": "Biztos, hogy elhagyja ezt a teret: %(spaceName)s?", + "This space is not public. You will not be able to rejoin without an invite.": "Ez a tér nem nyilvános. Kilépés után csak újabb meghívóval lehet újra belépni.", + "Start audio stream": "Hang folyam indítása", + "Failed to start livestream": "Az élő adás indítása sikertelen", + "Unable to start audio streaming.": "A hang folyam indítása sikertelen.", + "Save Changes": "Változások mentése", + "Saving...": "Mentés…", + "View dev tools": "Fejlesztői eszközök megjelenítése", + "Leave Space": "Tér elhagyása", + "Make this space private": "Tér beállítása privátnak", + "Edit settings relating to your space.": "Tér beállításainak szerkesztése.", + "Space settings": "Tér beállítások", + "Failed to save space settings.": "A tér beállításának mentése nem sikerült.", + "Invite someone using their name, username (like ) or share this space.": "Hívjon meg valakit a nevével, felhasználói nevével (pl. ) vagy oszd meg ezt a teret.", + "Invite someone using their name, email address, username (like ) or share this space.": "Hívjon meg valakit a nevét, e-mail címét, vagy felhasználónevét (például ) megadva, vagy oszd meg ezt a teret.", + "Unnamed Space": "Névtelen tér", + "Invite to %(spaceName)s": "Meghívás ide: %(spaceName)s", + "Failed to add rooms to space": "A szobát nem sikerült hozzáadni a térhez", + "Apply": "Alkalmaz", + "Applying...": "Alkalmaz…", + "Create a new room": "Új szoba készítése", + "Don't want to add an existing room?": "Nem szeretne létező szobát hozzáadni?", + "Spaces": "Terek", + "Filter your rooms and spaces": "Terek és szobák szűrése", + "Add existing spaces/rooms": "Létező terek/szobák hozzáadása", + "Space selection": "Tér kiválasztása", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Nem fogja tudni visszavonni ezt a változtatást, mert lefokozza magát, ha Ön az utolsó privilegizált felhasználó a térben, akkor lehetetlen lesz a jogosultságok visszanyerése.", + "Empty room": "Üres szoba", + "Suggested Rooms": "Javasolt szobák", + "Explore space rooms": "Szobák felderítése ebben a térben", + "You do not have permissions to add rooms to this space": "Nincs jogosultsága szobát hozzáadni ehhez a térhez", + "Add existing room": "Létező szoba hozzáadása", + "You do not have permissions to create new rooms in this space": "Nincs jogosultsága szoba létrehozására ebben a térben", + "Send message": "Üzenet küldése", + "Invite to this space": "Meghívás a térbe", + "Your message was sent": "Üzenet elküldve", + "Encrypting your message...": "Üzenet titkosítása…", + "Sending your message...": "Üzenet küldése…", + "Spell check dictionaries": "Helyesírási szótárak", + "Space options": "Tér beállításai", + "Space Home": "Tér Otthona", + "New room": "Új szoba", + "Leave space": "Tér elhagyása", + "Invite people": "Személyek meghívása", + "Share your public space": "Nyilvános tér megosztása", + "Invite members": "Tagok meghívása", + "Invite by email or username": "Meghívás e-mail címmel vagy felhasználói névvel", + "Share invite link": "Meghívó linkjének megosztása", + "Click to copy": "Másolás kattintással", + "Collapse space panel": "Tér panel összezárása", + "Expand space panel": "Tér panel kiterjesztése", + "Creating...": "Készül...", + "You can change these at any point.": "Bármikor megváltoztatható.", + "Give it a photo, name and description to help you identify it.": "Fotóval, névvel és leírással lehet segíteni az azonosítást.", + "Your private space": "Privát tér", + "Your public space": "Nyilvános tér", + "You can change this later": "Ezt később meg lehet változtatni", + "Invite only, best for yourself or teams": "Csak meghívóval, saját célra és csoportoknak ideális", + "Private": "Privát", + "Open space for anyone, best for communities": "Nyílt tér mindenkinek, a legjobb a közösségeknek", + "Public": "Nyilvános", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "A terek egy új lehetőség a szobák és emberek csoportosításához. Létező térhez meghívóval lehet csatlakozni", + "Create a space": "Tér készítése", + "Delete": "Töröl", + "Jump to the bottom of the timeline when you send a message": "Üzenetküldés után az idővonal aljára ugrás", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Terek prototípus. Nem kompatibilis se a Közösségekkel, közösségek v2-vel és az egyedi címkékkel. Kompatibilis matrix szerver kell bizonyos funkciókhoz.", + "This homeserver has been blocked by it's administrator.": "Ezt a matrix szervert az adminisztrátor lezárta.", + "This homeserver has been blocked by its administrator.": "Ezt a matrix szervert az adminisztrátor lezárta.", + "You're already in a call with this person.": "Már hívásban van ezzel a személlyel.", + "Already in call": "A hívás már folyamatban van" } From b1def1fecb5df49e83fa37ad8438ff4f102f4230 Mon Sep 17 00:00:00 2001 From: jelv Date: Mon, 15 Mar 2021 07:33:33 +0000 Subject: [PATCH 049/163] Translated using Weblate (Dutch) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/ --- src/i18n/strings/nl.json | 265 ++++++++++++++++++++++++++++----------- 1 file changed, 190 insertions(+), 75 deletions(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 18c7c3b0bf..e9e90f4b92 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -130,7 +130,7 @@ "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de gespreksnaam verwijderd.", "Create Room": "Gesprek aanmaken", "/ddg is not a command": "/ddg is geen opdracht", - "Deactivate Account": "Account sluiten", + "Deactivate Account": "Account Sluiten", "Decline": "Weigeren", "Decrypt %(text)s": "%(text)s ontsleutelen", "Disinvite": "Uitnodiging intrekken", @@ -422,7 +422,7 @@ "Delete Widget": "Widget verwijderen", "Who would you like to add to this community?": "Wie wil je toevoegen aan deze gemeenschap?", "Invite to Community": "Uitnodigen tot gemeenschap", - "Show these rooms to non-members on the community page and room list?": "Deze gesprekken tonen aan niet-leden op de gemeenschapspagina en gesprekslijst?", + "Show these rooms to non-members on the community page and room list?": "Deze gesprekken tonen aan niet-leden op de gemeenschapspagina en openbare gesprekkenlijst?", "Add rooms to the community": "Voeg gesprekken toe aan de gemeenschap", "Add to community": "Toevoegen aan gemeenschap", "Failed to invite the following users to %(groupId)s:": "Uitnodigen van volgende gebruikers tot %(groupId)s is mislukt:", @@ -640,7 +640,7 @@ "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s heeft %(displayName)s als weergavenaam aangenomen.", "Key request sent.": "Sleutelverzoek verstuurd.", "Did you know: you can use communities to filter your %(brand)s experience!": "Tip: u kunt gemeenschappen gebruiken om uw %(brand)s-beleving te filteren!", - "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Versleep een gemeenschapsavatar naar het filterpaneel helemaal links op het scherm om een filter in te stellen. Daarna kunt u op de avatar in het filterpaneel klikken wanneer u zich wilt beperken tot de gesprekken en mensen uit die gemeenschap.", + "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Versleep een gemeenschapsavatar naar het filterpaneel helemaal links op het scherm om een filter in te stellen. Daarna kunt u op de avatar in het filterpaneel klikken wanneer u zich wilt beperken tot de gesprekken en personen uit die gemeenschap.", "Clear filter": "Filter wissen", "Failed to set direct chat tag": "Instellen van direct gespreklabel is mislukt", "Failed to remove tag %(tagName)s from room": "Verwijderen van %(tagName)s-label van gesprek is mislukt", @@ -794,9 +794,9 @@ "Popout widget": "Widget in nieuw venster openen", "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kan de gebeurtenis waarop gereageerd was niet laden. Wellicht bestaat die niet, of u heeft geen toestemming die te bekijken.", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Dit zal uw account voorgoed onbruikbaar maken. U zult niet meer kunnen inloggen, en niemand anders zal zich met dezelfde gebruikers-ID kunnen registreren. Hierdoor zal uw account alle gesprekken waaraan u deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. Deze stap is onomkeerbaar.", - "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Het sluiten van uw account maakt op zich niet dat wij de door u verstuurde berichten vergeten. Als u wilt dat wij uw berichten vergeten, vink dan het vakje hieronder aan.", + "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Het sluiten van uw account maakt standaard niet dat wij de door u verstuurde berichten vergeten. Als u wilt dat wij uw berichten vergeten, vink dan het vakje hieronder aan.", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtbaarheid van berichten in Matrix is zoals bij e-mails. Het vergeten van uw berichten betekent dat berichten die u heeft verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.", - "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Vergeet bij het sluiten van mijn account alle door mij verstuurde berichten (Let op: hierdoor zullen gebruikers een onvolledig beeld krijgen van gesprekken)", + "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Vergeet bij het sluiten van mijn account alle door mij verstuurde berichten (Let op: hierdoor zullen personen een onvolledig beeld krijgen van gesprekken)", "To continue, please enter your password:": "Voer uw wachtwoord in om verder te gaan:", "Clear Storage and Sign Out": "Opslag wissen en afmelden", "Send Logs": "Logboek versturen", @@ -847,7 +847,7 @@ "Unable to load! Check your network connectivity and try again.": "Laden mislukt! Controleer je netwerktoegang en probeer het nogmaals.", "Failed to invite users to the room:": "Kon de volgende gebruikers hier niet uitnodigen:", "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Plakt ¯\\_(ツ)_/¯ vóór een bericht zonder opmaak", - "Upgrades a room to a new version": "Actualiseert het gesprek tot een nieuwe versie", + "Upgrades a room to a new version": "Upgrade het gesprek naar de nieuwe versie", "Changes your display nickname in the current room only": "Stelt uw weergavenaam alleen in het huidige gesprek in", "Gets or sets the room topic": "Verkrijgt het onderwerp van het gesprek of stelt het in", "This room has no topic.": "Dit gesprek heeft geen onderwerp.", @@ -1021,7 +1021,7 @@ "Verification code": "Verificatiecode", "Phone Number": "Telefoonnummer", "Profile picture": "Profielfoto", - "Upgrade to your own domain": "Waardeer op naar uw eigen domein", + "Upgrade to your own domain": "Upgrade naar uw eigen domein", "Display Name": "Weergavenaam", "Set a new account password...": "Stel een nieuw accountwachtwoord in…", "Email addresses": "E-mailadressen", @@ -1131,10 +1131,10 @@ "Report bugs & give feedback": "Fouten melden & feedback geven", "Go back": "Terug", "Room Settings - %(roomName)s": "Gespreksinstellingen - %(roomName)s", - "Failed to upgrade room": "Gesprek bijwerken mislukt", - "The room upgrade could not be completed": "Het bijwerken van het gesprek kon niet voltooid worden", - "Upgrade this room to version %(version)s": "Werk dit gesprek bij tot versie %(version)s", - "Upgrade Room Version": "Gespreksversie bijwerken", + "Failed to upgrade room": "Gesprek upgraden mislukt", + "The room upgrade could not be completed": "Het upgraden van het gesprek kon niet voltooid worden", + "Upgrade this room to version %(version)s": "Upgrade dit gesprek tot versie %(version)s", + "Upgrade Room Version": "Gespreksversie upgraden", "Create a new room with the same name, description and avatar": "Een nieuw gesprek aanmaken met dezelfde naam, beschrijving en avatar", "Update any local room aliases to point to the new room": "Alle lokale gespreksbijnamen naar het nieuwe gesprek laten verwijzen", "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Gebruikers verhinderen aan de oude versie van het gesprek bij te dragen, en daar een bericht plaatsen dat de gebruikers verwijst naar het nieuwe gesprek", @@ -1196,8 +1196,8 @@ "Sign in instead": "Aanmelden", "Your password has been reset.": "Uw wachtwoord is opnieuw ingesteld.", "Set a new password": "Stel een nieuw wachtwoord in", - "Invalid homeserver discovery response": "Ongeldig homeserver-ontdekkingsantwoord", - "Invalid identity server discovery response": "Ongeldig identiteitsserverontdekkingsantwoord", + "Invalid homeserver discovery response": "Ongeldig homeserver-vindbaarheids-antwoord", + "Invalid identity server discovery response": "Ongeldig identiteitsserver-vindbaarheidsantwoord", "General failure": "Algemene fout", "This homeserver does not support login using email address.": "Deze homeserver biedt geen ondersteuning voor inloggen met e-mailadres.", "Please contact your service administrator to continue using this service.": "Gelieve contact op te nemen met uw dienstbeheerder om deze dienst te blijven gebruiken.", @@ -1238,7 +1238,7 @@ "Please supply a https:// or http:// widget URL": "Voer een https://- of http://-widget-URL in", "You cannot modify widgets in this room.": "U kunt de widgets in dit gesprek niet aanpassen.", "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s heeft de uitnodiging aan %(targetDisplayName)s toe te treden tot het gesprek ingetrokken.", - "Upgrade this room to the recommended room version": "Werk dit gesprek bij tot de aanbevolen versie", + "Upgrade this room to the recommended room version": "Upgrade dit gesprek naar de aanbevolen gespreksversie", "This room is running room version , which this homeserver has marked as unstable.": "Dit gesprek draait op groepsgespreksversie , die door deze homeserver als onstabiel is gemarkeerd.", "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgraden zal de huidige versie van dit gesprek sluiten, en onder dezelfde naam een geüpgraded versie starten.", "Failed to revoke invite": "Intrekken van uitnodiging is mislukt", @@ -1341,7 +1341,7 @@ "Add room": "Gesprek toevoegen", "Your profile": "Uw profiel", "Your Matrix account on ": "Uw Matrix-account op ", - "Failed to get autodiscovery configuration from server": "Ophalen van auto-ontdekkingsconfiguratie van server is mislukt", + "Failed to get autodiscovery configuration from server": "Ophalen van auto-vindbaarheidsconfiguratie van server is mislukt", "Invalid base_url for m.homeserver": "Ongeldige base_url voor m.homeserver", "Homeserver URL does not appear to be a valid Matrix homeserver": "De homeserver-URL lijkt geen geldige Matrix-homeserver", "Invalid base_url for m.identity_server": "Ongeldige base_url voor m.identity_server", @@ -1413,22 +1413,22 @@ "Disconnect from the identity server ?": "Wilt u de verbinding met de identiteitsserver verbreken?", "Disconnect": "Verbinding verbreken", "Identity Server (%(server)s)": "Identiteitsserver (%(server)s)", - "You are currently using to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Om bekenden te kunnen vinden en door hen vindbaar te zijn gebruikt u momenteel . U kunt die identiteitsserver hieronder wijzigen.", + "You are currently using to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Om bekenden te kunnen vinden en voor hen vindbaar te zijn gebruikt u momenteel . U kunt die identiteitsserver hieronder wijzigen.", "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "U gebruikt momenteel geen identiteitsserver. Voeg er hieronder één toe om bekenden te kunnen vinden en voor hen vindbaar te zijn.", - "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "De verbinding met uw identiteitsserver verbreken zal ertoe leiden dat u niet door andere gebruikers gevonden zal kunnen worden, en dat u anderen niet via e-mail of telefoon zal kunnen uitnodigen.", + "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Als u de verbinding met uw identiteitsserver verbreekt zal u niet door andere personen gevonden kunnen worden, en dat u anderen niet via e-mail of telefoon zal kunnen uitnodigen.", "Integration Manager": "Integratiebeheerder", - "Discovery": "Ontdekking", + "Discovery": "Vindbaarheid", "Deactivate account": "Account sluiten", "Always show the window menu bar": "De venstermenubalk altijd tonen", "Unable to revoke sharing for email address": "Kan delen voor dit e-mailadres niet intrekken", "Unable to share email address": "Kan e-mailadres niet delen", "Revoke": "Intrekken", "Share": "Delen", - "Discovery options will appear once you have added an email above.": "Ontdekkingsopties zullen verschijnen wanneer u een e-mailadres hebt toegevoegd.", + "Discovery options will appear once you have added an email above.": "Vindbaarheidopties zullen verschijnen wanneer u een e-mailadres hebt toegevoegd.", "Unable to revoke sharing for phone number": "Kan delen voor dit telefoonnummer niet intrekken", "Unable to share phone number": "Kan telefoonnummer niet delen", "Please enter verification code sent via text.": "Voer de verificatiecode in die werd verstuurd via sms.", - "Discovery options will appear once you have added a phone number above.": "Ontdekkingsopties zullen verschijnen wanneer u een telefoonnummer hebt toegevoegd.", + "Discovery options will appear once you have added a phone number above.": "Vindbaarheidopties zullen verschijnen wanneer u een telefoonnummer hebt toegevoegd.", "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Er is een sms verstuurd naar +%(msisdn)s. Voor de verificatiecode in die in het bericht staat.", "Command Help": "Hulp bij opdrachten", "No identity server is configured: add one in server settings to reset your password.": "Er is geen identiteitsserver geconfigureerd: voeg er één toe in de serverinstellingen om uw wachtwoord opnieuw in te stellen.", @@ -1467,7 +1467,7 @@ "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Aanvaard de gebruiksvoorwaarden van de identiteitsserver (%(serverName)s) om vindbaar te zijn op e-mailadres of telefoonnummer.", "Read Marker lifetime (ms)": "Levensduur van leesbevestigingen (ms)", "Read Marker off-screen lifetime (ms)": "Levensduur van levensbevestigingen, niet op scherm (ms)", - "Upgrade the room": "Werk het gesprek bij", + "Upgrade the room": "Upgrade het gesprek", "Enable room encryption": "Gespreksversleuteling inschakelen", "Error changing power level requirement": "Fout bij wijzigen van machtsniveauvereiste", "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Er is een fout opgetreden bij het wijzigen van de machtsniveauvereisten van het gesprek. Zorg ervoor dat u over voldoende machtigingen beschikt en probeer het opnieuw.", @@ -1550,7 +1550,7 @@ "%(creator)s created and configured the room.": "Gesprek gestart en ingesteld door %(creator)s.", "Setting up keys": "Sleutelconfiguratie", "Verify this session": "Deze sessie verifiëren", - "Encryption upgrade available": "Er is een bijgewerkte versleuteling beschikbaar", + "Encryption upgrade available": "Versleutelingsupgrade beschikbaar", "You can use /help to list available commands. Did you mean to send this as a message?": "Typ /help om alle opdrachten te zien. Was het uw bedoeling dit als bericht te sturen?", "Help": "Hulp", "Set up encryption": "Versleuteling instellen", @@ -1588,11 +1588,11 @@ "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s", "The message you are trying to send is too large.": "Uw bericht is te lang om te versturen.", "a few seconds ago": "enige tellen geleden", - "about a minute ago": "een minuut of zo geleden", + "about a minute ago": "ongeveer een minuut geleden", "%(num)s minutes ago": "%(num)s minuten geleden", - "about an hour ago": "een uur of zo geleden", + "about an hour ago": "ongeveer een uur geleden", "%(num)s hours ago": "%(num)s uur geleden", - "about a day ago": "een dag of zo geleden", + "about a day ago": "ongeveer een dag geleden", "%(num)s days ago": "%(num)s dagen geleden", "a few seconds from now": "over een paar tellen", "about a minute from now": "over een minuut of zo", @@ -1602,7 +1602,7 @@ "about a day from now": "over een dag of zo", "%(num)s days from now": "over %(num)s dagen", "%(name)s (%(userId)s)": "%(name)s (%(userId)s)", - "Try out new ways to ignore people (experimental)": "Nieuwe manieren om mensen te negeren uitproberen (nog in ontwikkeling)", + "Try out new ways to ignore people (experimental)": "Nieuwe manieren om personen te negeren uitproberen (nog in ontwikkeling)", "Show info about bridges in room settings": "Toon bruginformatie in gespreksinstellingen", "Match system theme": "Aanpassen aan systeemthema", "Never send encrypted messages to unverified sessions from this session": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies versturen", @@ -1629,7 +1629,7 @@ "Channel: %(channelName)s": "Kanaal: %(channelName)s", "Show less": "Minder tonen", "Show more": "Meer tonen", - "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle berichtsleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw sleutels eerst wegschrijft, en na afloop weer inleest. Dit zal verbeterd worden.", + "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle versleutelingssleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw gesprekssleutels eerst opslaat, en na afloop weer inleest. Dit zal in de toekomst verbeterd worden.", "in memory": "in het geheugen", "not found": "niet gevonden", "Your homeserver does not support session management.": "Uw homeserver ondersteunt geen sessiebeheer.", @@ -1698,7 +1698,7 @@ "Session ID:": "Sessie-ID:", "Session key:": "Sessiesleutel:", "Message search": "Berichten zoeken", - "A session's public name is visible to people you communicate with": "De publieke naam van een sessie is zichtbaar voor de mensen waarmee u communiceert", + "A session's public name is visible to people you communicate with": "De openbare naam van een sessie is zichtbaar voor de personen waarmee u communiceert", "This room is bridging messages to the following platforms. Learn more.": "Dit gesprek wordt overbrugd naar de volgende platformen. Lees meer", "This room isn’t bridging messages to any platforms. Learn more.": "Dit gesprek wordt niet overbrugd naar andere platformen. Lees meer.", "Bridges": "Bruggen", @@ -1846,7 +1846,7 @@ "Reactions": "Reacties", " reacted with %(content)s": " heeft gereageerd met %(content)s", "Frequently Used": "Vaak gebruikt", - "Smileys & People": "Smileys & mensen", + "Smileys & People": "Smileys & Personen", "Animals & Nature": "Dieren en natuur", "Food & Drink": "Eten en drinken", "Activities": "Activiteiten", @@ -1907,11 +1907,11 @@ "If you didn’t sign in to this session, your account may be compromised.": "Als u zich niet heeft aangemeld bij deze sessie, is uw account wellicht geschonden.", "This wasn't me": "Dat was ik niet", "Automatically invite users": "Gebruikers automatisch uitnodigen", - "Upgrade private room": "Privégesprek bijwerken", - "Upgrade public room": "Openbaar gesprek bijwerken", + "Upgrade private room": "Privégesprek upgraden", + "Upgrade public room": "Openbaar gesprek upgraden", "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Het bijwerken van een gesprek is een gevorderde actie en wordt meestal aanbevolen wanneer een gesprek onstabiel is door fouten, ontbrekende functies of problemen met de beveiliging.", "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "Dit heeft meestal enkel een invloed op de manier waarop het gesprek door de server verwerkt wordt. Als u problemen met uw %(brand)s ondervindt, dien dan een foutmelding in.", - "You'll upgrade this room from to .": "U werkt dit gesprek bij van naar .", + "You'll upgrade this room from to .": "U upgrade dit gesprek van naar .", "This will allow you to return to your account after signing out, and sign in on other sessions.": "Daardoor kunt u na afmelding terugkeren tot uw account, en u bij andere sessies aanmelden.", "Verification Request": "Verificatieverzoek", "Recovery key mismatch": "Herstelsleutel komt niet overeen", @@ -1936,24 +1936,24 @@ "Your new session is now verified. Other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Ze zal voor andere gebruikers als vertrouwd gemarkeerd worden.", "Without completing security on this session, it won’t have access to encrypted messages.": "Als u de beveiliging van deze sessie niet vervolledigt, zal ze geen toegang hebben tot uw versleutelde berichten.", "Go Back": "Terugkeren", - "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Door uw wachtwoord te wijzigen stelt u alle eind-tot-eind-versleutelingssleutels op al uw sessies opnieuw in, waardoor uw versleutelde gespreksgeschiedenis onleesbaar wordt. Stel sleutelback-up in of schrijf uw gesprekssleutels van een andere sessie weg vooraleer u een nieuw wachtwoord instelt.", + "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Door uw wachtwoord te wijzigen stelt u alle eind-tot-eind-versleutelingssleutels op al uw sessies opnieuw in, waardoor uw versleutelde gespreksgeschiedenis onleesbaar wordt. Stel uw sleutelback-up in of sla uw gesprekssleutels van een andere sessie op voor u een nieuw wachtwoord instelt.", "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "U bent uitgelogd bij al uw sessies en zult geen pushberichten meer ontvangen. Meld u op elk apparaat opnieuw aan om meldingen opnieuw in te schakelen.", - "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Herwin toegang tot uw account en herstel de tijdens deze sessie opgeslagen versleutelingssleutels, zonder welke sommige van uw beveiligde berichten in al uw sessies onleesbaar zijn.", + "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Ontvang toegang tot uw account en herstel de tijdens deze sessie opgeslagen versleutelingssleutels, zonder deze sleutels zijn sommige van uw versleutelde berichten in uw sessies onleesbaar.", "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Let op: uw persoonlijke gegevens (waaronder versleutelingssleutels) zijn nog steeds opgeslagen in deze sessie. Wis ze wanneer u klaar bent met deze sessie, of wanneer u zich wilt aanmelden met een andere account.", "Command Autocomplete": "Opdrachten autoaanvullen", "DuckDuckGo Results": "DuckDuckGo-resultaten", - "Enter your account password to confirm the upgrade:": "Voer uw accountwachtwoord in om het bijwerken te bevestigen:", - "Restore your key backup to upgrade your encryption": "Herstel uw sleutelback-up om uw versleuteling bij te werken", + "Enter your account password to confirm the upgrade:": "Voer uw accountwachtwoord in om het upgraden te bevestigen:", + "Restore your key backup to upgrade your encryption": "Herstel uw sleutelback-up om uw versleuteling te upgraden", "Restore": "Herstellen", - "You'll need to authenticate with the server to confirm the upgrade.": "U zult zich moeten aanmelden bij de server om het bijwerken te bevestigen.", - "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Werk deze sessie bij om er andere sessies mee te verifiëren, waardoor deze ook de toegang verkrijgen tot uw versleutelde berichten en voor andere gebruikers als vertrouwd gemarkeerd worden.", + "You'll need to authenticate with the server to confirm the upgrade.": "U zult zich moeten aanmelden bij de server om het upgraden te bevestigen.", + "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade deze sessie om er andere sessies mee te verifiëren, waardoor deze ook de toegang verkrijgen tot uw versleutelde berichten en deze voor andere gebruikers als vertrouwd gemarkeerd worden.", "Set up with a recovery key": "Instellen met een herstelsleutel", "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewaar een kopie op een veilige plaats, zoals in een wachtwoordbeheerder of een kluis.", "Your recovery key": "Uw herstelsleutel", "Copy": "Kopiëren", "Your recovery key has been copied to your clipboard, paste it to:": "Uw herstelsleutel is gekopieerd naar uw klembord, plak hem en:", "Your recovery key is in your Downloads folder.": "Uw herstelsleutel bevindt zich in uw Downloads-map.", - "Upgrade your encryption": "Werk uw versleuteling bij", + "Upgrade your encryption": "Upgrade uw versleuteling", "Make a copy of your recovery key": "Maak een kopie van uw herstelsleutel", "Unable to set up secret storage": "Kan sleutelopslag niet instellen", "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Zonder veilig berichtherstel in te stellen zult u uw versleutelde berichtgeschiedenis niet kunnen herstellen als u uitlogt of een andere sessie gebruikt.", @@ -2465,7 +2465,7 @@ "Send %(count)s invites|one": "Stuur %(count)s uitnodiging", "Send %(count)s invites|other": "Stuur %(count)s uitnodigingen", "Show": "Toon", - "People you know on %(brand)s": "Mensen die u kent van %(brand)s", + "People you know on %(brand)s": "Personen die u kent van %(brand)s", "Add another email": "Nog een e-mailadres toevoegen", "Download logs": "Download logboeken", "Add a new server...": "Een nieuwe server toevoegen…", @@ -2508,7 +2508,7 @@ "Role": "Rol", "Room settings": "Gespreksinstellingen", "Show files": "Bestanden tonen", - "%(count)s people|other": "%(count)s mensen", + "%(count)s people|other": "%(count)s personen", "About": "Over", "Not encrypted": "Niet versleuteld", "Widgets": "Widgets", @@ -2533,7 +2533,7 @@ "Signature upload failed": "Versturen van ondertekening mislukt", "Signature upload success": "Ondertekening succesvol verstuurd", "Unable to upload": "Versturen niet mogelijk", - "Transfer": "Overdragen", + "Transfer": "Doorschakelen", "Start a conversation with someone using their name or username (like ).": "Start een gesprek met iemand door hun naam of gebruikersnaam (zoals ) te typen.", "May include members not in %(communityName)s": "Mag deelnemers bevatten die geen deel uitmaken van %(communityName)s", "Invite by email": "Via e-mail uitnodigen", @@ -2697,37 +2697,37 @@ "Navigation": "Navigatie", "Currently indexing: %(currentRoom)s": "Momenteel indexeren: %(currentRoom)s", "Enter your recovery passphrase a second time to confirm it.": "Voer uw Herstelwachtwoord een tweede keer in om te bevestigen.", - "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Deze sessie heeft ontdekt dat uw veiligheidszin en sleutel voor versleutelde berichten zijn verwijderd.", - "A new Security Phrase and key for Secure Messages have been detected.": "Er is een nieuwe veiligheidszin en sleutel voor versleutelde berichten gedetecteerd.", + "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Deze sessie heeft ontdekt dat uw veiligheidswachtwoord en -sleutel voor versleutelde berichten zijn verwijderd.", + "A new Security Phrase and key for Secure Messages have been detected.": "Er is een nieuwe veiligheidswachtwoord en -sleutel voor versleutelde berichten gedetecteerd.", "Save your Security Key": "Uw veiligheidssleutel opslaan", - "Confirm Security Phrase": "Veiligheidszin bevestigen", - "Set a Security Phrase": "Een veiligheidszin instellen", + "Confirm Security Phrase": "Veiligheidswachtwoord bevestigen", + "Set a Security Phrase": "Een veiligheidswachtwoord instellen", "You can also set up Secure Backup & manage your keys in Settings.": "U kunt ook een beveiligde back-up instellen en uw sleutels beheren via instellingen.", "Secure Backup": "Beveiligde back-up", - "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Geen toegang tot sleutelopslag. Controleer of u de juiste veiligheidszin hebt ingevoerd.", + "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Geen toegang tot geheime opslag. Controleer of u het juiste veiligheidswachtwoord hebt ingevoerd.", "Secret storage:": "Sleutelopslag:", "Unable to query secret storage status": "Kan status sleutelopslag niet opvragen", "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Bewaar uw veiligheidssleutel op een veilige plaats, zoals in een wachtwoordmanager of een kluis, aangezien deze wordt gebruikt om uw versleutelde gegevens te beveiligen.", "Confirm your recovery passphrase": "Bevestig uw Herstelwachtwoord", "Use a different passphrase?": "Gebruik een ander wachtwoord?", - "Enter a security phrase only you know, as it’s used to safeguard your data. To be secure, you shouldn’t re-use your account password.": "Voer een veiligheidszin in die alleen u kent, aangezien deze wordt gebruikt om uw gegevens te versleutelen. Om veilig te zijn, moet u het wachtwoord van uw account niet opnieuw gebruiken.", + "Enter a security phrase only you know, as it’s used to safeguard your data. To be secure, you shouldn’t re-use your account password.": "Voer een veiligheidswachtwoord in die alleen u kent, aangezien deze wordt gebruikt om uw gegevens te versleutelen. Om veilig te zijn, moet u het wachtwoord van uw account niet opnieuw gebruiken.", "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Bescherm uw server tegen toegangsverlies tot versleutelde berichten en gegevens door een back-up te maken van de versleutelingssleutels.", - "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Gebruik een veiligheidszin die alleen u kent, en sla optioneel een veiligheidssleutel op om te gebruiken als back-up.", + "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Gebruik een veiligheidswachtwoord die alleen u kent, en sla optioneel een veiligheidssleutel op om te gebruiken als back-up.", "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Wij maken een veiligheidssleutel voor u aan die u ergens veilig kunt opbergen, zoals in een wachtwoordmanager of een kluis.", "Generate a Security Key": "Genereer een veiligheidssleutel", "Make a copy of your Security Key": "Maak een kopie van uw veiligheidssleutel", - "Confirm your Security Phrase": "Bevestig uw veiligheidszin", - "Secure your backup with a Security Phrase": "Beveilig uw back-up met een veiligheidszin", + "Confirm your Security Phrase": "Bevestig uw veiligheidswachtwoord", + "Secure your backup with a Security Phrase": "Beveilig uw back-up met een veiligheidswachtwoord", "Your Security Key is in your Downloads folder.": "Uw veiligheidssleutel staat in uw Downloads-map.", "Your Security Key has been copied to your clipboard, paste it to:": "Uw veiligheidssleutel is gekopieerd naar uw klembord, plak het in:", "Your Security Key": "Uw veiligheidssleutel", - "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Uw veiligheidssleutel is een vangnet - u kunt hem gebruiken om de toegang tot uw versleutelde berichten te herstellen als u uw veiligheidszin bent vergeten.", - "Repeat your Security Phrase...": "Herhaal uw veiligheidszin...", - "Please enter your Security Phrase a second time to confirm.": "Voer uw veiligheidszin een tweede keer in om te bevestigen.", + "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Uw veiligheidssleutel is een vangnet - u kunt hem gebruiken om de toegang tot uw versleutelde berichten te herstellen als u uw veiligheidswachtwoord bent vergeten.", + "Repeat your Security Phrase...": "Herhaal uw veiligheidswachtwoord...", + "Please enter your Security Phrase a second time to confirm.": "Voer uw veiligheidswachtwoord een tweede keer in om deze te bevestigen.", "Set up with a Security Key": "Instellen met een veiligheidssleutel", - "Great! This Security Phrase looks strong enough.": "Geweldig. Deze veiligheidszin ziet er sterk genoeg uit.", - "Enter a Security Phrase": "Veiligheidszin invoeren", - "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Wij bewaren een versleutelde kopie van uw sleutels op onze server. Beveilig uw back-up met een veiligheidszin.", + "Great! This Security Phrase looks strong enough.": "Geweldig. Dit veiligheidswachtwoord ziet er sterk genoeg uit.", + "Enter a Security Phrase": "Veiligheidswachtwoord invoeren", + "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Wij bewaren een versleutelde kopie van uw sleutels op onze server. Beveilig uw back-up met een veiligheidswachtwoord.", "or another cross-signing capable Matrix client": "of een andere Matrix-client die kruislings kan ondertekenen", "%(brand)s Android": "%(brand)s Android", "%(brand)s iOS": "%(brand)s iOS", @@ -2735,7 +2735,7 @@ "%(brand)s Web": "%(brand)s Web", "This requires the latest %(brand)s on your other devices:": "Dit vereist de nieuwste %(brand)s op uw andere toestellen:", "Use Security Key": "Gebruik veiligheidssleutel", - "Use Security Key or Phrase": "Gebruik veiligheidssleutel of -zin", + "Use Security Key or Phrase": "Gebruik veiligheidssleutel of -wachtwoord", "Decide where your account is hosted": "Kies waar uw account wordt gehost", "Host account on": "Host uw account op", "Already have an account? Sign in here": "Heeft u al een account? Aanmelden", @@ -2768,8 +2768,8 @@ "Upgrade to pro": "Upgrade naar pro", "Now, let's help you get started": "Laten we u helpen om te beginnen", "Welcome %(name)s": "Welkom %(name)s", - "Add a photo so people know it's you.": "Voeg een foto toe zodat mensen weten dat u het bent.", - "Great, that'll help people know it's you": "Geweldig, dat zal mensen helpen te weten dat u het bent", + "Add a photo so people know it's you.": "Voeg een foto toe zodat personen weten dat u het bent.", + "Great, that'll help people know it's you": "Geweldig, dan zullen personen weten dat u het bent", "

HTML for your community's page

\n

\n Use the long description to introduce new members to the community, or distribute\n some important links\n

\n

\n You can even add images with Matrix URLs \n

\n": "

HTML voor de pagina van uw gemeenschap

\n

\nGebruik de lange beschrijving om nieuwe deelnemers voor te stellen aan de gemeenschap, of verspreid enkele belangrijke links\n

\n

\nU kunt zelfs afbeeldingen toevoegen met Matrix URL's \n

\n", "Create community": "Gemeenschap aanmaken", "Attach files from chat or just drag and drop them anywhere in a room.": "Voeg bestanden toe vanuit het gesprek of sleep ze in een gesprek.", @@ -2797,13 +2797,13 @@ "Not a valid Security Key": "Geen geldige veiligheidssleutel", "This looks like a valid Security Key!": "Dit lijkt op een geldige veiligheidssleutel!", "Enter Security Key": "Veiligheidssleutel invoeren", - "If you've forgotten your Security Phrase you can use your Security Key or set up new recovery options": "Als u uw Herstelwachtwoord bent vergeten, kunt u uw Herstelsleutel gebruiken of nieuwe herstelopties instellen", - "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Ga naar uw veilige berichtengeschiedenis en stel veilige berichten in door uw veiligheidszin in te voeren.", - "Enter Security Phrase": "Voer veiligheidszin in", + "If you've forgotten your Security Phrase you can use your Security Key or set up new recovery options": "Als u uw veiligheidswachtwoord bent vergeten, kunt u uw veiligheidssleutel gebruiken of nieuwe herstelopties instellen", + "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Ga naar uw versleutelde berichtengeschiedenis en stel versleutelde berichten in door uw veiligheidswachtwoord in te voeren.", + "Enter Security Phrase": "Veiligheidswachtwoord invoeren", "Successfully restored %(sessionCount)s keys": "Succesvol %(sessionCount)s sleutels hersteld", "Keys restored": "Sleutels hersteld", - "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Back-up kon niet worden gedecodeerd met deze veiligheidszin: controleer of u de juiste veiligheidszin hebt ingevoerd.", - "Incorrect Security Phrase": "Onjuiste veiligheidszin", + "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Back-up kon niet worden ontsleuteld met dit veiligheidswachtwoord: controleer of u het juiste veiligheidswachtwoord hebt ingevoerd.", + "Incorrect Security Phrase": "Onjuist Veiligheidswachtwoord", "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Back-up kon niet worden ontcijferd met deze veiligheidssleutel: controleer of u de juiste veiligheidssleutel hebt ingevoerd.", "Security Key mismatch": "Verkeerde veiligheidssleutel", "%(completed)s of %(total)s keys restored": "%(completed)s van %(total)s sleutels hersteld", @@ -2814,8 +2814,8 @@ "Confirm encryption setup": "Bevestig versleuting instelling", "Use your Security Key to continue.": "Gebruik uw veiligheidssleutel om verder te gaan.", "Security Key": "Veiligheidssleutel", - "Enter your Security Phrase or to continue.": "Voer uw veiligheidszin in of om verder te gaan.", - "Security Phrase": "Veiligheidszin", + "Enter your Security Phrase or to continue.": "Voer uw veiligheidswachtwoord in of om verder te gaan.", + "Security Phrase": "Veiligheidswachtwoord", "Invalid Security Key": "Ongeldige veiligheidssleutel", "Wrong Security Key": "Verkeerde veiligheidssleutel", "Looks good!": "Ziet er goed uit!", @@ -2869,11 +2869,11 @@ "Upload completed": "Upload voltooid", "Maximize dialog": "Maximaliseer dialoog", "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Installatie", - "You should know": "U moet weten", + "You should know": "Dit moet u weten", "Privacy Policy": "Privacystatement", "Cookie Policy": "Cookiebeleid", - "Abort": "Annuleren", - "Confirm abort of host creation": "Bevestig het annuleren van de host creatie", + "Abort": "Afbreken", + "Confirm abort of host creation": "Bevestig het afbreken van host creatie", "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "U zou dit kunnen aanzetten als dit gesprek alleen gebruikt zal worden voor samenwerking met interne teams op uw homeserver. Dit kan later niet meer veranderd worden.", "You can’t disable this later. Bridges & most bots won’t work yet.": "U kunt dit later niet uitschakelen. Bruggen en de meeste bots zullen nog niet werken.", "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Er is een fout opgetreden bij het aanmaken van uw gemeenschap. De naam kan bezet zijn of de server is niet in staat om uw aanvraag te verwerken.", @@ -2887,7 +2887,7 @@ "Screens": "Schermen", "Share your screen": "Uw scherm delen", "Submit logs": "Logs versturen", - "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Berichten in dit gesprek zijn eind-tot-eind-versleuteld. Als mensen deelnemen, kan u ze verifiëren in hun profiel, tik gewoon op hun avatar.", + "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Berichten in dit gesprek zijn eind-tot-eind-versleuteld. Als personen deelnemen, kan u ze verifiëren in hun profiel, tik hiervoor op hun avatar.", "In encrypted rooms, verify all users to ensure it’s secure.": "Controleer alle gebruikers in versleutelde gesprekken om er zeker van te zijn dat het veilig is.", "Verify all users in a room to ensure it's secure.": "Controleer alle gebruikers in een gesprek om er zeker van te zijn dat hij veilig is.", "%(count)s people|one": "%(count)s persoon", @@ -2903,7 +2903,7 @@ "Use the + to make a new room or explore existing ones below": "Gebruik de + om een nieuw gesprek te starten of ontdek de bestaande groepen hieronder", "Open dial pad": "Kiestoetsen openen", "Recently visited rooms": "Onlangs geopende gesprekken", - "Add a photo, so people can easily spot your room.": "Voeg een foto toe, zodat mensen je gemakkelijk kunnen herkennen in het gesprek.", + "Add a photo, so people can easily spot your room.": "Voeg een foto toe, zodat personen u gemakkelijk kunnen herkennen in het gesprek.", "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Alleen u beiden nemen deel aan dit gesprek, tenzij een van u beiden iemand uitnodigt om deel te nemen.", "Emoji picker": "Emoji kiezer", "Room ID or address of ban list": "Gesprek-ID of het adres van de banlijst", @@ -2916,7 +2916,7 @@ "Hey you. You're the best!": "Hey. U bent de beste!", "Backup key cached:": "Back-up sleutel cached:", "Backup key stored:": "Back-up sleutel bewaard:", - "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Maak een back-up van uw encryptiesleutels met uw accountgegevens voor het geval u de toegang tot uw sessies verliest. Uw sleutels worden beveiligd met een unieke veiligheidssleutel.", + "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Maak een back-up van uw versleutelingssleutels met uw accountgegevens voor het geval u de toegang tot uw sessies verliest. Uw sleutels worden beveiligd met een unieke veiligheidssleutel.", "well formed": "goed gevormd", "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use %(brand)s Desktop for encrypted messages to appear in search results.": "%(brand)s kan versleutelde berichten niet veilig lokaal opslaan in een webbrowser. Gebruik %(brand)s Desktop om versleutelde berichten in zoekresultaten te laten verschijnen.", "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s gesprek.", @@ -2950,7 +2950,7 @@ "Create a Group Chat": "Maak een groepsgesprek aan", "Send a Direct Message": "Start een direct gesprek", "Welcome to %(appName)s": "Welkom bij %(appName)s", - "Add a topic to help people know what it is about.": "Stel een gespreksonderwerp in zodat mensen weten waar het over gaat.", + "Add a topic to help people know what it is about.": "Stel een gespreksonderwerp in zodat de personen weten waar het over gaat.", "Upgrade to %(hostSignupBrand)s": "Upgrade naar %(hostSignupBrand)s", "Edit Values": "Waarde wijzigen", "Values at explicit levels in this room:": "Waarde op expliciete niveaus in dit gesprek:", @@ -2972,5 +2972,120 @@ "Setting ID": "Instellingen-ID", "Failed to save settings": "Kan geen instellingen opslaan", "Settings Explorer": "Instellingen Ontdekken", - "Show chat effects (animations when receiving e.g. confetti)": "Effecten tonen (animaties bij ontvangst bijv. confetti)" + "Show chat effects (animations when receiving e.g. confetti)": "Effecten tonen (animaties bij ontvangst bijv. confetti)", + "Jump to the bottom of the timeline when you send a message": "Naar de onderkant van de tijdlijn springen wanneer u een bericht verstuurd", + "Original event source": "Originele gebeurtenisbron", + "Decrypted event source": "Ontsleutel de gebeurtenisbron", + "We'll create rooms for each of them. You can add existing rooms after setup.": "We maken gesprekken voor elk van hen. U kunt bestaande gesprekken toevoegen na het instellen.", + "What projects are you working on?": "Aan welke projecten werkt u?", + "We'll create rooms for each topic.": "We maken gesprekken voor elk onderwerp.", + "What are some things you want to discuss?": "Wat zijn dingen die u wilt bespreken?", + "Inviting...": "Uitnodigen...", + "Invite by username": "Op gebruikersnaam uitnodigen", + "Invite your teammates": "Uw teamgenoten uitnodigen", + "Failed to invite the following users to your space: %(csvUsers)s": "Het uitnodigen van de volgende gebruikers voor uw space is mislukt: %(csvUsers)s", + "A private space for you and your teammates": "Een privé space voor u en uw teamgenoten", + "Me and my teammates": "Ik en mijn teamgenoten", + "A private space just for you": "Een privé space alleen voor u", + "Just Me": "Alleen Ik", + "Ensure the right people have access to the space.": "Zorg ervoor dat de juiste personen toegang hebben tot deze space.", + "Who are you working with?": "Met wie werkt u samen?", + "Finish": "Voltooien", + "At the moment only you can see it.": "Op dit moment kan u deze alleen zien.", + "Creating rooms...": "Gesprekken aanmaken...", + "Skip for now": "Voorlopig overslaan", + "Failed to create initial space rooms": "Het maken van de space gesprekken is mislukt", + "Room name": "Gespreksnaam", + "Support": "Ondersteuning", + "Random": "Willekeurig", + "Welcome to ": "Welkom in ", + "Your private space ": "Uw privé space ", + "Your public space ": "Uw openbare space ", + "You have been invited to ": "U bent uitgenodigd voor ", + " invited you to ": " heeft u uitgenodigd voor ", + "%(count)s members|other": "%(count)s personen", + "%(count)s members|one": "%(count)s persoon", + "Your server does not support showing space hierarchies.": "Uw server heeft geen ondersteuning voor het weergeven van space indelingen.", + "Default Rooms": "Standaard Gesprekken", + "Add existing rooms & spaces": "Bestaande gesprekken en spaces toevoegen", + "Accept Invite": "Uitnodiging Accepteren", + "Find a room...": "Vind een gesprek...", + "Manage rooms": "Gesprekken beheren", + "Promoted to users": "Gepromoot aan gebruikers", + "Save changes": "Wijzigingen opslaan", + "You're in this room": "U bent in dit gesprek", + "You're in this space": "U bent in deze space", + "No permissions": "Geen rechten", + "Remove from Space": "Van space verwijderen", + "Undo": "Ongedaan maken", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "Uw bericht is niet verstuurd, omdat deze homeserver is geblokkeerd door zijn beheerder. Gelieve contact op te nemen met uw beheerder om de dienst te blijven gebruiken.", + "Are you sure you want to leave the space '%(spaceName)s'?": "Weet u zeker dat u de space '%(spaceName)s' wilt verlaten?", + "This space is not public. You will not be able to rejoin without an invite.": "Deze space is niet openbaar. Zonder uitnodiging zult u niet opnieuw kunnen toetreden.", + "Start audio stream": "Audio-stream starten", + "Failed to start livestream": "Starten van livestream is mislukt", + "Unable to start audio streaming.": "Kan audio-streaming niet starten.", + "Save Changes": "Wijzigingen Opslaan", + "Saving...": "Opslaan...", + "View dev tools": "Bekijk dev tools", + "Leave Space": "Space verlaten", + "Make this space private": "Maak deze space privé", + "Failed to save space settings.": "Het opslaan van de space-instellingen is mislukt.", + "Space settings": "Space-instellingen", + "Edit settings relating to your space.": "Bewerk instellingen gerelateerd aan uw space.", + "Invite someone using their name, username (like ) or share this space.": "Nodig iemand uit per naam, gebruikersnaam (zoals ) of deel deze space.", + "Invite someone using their name, email address, username (like ) or share this space.": "Nodig iemand uit per naam, e-mailadres, gebruikersnaam (zoals ) of deel deze space.", + "Unnamed Space": "Naamloze Space", + "Invite to %(spaceName)s": "Voor %(spaceName)s uitnodigen", + "Failed to add rooms to space": "Het toevoegen van gesprekken aan de space is mislukt", + "Apply": "Toepassen", + "Applying...": "Toepassen...", + "Create a new room": "Een nieuw gesprek aanmaken", + "Don't want to add an existing room?": "Wilt u geen bestaand gesprek toevoegen?", + "Spaces": "Spaces", + "Filter your rooms and spaces": "Gesprekken en spaces filteren", + "Add existing spaces/rooms": "Bestaande spaces/gesprekken toevoegen", + "Space selection": "Space-selectie", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "U kunt deze wijziging niet ongedaan maken omdat u uzelf rechten ontneemt, als u de laatste bevoegde gebruiker in de ruimte bent zal het onmogelijk zijn om weer rechten te krijgen.", + "Empty room": "Leeg gesprek", + "Suggested Rooms": "Gespreksuggesties", + "Explore space rooms": "Space-gesprekken ontdekken", + "You do not have permissions to add rooms to this space": "U hebt geen toestemming om gesprekken toe te voegen in deze space", + "Add existing room": "Bestaande gesprekken toevoegen", + "You do not have permissions to create new rooms in this space": "U hebt geen toestemming om gesprekken te maken in deze space", + "Send message": "Bericht versturen", + "Invite to this space": "Uitnodigen voor deze space", + "Your message was sent": "Uw bericht is verstuurd", + "Encrypting your message...": "Uw bericht versleutelen...", + "Sending your message...": "Uw bericht versturen...", + "Spell check dictionaries": "Spellingscontrole woordenboeken", + "Space options": "Space-opties", + "Space Home": "Space Thuis", + "New room": "Nieuw gesprek", + "Leave space": "Space verlaten", + "Invite people": "Personen uitnodigen", + "Share your public space": "Deel uw publieke space", + "Invite members": "Leden uitnodigen", + "Invite by email or username": "Uitnodigen per e-mail of gebruikersnaam", + "Share invite link": "Deel uitnodigingskoppeling", + "Click to copy": "Klik om te kopiëren", + "Collapse space panel": "Space-paneel invouwen", + "Expand space panel": "Space-paneel uitvouwen", + "Creating...": "Aanmaken...", + "You can change these at any point.": "U kan dit op elk moment aanpassen.", + "Give it a photo, name and description to help you identify it.": "Geef het een foto, naam en omschrijving om u te helpen het te herkennen.", + "Your private space": "Uw privé space", + "Your public space": "Uw openbare space", + "You can change this later": "U kan dit later aanpassen", + "Invite only, best for yourself or teams": "Alleen op uitnodiging, geschikt voor uzelf of teams", + "Private": "Privé", + "Open space for anyone, best for communities": "Openbare space voor iedereen, geschikt voor gemeenschappen", + "Public": "Openbaar", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces is een nieuwe manier van groeperen van gesprekken en personen. Om deel te nemen aan een bestaande space heeft u een uitnodiging nodig", + "Create a space": "Space aanmaken", + "Delete": "Verwijderen", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototype. Niet compatibel met Gemeenschappen, Gemeenschappen v2 en Aangepaste Labels. Vereist een geschikte homeserver voor sommige functies.", + "This homeserver has been blocked by it's administrator.": "Deze homeserver is geblokkeerd door zijn beheerder.", + "This homeserver has been blocked by its administrator.": "Deze homeserver is geblokkeerd door uw beheerder.", + "Already in call": "Al in gesprek", + "You're already in a call with this person.": "U bent al in gesprek met deze persoon." } From 976bf0192a00ab45d5fda12f01d07e0b541400f2 Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Thu, 11 Mar 2021 20:02:37 +0000 Subject: [PATCH 050/163] Translated using Weblate (Portuguese (Brazil)) Currently translated at 96.6% (2792 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/ --- src/i18n/strings/pt_BR.json | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index ef748c5fd8..f054fa31e6 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -3019,5 +3019,23 @@ "Value": "Valor", "Failed to save settings": "Falha ao salvar as configurações", "Show chat effects (animations when receiving e.g. confetti)": "Mostrar efeitos na conversa (por exemplo: animações ao receber confetes)", - "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "O Element Web é experimental para dispositivos móveis. Para uma melhor experiência e os recursos mais recentes, use nosso aplicativo gratuito." + "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "O Element Web é experimental para dispositivos móveis. Para uma melhor experiência e os recursos mais recentes, use nosso aplicativo gratuito.", + "Empty room": "Sala vazia", + "Suggested Rooms": "Salas sugeridas", + "Add existing room": "Adicionar sala existente", + "Send message": "Enviar mensagem", + "Just Me": "Somente eu", + "Finish": "Concluir", + "Creating rooms...": "Criando salas...", + "Skip for now": "Ignorar por enquanto", + "Room name": "Nome da sala", + "Random": "Aleatório", + "Welcome to ": "Boas-vindas ao ", + "Creating...": "Criando...", + "Private": "Privado", + "Public": "Público", + "Delete": "Excluir", + "This homeserver has been blocked by it's administrator.": "Este servidor local foi bloqueado pelo seu administrador.", + "This homeserver has been blocked by its administrator.": "Este servidor local foi bloqueado pelo seu administrador.", + "You're already in a call with this person.": "Você já está em uma chamada com essa pessoa." } From d57c1b406c2af3d6d3795392330fafb6c87fefa8 Mon Sep 17 00:00:00 2001 From: LinAGKar Date: Sat, 13 Mar 2021 12:44:34 +0000 Subject: [PATCH 051/163] Translated using Weblate (Swedish) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/ --- src/i18n/strings/sv.json | 117 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index c8a5a41339..002b825cb0 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -3018,5 +3018,120 @@ "Setting ID": "Inställnings-ID", "Failed to save settings": "Misslyckades att spara inställningar", "Settings Explorer": "Inställningsutforskare", - "Show chat effects (animations when receiving e.g. confetti)": "Visa chatteffekter (animeringar när du tar emot t.ex. konfetti)" + "Show chat effects (animations when receiving e.g. confetti)": "Visa chatteffekter (animeringar när du tar emot t.ex. konfetti)", + "Original event source": "Ursprunglig händelsekällkod", + "Decrypted event source": "Avkrypterad händelsekällkod", + "We'll create rooms for each of them. You can add existing rooms after setup.": "Vi kommer att skapa rum för varje. Du kan lägga till existerande rum efter inställningen.", + "What projects are you working on?": "Vilka projekt jobbar du på?", + "We'll create rooms for each topic.": "Vi kommer att skapa rum för varje ämne.", + "What are some things you want to discuss?": "Vad är exempel på saker du vill diskutera?", + "Inviting...": "Bjuder in…", + "Invite by username": "Bjud in med användarnamn", + "Invite your teammates": "Bjud in dina teamkamrater", + "Failed to invite the following users to your space: %(csvUsers)s": "Misslyckades att bjuda in följande användare till ditt utrymme: %(csvUsers)s", + "A private space for you and your teammates": "Ett privat utrymme för dig och dina teamkamrater", + "Me and my teammates": "Jag och mina teamkamrater", + "A private space just for you": "Ett personligt utrymme för bara dig", + "Just Me": "Bara jag", + "Ensure the right people have access to the space.": "Försäkra att rätt personer har tillgång till utrymmet.", + "Who are you working with?": "Vem arbetar du med?", + "Finish": "Färdigställ", + "At the moment only you can see it.": "För tillfället så kan bara du se det.", + "Creating rooms...": "Skapar rum…", + "Skip for now": "Hoppa över för tillfället", + "Failed to create initial space rooms": "Misslyckades att skapa initiala utrymmesrum", + "Room name": "Rumsnamn", + "Support": "Hjälp", + "Random": "Slumpmässig", + "Welcome to ": "Välkommen till ", + "Your private space ": "Ditt privata utrymme ", + "Your public space ": "Ditt offentliga utrymme ", + "You have been invited to ": "Du har blivit inbjuden till ", + " invited you to ": " bjöd in dig till ", + "%(count)s members|one": "%(count)s medlem", + "%(count)s members|other": "%(count)s medlemmar", + "Your server does not support showing space hierarchies.": "Din server stöder inte att visa utrymmeshierarkier.", + "Default Rooms": "Förvalda rum", + "Add existing rooms & spaces": "Lägg till existerande rum och utrymmen", + "Accept Invite": "Acceptera inbjudan", + "Find a room...": "Hitta ett rum…", + "Manage rooms": "Hantera rum", + "Promoted to users": "Befordrad till användare", + "Save changes": "Spara ändringar", + "You're in this room": "Du är i det här rummet", + "You're in this space": "Du är i det här utrymmet", + "No permissions": "Inga behörigheter", + "Remove from Space": "Ta bort från utrymmet", + "Undo": "Ångra", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "Ditt meddelande skickades inte eftersom att hemservern har blockerats av sin administratör. Vänligen kontakta din tjänsteadministratör för att fortsätta använda tjänsten.", + "Are you sure you want to leave the space '%(spaceName)s'?": "Är du säker på att du vill lämna utrymmet '%(spaceName)s'?", + "This space is not public. You will not be able to rejoin without an invite.": "Det här utrymmet är inte offentligt. Du kommer inte kunna gå med igen utan en inbjudan.", + "Start audio stream": "Starta ljudström", + "Failed to start livestream": "Misslyckades att starta livestream", + "Unable to start audio streaming.": "Kunde inte starta ljudströmning.", + "Save Changes": "Spara inställningar", + "Saving...": "Sparar…", + "View dev tools": "Visa utvecklingsverktyg", + "Leave Space": "Lämna utrymmet", + "Make this space private": "Gör det här utrymmet privat", + "Edit settings relating to your space.": "Redigera inställningar relaterat till ditt utrymme.", + "Space settings": "Utrymmesinställningar", + "Failed to save space settings.": "Misslyckades att spara utrymmesinställningar.", + "Invite someone using their name, username (like ) or share this space.": "Bjud in någon med deras namn eller användarnamn (som ), eller dela det här utrymmet.", + "Invite someone using their name, email address, username (like ) or share this space.": "Bjud in någon med deras namn, e-postadress eller användarnamn (som ), eller dela det här rummet.", + "Unnamed Space": "Namnlöst utrymme", + "Invite to %(spaceName)s": "Bjud in till %(spaceName)s", + "Failed to add rooms to space": "Misslyckades att lägga till rum till utrymmet", + "Apply": "Verkställ", + "Applying...": "Verkställer…", + "Create a new room": "Skapa ett nytt rum", + "Don't want to add an existing room?": "Vill du inte lägga till ett existerande rum?", + "Spaces": "Utrymmen", + "Filter your rooms and spaces": "Filtrera dina rum och utrymmen", + "Add existing spaces/rooms": "Lägg till existerande utrymmen/rum", + "Space selection": "Utrymmesval", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Du kommer inte kunna ångra den här ändringen eftersom du degraderar dig själv, och om du är den sista privilegierade användaren i utrymmet så kommer det att vara omöjligt att återfå utrymmet.", + "Empty room": "Tomt rum", + "Suggested Rooms": "Föreslagna rum", + "Explore space rooms": "Utforska rum i utrymmet", + "You do not have permissions to add rooms to this space": "Du är inte behörig att lägga till rum till det här utrymmet", + "Add existing room": "Lägg till existerande rum", + "You do not have permissions to create new rooms in this space": "Du är inte behörig att skapa nya rum i det här utrymmet", + "Send message": "Skicka meddelande", + "Invite to this space": "Bjud in till det här utrymmet", + "Your message was sent": "Ditt meddelande skickades", + "Encrypting your message...": "Krypterar ditt meddelande…", + "Sending your message...": "Skickar dina meddelanden…", + "Spell check dictionaries": "Rättstavningsordböcker", + "Space options": "Utrymmesalternativ", + "Space Home": "Utrymmeshem", + "New room": "Nytt rum", + "Leave space": "Lämna utrymmet", + "Invite people": "Bjud in folk", + "Share your public space": "Dela ditt offentliga utrymme", + "Invite members": "Bjud in medlemmar", + "Invite by email or username": "Bjud in med e-post eller användarnamn", + "Share invite link": "Skapa inbjudningslänk", + "Click to copy": "Klicka för att kopiera", + "Collapse space panel": "Kollapsa utrymmespanelen", + "Expand space panel": "Expandera utrymmespanelen", + "Creating...": "Skapar…", + "You can change these at any point.": "Du kan ändra dessa när som helst.", + "Give it a photo, name and description to help you identify it.": "Ge den en bild, ett namn och en beskrivning för att hjälpa dig att identifiera den.", + "Your private space": "Ditt privata utrymme", + "Your public space": "Ditt offentliga utrymme", + "You can change this later": "Du kan ändra detta senare", + "Invite only, best for yourself or teams": "Endast inbjudan, bäst för dig själv eller team", + "Private": "Privat", + "Open space for anyone, best for communities": "Öppna utrymmet för alla, bäst för gemenskaper", + "Public": "Offentligt", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Utrymmen är nya sätt att gruppera rum och personer. För att gå med i ett existerande utrymme så behöver du en inbjudan", + "Create a space": "Skapa ett utrymme", + "Delete": "Radera", + "Jump to the bottom of the timeline when you send a message": "Hoppa till botten av tidslinjen när du skickar ett meddelande", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototyp för utrymmen. Inkompatibel med gemenskaper, gemenskaper v2 och anpassade taggar. Kräver en kompatibel hemserver för viss funktionalitet.", + "This homeserver has been blocked by it's administrator.": "Den här hemservern har blockerats av sin administratör.", + "This homeserver has been blocked by its administrator.": "Hemservern har blockerats av sin administratör.", + "You're already in a call with this person.": "Du är redan i ett samtal med den här personen.", + "Already in call": "Redan i samtal" } From 02a2bd55f99b2c242e8028a0090760a2e4959a5a Mon Sep 17 00:00:00 2001 From: TyIL TTY7 Date: Wed, 17 Mar 2021 02:11:21 +0000 Subject: [PATCH 052/163] Translated using Weblate (Chinese (Simplified)) Currently translated at 80.0% (2312 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/ --- src/i18n/strings/zh_Hans.json | 75 ++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 12fb5e2877..a22e600865 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -2482,5 +2482,78 @@ "Too Many Calls": "太多呼叫", "Call failed because webcam or microphone could not be accessed. Check that:": "通话失败，因为无法访问网络摄像头或麦克风。请检查：", "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "呼叫失败，因为无法访问任何麦克风。 检查是否已插入麦克风并正确设置。", - "Answered Elsewhere": "在其他地方已回答" + "Answered Elsewhere": "在其他地方已回答", + "Use the + to make a new room or explore existing ones below": "使用 + 创建新的聊天室或通过下面列出的方式探索已有聊天室", + "Start a new chat": "开始新会话", + "Room settings": "聊天室设置", + "%(count)s people|one": "%(count)s 位成员", + "Show files": "显示已发送的文件", + "About homeservers": "关于 homeservers", + "About": "关于", + "Invite members": "邀请成员", + "Invite by email or username": "通过电子邮件或用户名邀请", + "Share invite link": "分享邀请链接", + "Click to copy": "点击复制", + "Creating...": "创建中……", + "You can change these at any point.": "您可随时更改这些。", + "Give it a photo, name and description to help you identify it.": "为它添加一张照片、姓名与描述来帮助您辨认它。", + "Your private space": "您的私有空间", + "Your public space": "您的公共空间", + "You can change this later": "您可稍后更改此项", + "Invite only, best for yourself or teams": "仅邀请，适合您自己或团队", + "Private": "私有", + "Public": "公共", + "Delete": "删除", + "Dial pad": "拨号盘", + "There was an error looking up the phone number": "查询电话号码的过程中发生错误", + "Unable to look up phone number": "无法查询电话号码", + "Return to call": "返回通话", + "Voice Call": "语音通话", + "Video Call": "视频通话", + "%(peerName)s held the call": "%(peerName)s 挂起了通话", + "You held the call Resume": "您挂起了通话 恢复", + "You held the call Switch": "您挂起了通话 切换", + "Takes the call in the current room off hold": "解除挂起当前聊天室的通话", + "Places the call in the current room on hold": "挂起当前聊天室的通话", + "Show chat effects (animations when receiving e.g. confetti)": "显示聊天特效（如收到五彩纸屑时的动画效果）", + "Use Ctrl + Enter to send a message": "使用 Ctrl + Enter 发送信息", + "Use Command + Enter to send a message": "使用 Command + Enter 发送消息", + "Use Ctrl + F to search": "使用 Ctrl + F 搜索", + "Use Command + F to search": "使用 Command + F 搜索", + "Jump to the bottom of the timeline when you send a message": "发送信息时跳转到时间线底部", + "Show line numbers in code blocks": "在代码块中显示行号", + "Expand code blocks by default": "默认展开代码块", + "Show stickers button": "显示贴纸按钮", + "Render LaTeX maths in messages": "在信息中渲染 LaTeX 数学", + "%(senderName)s ended the call": "%(senderName)s 结束了通话", + "You ended the call": "您结束了通话", + "This homeserver has been blocked by it's administrator.": "此 homeserver 已被其管理员屏蔽。", + "Use app": "使用 app", + "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element 网页版在移动设备上仍处于试验阶段。使用免费的原生 app 以获得更好的体验与最新的功能。", + "Use app for a better experience": "使用 app 以获得更好的体验", + "Enable desktop notifications": "开启桌面通知", + "Don't miss a reply": "不要错过任何回复", + "This homeserver has been blocked by its administrator.": "此 homeserver 已被其管理员屏蔽。", + "Send stickers to this room as you": "以您的身份发送贴纸到此聊天室", + "Change the avatar of your active room": "更改活跃聊天室的头像", + "Change the avatar of this room": "更改当前聊天室的头像", + "Change the name of your active room": "更改活跃聊天室的名称", + "Change the name of this room": "更改当前聊天室的名称", + "Change the topic of your active room": "更改当前活跃聊天室的讨论主题", + "Change the topic of this room": "更改当前聊天室的讨论主题", + "Change which room, message, or user you're viewing": "更改当前正在查看哪个聊天室、消息或用户", + "Change which room you're viewing": "更改当前正在查看哪个聊天室", + "Send stickers into your active room": "发送贴纸到您的活跃聊天室", + "Send stickers into this room": "发送贴纸到此聊天室", + "Remain on your screen while running": "运行时始终保留在您的屏幕上", + "Remain on your screen when viewing another room, when running": "运行时始终保留在您的屏幕上，即使您在浏览其它聊天室", + "%(senderName)s declined the call.": "%(senderName)s 拒绝了通话。", + "(an error occurred)": "（发生了一个错误）", + "(their device couldn't start the camera / microphone)": "（对方的设备无法开启摄像头/麦克风）", + "Converts the room to a DM": "将此聊天室会话转化为私聊会话", + "Converts the DM to a room": "将此私聊会话转化为聊天室会话", + "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "在纯文字信息前添加 ┬──┬ ノ( ゜-゜ノ)", + "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "在纯文字信息前添加 (╯°□°）╯︵ ┻━┻", + "You're already in a call with this person.": "您与此人已处在通话中。", + "Already in call": "已在通话中" } From 6e73b56c4bbd696df1e5f29808316d6c87a3bc54 Mon Sep 17 00:00:00 2001 From: random Date: Wed, 17 Mar 2021 13:30:03 +0000 Subject: [PATCH 053/163] Translated using Weblate (Italian) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 117 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 3e5ad9296b..62989bd16e 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -3087,5 +3087,120 @@ "Setting ID": "ID impostazione", "Failed to save settings": "Impossibile salvare le impostazioni", "Settings Explorer": "Esploratore di impostazioni", - "Show chat effects (animations when receiving e.g. confetti)": "Mostra effetti chat (animazioni quando si ricevono ad es. coriandoli)" + "Show chat effects (animations when receiving e.g. confetti)": "Mostra effetti chat (animazioni quando si ricevono ad es. coriandoli)", + "Original event source": "Fonte dell'evento originale", + "Decrypted event source": "Fonte dell'evento decifrato", + "We'll create rooms for each of them. You can add existing rooms after setup.": "Creeremo stanze per ognuno di essi. Puoi aggiungere stanze esistenti dopo la configurazione.", + "What projects are you working on?": "Su quali progetti stai lavorando?", + "We'll create rooms for each topic.": "Creeremo stanze per ogni argomento.", + "What are some things you want to discuss?": "Di cosa vuoi discutere?", + "Inviting...": "Invito...", + "Invite by username": "Invita per nome utente", + "Invite your teammates": "Invita la tua squadra", + "Failed to invite the following users to your space: %(csvUsers)s": "Impossibile invitare i seguenti utenti nello spazio: %(csvUsers)s", + "A private space for you and your teammates": "Uno spazio privato per te e i tuoi compagni", + "Me and my teammates": "Io e la mia squadra", + "A private space just for you": "Uno spazio privato solo per te", + "Just Me": "Solo io", + "Ensure the right people have access to the space.": "Assicurati che le persone giuste abbiano accesso allo spazio.", + "Who are you working with?": "Con chi stai lavorando?", + "Finish": "Fine", + "At the moment only you can see it.": "Al momento solo tu puoi vederlo.", + "Creating rooms...": "Creazione stanze...", + "Skip for now": "Salta per adesso", + "Failed to create initial space rooms": "Creazione di stanze iniziali dello spazio fallita", + "Room name": "Nome stanza", + "Support": "Supporto", + "Random": "Casuale", + "Welcome to ": "Ti diamo il benvenuto in ", + "Your private space ": "Il tuo spazio privato ", + "Your public space ": "Il tuo spazio pubblico ", + "You have been invited to ": "Sei stato invitato in ", + " invited you to ": " ti ha invitato in ", + "%(count)s members|one": "%(count)s membro", + "%(count)s members|other": "%(count)s membri", + "Your server does not support showing space hierarchies.": "Il tuo server non supporta la visualizzazione di gerarchie di spazi.", + "Default Rooms": "Stanze predefinite", + "Add existing rooms & spaces": "Aggiungi stanze e spazi esistenti", + "Accept Invite": "Accetta invito", + "Find a room...": "Trova una stanza...", + "Manage rooms": "Gestisci stanze", + "Promoted to users": "Promosso a utenti", + "Save changes": "Salva modifiche", + "You're in this room": "Sei in questa stanza", + "You're in this space": "Sei in questo spazio", + "No permissions": "Nessuna autorizzazione", + "Remove from Space": "Rimuovi dallo spazio", + "Undo": "Annulla", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "Il tuo messaggio non è stato inviato perché questo homeserver è stato bloccato dal suo amministratore. Contatta l'amministratore del servizio per continuare ad usarlo.", + "Are you sure you want to leave the space '%(spaceName)s'?": "Vuoi veramente uscire dallo spazio '%(spaceName)s'?", + "This space is not public. You will not be able to rejoin without an invite.": "Questo spazio non è pubblico. Non potrai rientrare senza un invito.", + "Start audio stream": "Avvia stream audio", + "Failed to start livestream": "Impossibile avviare lo stream in diretta", + "Unable to start audio streaming.": "Impossibile avviare lo streaming audio.", + "Save Changes": "Salva modifiche", + "Saving...": "Salvataggio...", + "View dev tools": "Vedi strumenti da sviluppatore", + "Leave Space": "Esci dallo spazio", + "Make this space private": "Rendi privato questo spazio", + "Edit settings relating to your space.": "Modifica le impostazioni relative al tuo spazio.", + "Space settings": "Impostazioni spazio", + "Failed to save space settings.": "Impossibile salvare le impostazioni dello spazio.", + "Invite someone using their name, username (like ) or share this space.": "Invita qualcuno usando il suo nome, nome utente (come ) o condividi questo spazio.", + "Invite someone using their name, email address, username (like ) or share this space.": "Invita qualcuno usando il suo nome, indirizzo email, nome utente (come ) o condividi questo spazio.", + "Unnamed Space": "Spazio senza nome", + "Invite to %(spaceName)s": "Invita in %(spaceName)s", + "Failed to add rooms to space": "Aggiunta di stanze allo spazio fallita", + "Apply": "Applica", + "Applying...": "Applicazione...", + "Create a new room": "Crea nuova stanza", + "Don't want to add an existing room?": "Non vuoi aggiungere una stanza esistente?", + "Spaces": "Spazi", + "Filter your rooms and spaces": "Filtra le tue stanze e spazi", + "Add existing spaces/rooms": "Aggiungi spazi/stanze esistenti", + "Space selection": "Selezione spazio", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Non potrai annullare questa modifica dato che ti stai declassando, se sei l'ultimo utente privilegiato nello spazio sarà impossibile riottenere il grado.", + "Empty room": "Stanza vuota", + "Suggested Rooms": "Stanze suggerite", + "Explore space rooms": "Esplora stanze dello spazio", + "You do not have permissions to add rooms to this space": "Non hai i permessi per aggiungere stanze a questo spazio", + "Add existing room": "Aggiungi stanza esistente", + "You do not have permissions to create new rooms in this space": "Non hai i permessi per creare stanze in questo spazio", + "Send message": "Invia messaggio", + "Invite to this space": "Invita in questo spazio", + "Your message was sent": "Il tuo messaggio è stato inviato", + "Encrypting your message...": "Crittazione del tuo messaggio...", + "Sending your message...": "Invio del tuo messaggio...", + "Spell check dictionaries": "Dizionari di controllo ortografia", + "Space options": "Opzioni dello spazio", + "Space Home": "Pagina iniziale dello spazio", + "New room": "Nuova stanza", + "Leave space": "Esci dallo spazio", + "Invite people": "Invita persone", + "Share your public space": "Condividi il tuo spazio pubblico", + "Invite members": "Invita membri", + "Invite by email or username": "Invita per email o nome utente", + "Share invite link": "Condividi collegamento di invito", + "Click to copy": "Clicca per copiare", + "Collapse space panel": "Riduci pannello dello spazio", + "Expand space panel": "Espandi pannello dello spazio", + "Creating...": "Creazione...", + "You can change these at any point.": "Puoi cambiarli in qualsiasi momento.", + "Give it a photo, name and description to help you identify it.": "Dagli una foto, un nome e una descrizione per aiutarti a identificarlo.", + "Your private space": "Il tuo spazio privato", + "Your public space": "Il tuo spazio pubblico", + "You can change this later": "Puoi modificarlo in seguito", + "Invite only, best for yourself or teams": "Solo su invito, la scelta migliore per te o i team", + "Private": "Privato", + "Open space for anyone, best for communities": "Spazio aperto a tutti, la scelta migliore per le comunità", + "Public": "Pubblico", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototipo degli spazi. Non compatibile con comunità, comunità v2 ed etichette personalizzate. Richiede un homeserver compatibile per alcune funzioni.", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Gli spazi sono nuovi modi di raggruppare stanze e persone. Per entrare in uno spazio esistente ti serve un invito", + "Create a space": "Crea uno spazio", + "Delete": "Elimina", + "Jump to the bottom of the timeline when you send a message": "Salta in fondo alla linea temporale quando invii un messaggio", + "This homeserver has been blocked by it's administrator.": "Questo homeserver è stato bloccato dal suo amministratore.", + "This homeserver has been blocked by its administrator.": "Questo homeserver è stato bloccato dal suo amministratore.", + "You're already in a call with this person.": "Sei già in una chiamata con questa persona.", + "Already in call": "Già in una chiamata" } From 56d3a9ac61560dd8f51ebcd67256eb4ebe0ed1c3 Mon Sep 17 00:00:00 2001 From: tateisu Date: Fri, 12 Mar 2021 12:23:34 +0000 Subject: [PATCH 054/163] Translated using Weblate (Japanese) Currently translated at 79.6% (2301 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/ --- src/i18n/strings/ja.json | 112 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 0035bdd5df..09329fb359 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -1484,7 +1484,7 @@ "e.g. my-room": "例: my-room", "Room address": "ルームアドレス", "New published address (e.g. #alias:server)": "新しい公開アドレス (例: #alias:server)", - "No other published addresses yet, add one below": "現在、公開アドレスがありません。以下から追加可能です", + "No other published addresses yet, add one below": "他の公開アドレスはまだありません。以下から追加できます", "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "検索結果を表示させるために、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s 件の部屋のメッセージの保存に %(size)s を使用中です。", "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "検索結果を表示させるために、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s 件の部屋のメッセージの保存に %(size)s を使用中です。", "Mentions & Keywords": "メンションとキーワード", @@ -2336,5 +2336,113 @@ "Click the button below to confirm adding this phone number.": "下のボタンをクリックして電話番号の追加を確認します。", "Confirm adding phone number": "電話番号の追加を確認する", "Confirm adding this phone number by using Single Sign On to prove your identity.": "シングルサインオンを使用して本人確認を行い、電話番号の追加を承認してください。", - "Click the button below to confirm adding this email address.": "下のボタンを押してこのメールアドレスを確認します。" + "Click the button below to confirm adding this email address.": "下のボタンを押してこのメールアドレスを確認します。", + "Reactions": "リアクション", + "Declining …": "断り中です…", + "Accepting …": "受け付け中です…", + "%(name)s accepted": "%(name)s は受け付けました", + "You accepted": "あなたは受け付けました", + "Waiting for you to accept on your other session…": "あなたがサインイン中の他のセッションで受け付けられるのを待ちます…", + "%(name)s cancelled": "%(name)s は中止しました", + "%(name)s declined": "%(name)sは断りました", + "You cancelled": "あなたは中止しました", + "You declined": "あなたは断りました", + "%(name)s cancelled verifying": "%(name)s は検証を中止しました", + "You cancelled verifying %(name)s": "%(name)s の検証を中止しました", + "You verified %(name)s": "%(name)s を検証しました", + "You have ignored this user, so their message is hidden. Show anyways.": "このユーザを無視しているのでメッセージは隠されます。とにかく表示する", + "Video conference started by %(senderName)s": "ビデオ会議は %(senderName)s により開始されました", + "Video conference ended by %(senderName)s": "ビデオ会議は %(senderName)s により終了しました", + "Video conference updated by %(senderName)s": "ビデオ会議は %(senderName)s により更新されました", + "Join the conference from the room information card on the right": "右側の部屋情報カードから会議に参加する", + "Join the conference at the top of this room": "この部屋の上部で会議に参加する", + "Message Actions": "メッセージのアクション", + "Ignored attempt to disable encryption": "暗号化を無効にする試みを無視しました", + "Compare emoji": "絵文字を比較", + "You cancelled verification on your other session.": "他のセッションで検証を中止しました。", + "Verification timed out.": "検証がタイムアウトしました。", + "Start verification again from the notification.": "通知から再度検証を開始します。", + "Verified": "検証済", + "In encrypted rooms, verify all users to ensure it’s secure.": "暗号化された部屋では、安全確認のために全てのユーザーを検証します。", + "Almost there! Is %(displayName)s showing the same shield?": "あと少しです！ %(displayName)s は同じ盾マークを表示していますか？", + "Almost there! Is your other session showing the same shield?": "あと少しです！ あなたの他のセッションは同じ盾マークを表示していますか？", + "Verify by emoji": "絵文字で検証", + "Verify by comparing unique emoji.": "絵文字の並びを比較して検証。", + "If you can't scan the code above, verify by comparing unique emoji.": "上記のコードをスキャンできない場合は、絵文字による確認を行ってください。", + "Ask %(displayName)s to scan your code:": "%(displayName)s にQRコードをスキャンするよう問い合わせてください:", + "Verify by scanning": "QRコードスキャンで検証", + "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "検証しようとしているセッションは %(brand)s で利用できる QRコードのスキャンまたは絵文字認証をサポートしていません。 別のクライアントで試してください。", + "This client does not support end-to-end encryption.": "このクライアントはエンドツーエンド暗号化に対応していません。", + "Failed to deactivate user": "ユーザーの非アクティブ化に失敗しました", + "Deactivate user": "ユーザーを非アクティブ化する", + "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "このユーザーを非アクティブ化するとユーザーはログアウトされて再度ログインできなくなります。さらにユーザーは現在参加中の部屋すべてから離れます。このアクションを元に戻すことはできません。 このユーザーを非アクティブ化してもよろしいですか?", + "Deactivate user?": "ユーザーを非アクティブ化しますか?", + "Remove %(count)s messages|one": "1件のメッセージを削除する", + "Remove %(count)s messages|other": "%(count)s 件のメッセージを削除する", + "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "大量のメッセージだと時間がかかるかもしれません。その間はクライアントをリロードしないでください。", + "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "%(user)s からのメッセージ 1 件を削除しようとしています。 これは元に戻せません。続けますか?", + "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "%(user)s からの %(count)s 件のメッセージを削除しようとしています。これは元に戻せません。続けますか?", + "Remove recent messages by %(user)s": "%(user)s からの最近のメッセージを削除する", + "Try scrolling up in the timeline to see if there are any earlier ones.": "タイムラインを上にスクロールして、以前のものがあるかどうかを確認してください。", + "No recent messages by %(user)s found": "%(user)s からの最近のメッセージが見つかりません", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "自分自身を降格しているため、この変更を元に戻すことはできません。スペース内の最後の特権ユーザーである場合、特権を取り戻すことはできません。", + "Not encrypted": "暗号化されていません", + "Edit widgets, bridges & bots": "ウィジェット、ブリッジ、ボットを編集する", + "Set my room layout for everyone": "私の部屋のレイアウトをみんな用に設定します", + "Unpin a widget to view it in this panel": "ウィジェットのピン留めを外して、このパネルに表示します", + "Unpin": "ピン留めを外す", + "You can only pin up to %(count)s widgets|other": "ウィジェットのピン留めは %(count)s 件までです", + "Yours, or the other users’ session": "あなたまたは他のユーザーのセッション", + "Yours, or the other users’ internet connection": "あなたまたは他のユーザーのインターネット接続", + "The homeserver the user you’re verifying is connected to": "あなたが検証しているユーザーが接続するホームサーバー", + "One of the following may be compromised:": "次のいずれかが危険にさらされる可能性があります:", + "Your messages are not secure": "あなたのメッセージは暗号化されません", + "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "暗号化された部屋ではメッセージは保護されます。メッセージをアンロックするためのキーはあなたと受信者だけが持っています。", + "Other published addresses:": "他の公開アドレス:", + "Error removing address": "アドレスの削除のエラー", + "There was an error removing that address. It may no longer exist or a temporary error occurred.": "アドレスの削除中にエラーがありました。既に存在しない部屋か、一時的なエラーが発生したか。", + "You don't have permission to delete the address.": "アドレスを削除する権限がありません。", + "Empty room": "空の部屋", + "Suggested Rooms": "おすすめの部屋", + "Explore space rooms": "スペース内の部屋を探索します", + "You do not have permissions to add rooms to this space": "このスペースに部屋を追加する権限がありません", + "Add existing room": "既存の部屋を追加します", + "You do not have permissions to create new rooms in this space": "このスペースに新しい部屋を作成する権限がありません", + "Send message": "メッセージを送ります", + "Invite to this space": "このスペースに招待します", + "Your message was sent": "メッセージは送信されました", + "Encrypting your message...": "メッセージの暗号化中…", + "Sending your message...": "メッセージの送信中…", + "Spell check dictionaries": "スペルチェック辞書", + "Space options": "スペースのオプション", + "Space Home": "スペースのホーム", + "New room": "新しい部屋", + "Leave space": "スペースを離れる", + "Invite people": "人々を招待する", + "Share your public space": "公開スペースを共有する", + "Invite members": "参加者を招待する", + "Invite by email or username": "メールまたはユーザー名で招待する", + "Share invite link": "招待リンクを共有する", + "Click to copy": "クリックでコピーします", + "Collapse space panel": "スペースパネルを畳む", + "Expand space panel": "スペースパネルを展開", + "Creating...": "作成中…", + "You can change these at any point.": "これらはいつでも変更できます。", + "Give it a photo, name and description to help you identify it.": "写真、名前、説明を追加して識別しやすくします。", + "Your private space": "あなたの非公開スペース", + "Your public space": "あなたの公開スペース", + "You can change this later": "これは後から変更できます", + "Invite only, best for yourself or teams": "招待のみ。チームや個人での使用に適しています", + "Private": "非公開", + "Open space for anyone, best for communities": "誰もが利用できるオープンスペース、コミュニティに最適", + "Public": "公開", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "スペースは部屋や人をグループ化する新しい方法です。 既存のスペースに参加するには招待状が必要です", + "Create a space": "スペースを作成する", + "Delete": "削除", + "Jump to the bottom of the timeline when you send a message": "メッセージを送信する際にタイムライン最下部に移動します", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spacesはプロトタイプです。 コミュニティ、コミュニティv2、カスタムタグとは互換性がありません。 一部の機能には互換性のあるホームサーバーが必要です。", + "This homeserver has been blocked by it's administrator.": "このホームサーバーは管理者によりブロックされています。", + "This homeserver has been blocked by its administrator.": "このホームサーバーは管理者によりブロックされています。", + "You're already in a call with this person.": "あなたは既にこの人と通話中です。", + "Already in call": "既に電話中です" } From 11da2d5ca5562c7ed985ff919eb46dd3c91cf021 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Wed, 17 Mar 2021 17:08:50 +0000 Subject: [PATCH 055/163] Translated using Weblate (Czech) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/ --- src/i18n/strings/cs.json | 127 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 121 insertions(+), 6 deletions(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index db01caed97..90941ced30 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -228,7 +228,7 @@ "Who can access this room?": "Kdo má přístup do této místnosti?", "Who can read history?": "Kdo může číst historii?", "You are not in this room.": "Nejste v této místnosti.", - "You do not have permission to do that in this room.": "V této místnosti nemáte na toto právo.", + "You do not have permission to do that in this room.": "V této místnosti k tomu nemáte oprávnění.", "You cannot place a call with yourself.": "Nemůžete volat sami sobě.", "You cannot place VoIP calls in this browser.": "V tomto prohlížeči nelze vytáčet VoIP hovory.", "You do not have permission to post to this room": "Nemáte oprávnění zveřejňovat příspěvky v této místnosti", @@ -749,7 +749,7 @@ "A call is currently being placed!": "Právě probíhá jiný hovor!", "A call is already in progress!": "Jeden hovor už probíhá!", "Permission Required": "Vyžaduje oprávnění", - "You do not have permission to start a conference call in this room": "Nemáte oprávnění v této místnosti začít konferenční hovor", + "You do not have permission to start a conference call in this room": "V této místnosti nemáte oprávnění zahájit konferenční hovor", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s", "Missing roomId.": "Chybějící ID místnosti.", "Opens the Developer Tools dialog": "Otevře dialog nástrojů pro vývojáře", @@ -818,7 +818,7 @@ "Share Room Message": "Sdílet zprávu z místnosti", "Link to selected message": "Odkaz na vybranou zprávu", "COPY": "Kopírovat", - "Share Message": "Sdílet", + "Share Message": "Sdílet zprávu", "Collapse Reply Thread": "Sbalit vlákno odpovědi", "Unable to join community": "Není možné vstoupit do skupiny", "Unable to leave community": "Není možné opustit skupinu", @@ -1941,7 +1941,7 @@ "Indexed rooms:": "Indexované místnosti:", "Message downloading sleep time(ms)": "Čas na stažení zprávy (ms)", "Sign In or Create Account": "Přihlásit nebo vytvořit nový účet", - "Use your account or create a new one to continue.": "Pro pokračování se přihlaste existujícím účtem, nebo si vytvořte nový.", + "Use your account or create a new one to continue.": "Pro pokračování se přihlaste stávajícím účtem, nebo si vytvořte nový.", "Create Account": "Vytvořit účet", "Order rooms by name": "Seřadit místnosti podle názvu", "Show rooms with unread notifications first": "Zobrazovat místnosti s nepřečtenými oznámeními navrchu", @@ -2982,7 +2982,7 @@ "Abort": "Přerušit", "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Opravdu chcete přerušit vytváření hostitele? Proces nemůže být navázán.", "Confirm abort of host creation": "Potvrďte přerušení vytváření hostitele", - "Upgrade to %(hostSignupBrand)s": "Aktualizovat na %(hostSignupBrand)s", + "Upgrade to %(hostSignupBrand)s": "Povýšit na %(hostSignupBrand)s", "Edit Values": "Upravit hodnoty", "Values at explicit levels in this room:": "Hodnoty na explicitních úrovních v této místnosti:", "Values at explicit levels:": "Hodnoty na explicitních úrovních:", @@ -3003,5 +3003,120 @@ "Setting ID": "ID nastavení", "Failed to save settings": "Nastavení se nepodařilo uložit", "Settings Explorer": "Průzkumník nastavení", - "Show chat effects (animations when receiving e.g. confetti)": "Zobrazit efekty chatu (animace např. při přijetí konfet)" + "Show chat effects (animations when receiving e.g. confetti)": "Zobrazit efekty chatu (animace např. při přijetí konfet)", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces jsou nový způsob, jak seskupovat místnosti a lidi. Chcete-li se připojit k existujícímu space, budete potřebovat pozvánku", + "We'll create rooms for each of them. You can add existing rooms after setup.": "Pro každý z nich vytvoříme místnost. Po nastavení můžete přidat stávající místnosti.", + "What projects are you working on?": "Na jakých projektech pracujete?", + "We'll create rooms for each topic.": "Pro každé téma vytvoříme místnosti.", + "What are some things you want to discuss?": "O kterých věcech chcete diskutovat?", + "Inviting...": "Pozvání...", + "Invite by username": "Pozvat podle uživatelského jména", + "Invite your teammates": "Pozvěte své spolupracovníky", + "Failed to invite the following users to your space: %(csvUsers)s": "Nepodařilo se pozvat následující uživatele do vašeho space: %(csvUsers)s", + "A private space for you and your teammates": "Soukromý space pro Vás a vaše spolupracovníky", + "Me and my teammates": "Já a moji spolupracovníci", + "A private space just for you": "Soukromý space právě pro vás", + "Just Me": "Pouze já", + "Ensure the right people have access to the space.": "Zajistěte, aby do prostoru měli přístup správní lidé.", + "Who are you working with?": "S kým pracujete?", + "At the moment only you can see it.": "V tuto chvíli to vidíte jen Vy.", + "Creating rooms...": "Vytváření místností...", + "Skip for now": "Prozatím přeskočit", + "Failed to create initial space rooms": "Vytvoření počátečních místností ve space se nezdařilo", + "Random": "Náhodný", + "Your private space ": "Váš soukromý space ", + "Your public space ": "Váš veřejný space ", + "You have been invited to ": "Byli jste pozváni do ", + " invited you to ": " vás pozval do ", + "%(count)s members|one": "%(count)s člen", + "%(count)s members|other": "%(count)s členů", + "Your server does not support showing space hierarchies.": "Váš server nepodporuje zobrazování hierarchií spaces.", + "Default Rooms": "Výchozí místnosti", + "Add existing rooms & spaces": "Přidat stávající místnosti a spaces", + "Accept Invite": "Přijmout pozvání", + "Find a room...": "Najít místnost...", + "Manage rooms": "Spravovat místnosti", + "Promoted to users": "Propagováno uživatelům", + "Save changes": "Uložit změny", + "You're in this room": "Jste v této místnosti", + "You're in this space": "Jste v tomto space", + "No permissions": "Žádná oprávnění", + "Remove from Space": "Odebrat ze space", + "Undo": "Vrátit", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "Vaše zpráva nebyla odeslána, protože tento domovský server byl zablokován jeho správcem. Kontaktujte svého správce služby, abyste mohli službu nadále používat.", + "Are you sure you want to leave the space '%(spaceName)s'?": "Opravdu chcete opustit space '%(spaceName)s'?", + "This space is not public. You will not be able to rejoin without an invite.": "Tento space není veřejný. Bez pozvánky se nebudete moci znovu připojit.", + "Start audio stream": "Zahájit audio přenos", + "Failed to start livestream": "Nepodařilo spustit živý přenos", + "Unable to start audio streaming.": "Nelze spustit streamování zvuku.", + "View dev tools": "Zobrazit nástroje pro vývojáře", + "Leave Space": "Opustit space", + "Make this space private": "Nastavit tento space jako soukromý", + "Edit settings relating to your space.": "Upravte nastavení týkající se vašeho space.", + "Space settings": "Nastavení space", + "Failed to save space settings.": "Nastavení space se nepodařilo uložit.", + "Invite someone using their name, username (like ) or share this space.": "Pozvěte někoho pomocí jeho jména, uživatelského jména (například ) nebo sdílejte tento space.", + "Invite someone using their name, email address, username (like ) or share this space.": "Pozvěte někoho pomocí jeho jména, e-mailové adresy, uživatelského jména (například ) nebo sdílejte tento space.", + "Unnamed Space": "Nejmenovaný space", + "Invite to %(spaceName)s": "Pozvat do %(spaceName)s", + "Failed to add rooms to space": "Nepodařilo se přidat místnosti do space", + "Applying...": "Potvrzuji...", + "Apply": "Použít", + "Create a new room": "Vytvořit novou místnost", + "Don't want to add an existing room?": "Nechcete přidat existující místnost?", + "Spaces": "Spaces", + "Filter your rooms and spaces": "Filtrujte své místnosti a spaces", + "Add existing spaces/rooms": "Přidat existující space/místnost", + "Space selection": "Výběr space", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Tuto změnu nebudete moci vrátit zpět, protože budete degradováni, pokud jste posledním privilegovaným uživatelem v daném space, nebude možné znovu získat oprávnění.", + "Empty room": "Prázdná místnost", + "Suggested Rooms": "Doporučené místnosti", + "Explore space rooms": "Prozkoumat místnosti space", + "You do not have permissions to add rooms to this space": "Nemáte oprávnění k přidávání místností do tohoto space", + "Add existing room": "Přidat existující místnost", + "You do not have permissions to create new rooms in this space": "Nemáte oprávnění k vytváření nových místností v tomto space", + "Send message": "Poslat zprávu", + "Invite to this space": "Pozvat do tohoto space", + "Your message was sent": "Zpráva byla odeslána", + "Encrypting your message...": "Šifrování zprávy...", + "Sending your message...": "Odesílání zprávy...", + "Spell check dictionaries": "Slovníky pro kontrolu pravopisu", + "Space options": "Nastavení space", + "Space Home": "Domov space", + "New room": "Nová místnost", + "Leave space": "Opusit space", + "Invite people": "Pozvat lidi", + "Share your public space": "Sdílejte svůj veřejný space", + "Invite members": "Pozvat členy", + "Invite by email or username": "Pozvěte e-mailem nebo uživatelským jménem", + "Share invite link": "Sdílet odkaz na pozvánku", + "Click to copy": "Kliknutím zkopírujte", + "Expand space panel": "Rozbalit space panel", + "Collapse space panel": "Sbalit space panel", + "Creating...": "Vytváření...", + "You can change these at any point.": "Můžete je kdykoli změnit.", + "Give it a photo, name and description to help you identify it.": "Přiřaďte mu obrázek, jméno a popis, abyste jej mohli lépe identifikovat.", + "Your private space": "Váš soukromý space", + "Your public space": "Váš veřejný space", + "You can change this later": "Toto můžete změnit později", + "Invite only, best for yourself or teams": "Pouze pozvat, nejlepší pro sebe nebo pro týmy", + "Private": "Soukromý", + "Open space for anyone, best for communities": "Otevřený space pro kohokoli, nejlepší pro komunity", + "Public": "Veřejný", + "Create a space": "Vytvořit space", + "Jump to the bottom of the timeline when you send a message": "Při odesílání zprávy přeskočit na konec časové osy", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototyp. Nejsou kompatibilní se skupinami, skupinami v2 a vlastními štítky. Pro některé funkce je vyžadován kompatibilní domovský server.", + "This homeserver has been blocked by its administrator.": "Tento domovský server byl zablokován jeho správcem.", + "You're already in a call with this person.": "S touto osobou již telefonujete.", + "Already in call": "Již máte hovor", + "Delete": "Smazat", + "This homeserver has been blocked by it's administrator.": "Tento domovský server byl zablokován jeho správcem.", + "Original event source": "Původní zdroj události", + "Decrypted event source": "Dešifrovaný zdroj události", + "Saving...": "Ukládám...", + "Save Changes": "Uložit změny", + "Welcome to ": "Vítejte v ", + "Support": "Podpora", + "Room name": "Název místnosti", + "Finish": "Dokončit" } From 319c472fdd33b14933a26172e118807a27d8f860 Mon Sep 17 00:00:00 2001 From: XoseM Date: Fri, 12 Mar 2021 05:33:00 +0000 Subject: [PATCH 056/163] Translated using Weblate (Galician) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/ --- src/i18n/strings/gl.json | 117 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index 98a984d860..f581013250 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -3087,5 +3087,120 @@ "Setting ID": "ID do axuste", "Failed to save settings": "Non se gardaron os axustes", "Settings Explorer": "Navegar nos axustes", - "Show chat effects (animations when receiving e.g. confetti)": "Mostrar efectos no chat (animacións na recepción, ex. confetti)" + "Show chat effects (animations when receiving e.g. confetti)": "Mostrar efectos no chat (animacións na recepción, ex. confetti)", + "Original event source": "Fonte orixinal do evento", + "Decrypted event source": "Fonte descifrada do evento", + "We'll create rooms for each of them. You can add existing rooms after setup.": "Crearemos salas para cada un deles. Podes engadir salas existentes após a configuración.", + "What projects are you working on?": "En que proxectos estás a traballar?", + "We'll create rooms for each topic.": "Crearemos salas para cada tema.", + "What are some things you want to discuss?": "Cales son os temas sobre os que queres debater?", + "Inviting...": "Convidando...", + "Invite by username": "Convidar por nome de usuaria", + "Invite your teammates": "Convida ao teu equipo", + "Failed to invite the following users to your space: %(csvUsers)s": "Fallou o convite ao teu espazo para as seguintes usuarias: %(csvUsers)s", + "A private space for you and your teammates": "Un espazo privado para ti e o teu equipo", + "Me and my teammates": "Eu máis o meu equipo", + "A private space just for you": "Un espazo privado só para ti", + "Just Me": "Só eu", + "Ensure the right people have access to the space.": "Asegúrate de que as persoas correctas teñen acceso ao espazo.", + "Who are you working with?": "Con quen estás a traballar?", + "Finish": "Rematar", + "At the moment only you can see it.": "Por agora só ti podes velo.", + "Creating rooms...": "Creando salas...", + "Skip for now": "Omitir por agora", + "Failed to create initial space rooms": "Fallou a creación inicial das salas do espazo", + "Room name": "Nome da sala", + "Support": "Axuda", + "Random": "Ao chou", + "Welcome to ": "Benvida a ", + "Your private space ": "O teu espazo privado ", + "Your public space ": "O teu espazo público ", + "You have been invited to ": "Foches convidada a ", + " invited you to ": " convidoute a ", + "%(count)s members|one": "%(count)s participante", + "%(count)s members|other": "%(count)s participantes", + "Your server does not support showing space hierarchies.": "O teu servidor non soporta amosar xerarquías dos espazos.", + "Default Rooms": "Salas por defecto", + "Add existing rooms & spaces": "Engadir salas e espazos existentes", + "Accept Invite": "Aceptar Convite", + "Find a room...": "Atopar unha sala...", + "Manage rooms": "Xestionar salas", + "Promoted to users": "Promovida ás usuarias", + "Save changes": "Gardar cambios", + "You're in this room": "Estás nesta sala", + "You're in this space": "Estas neste espazo", + "No permissions": "Sen permiso", + "Remove from Space": "Eliminar do Espazo", + "Undo": "Desfacer", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "A túa mensaxe non se enviou porque o servidor foi bloqueado pola súa administración. Contacta coa administración do servizo para seguir utilizando o servizo.", + "Are you sure you want to leave the space '%(spaceName)s'?": "Tes a certeza de querer deixar o espazo '%(spaceName)s'?", + "This space is not public. You will not be able to rejoin without an invite.": "Este espazo non é público. Non poderás volver a unirte sen un convite.", + "Start audio stream": "Iniciar fluxo de audio", + "Failed to start livestream": "Fallou o inicio da emisión en directo", + "Unable to start audio streaming.": "Non se puido iniciar a retransmisión de audio.", + "Save Changes": "Gardar cambios", + "Saving...": "Gardando...", + "View dev tools": "Ver ferramentas dev", + "Leave Space": "Deixar o Espazo", + "Make this space private": "Establecer este espazo como privado", + "Edit settings relating to your space.": "Editar os axustes relativos ao teu espazo.", + "Space settings": "Axustes do espazo", + "Failed to save space settings.": "Fallo ao gardar os axustes do espazo.", + "Invite someone using their name, username (like ) or share this space.": "Convida a alguén usando o seu nome, nome de usuaria (como ) ou comparte este espazo.", + "Invite someone using their name, email address, username (like ) or share this space.": "Convida a persoas usando o seu nome, enderezo de email, nome de usuaria (como ) ou comparte este espazo.", + "Unnamed Space": "Espazo sen nome", + "Invite to %(spaceName)s": "Convidar a %(spaceName)s", + "Failed to add rooms to space": "Fallou a adición das salas ao espazo", + "Apply": "Aplicar", + "Applying...": "Aplicando...", + "Create a new room": "Crear unha nova sala", + "Don't want to add an existing room?": "Non queres engadir unha sala existente?", + "Spaces": "Espazos", + "Filter your rooms and spaces": "Filtra as túas salas e espazos", + "Space selection": "Selección de Espazos", + "Add existing spaces/rooms": "Engadir espazos/salas existentes", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Non poderás desfacer este cambio xa que te estás degradando a ti mesma, se es a última usuaria con privilexios no espazo será imposible volver a obter os privilexios.", + "Empty room": "Sala baleira", + "Suggested Rooms": "Salas suxeridas", + "Explore space rooms": "Explorar salas do espazo", + "You do not have permissions to add rooms to this space": "Non tes permiso para engadir salas a este espazo", + "Add existing room": "Engadir sala existente", + "You do not have permissions to create new rooms in this space": "Non tes permiso para crear novas salas neste espazo", + "Send message": "Enviar mensaxe", + "Invite to this space": "Convidar a este espazo", + "Your message was sent": "Enviouse a túa mensaxe", + "Encrypting your message...": "Cifrando a túa mensaxe...", + "Sending your message...": "Enviando a túa mensaxe...", + "Spell check dictionaries": "Dicionarios de ortografía", + "Space options": "Opcións do Espazo", + "Space Home": "Incio do Espazo", + "New room": "Nova sala", + "Leave space": "Saír do espazo", + "Invite people": "Convidar persoas", + "Share your public space": "Comparte o teu espazo público", + "Invite members": "Convidar membros", + "Invite by email or username": "Convidar por email ou nome de usuaria", + "Share invite link": "Compartir ligazón do convite", + "Click to copy": "Click para copiar", + "Collapse space panel": "Pechar panel do espazo", + "Expand space panel": "Despregar panel do espazo", + "Creating...": "Creando...", + "You can change these at any point.": "Podes cambiar esto en calquera momento.", + "Give it a photo, name and description to help you identify it.": "Ponlle unha foto, nome e descrición para axudar a identificalo.", + "Your private space": "O teu espazo privado", + "Your public space": "O teu espazo público", + "You can change this later": "Podes cambiar esto máis tarde", + "Invite only, best for yourself or teams": "Só con convite, mellor para ti ou para equipos", + "Private": "Privado", + "Open space for anyone, best for communities": "Espazo aberto para calquera, mellor para comunidades", + "Public": "Público", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Espazos son novos xeitos de agrupar salas e persoas. Para unirse a un espazo existente precisarás un convite", + "Create a space": "Crear un espazo", + "Delete": "Eliminar", + "Jump to the bottom of the timeline when you send a message": "Ir ao final da cronoloxía cando envías unha mensaxe", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototipo de Espazos. Incompatible con Comunidades, Comunidades v2 e Etiquetas Personais. Require un servidor compatible para algunhas características.", + "This homeserver has been blocked by it's administrator.": "Este servidor de inicio foi bloqueado pola súa administración.", + "This homeserver has been blocked by its administrator.": "O servidor de inicio foi bloqueado pola súa administración.", + "You're already in a call with this person.": "Xa estás nunha conversa con esta persoa.", + "Already in call": "Xa estás nunha chamada" } From 0dc62347ed89c02c7965f255f663c8ac725ea982 Mon Sep 17 00:00:00 2001 From: MamasLT Date: Mon, 15 Mar 2021 18:27:26 +0000 Subject: [PATCH 057/163] Translated using Weblate (Lithuanian) Currently translated at 65.8% (1901 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/ --- src/i18n/strings/lt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index 1973247e66..6ba078ad64 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -79,7 +79,7 @@ "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s naudoja daug išplėstinių naršyklės funkcijų, kai kurios iš jų yra neprieinamos arba eksperimentinės jūsų esamoje naršyklėje.", "Event sent!": "Įvykis išsiųstas!", "Unnamed room": "Kambarys be pavadinimo", - "Dismiss": "Atsisakyti", + "Dismiss": "Atmesti", "Explore Account Data": "Peržiūrėti paskyros duomenis", "Remove from Directory": "Pašalinti iš Katalogo", "Download this file": "Atsisiųsti šį failą", From e53caed44ca8e7180f8e1aeb3c3e7a46ee1a4775 Mon Sep 17 00:00:00 2001 From: Besnik Bleta Date: Wed, 10 Mar 2021 18:17:45 +0000 Subject: [PATCH 058/163] Translated using Weblate (Albanian) Currently translated at 99.6% (2878 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/ --- src/i18n/strings/sq.json | 117 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index dd58154b5a..cb08a6b5f9 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -3076,5 +3076,120 @@ "Value": "Vlerë", "Failed to save settings": "S’u arrit të ruhen rregullimet", "Settings Explorer": "Eksplorues Rregullimesh", - "Show chat effects (animations when receiving e.g. confetti)": "Shfaq efekte fjalosjeje (animacione kur merren bonbone, për shembull)" + "Show chat effects (animations when receiving e.g. confetti)": "Shfaq efekte fjalosjeje (animacione kur merren bonbone, për shembull)", + "Original event source": "Burim i veprimtarisë origjinale", + "Decrypted event source": "U shfshehtëzua burim veprimtarie", + "We'll create rooms for each of them. You can add existing rooms after setup.": "Do të krijojmë dhoma për çdo një prej tyre. Pas ujdisjes mund të shtoni dhoma ekzistuese.", + "What projects are you working on?": "Me çfarë projektesh po merreni?", + "We'll create rooms for each topic.": "Do të krijojmë dhoma për çdo temë.", + "What are some things you want to discuss?": "Cilat janë disa nga gjërat që doni të diskutoni?", + "Inviting...": "Po ftohen…", + "Invite by username": "Ftoni përmes emri përdoruesi", + "Invite your teammates": "Ftoni anëtarët e ekipit tuaj", + "Failed to invite the following users to your space: %(csvUsers)s": "S’u arrit të ftoheshin te hapësira juaj përdoruesit vijues: %(csvUsers)s", + "A private space for you and your teammates": "Një hapësirë private për ju dhe anëtarët e ekipit tuaj", + "Me and my teammates": "Unë dhe anëtarët e ekipit tim", + "A private space just for you": "Një hapësirë private vetëm për ju", + "Just Me": "Vetëm Unë", + "Ensure the right people have access to the space.": "Siguroni që personat e duhur të mund të hyjnë te hapësira", + "Who are you working with?": "Me cilët po punoni?", + "Finish": "Përfundoje", + "At the moment only you can see it.": "Hëpërhë mund ta shihni vetëm ju.", + "Creating rooms...": "Po krijohen dhoma…", + "Skip for now": "Hëpërhë anashkaloje", + "Failed to create initial space rooms": "S’u arrit të krijohen dhomat fillestare të hapësirës", + "Room name": "Emër dhome", + "Support": "Asistencë", + "Random": "Kuturu", + "Welcome to ": "Mirë se vini te ", + "Your private space ": "Hapësira juaj private ", + "Your public space ": "Hapësira juaj publike ", + "You have been invited to ": "Jeni ftuar te ", + " invited you to ": " ju ftoi te ", + "%(count)s members|one": "%(count)s anëtar", + "%(count)s members|other": "%(count)s anëtarë", + "Your server does not support showing space hierarchies.": "Shërbyesi juaj nuk mbulon shfaqje hierarkish hapësire.", + "Default Rooms": "Dhoma Parazgjedhje", + "Add existing rooms & spaces": "Shtoni dhoma & hapësira ekzistuese", + "Accept Invite": "Pranoje Ftesën", + "Find a room...": "Gjeni një dhomë…", + "Manage rooms": "Administroni dhoma", + "Save changes": "Ruaji ndryshimet", + "You're in this room": "Gjendeni në këtë dhomë", + "You're in this space": "Gjendeni në këtë hapësirë", + "No permissions": "S’ka leje", + "Remove from Space": "Hiqe prej Hapësire", + "Undo": "Zhbëje", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "Mesazhi juaj s’u dërgua, ngaqë ky shërbyes Home është bllokuar nga përgjegjësi i tij. Ju lutemi, që të vazhdoni ta përdorni këtë shërbim, lidhuni me përgjegjësin e shërbimit tuaj.", + "Are you sure you want to leave the space '%(spaceName)s'?": "Jeni i sigurt se doni të dilni nga hapësira '%(spaceName)s'?", + "This space is not public. You will not be able to rejoin without an invite.": "Kjo hapësirë s’është publike. S’do të jeni në gjendje të rihyni në të pa një ftesë.", + "Start audio stream": "Nisni transmetim audio", + "Unable to start audio streaming.": "S’arrihet të niset transmetim audio.", + "Save Changes": "Ruaji Ndryshimet", + "Saving...": "Po ruhet…", + "View dev tools": "Shihni mjete zhvilluesi", + "Leave Space": "Braktiseni Hapësirën", + "Make this space private": "Bëje këtë hapësirë private", + "Edit settings relating to your space.": "Përpunoni rregullime që lidhen me hapësirën tuaj", + "Space settings": "Rregullime hapësire", + "Failed to save space settings.": "S’u arrit të ruhen rregullime hapësire.", + "Invite someone using their name, username (like ) or share this space.": "Ftoni dikë duke përdorur emrin e tij, emrin e tij të përdoruesit (bie fjala, ) ose ndani me të këtë hapësirë.", + "Invite someone using their name, email address, username (like ) or share this space.": "Ftoni dikë duke përdorur emrin e tij, adresën email, emrin e përdoruesit (bie fjala, ) ose ndani me të këtë hapësirë.", + "Unnamed Space": "Hapësirë e Paemërtuar", + "Invite to %(spaceName)s": "Ftojeni te %(spaceName)s", + "Caution:": "Kujdes:", + "Setting ID": "ID Rregullimi", + "Failed to add rooms to space": "S’u arrit të shtoheshin dhomat te hapësira", + "Apply": "Aplikoje", + "Applying...": "Po aplikohet …", + "Create a new room": "Krijoni dhomë të re", + "Don't want to add an existing room?": "S’doni të shtoni një dhomë ekzistuese?", + "Spaces": "Hapësira", + "Filter your rooms and spaces": "Filtroni dhomat dhe hapësirat tuaja", + "Add existing spaces/rooms": "Shtoni hapësira/dhoma ekzistuese", + "Space selection": "Përzgjedhje hapësire", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "S’do të jeni në gjendje ta zhbëni këtë ndryshim, teksa zhgradoni veten, nëse jeni përdoruesi i fundit i privilegjuar te hapësira, s’do të jetë e mundur të rifitoni privilegjet.", + "Empty room": "Dhomë e zbrazët", + "Suggested Rooms": "Roma të Këshilluara", + "Explore space rooms": "Eksploroni dhoma hapësire", + "You do not have permissions to add rooms to this space": "S’keni leje të shtoni dhoma në këtë hapësirë", + "Add existing room": "Shtoni dhomë ekzistuese", + "You do not have permissions to create new rooms in this space": "S’keni leje të krijoni dhoma të reja në këtë hapësirë", + "Send message": "Dërgoje mesazhin", + "Invite to this space": "Ftoni në këtë hapësirë", + "Your message was sent": "Mesazhi juaj u dërgua", + "Encrypting your message...": "Po fshehtëzohet meszhi juaj…", + "Sending your message...": "Po dërgohet mesazhi juaj…", + "Spell check dictionaries": "Fjalorë kontrolli drejtshkrimi", + "Space options": "Mundësi Hapësire", + "Space Home": "Shtëpi Hapësire", + "New room": "Dhomë e re", + "Leave space": "Braktiseni hapësirën", + "Invite people": "Ftoni njerëz", + "Share your public space": "Ndani me të tjerët hapësirën tuaj publike", + "Invite members": "Ftoni anëtarë", + "Invite by email or username": "Ftoni përmes email-i ose emri përdoruesi", + "Share invite link": "Jepuni lidhje ftese", + "Click to copy": "Klikoni që të kopjohet", + "Collapse space panel": "Tkurre panelin e hapësirave", + "Expand space panel": "Zgjeroje panelin e hapësirave", + "Creating...": "Po krijohet…", + "You can change these at any point.": "Këto mund ti ndryshoni kur të doni.", + "Give it a photo, name and description to help you identify it.": "Jepini një foto, emër dhe përshkrim, për t’ju ndihmuar ta indentifikoni.", + "Your private space": "Hapësira juaj private", + "Your public space": "Hapësira juaj publike", + "You can change this later": "Këtë mund ta ndryshoni më vonë", + "Invite only, best for yourself or teams": "Vetëm me ftesa, më e mira për ju dhe ekipe", + "Private": "Private", + "Open space for anyone, best for communities": "Hapësirë e hapur për këdo, më e mira për bashkësi", + "Public": "Publike", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Hapësirat janë rrugë e re për të grupuar dhoma dhe njerëz. Për t’u bërë pjesë e një hapësire ekzistuese, do t’ju duhet një ftesë", + "Create a space": "Krijoni një hapësirë", + "Delete": "Fshije", + "Jump to the bottom of the timeline when you send a message": "Kalo te fundi i rrjedhës kohore, kur dërgoni një mesazh", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototip hapësirash. I papërputhshëm me Bashkësi, Bashkësi v2 dhe Etiketa Vetjake. Për disa nga veçoritë, lyp shërbyes Home të përputhshëm.", + "This homeserver has been blocked by it's administrator.": "Ky shërbyes Home është bllokuar nga përgjegjësi i tij.", + "This homeserver has been blocked by its administrator.": "Ky shërbyes Home është bllokuar nga përgjegjësit e tij.", + "You're already in a call with this person.": "Gjendeni tashmë në thirrje me këtë person.", + "Already in call": "Tashmë në thirrje" } From 69aea71a0b6efa13cb10681b07ccbe979c790022 Mon Sep 17 00:00:00 2001 From: Graeme Power Date: Sun, 14 Mar 2021 19:21:22 +0000 Subject: [PATCH 059/163] Translated using Weblate (Irish) Currently translated at 22.9% (663 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/ --- src/i18n/strings/ga.json | 667 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 666 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json index 0967ef424b..4580e538ce 100644 --- a/src/i18n/strings/ga.json +++ b/src/i18n/strings/ga.json @@ -1 +1,666 @@ -{} +{ + "Sign in with": "Sínigh isteach le", + "Signing In...": "ag Síniú Isteach…", + "Sign in": "Sínigh Isteach", + "Already have an account? Sign in here": "An bhfuil cuntas agat cheana? Sínigh isteach anseo", + "Show less": "Taispeái níos lú", + "Show more": "Taispeáin níos mó", + "Show %(count)s more|one": "Taispeáin %(count)s níos mó", + "Show %(count)s more|other": "Taispeáin %(count)s níos mó", + "Switch to dark mode": "Athraigh go mód dorcha", + "Switch to light mode": "Athraigh go mód geal", + "User settings": "Socruithe úsáideora", + "Community settings": "Socruithe pobail", + "Notification settings": "Socruithe fógra", + "Got an account? Sign in": "An bhfuil cuntas agat? Sínigh isteach", + "New here? Create an account": "Céaduaire? Cruthaigh cuntas", + "All settings": "Gach Socrú", + "Security & Privacy": "Slándáil ⁊ Príobháideachas", + "Security & privacy": "Slándáil ⁊ príobháideachas", + "A verification email will be sent to your inbox to confirm setting your new password.": "Seolfar ríomhphost fíoraithe chuig do bhosca isteach chun a dhearbhú go bhfuil do phasfhocal nua socraithe.", + "Sign in instead": "Sínigh Isteach ina ionad sin", + "Send Reset Email": "Seol ríomhphost athshocruithe", + "What's new?": "Cad é nua?", + "New? Create account": "Céaduaire? Cruthaigh cuntas", + "Forgotten your password?": "An nDearna tú dearmad ar do fhocal faire?", + "Forgot password?": "An nDearna tú dearmad ar do fhocal faire?", + "Sign In or Create Account": "Sínigh Isteach nó Déan cuntas a chruthú", + "Autoplay GIFs and videos": "Uathsheinn GIFs agus físeáin", + "Are you sure you want to reject the invitation?": "An bhfuil tú cinnte gur mian leat an cuireadh a dhiúltú?", + "Are you sure you want to leave the room '%(roomName)s'?": "An bhfuil tú cinnte gur mian leat an seomra '%(roomName)s' a fhágáil?", + "Are you sure?": "An bhfuil tú cinnte?", + "Anyone who knows the room's link, including guests": "Duine ar bith a bhfuil eolas aige ar nasc an tseomra, aíonna san áireamh", + "Anyone who knows the room's link, apart from guests": "Duine ar bith a bhfuil eolas aige ar nasc an tseomra, seachas aíonna", + "An error has occurred.": "D’imigh earráid éigin.", + "%(senderName)s answered the call.": "D'fhreagair %(senderName)s an glao.", + "A new password must be entered.": "Caithfear focal faire nua a iontráil.", + "%(items)s and %(lastItem)s": "%(items)s agus %(lastItem)s", + "Always show message timestamps": "Taispeáin stampaí ama teachtaireachta i gcónaí", + "Alt Gr": "Alt Gr", + "Default Device": "Gléas Réamhshocraithe", + "No media permissions": "Gan cheadanna meáin", + "No Webcams detected": "Níor braitheadh aon ceamara gréasáin", + "No Microphones detected": "Níor braitheadh aon micreafón", + "Access Token:": "Licín Rochtana:", + "%(targetName)s accepted the invitation for %(displayName)s.": "Ghlac %(targetName)s leis an cuireadh ó %(displayName)s.", + "%(targetName)s accepted an invitation.": "Ghlac %(targetName)s leis an cuireadh.", + "Waiting for answer": "ag Fanacht le freagra", + "%(senderName)s started a call": "Thosaigh %(senderName)s an glao", + "You started a call": "Thosaigh tú an glao", + "Call ended": "Críochnaíodh an glao", + "%(senderName)s ended the call": "Chríochnaigh %(senderName)s an glao", + "You ended the call": "Chríochnaigh tú an glao", + "Call in Progress": "Glaoch ar siúl", + "Call in progress": "Glaoch ar siúl", + "Unable to access microphone": "Ní féidir rochtain a fháil ar mhicreafón", + "Try using turn.matrix.org": "Déan iarracht turn.matrix.org a úsáid", + "Alternatively, you can try to use the public server at turn.matrix.org, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "De rogha air sin, is féidir leat iarracht a dhéanamh an freastalaí poiblí ag turn.matrix.org a úsáid, ach ní bheidh sé seo chomh iontaofa, agus roinnfidh sé do sheoladh ip leis an freastalaí sin. Is féidir leat é seo a bhainistiú sa socruithe freisin.", + "Please ask the administrator of your homeserver (%(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Iarr ar an riarthóir do fhreastalaí baile (%(homeserverDomain)s) freastalaí TURN a chumrú go bhfeidhmeoidh glaonna go hiontaofa.", + "Call failed due to misconfigured server": "Theip an glaoch de bharr freastalaí mícumraithe", + "Answered Elsewhere": "Tógtha in áit eile", + "The call could not be established": "Níor féidir an glaoch a bhunú", + "The remote side failed to pick up": "Níor thóg an taobh eile an glaoch", + "The other party declined the call.": "Dhiúltaigh an duine eile an glaoch.", + "Call Declined": "Glao Diúltaithe", + "Unable to load! Check your network connectivity and try again.": "Ní féidir a lódáil! Seiceáil do nascacht líonra agus bain triail eile as.", + "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "As chás go bhfuil eolas inaitheanta ar an leathanach seo, mar shampla ID seomra, úsáideora nó grúpa, baintear na sonraí sin sula seoltar chuig an bhfreastalaí iad.", + "The information being sent to us to help make %(brand)s better includes:": "Cuimsíonn an eolas a chuirtear chugainn chun cabhrú le %(brand)s a dhéanamh níos fearr:", + "Your device resolution": "Taifeach do gléas", + "Your user agent": "Do ghníomhaire úsáideora", + "The call was answered on another device.": "Do ghníomhaire úsáideora.", + "Every page you use in the app": "Gach leathanach a úsáideann tú san aip", + "Whether you're using %(brand)s as an installed Progressive Web App": "Má úsáideann tú %(brand)s mar feidhmchlár gréasáin forásach (PWA) suiteáilte", + "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Má úsáideann tú an gné “grabhróige aráin” (abhatáranna os cionn an liosta seomra)", + "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Má úsáideann tú %(brand)s ar gléas arb é an teagmháil an phríomh-mheicníocht ionchuir", + "Your homeserver's URL": "An URL do fhreastalaí baile", + "Whether or not you're using the Richtext mode of the Rich Text Editor": "Má tá nó níl tú ag úsáid an modh téacs saibhir an eagarthóra téacs saibhir", + "Which officially provided instance you are using, if any": "Cén ásc a chuirtear ar fáil go hoifigiúil atá á úsáid agat, más ann dó", + "Your language of choice": "Do theanga roghnaithe", + "Whether or not you're logged in (we don't record your username)": "Má logáil nó níor logáil tú isteach (ní thaifeadaimid d'ainm úsáideora)", + "Failed to verify email address: make sure you clicked the link in the email": "Níor cinntíodh an seoladh ríomhphoist: déan cinnte gur chliceáil tú an nasc sa ríomhphost", + "Reject & Ignore user": "Diúltaigh ⁊ Neamaird do úsáideoir", + "Ignore": "Neamhaird", + "Ignored users": "Úsáideoirí neamhairde", + "Ignored/Blocked": "Neamhairde/Tachta", + "Message Pinning": "Ceangal teachtaireachta", + "Avoid sequences": "Seachain seicheamh", + "Unrecognised address": "Seoladh nár aithníodh", + "(no answer)": "(gan freagra)", + "Displays action": "Taispeáin gníomh", + "Verified key": "Eochair deimhnithe", + "Unignored user": "Úsáideoir leis aird", + "Ignored user": "Úsáideoir neamhairde", + "Unignore": "Stop ag tabhairt neamhaird air", + "Leave room": "Fág an seomra", + "Missing roomId.": "Comhartha aitheantais seomra ar iarraidh.", + "Operation failed": "Chlis an oibríocht", + "Unnamed Room": "Seomra gan ainm", + "%(weekDayName)s %(time)s": "%(weekDayName)s ar a %(time)s", + "Upload Failed": "Chlis an uaslódáil", + "Permission Required": "Is Teastáil Cead", + "Call Failed": "Chlis an glaoch", + "e.g. ": "mar shampla ", + "e.g. %(exampleValue)s": "mar shampla %(exampleValue)s", + "Inviting...": "ag Tabhairt cuireadh…", + "Finish": "Críochnaigh", + "Support": "Tacaíocht", + "Random": "Randamach", + "Undo": "Cuir ar ceal", + "Saving...": "ag Sábháil…", + "Apply": "Cuir i bhfeidhm", + "Applying...": "ag Cur i bhfeidhm…", + "Spaces": "Spásanna", + "Creating...": "ag Cruthú…", + "Private": "Príobháideach", + "Public": "Poiblí", + "Delete": "Bain amach", + "Value:": "Luach:", + "Level": "Leibhéal", + "Caution:": "Faichill:", + "Setting:": "Socrú:", + "Value": "Luach", + "Abort": "Tobscoir", + "Windows": "Fuinneoga", + "Screens": "Scáileáin", + "Transfer": "Aistrigh", + "Hold": "Fan", + "Resume": "Tosaigh arís", + "Effects": "Tionchair", + "Homeserver": "Freastalaí baile", + "Approve": "Ceadaigh", + "Filter": "Scag", + "Role": "Ról", + "Zimbabwe": "an tSiombáib", + "Zambia": "an tSaimbia", + "Yemen": "Éimin", + "Vietnam": "Vítneam", + "Venezuela": "Veiniséala", + "Vanuatu": "Vanuatú", + "Uzbekistan": "an Úisbéiceastáin", + "Uruguay": "Uragua", + "Ukraine": "an Úcráin", + "Uganda": "Uganda", + "Tuvalu": "Túvalú", + "Turkmenistan": "an Tuircméanastáin", + "Turkey": "an Tuirc", + "Tunisia": "an Túinéis", + "Tonga": "Tonga", + "Tokelau": "Oileáin Tokelau", + "Togo": "Tóga", + "Timor-Leste": "Tíomór Thoir", + "Thailand": "an Téalainn", + "Tanzania": "an Tansáin", + "Tajikistan": "an Táidsíceastáin", + "Taiwan": "an Téaváin", + "Syria": "an tSiria", + "Switzerland": "an Eilvéis", + "Sweden": "an tSualainn", + "Swaziland": "an tSuasalainn", + "Suriname": "Suranam", + "Sudan": "an tSúdáin", + "Spain": "an Spáinn", + "Somalia": "an tSomáil", + "Slovenia": "an tSlóivéin", + "Slovakia": "an tSlóvaic", + "Singapore": "Singeapór", + "Seychelles": "na Séiséil", + "Serbia": "an tSeirbia", + "Senegal": "an tSeineagáil", + "Samoa": "Samó", + "Réunion": "La Réunion", + "Rwanda": "Ruanda", + "Russia": "an Rúis", + "Romania": "an Rómáin", + "Qatar": "Catar", + "Portugal": "an Phortaingéil", + "Poland": "an Pholainn", + "Philippines": "na hOileáin Fhilipíneacha", + "Peru": "Peiriú", + "Paraguay": "Paragua", + "Panama": "Panama", + "Palestine": "an Phalaistín", + "Palau": "Oileáin Palau", + "Pakistan": "an Phacastáin", + "Oman": "Óman", + "Norway": "an Iorua", + "Niue": "Niue", + "Nigeria": "an Nigéir", + "Niger": "an Nígir", + "Nicaragua": "Nicearagua", + "Netherlands": "an Ísiltír", + "Nepal": "Neipeal", + "Nauru": "Nárú", + "Namibia": "an Namaib", + "Myanmar": "Maenmar", + "Mozambique": "Mósaimbíc", + "Morocco": "Maracó", + "Montserrat": "Montsarat", + "Montenegro": "Montainéagró", + "Mongolia": "an Mhongóil", + "Monaco": "Monacó", + "Moldova": "an Mholdóiv", + "Micronesia": "an Mhicrinéis", + "Mexico": "Meicsiceo", + "Mayotte": "Mayotte", + "Mauritius": "Oileán Mhuirís", + "Mauritania": "an Mháratáin", + "Martinique": "Martinique", + "Malta": "Málta", + "Mali": "Mailí", + "Maldives": "Oileáin Mhaildíve", + "Malaysia": "an Mhalaeisia", + "Malawi": "an Mhaláiv", + "Madagascar": "Madagascar", + "Macedonia": "an Mhacadóin", + "Macau": "Macau", + "Luxembourg": "Lucsamburg", + "Lithuania": "an Liotuáin", + "Liechtenstein": "Lichtinstéin", + "Libya": "an Libia", + "Liberia": "an Libéir", + "Lesotho": "Leosóta", + "Lebanon": "an Liobáin", + "Latvia": "an Laitvia", + "Laos": "Laos", + "Kyrgyzstan": "an Chirgeastáin", + "Kuwait": "Cuáit", + "Kosovo": "an Chosaiv", + "Kiribati": "Ciribeas", + "Kenya": "an Chéinia", + "Kazakhstan": "an Chasacstáin", + "Jordan": "an Iordáin", + "Jersey": "Geirsí", + "Japan": "an tSeapáin", + "Jamaica": "Iamáice", + "Italy": "an Iodáil", + "Israel": "Iosrael", + "Ireland": "Éire", + "Iraq": "an Iaráic", + "Iran": "an Iaráin", + "Indonesia": "an Indinéis", + "India": "an India", + "Iceland": "an Íoslainn", + "Hungary": "an Ungáir", + "Honduras": "Hondúras", + "Haiti": "Háití", + "Guyana": "an Ghuáin", + "Guinea-Bissau": "Guine Bissau", + "Guinea": "an Ghuine", + "Guernsey": "Geansaí", + "Guatemala": "Guatamala", + "Guam": "Guam", + "Guadeloupe": "Guadalúip", + "Grenada": "Greanáda", + "Greenland": "an Ghraonlainn", + "Greece": "an Ghréig", + "Gibraltar": "Giobráltar", + "Ghana": "Gána", + "Germany": "an Ghearmáin", + "Georgia": "an tSeoirsia", + "Gambia": "an Ghaimbia", + "Gabon": "an Ghabúin", + "France": "an Fhrainc", + "Finland": "an Fhionlainn", + "Fiji": "Fidsí", + "Ethiopia": "an Aetóip", + "Estonia": "an Eastóin", + "Eritrea": "an Eirtré", + "Egypt": "an Éigipt", + "Ecuador": "Eacuadór", + "Dominica": "Doiminice", + "Djibouti": "Djibouti", + "Denmark": "an Danmhairg", + "Cyprus": "an Chipir", + "Curaçao": "Curaçao", + "Cuba": "Cúba", + "Croatia": "an Chróit", + "Comoros": "Oileáin Chomóra", + "Colombia": "an Cholóim", + "China": "an tSín", + "Chile": "an tSile", + "Chad": "Sead", + "Canada": "Ceanada", + "Cameroon": "Camarún", + "Cambodia": "an Chambóid", + "Burundi": "an Bhurúin", + "Bulgaria": "an Bhulgáir", + "Brunei": "Brúiné", + "Brazil": "an Bhrasaíl", + "Botswana": "an Bhotsuáin", + "Bosnia": "an Bhoisnia agus an Heirseagaivéin", + "Bolivia": "an Bholaiv", + "Bhutan": "an Bhútáin", + "Bermuda": "Beirmiúda", + "Benin": "Beinin", + "Belize": "an Bheilís", + "Belgium": "an Bheilg", + "Belarus": "an Bhealarúis", + "Barbados": "Barbadós", + "Bangladesh": "an Bhanglaidéis", + "Bahrain": "Bairéin", + "Bahamas": "na Bahámaí", + "Azerbaijan": "an Asarbaiseáin", + "Austria": "an Ostair", + "Australia": "an Astráil", + "Aruba": "Arúba", + "Armenia": "an Airméin", + "Argentina": "an Airgintín", + "Antarctica": "Antartaice", + "Anguilla": "Angaíle", + "Angola": "Angóla", + "Andorra": "Andóra", + "Algeria": "an Ailgéir", + "Albania": "an Albáin", + "Afghanistan": "an Afganastáin", + "Comment": "Trácht", + "Pin": "Biorán", + "Widgets": "Giuirléidí", + "ready": "réidh", + "Algorithm:": "Algartam:", + "Unpin": "Neamhceangail", + "About": "Faoi", + "Privacy": "Príobháideachas", + "Show": "Taispeáin", + "Information": "Eolas", + "Away": "Imithe", + "Favourited": "Roghnaithe", + "Restore": "Athbhunaigh", + "Dark": "Dorcha", + "Light": "Geal", + "A-Z": "A-Z", + "Activity": "Gníomhaíocht", + "Feedback": "Aiseolas", + "People": "Daoine", + "Ok": "Togha", + "Categories": "Catagóire", + "Appearance": "Cuma", + "Syncing...": "ag Sioncrónú...", + "Verified": "Deimhnithe", + "End": "End", + "Space": "Spás", + "Enter": "Enter", + "Esc": "Esc", + "Ctrl": "Ctrl", + "Super": "Súpar", + "Shift": "Shift", + "Alt": "Alt", + "Autocomplete": "Uathiomlánaigh", + "Calls": "Glaonna", + "Navigation": "Nascleanúint", + "Matrix": "Matrix", + "Accepting…": "ag Glacadh leis…", + "Cancelling…": "ag Cealú…", + "exists": "a bheith ann", + "or": "nó", + "Copy": "Cóipeáil", + "Mod": "Mod", + "Bridges": "Droichid", + "Disable": "Cuir as feidhm", + "Enable": "Tosaigh", + "Manage": "Bainistigh", + "Review": "Athbhreithnigh", + "Later": "Níos deireanaí", + "Done": "Críochnaithe", + "Start": "Tosaigh", + "Lock": "Glasáil", + "Suggestions": "Moltaí", + "Go": "Téigh", + "Cross-signing": "Cros-síniú", + "Reactions": "Freagartha", + "Unencrypted": "Gan chriptiú", + "Upgrade": "Uasghrádaigh", + "Verify": "Cinntigh", + "Security": "Slándáil", + "Trusted": "Dílis", + "Subscribe": "Liostáil", + "Unsubscribe": "Díliostáil", + "None": "Níl aon cheann", + "Trust": "Cuir muinín i", + "React": "Freagair", + "Flags": "Bratacha", + "Symbols": "Siombailí", + "Objects": "Rudaí", + "Activities": "Gníomhaíochtaí", + "Document": "Cáipéis", + "Complete": "Críochnaigh", + "View": "Amharc", + "Preview": "Réamhamharc", + "Strikethrough": "Líne a chur trí", + "Italics": "Iodálach", + "Bold": "Trom", + "ID": "Comhartha aitheantais", + "Disconnect": "Dícheangail", + "Share": "Roinn le", + "Revoke": "Cúlghair", + "Discovery": "Aimsiú", + "Actions": "Gníomhartha", + "Messages": "Teachtaireachtaí", + "Retry": "Atriail", + "Success!": "Rath!", + "Download": "Íoslódáil", + "Import": "Iompórtáil", + "Export": "Easpórtáil", + "Name": "Ainm", + "Users": "Úsáideoirí", + "Emoji": "Straoiseog", + "Commands": "Ordú", + "Guest": "Cuairteoir", + "Room": "Seomra", + "Logout": "Logáil amach", + "Description": "Cuntas", + "Everyone": "Gach duine", + "Other": "Eile", + "Change": "Athraigh", + "Phone": "Guthán", + "Username": "Ainm úsáideora", + "Email": "Ríomhphost", + "Submit": "Cuir isteach", + "Code": "Cód", + "Home": "Tús", + "Hide": "Cuir i bhfolach", + "Favourite": "Cuir mar ceanán", + "Leave": "Fág", + "Quote": "Luaigh", + "Resend": "Athsheol", + "Upload": "Uaslódáil", + "Next": "Ar Aghaidh", + "Summary": "Achoimre", + "Service": "Seirbhís", + "Skip": "Léim", + "Refresh": "Athnuaigh", + "Toolbox": "Uirlisí", + "Back": "Ar Ais", + "Create": "Cruthaigh", + "example": "sampla", + "Example": "Sampla", + "Removing…": "ag Baint…", + "Changelog": "Loga na n-athruithe", + "Unavailable": "Níl sé ar fáil", + "Notes": "Nótaí", + "expand": "méadaigh", + "collapse": "cumaisc", + "%(oneUser)sleft %(count)s times|one": "D'fhág %(oneUser)s", + "%(severalUsers)sleft %(count)s times|one": "D'fhág %(severalUsers)s", + "%(oneUser)sjoined %(count)s times|one": "Tháinig %(oneUser)s isteach", + "%(severalUsers)sjoined %(count)s times|one": "Tháinig %(severalUsers)s isteach", + "Communities": "Pobail", + "Join": "Téigh isteach", + "Warning": "Rabhadh", + "Update": "Uasdátaigh", + "edited": "curtha in eagar", + "Copied!": "Cóipeáilte!", + "Attachment": "Ceangaltán", + "Options": "Roghanna", + "Edit": "Cuir in eagar", + "Reply": "Freagair", + "Yesterday": "Inné", + "Today": "Inniu", + "Saturday": "Dé Sathairn", + "Friday": "Dé hAoine", + "Thursday": "Déardaoin", + "Wednesday": "Dé Céadaoin", + "Tuesday": "Dé Máirt", + "Monday": "Dé Luain", + "Sunday": "Dé Domhnaigh", + "Members": "Baill", + "Stickerpack": "Pacáiste greamáin", + "Search…": "Cuardaigh…", + "Reject": "Diúltaigh", + "Re-join": "Téigh ar ais isteach", + "Historical": "Stairiúil", + "Rooms": "Seomraí", + "Favourites": "Ceanáin", + "Invites": "Cuirí", + "Search": "Cuardaigh", + "Settings": "Socruithe", + "Replying": "Ag freagairt", + "Unknown": "Anaithnid", + "Offline": "As líne", + "Idle": "Díomhaoin", + "Online": "Ar Líne", + "%(duration)sd": "%(duration)sl", + "%(duration)sh": "%(duration)su", + "%(duration)sm": "%(duration)sn", + "%(duration)ss": "%(duration)ss", + "Delete Backup": "Scrios cúltaca", + "Email Address": "Seoladh Ríomhphoist", + "Last seen": "Úsáid deireanach", + "Change Password": "Athraigh focal faire", + "Confirm password": "Deimhnigh focal faire", + "New Password": "Focal Faire Nua", + "Current password": "Focal faire reatha", + "Upload new:": "Uaslódáil nua:", + "Light bulb": "Bolgán solais", + "Thumbs up": "Ordógí suas", + "Got It": "Tuigthe", + "Call invitation": "Nuair a fhaighim cuireadh glaoigh", + "Collecting logs": "ag Bailiú logaí", + "Room Colour": "Dath an tSeomra", + "Loading...": "ag Lódáil...", + "Invited": "Le cuireadh", + "Close": "Dún", + "Mute": "Ciúinaigh", + "Unmute": "Stop ag ciúnú", + "Invite": "Tabhair cuireadh", + "Mention": "Luaigh", + "Demote": "Bain ceadanna", + "Ban": "Coisc", + "Kick": "Caith amach", + "Disinvite": "Tarraing siar cuireadh", + "Encrypted": "Criptithe", + "Encryption": "Criptiúchán", + "Anyone": "Aon duine", + "Permissions": "Ceadanna", + "Unban": "Bain an coisc", + "Browse": "Brabhsáil", + "Reset": "Athshocraigh", + "Sounds": "Fuaimeanna", + "Camera": "Ceamara", + "Microphone": "Micreafón", + "Cryptography": "Cripteagrafaíocht", + "Timeline": "Amlíne", + "Composer": "Eagarthóir", + "Preferences": "Roghanna", + "Notifications": "Fógraí", + "Versions": "Leaganacha", + "Labs": "Turgnaimh", + "FAQ": "Ceisteanna Coitianta - CC", + "Credits": "Creidiúintí", + "Legal": "Dlí", + "General": "Ginearálta", + "Theme": "Téama", + "Account": "Cuntas", + "Profile": "Próifíl", + "Success": "Rath", + "Flair": "Suaitheantas", + "Save": "Sábháil", + "Noisy": "Callánach", + "On": "Ar siúl", + "Off": "Múchta", + "Keywords": "Eochairfhocail", + "Advanced": "Forbartha", + "Add": "Cuir", + "Remove": "Bain", + "No": "Níl", + "Yes": "Tá", + "Authentication": "Fíordheimhniú", + "Password": "Pasfhocal", + "Warning!": "Aire!", + "Folder": "Fillteán", + "Headphones": "Cluasáin", + "Anchor": "Ancaire", + "Bell": "Cloigín", + "Trumpet": "Trumpa", + "Guitar": "Giotár", + "Ball": "Liathróid", + "Trophy": "Corn", + "Rocket": "Roicéad", + "Aeroplane": "Eitleán", + "Bicycle": "Rothar", + "Train": "Traein", + "Flag": "Bratach", + "Telephone": "Guthán", + "Hammer": "Casúr", + "Key": "Eochair", + "Scissors": "Siosúr", + "Paperclip": "Fáiscín páipéir", + "Pencil": "Peann luaidhe", + "Book": "Leabhar", + "Gift": "Bronntanas", + "Clock": "Clog", + "Hourglass": "Orláiste", + "Umbrella": "Scáth báistí", + "Santa": "Daidí na Nollag", + "Spanner": "Castaire", + "Glasses": "Spéaclaí", + "Hat": "Hata", + "Robot": "Róbat", + "Smiley": "Straoiseog", + "Heart": "Croí", + "Cake": "Cáca", + "Pizza": "Píotsa", + "Corn": "Grán buí", + "Strawberry": "Sú talún", + "Apple": "Úll", + "Banana": "Banana", + "Fire": "Tine", + "Cloud": "Scamall", + "Moon": "Gealach", + "Globe": "Cruinneog", + "Mushroom": "Muisiriún", + "Cactus": "Cachtas", + "Tree": "Crann", + "Flower": "Bláth", + "Butterfly": "Féileacán", + "Octopus": "Ochtapas", + "Fish": "Iasc", + "Turtle": "Turtar", + "Penguin": "Piongain", + "Rooster": "Coileach", + "Panda": "Panda", + "Rabbit": "Coinín", + "Elephant": "Eilifint", + "Pig": "Muc", + "Unicorn": "Aonbheannach", + "Horse": "Capall", + "Lion": "Leon", + "Cat": "Cat", + "Dog": "Madra", + "Cancel": "Cuir ar ceal", + "Verified!": "Deimhnithe!", + "OK": "Togha", + "Accept": "Glac", + "Decline": "Diúltaigh", + "Someone": "Duine éigin", + "Reason": "Cúis", + "Usage": "Úsáid", + "Admin": "Riarthóir", + "Moderator": "Modhnóir", + "Restricted": "Teoranta", + "Default": "Réamhshocrú", + "Register": "Cláraigh", + "Error": "Earráid", + "AM": "RN", + "PM": "IN", + "Dec": "Nol", + "Nov": "Saṁ", + "Oct": "DFó", + "Sep": "MFó", + "Aug": "Lún", + "Jul": "Iúil", + "Jun": "Meiṫ", + "May": "Beal", + "Apr": "Aib", + "Mar": "Már", + "Feb": "Feaḃ", + "Jan": "Ean", + "Sat": "Saṫ", + "Fri": "Aoi", + "Thu": "Déa", + "Wed": "Céa", + "Tue": "Mái", + "Mon": "Lua", + "Sun": "Doṁ", + "Send": "Seol", + "Continue": "Lean ar aghaidh", + "Analytics": "Anailísiú sonraí", + "The version of %(brand)s": "An leagan %(brand)s", + "The platform you're on": "An t-ardán ar a bhfuil tú", + "Add Phone Number": "Cuir uimhir ghutháin", + "Click the button below to confirm adding this phone number.": "Cliceáil an cnaipe thíos chun an uimhir ghutháin nua a dheimhniú.", + "Confirm adding phone number": "Deimhnigh an uimhir ghutháin nua", + "Confirm adding this phone number by using Single Sign On to prove your identity.": "Deimhnigh an uimhir ghutháin seo le SSO mar cruthúnas céannachta.", + "Add Email Address": "Cuir seoladh ríomhphoist", + "Confirm": "Deimhnigh", + "Click the button below to confirm adding this email address.": "Cliceáil an cnaipe thíos chun an seoladh ríomhphoist nua a dheimhniú.", + "Confirm adding email": "Deimhnigh an seoladh ríomhphoist nua", + "Single Sign On": "Single Sign On", + "Confirm adding this email address by using Single Sign On to prove your identity.": "Deimhnigh an seoladh ríomhphoist seo le SSO mar cruthúnas céannachta.", + "Explore rooms": "Breathnaigh thart ar na seomraí", + "Create Account": "Déan cuntas a chruthú", + "Sign In": "Sínigh Isteach", + "Dismiss": "Cuir uait", + "Use Single Sign On to continue": "Lean ar aghaidh le SSO", + "This phone number is already in use": "Úsáidtear an uimhir ghutháin seo chean féin", + "This email address is already in use": "Úsáidtear an seoladh ríomhphoist seo chean féin" +} From ff149ba1efb79ffbea5d64d1e8558a2a2a53fd2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Thu, 11 Mar 2021 19:04:56 +0000 Subject: [PATCH 060/163] Translated using Weblate (Estonian) Currently translated at 96.1% (2778 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/ --- src/i18n/strings/et.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json index eb895f5f26..7ae8c1a4c1 100644 --- a/src/i18n/strings/et.json +++ b/src/i18n/strings/et.json @@ -1132,7 +1132,7 @@ "Bridges": "Sõnumisillad", "Room Addresses": "Jututubade aadressid", "Browse": "Sirvi", - "Change room avatar": "Muuda jututoa profiilipilti ehk avatari", + "Change room avatar": "Muuda jututoa tunnuspilti ehk avatari", "Change main address for the room": "Muuda jututoa põhiaadressi", "Change history visibility": "Muuda vestlusajaloo nähtavust", "Change permissions": "Muuda õigusi", @@ -3088,5 +3088,9 @@ "Setting ID": "Seadistuse tunnus", "Failed to save settings": "Seadistuste salvestamine ei õnnestunud", "Settings Explorer": "Seadistuste haldur", - "Show chat effects (animations when receiving e.g. confetti)": "Näita vestluses edevat graafikat (näiteks kui keegi on saatnud serpentiine)" + "Show chat effects (animations when receiving e.g. confetti)": "Näita vestluses edevat graafikat (näiteks kui keegi on saatnud serpentiine)", + "This homeserver has been blocked by it's administrator.": "Ligipääs sellele koduserverile on sinu serveri haldaja poolt blokeeritud.", + "This homeserver has been blocked by its administrator.": "Ligipääs sellele koduserverile on sinu serveri haldaja poolt blokeeritud.", + "You're already in a call with this person.": "Sinul juba kõne käsil selle osapoolega.", + "Already in call": "Kõne on juba pooleli" } From c73c302e1a6eb4ae03b3cfe8e2793fd813ea529e Mon Sep 17 00:00:00 2001 From: KAHINA Date: Sun, 14 Mar 2021 22:29:04 +0000 Subject: [PATCH 061/163] Translated using Weblate (Kabyle) Currently translated at 86.5% (2501 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/kab/ --- src/i18n/strings/kab.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json index 6c282af33c..c4e0cc7099 100644 --- a/src/i18n/strings/kab.json +++ b/src/i18n/strings/kab.json @@ -2749,5 +2749,10 @@ "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Yerna (╯°□°）╯︵ ┻━┻ ɣer tazwara n yizen", "This will end the conference for everyone. Continue?": "Aya ad yeḥbes asarag i yal yiwen. Kemmel?", "End conference": "Kfu asarag", - "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Tawuri tecceḍ acku asawaḍ ur yessaweḍ ara ad yekcem. Senqed ma yella usawaḍ yeqqnen yerna yettusbadu akken iwata." + "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Tawuri tecceḍ acku asawaḍ ur yessaweḍ ara ad yekcem. Senqed ma yella usawaḍ yeqqnen yerna yettusbadu akken iwata.", + "%(senderName)s declined the call.": "%(senderName)s yugi asiwel.", + "(an error occurred)": "(tella-d tuccḍa)", + "(connection failed)": "(tuqqna ur teddi ara)", + "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Iqeddcen akk ttwagedlen seg uttekki! Taxxamt-a dayen ur tettuseqdac ara.", + "Try again": "Ɛreḍ tikkelt-nniḍen" } From d04c8b3fb417fc9cc3eedcc78d3d8b4a84de035a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 19 Mar 2021 11:36:36 +0000 Subject: [PATCH 062/163] Improve discovery of rooms in a space --- res/css/structures/_SpaceRoomDirectory.scss | 271 +++++--- res/img/element-icons/warning-badge.svg | 6 +- .../structures/SpaceRoomDirectory.tsx | 635 +++++++++--------- src/components/structures/SpaceRoomView.tsx | 9 +- .../views/elements/TextWithTooltip.js | 10 +- src/i18n/strings/en_EN.json | 32 +- 6 files changed, 527 insertions(+), 436 deletions(-) diff --git a/res/css/structures/_SpaceRoomDirectory.scss b/res/css/structures/_SpaceRoomDirectory.scss index b14e92a1af..b20554166a 100644 --- a/res/css/structures/_SpaceRoomDirectory.scss +++ b/res/css/structures/_SpaceRoomDirectory.scss @@ -31,7 +31,8 @@ limitations under the License. display: flex; .mx_BaseAvatar { - margin-right: 16px; + margin-right: 12px; + align-self: center; } .mx_BaseAvatar_image { @@ -47,6 +48,7 @@ limitations under the License. } > div { + font-weight: 400; color: $secondary-fg-color; font-size: $font-15px; line-height: $font-24px; @@ -55,38 +57,71 @@ limitations under the License. } .mx_Dialog_content { - // TODO fix scrollbar - //display: flex; - //flex-direction: column; - //height: calc(100% - 80px); - .mx_AccessibleButton_kind_link { padding: 0; } .mx_SearchBox { - margin: 24px 0 28px; + margin: 24px 0 16px; + } + + .mx_SpaceRoomDirectory_noResults { + text-align: center; + + > div { + font-size: $font-15px; + line-height: $font-24px; + color: $secondary-fg-color; + } } .mx_SpaceRoomDirectory_listHeader { display: flex; - font-size: $font-12px; - line-height: $font-15px; - color: $secondary-fg-color; + min-height: 32px; + align-items: center; + font-size: $font-15px; + line-height: $font-24px; + color: $primary-fg-color; - .mx_FormButton { - margin-bottom: 8px; + .mx_AccessibleButton { + padding: 2px 8px; + font-weight: normal; + + & + .mx_AccessibleButton { + margin-left: 16px; + } } > span { - margin: auto 0 0 auto; + margin-left: auto; + } + } + + .mx_SpaceRoomDirectory_error { + position: relative; + font-weight: $font-semi-bold; + color: $notice-primary-color; + font-size: $font-15px; + line-height: $font-18px; + margin: 20px auto 12px; + padding-left: 24px; + width: max-content; + + &::before { + content: ""; + position: absolute; + height: 16px; + width: 16px; + left: 0; + background-image: url("$(res)/img/element-icons/warning-badge.svg"); } } } } .mx_SpaceRoomDirectory_list { - margin-top: 8px; + margin-top: 16px; + padding-bottom: 40px; .mx_SpaceRoomDirectory_roomCount { > h3 { @@ -106,115 +141,128 @@ limitations under the License. } .mx_SpaceRoomDirectory_subspace { - margin-top: 8px; - - .mx_SpaceRoomDirectory_subspace_info { - display: flex; - flex-direction: row; - align-items: center; - margin-bottom: 8px; - color: $secondary-fg-color; - font-weight: $font-semi-bold; - font-size: $font-12px; - line-height: $font-15px; - - .mx_BaseAvatar { - margin-right: 12px; - vertical-align: middle; - } - - .mx_BaseAvatar_image { - border-radius: 8px; - } - - .mx_SpaceRoomDirectory_actions { - text-align: right; - height: min-content; - margin-left: auto; - margin-right: 16px; - display: inline-flex; - } - } - - .mx_SpaceRoomDirectory_subspace_children { - margin-left: 12px; - border-left: 2px solid $space-button-outline-color; - padding-left: 24px; + .mx_BaseAvatar_image { + border-radius: 8px; } } - .mx_SpaceRoomDirectory_roomTile { - padding: 16px; - border-radius: 8px; - border: 1px solid $space-button-outline-color; - margin: 8px 0 16px; - display: flex; - min-height: 76px; - box-sizing: border-box; + .mx_SpaceRoomDirectory_subspace_toggle { + position: absolute; + left: -1px; + top: 10px; + height: 16px; + width: 16px; + border-radius: 4px; + background-color: $primary-bg-color; - &.mx_AccessibleButton:hover { - background-color: rgba(141, 151, 165, 0.1); + &::before { + content: ''; + position: absolute; + top: 0; + left: 0; + height: 16px; + width: 16px; + mask-repeat: no-repeat; + mask-position: center; + background-color: $tertiary-fg-color; + mask-size: 16px; + transform: rotate(270deg); + mask-image: url('$(res)/img/feather-customised/chevron-down.svg'); } + &.mx_SpaceRoomDirectory_subspace_toggle_shown::before { + transform: rotate(0deg); + } + } + + .mx_SpaceRoomDirectory_subspace_children { + position: relative; + padding-left: 12px; + } + + .mx_SpaceRoomDirectory_roomTile { + position: relative; + padding: 6px 16px; + border-radius: 8px; + min-height: 56px; + box-sizing: border-box; + + display: grid; + grid-template-columns: 20px auto max-content; + grid-column-gap: 8px; + align-items: center; + .mx_BaseAvatar { - margin-right: 16px; - margin-top: 6px; + grid-row: 1; + grid-column: 1; + } + + .mx_SpaceRoomDirectory_roomTile_name { + font-weight: $font-semi-bold; + font-size: $font-15px; + line-height: $font-18px; + grid-row: 1; + grid-column: 2; + + .mx_InfoTooltip { + display: inline; + margin-left: 12px; + color: $tertiary-fg-color; + font-size: $font-12px; + line-height: $font-15px; + + .mx_InfoTooltip_icon { + margin-right: 4px; + } + } } .mx_SpaceRoomDirectory_roomTile_info { - display: inline-block; - font-size: $font-15px; - flex-grow: 1; - height: min-content; - margin: auto 0; - - .mx_SpaceRoomDirectory_roomTile_name { - font-weight: $font-semi-bold; - line-height: $font-18px; - } - .mx_SpaceRoomDirectory_roomTile_topic { - line-height: $font-24px; - color: $secondary-fg-color; - } - } - - .mx_SpaceRoomDirectory_roomTile_memberCount { - position: relative; - margin: auto 0 auto 24px; - padding: 0 0 0 28px; - line-height: $font-24px; - display: inline-block; - width: 32px; - - &::before { - position: absolute; - content: ''; - width: 24px; - height: 24px; - top: 0; - left: 0; - mask-position: center; - mask-repeat: no-repeat; - mask-size: contain; - background-color: $secondary-fg-color; - mask-image: url('$(res)/img/element-icons/community-members.svg'); - } + font-size: $font-12px; + line-height: $font-15px; + color: $tertiary-fg-color; + grid-row: 2; + grid-column: 1/3; } .mx_SpaceRoomDirectory_actions { - width: 180px; text-align: right; - margin-left: 28px; - display: inline-flex; - align-items: center; + margin-left: 20px; + grid-column: 3; + grid-row: 1/3; .mx_AccessibleButton { - vertical-align: middle; + padding: 6px 18px; - & + .mx_AccessibleButton { - margin-left: 24px; - } + display: none; } + + .mx_Checkbox { + display: inline-flex; + vertical-align: middle; + margin-left: 12px; + } + } + + &:hover { + background-color: $groupFilterPanel-bg-color; + + .mx_AccessibleButton { + display: inline-block; + } + } + } + + .mx_SpaceRoomDirectory_roomTile, + .mx_SpaceRoomDirectory_subspace_children { + &::before { + content: ""; + position: absolute; + background-color: $groupFilterPanel-bg-color; + width: 1px; + height: 100%; + left: 6px; + top: 0; } } @@ -226,4 +274,17 @@ limitations under the License. color: $secondary-fg-color; } } + + > hr { + border: none; + height: 1px; + background-color: rgba(141, 151, 165, 0.2); + margin: 20px 0; + } + + .mx_SpaceRoomDirectory_createRoom { + display: block; + margin: 16px auto 0; + width: max-content; + } } diff --git a/res/img/element-icons/warning-badge.svg b/res/img/element-icons/warning-badge.svg index ac5991f221..1ae4e40ffe 100644 --- a/res/img/element-icons/warning-badge.svg +++ b/res/img/element-icons/warning-badge.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx index 9ee16558d3..0a53f38238 100644 --- a/src/components/structures/SpaceRoomDirectory.tsx +++ b/src/components/structures/SpaceRoomDirectory.tsx @@ -14,27 +14,30 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React, {useMemo, useRef, useState} from "react"; +import React, {useMemo, useState} from "react"; import Room from "matrix-js-sdk/src/models/room"; -import MatrixEvent from "matrix-js-sdk/src/models/event"; import {EventType, RoomType} from "matrix-js-sdk/src/@types/event"; +import classNames from "classnames"; +import {sortBy} from "lodash"; import {MatrixClientPeg} from "../../MatrixClientPeg"; import dis from "../../dispatcher/dispatcher"; import {_t} from "../../languageHandler"; import AccessibleButton from "../views/elements/AccessibleButton"; import BaseDialog from "../views/dialogs/BaseDialog"; -import FormButton from "../views/elements/FormButton"; +import Spinner from "../views/elements/Spinner"; import SearchBox from "./SearchBox"; import RoomAvatar from "../views/avatars/RoomAvatar"; import RoomName from "../views/elements/RoomName"; import {useAsyncMemo} from "../../hooks/useAsyncMemo"; -import {shouldShowSpaceSettings} from "../../utils/space"; import {EnhancedMap} from "../../utils/maps"; import StyledCheckbox from "../views/elements/StyledCheckbox"; import AutoHideScrollbar from "./AutoHideScrollbar"; import BaseAvatar from "../views/avatars/BaseAvatar"; import {mediaFromMxc} from "../../customisations/Media"; +import InfoTooltip from "../views/elements/InfoTooltip"; +import TextWithTooltip from "../views/elements/TextWithTooltip"; +import {useStateToggle} from "../../hooks/useStateToggle"; interface IProps { space: Room; @@ -72,215 +75,98 @@ export interface ISpaceSummaryEvent { } /* eslint-enable camelcase */ -interface ISubspaceProps { - space: ISpaceSummaryRoom; - event?: MatrixEvent; +interface ITileProps { + room: ISpaceSummaryRoom; editing?: boolean; - onPreviewClick?(): void; - queueAction?(action: IAction): void; - onJoinClick?(): void; + suggested?: boolean; + selected?: boolean; + numChildRooms?: number; + hasPermissions?: boolean; + onViewRoomClick(autoJoin: boolean): void; + onToggleClick?(): void; } -const SubSpace: React.FC = ({ - space, +const Tile: React.FC = ({ + room, editing, - event, - queueAction, - onJoinClick, - onPreviewClick, + suggested, + selected, + hasPermissions, + onToggleClick, + onViewRoomClick, + numChildRooms, children, }) => { - const name = space.name || space.canonical_alias || space.aliases?.[0] || _t("Unnamed Space"); + const name = room.name || room.canonical_alias || room.aliases?.[0] + || (room.room_type === RoomType.Space ? _t("Unnamed Space") : _t("Unnamed Room")); - const evContent = event?.getContent(); - const [suggested, _setSuggested] = useState(evContent?.suggested); - const [removed, _setRemoved] = useState(!evContent?.via); - - const cli = MatrixClientPeg.get(); - const cliRoom = cli.getRoom(space.room_id); - const myMembership = cliRoom?.getMyMembership(); - - // TODO DRY code - let actions; - if (editing && queueAction) { - if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) { - const setSuggested = () => { - _setSuggested(v => { - queueAction({ - event, - removed, - suggested: !v, - }); - return !v; - }); - }; - - const setRemoved = () => { - _setRemoved(v => { - queueAction({ - event, - removed: !v, - suggested, - }); - return !v; - }); - }; - - if (removed) { - actions = - - ; - } else { - actions = - - - ; - } - } else { - actions = - { _t("No permissions")} - ; - } - // TODO confirm remove from space click behaviour here - } else { - if (myMembership === "join") { - actions = - { _t("You're in this space")} - ; - } else if (onJoinClick) { - actions = - - { _t("Preview") } - - - - } - } - - let url: string; - if (space.avatar_url) { - url = mediaFromMxc(space.avatar_url).getSquareThumbnailHttp(Math.floor(24 * window.devicePixelRatio)); - } - - return
-
- - { name } - -
- { actions } -
-
-
- { children } -
-
-}; - -interface IAction { - event: MatrixEvent; - suggested: boolean; - removed: boolean; -} - -interface IRoomTileProps { - room: ISpaceSummaryRoom; - event?: MatrixEvent; - editing?: boolean; - onPreviewClick(): void; - queueAction?(action: IAction): void; - onJoinClick?(): void; -} - -const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinClick }: IRoomTileProps) => { - const name = room.name || room.canonical_alias || room.aliases?.[0] || _t("Unnamed Room"); - - const evContent = event?.getContent(); - const [suggested, _setSuggested] = useState(evContent?.suggested); - const [removed, _setRemoved] = useState(!evContent?.via); + const [showChildren, toggleShowChildren] = useStateToggle(true); const cli = MatrixClientPeg.get(); const cliRoom = cli.getRoom(room.room_id); const myMembership = cliRoom?.getMyMembership(); - let actions; - if (editing && queueAction) { - if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) { - const setSuggested = () => { - _setSuggested(v => { - queueAction({ - event, - removed, - suggested: !v, - }); - return !v; - }); - }; + const onPreviewClick = () => onViewRoomClick(false); + const onJoinClick = () => onViewRoomClick(true); - const setRemoved = () => { - _setRemoved(v => { - queueAction({ - event, - removed: !v, - suggested, - }); - return !v; - }); - }; + let button; + if (myMembership === "join") { + button = + { _t("Open") } + ; + } else if (onJoinClick) { + button = + { _t("Join") } + ; + } - if (removed) { - actions = - - ; - } else { - actions = - - - ; - } + let checkbox; + if (onToggleClick) { + if (hasPermissions) { + checkbox = ; } else { - actions = - { _t("No permissions")} - ; - } - // TODO confirm remove from space click behaviour here - } else { - if (myMembership === "join") { - actions = - { _t("You're in this room")} - ; - } else if (onJoinClick) { - actions = - - { _t("Preview") } - - - + checkbox = { ev.stopPropagation() }} + > + + ; } } let url: string; if (room.avatar_url) { - url = mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(Math.floor(32 * window.devicePixelRatio)); + url = mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(Math.floor(20 * window.devicePixelRatio)); + } + + let description = _t("%(count)s members", { count: room.num_joined_members }); + if (numChildRooms) { + description += " · " + _t("%(count)s rooms", { count: numChildRooms }); + } + if (room.topic) { + description += " · " + room.topic; + } + + let suggestedSection; + if (suggested) { + suggestedSection = + { _t("Suggested") } + ; } const content = - + +
+ { name } + { suggestedSection } +
-
- { name } -
-
- { room.topic } -
+ { description }
-
- { room.num_joined_members } -
-
- { actions } + { button } + { checkbox }
; @@ -290,9 +176,38 @@ const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinCli } - return - { content } - ; + let childToggle; + let childSection; + if (children) { + // the chevron is purposefully a div rather than a button as it should be ignored for a11y + childToggle =
{ + ev.stopPropagation(); + toggleShowChildren(); + }} + />; + if (showChildren) { + childSection =
+ { children } +
; + } + } + + return <> + + { content } + { childToggle } + + { childSection } + ; }; export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoin = false) => { @@ -325,88 +240,77 @@ export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoi interface IHierarchyLevelProps { spaceId: string; rooms: Map; - editing?: boolean; - relations: EnhancedMap; + relations: EnhancedMap>; parents: Set; - queueAction?(action: IAction): void; - onPreviewClick(roomId: string): void; - onRemoveFromSpaceClick?(roomId: string): void; - onJoinClick?(roomId: string): void; + selectedMap?: Map>; + onViewRoomClick(roomId: string, autoJoin: boolean): void; + onToggleClick?(parentId: string, childId: string): void; } export const HierarchyLevel = ({ spaceId, rooms, - editing, relations, parents, - onPreviewClick, - onJoinClick, - queueAction, + selectedMap, + onViewRoomClick, + onToggleClick, }: IHierarchyLevelProps) => { const cli = MatrixClientPeg.get(); const space = cli.getRoom(spaceId); - // TODO respect order - const [subspaces, childRooms] = relations.get(spaceId)?.reduce((result, roomId: string) => { - if (!rooms.has(roomId)) return result; // TODO wat + const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId()) + + const sortedChildren = sortBy([...relations.get(spaceId)?.values()], ev => ev.content.order || null); + const [subspaces, childRooms] = sortedChildren.reduce((result, ev: ISpaceSummaryEvent) => { + const roomId = ev.state_key; + if (!rooms.has(roomId)) return result; result[rooms.get(roomId).room_type === RoomType.Space ? 0 : 1].push(roomId); return result; }, [[], []]) || [[], []]; - // Don't render this subspace if it has no rooms we can show - // TODO this is broken - as a space may have subspaces we still need to show - // if (!childRooms.length) return null; - - const userId = cli.getUserId(); - const newParents = new Set(parents).add(spaceId); return { childRooms.map(roomId => ( - { - onPreviewClick(roomId); + suggested={relations.get(spaceId)?.get(roomId)?.content.suggested} + selected={selectedMap?.get(spaceId)?.has(roomId)} + onViewRoomClick={(autoJoin) => { + onViewRoomClick(roomId, autoJoin); }} - onJoinClick={onJoinClick ? () => { - onJoinClick(roomId); - } : undefined} + hasPermissions={hasPermissions} + onToggleClick={onToggleClick ? () => onToggleClick(spaceId, roomId) : undefined} /> )) } { subspaces.filter(roomId => !newParents.has(roomId)).map(roomId => ( - { - onPreviewClick(roomId); - }} - onJoinClick={() => { - onJoinClick(roomId); + room={rooms.get(roomId)} + numChildRooms={Array.from(relations.get(roomId)?.values() || []) + .filter(ev => rooms.get(ev.state_key)?.room_type !== RoomType.Space).length} + suggested={relations.get(spaceId)?.get(roomId)?.content.suggested} + selected={selectedMap?.get(spaceId)?.has(roomId)} + onViewRoomClick={(autoJoin) => { + onViewRoomClick(roomId, autoJoin); }} + hasPermissions={hasPermissions} + onToggleClick={onToggleClick ? () => onToggleClick(spaceId, roomId) : undefined} > - + )) } @@ -415,8 +319,8 @@ export const HierarchyLevel = ({ const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinished }) => { // TODO pagination const cli = MatrixClientPeg.get(); + const userId = cli.getUserId(); const [query, setQuery] = useState(initialText); - const [isEditing, setIsEditing] = useState(false); const onCreateRoomClick = () => { dis.dispatch({ @@ -426,51 +330,19 @@ const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinis onFinished(); }; - // stored within a ref as we don't need to re-render when it changes - const pendingActions = useRef(new Map()); + const [selected, setSelected] = useState(new Map>()); // Map> - let adminButton; - if (shouldShowSpaceSettings(cli, space)) { // TODO this is an imperfect test - const onManageButtonClicked = () => { - setIsEditing(true); - }; - - const onSaveButtonClicked = () => { - // TODO setBusy - pendingActions.current.forEach(({event, suggested, removed}) => { - const content = { - ...event.getContent(), - suggested, - }; - - if (removed) { - delete content["via"]; - } - - cli.sendStateEvent(event.getRoomId(), event.getType(), content, event.getStateKey()); - }); - setIsEditing(false); - }; - - if (isEditing) { - adminButton = - - { _t("Promoted to users") } - ; - } else { - adminButton = ; - } - } - - const [rooms, relations, viaMap] = useAsyncMemo(async () => { + const [rooms, parentChildMap, childParentMap, viaMap] = useAsyncMemo(async () => { try { const data = await cli.getSpaceSummary(space.roomId); - const parentChildRelations = new EnhancedMap(); + const parentChildRelations = new EnhancedMap>(); + const childParentRelations = new EnhancedMap>(); const viaMap = new EnhancedMap>(); data.events.map((ev: ISpaceSummaryEvent) => { if (ev.type === EventType.SpaceChild) { - parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key); + parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev); + childParentRelations.getOrCreate(ev.state_key, new Set()).add(ev.room_id); } if (Array.isArray(ev.content["via"])) { const set = viaMap.getOrCreate(ev.state_key, new Set()); @@ -478,7 +350,7 @@ const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinis } }); - return [data.rooms, parentChildRelations, viaMap]; + return [data.rooms as ISpaceSummaryRoom[], parentChildRelations, childParentRelations, viaMap]; } catch (e) { console.error(e); // TODO } @@ -488,54 +360,204 @@ const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinis const roomsMap = useMemo(() => { if (!rooms) return null; - const lcQuery = query.toLowerCase(); + const lcQuery = query.toLowerCase().trim(); - const filteredRooms = rooms.filter(r => { - return r.room_type === RoomType.Space // always include spaces to allow filtering of sub-space rooms - || r.name?.toLowerCase().includes(lcQuery) - || r.topic?.toLowerCase().includes(lcQuery); + const roomsMap = new Map(rooms.map(r => [r.room_id, r])); + if (!lcQuery) return roomsMap; + + const directMatches = rooms.filter(r => { + return r.name?.toLowerCase().includes(lcQuery) || r.topic?.toLowerCase().includes(lcQuery); }); - return new Map(filteredRooms.map(r => [r.room_id, r])); - // const root = rooms.get(space.roomId); - }, [rooms, query]); + // Walk back up the tree to find all parents of the direct matches to show their place in the hierarchy + const visited = new Set(); + const queue = [...directMatches.map(r => r.room_id)]; + while (queue.length) { + const roomId = queue.pop(); + visited.add(roomId); + childParentMap.get(roomId)?.forEach(parentId => { + if (!visited.has(parentId)) { + queue.push(parentId); + } + }); + } + + // Remove any mappings for rooms which were not visited in the walk + Array.from(roomsMap.keys()).forEach(roomId => { + if (!visited.has(roomId)) { + roomsMap.delete(roomId); + } + }); + return roomsMap; + }, [rooms, childParentMap, query]); const title = - +

{ _t("Explore rooms") }

; + const explanation = - _t("If you can't find the room you're looking for, ask for an invite or Create a new room.", null, + _t("If you can't find the room you're looking for, ask for an invite or create a new room.", null, {a: sub => { return {sub}; }}, ); + const [error, setError] = useState(""); + const [removing, setRemoving] = useState(false); + const [saving, setSaving] = useState(false); + let content; if (roomsMap) { - content = - { - pendingActions.current.set(action.event.room_id, action); - }} - onPreviewClick={roomId => { - showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), false); - onFinished(); - }} - onJoinClick={(roomId) => { - showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), true); - onFinished(); - }} - /> - ; + const numRooms = Array.from(roomsMap.values()).filter(r => r.room_type !== RoomType.Space).length; + const numSpaces = roomsMap.size - numRooms - 1; // -1 at the end to exclude the space we are looking at + + let countsStr; + if (numSpaces > 1) { + countsStr = _t("%(count)s rooms and %(numSpaces)s spaces", { count: numRooms, numSpaces }); + } else if (numSpaces > 0) { + countsStr = _t("%(count)s rooms and 1 space", { count: numRooms, numSpaces }); + } else { + countsStr = _t("%(count)s rooms", { count: numRooms, numSpaces }); + } + + let editSection; + if (space.getMyMembership() === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) { + const selectedRelations = Array.from(selected.keys()).flatMap(parentId => { + return [...selected.get(parentId).values()].map(childId => [parentId, childId]) as [string, string][]; + }); + + let buttons; + if (selectedRelations.length) { + const selectionAllSuggested = selectedRelations.every(([parentId, childId]) => { + return parentChildMap.get(parentId)?.get(childId)?.content.suggested; + }); + + const disabled = removing || saving; + + buttons = <> + { + setRemoving(true); + try { + for (const [parentId, childId] of selectedRelations) { + await cli.sendStateEvent(parentId, EventType.SpaceChild, {}, childId); + parentChildMap.get(parentId).get(childId).content = {}; + parentChildMap.set(parentId, new Map(parentChildMap.get(parentId))); + } + } catch (e) { + setError(_t("Failed to remove some rooms. Try again later")); + } + setRemoving(false); + }} + kind="danger_outline" + disabled={disabled} + > + { removing ? _t("Removing...") : _t("Remove") } + + { + setSaving(true); + try { + for (const [parentId, childId] of selectedRelations) { + const suggested = !selectionAllSuggested; + const existingContent = parentChildMap.get(parentId)?.get(childId)?.content; + if (!existingContent || existingContent.suggested === suggested) continue; + + const content = { + ...existingContent, + suggested: !selectionAllSuggested, + }; + + await cli.sendStateEvent(parentId, EventType.SpaceChild, content, childId); + + parentChildMap.get(parentId).get(childId).content = content; + parentChildMap.set(parentId, new Map(parentChildMap.get(parentId))); + } + } catch (e) { + setError("Failed to update some suggestions. Try again later"); + } + setSaving(false); + }} + kind="primary_outline" + disabled={disabled} + > + { saving + ? _t("Saving...") + : (selectionAllSuggested ? _t("Mark as not suggested") : _t("Mark as suggested")) + } + + ; + } + + editSection = + { buttons } + ; + } + + let results; + if (roomsMap.size) { + results = <> + { + setError(""); + if (!selected.has(parentId)) { + setSelected(new Map(selected.set(parentId, new Set([childId])))); + return; + } + + const parentSet = selected.get(parentId); + if (!parentSet.has(childId)) { + setSelected(new Map(selected.set(parentId, new Set([...parentSet, childId])))); + return; + } + + parentSet.delete(childId); + setSelected(new Map(selected.set(parentId, new Set(parentSet)))); + }} + onViewRoomClick={(roomId, autoJoin) => { + showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), autoJoin); + onFinished(); + }} + /> +
+ ; + } else { + results =
+

{ _t("No results found") }

+
{ _t("You may want to try a different search or check for typos.") }
+
; + } + + content = <> +
+ { countsStr } + { editSection } +
+ { error &&
+ { error } +
} + + { results } + + { _t("Create room") } + + + ; + } else { + content = ; } // TODO loading state/error state @@ -546,13 +568,10 @@ const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinis -
- { adminButton } -
{ content }
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 0b0f2a2ac9..2b4168a983 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -230,10 +230,10 @@ const SpaceLanding = ({ space }) => { try { const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join"); - const parentChildRelations = new EnhancedMap(); + const parentChildRelations = new EnhancedMap>(); data.events.map((ev: ISpaceSummaryEvent) => { if (ev.type === EventType.SpaceChild) { - parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key); + parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev); } }); @@ -257,11 +257,10 @@ const SpaceLanding = ({ space }) => { { - showRoom(roomsMap.get(roomId), [], false); // TODO + onViewRoomClick={(roomId, autoJoin) => { + showRoom(roomsMap.get(roomId), [], autoJoin); }} /> ; diff --git a/src/components/views/elements/TextWithTooltip.js b/src/components/views/elements/TextWithTooltip.js index e4ad234ae2..0bd491768c 100644 --- a/src/components/views/elements/TextWithTooltip.js +++ b/src/components/views/elements/TextWithTooltip.js @@ -46,12 +46,14 @@ export default class TextWithTooltip extends React.Component { render() { const Tooltip = sdk.getComponent("elements.Tooltip"); + const {class: className, children, tooltip, tooltipClass, ...props} = this.props; + return ( - - {this.props.children} + + {children} {this.state.hover && } ); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 07d292a0e7..e4d197470d 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -2603,20 +2603,30 @@ "Drop file here to upload": "Drop file here to upload", "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.", "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.", - "Undo": "Undo", - "Remove from Space": "Remove from Space", - "No permissions": "No permissions", - "You're in this space": "You're in this space", - "You're in this room": "You're in this room", - "Save changes": "Save changes", - "Promoted to users": "Promoted to users", - "Manage rooms": "Manage rooms", - "Find a room...": "Find a room...", + "Open": "Open", + "You don't have permission": "You don't have permission", + "%(count)s members|other": "%(count)s members", + "%(count)s members|one": "%(count)s member", + "%(count)s rooms|other": "%(count)s rooms", + "%(count)s rooms|one": "%(count)s room", + "This room is suggested as a good one to join": "This room is suggested as a good one to join", + "Suggested": "Suggested", + "If you can't find the room you're looking for, ask for an invite or create a new room.": "If you can't find the room you're looking for, ask for an invite or create a new room.", + "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s rooms and %(numSpaces)s spaces", + "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s room and %(numSpaces)s spaces", + "%(count)s rooms and 1 space|other": "%(count)s rooms and 1 space", + "%(count)s rooms and 1 space|one": "%(count)s room and 1 space", + "Failed to remove some rooms. Try again later": "Failed to remove some rooms. Try again later", + "Removing...": "Removing...", + "Mark as not suggested": "Mark as not suggested", + "Mark as suggested": "Mark as suggested", + "No results found": "No results found", + "You may want to try a different search or check for typos.": "You may want to try a different search or check for typos.", + "Create room": "Create room", + "Search names and description": "Search names and description", " invites you": " invites you", "Public space": "Public space", "Private space": "Private space", - "%(count)s members|other": "%(count)s members", - "%(count)s members|one": "%(count)s member", "Add existing rooms & spaces": "Add existing rooms & spaces", "Default Rooms": "Default Rooms", "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.", From 90d87122bc45d3082d4322f8f06085f71377086b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 16 Mar 2021 11:39:06 +0000 Subject: [PATCH 063/163] Tweak copy on space creation flows --- src/components/structures/SpaceRoomView.tsx | 14 ++++++++++---- src/components/views/spaces/SpaceCreateMenu.tsx | 4 ++-- src/i18n/strings/en_EN.json | 10 +++++----- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 0b0f2a2ac9..17ab75e707 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -369,7 +369,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => { let buttonLabel = _t("Skip for now"); if (roomNames.some(name => name.trim())) { onClick = onNextClick; - buttonLabel = busy ? _t("Creating rooms...") : _t("Next") + buttonLabel = busy ? _t("Creating rooms...") : _t("Continue") } return
@@ -391,8 +391,14 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => { const SpaceSetupPublicShare = ({ space, onFinished }) => { return
-

{ _t("Share your public space") }

-
{ _t("At the moment only you can see it.") }
+

{ _t("Invite people") }

+
+ { + _t("It's just you at the moment.") + } { + _t("%(spaceName)s will be even better with others", { spaceName: space.name }) + } +
@@ -610,7 +616,7 @@ export default class SpaceRoomView extends React.PureComponent { return this.setState({ phase: Phase.PublicShare })} />; case Phase.PublicShare: diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx index 88098d1b66..ca5b25f128 100644 --- a/src/components/views/spaces/SpaceCreateMenu.tsx +++ b/src/components/views/spaces/SpaceCreateMenu.tsx @@ -140,9 +140,9 @@ const SpaceCreateMenu = ({ onFinished }) => {

{ - _t("Give it a photo, name and description to help you identify it.") + _t("Add some details to help people recognise it.") } { - _t("You can change these at any point.") + _t("You can change these anytime.") }

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 07d292a0e7..e3ccc1794d 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -998,8 +998,8 @@ "Go back": "Go back", "Your public space": "Your public space", "Your private space": "Your private space", - "Give it a photo, name and description to help you identify it.": "Give it a photo, name and description to help you identify it.", - "You can change these at any point.": "You can change these at any point.", + "Add some details to help people recognise it.": "Add some details to help people recognise it.", + "You can change these anytime.": "You can change these anytime.", "Creating...": "Creating...", "Create": "Create", "Expand space panel": "Expand space panel", @@ -2629,8 +2629,8 @@ "Failed to create initial space rooms": "Failed to create initial space rooms", "Skip for now": "Skip for now", "Creating rooms...": "Creating rooms...", - "At the moment only you can see it.": "At the moment only you can see it.", - "Finish": "Finish", + "It's just you at the moment.": "It's just you at the moment.", + "%(spaceName)s will be even better with others": "%(spaceName)s will be even better with others", "Who are you working with?": "Who are you working with?", "Ensure the right people have access to the space.": "Ensure the right people have access to the space.", "Just Me": "Just Me", @@ -2642,7 +2642,7 @@ "Invite by username": "Invite by username", "Inviting...": "Inviting...", "What are some things you want to discuss?": "What are some things you want to discuss?", - "We'll create rooms for each topic.": "We'll create rooms for each topic.", + "We'll create a room for each of them. You can add more later too.": "We'll create a room for each of them. You can add more later too.", "What projects are you working on?": "What projects are you working on?", "We'll create rooms for each of them. You can add existing rooms after setup.": "We'll create rooms for each of them. You can add existing rooms after setup.", "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.", From c6f6d24b32b22fc1a77fc306a117e7209438ce76 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 16 Mar 2021 14:18:45 +0000 Subject: [PATCH 064/163] Iterate space creation and previews --- src/components/structures/SpaceRoomView.tsx | 87 ++++++++++++++++++--- src/i18n/strings/en_EN.json | 1 + src/stores/SpaceStore.tsx | 35 ++++++--- 3 files changed, 100 insertions(+), 23 deletions(-) diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 17ab75e707..cfa261bb9b 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -17,6 +17,7 @@ limitations under the License. import React, {RefObject, useContext, useRef, useState} from "react"; import {EventType, RoomType} from "matrix-js-sdk/src/@types/event"; import {Room} from "matrix-js-sdk/src/models/room"; +import {EventSubscription} from "fbemitter"; import MatrixClientContext from "../../contexts/MatrixClientContext"; import RoomAvatar from "../views/avatars/RoomAvatar"; @@ -42,7 +43,6 @@ import ErrorBoundary from "../views/elements/ErrorBoundary"; import {ActionPayload} from "../../dispatcher/payloads"; import RightPanel from "./RightPanel"; import RightPanelStore from "../../stores/RightPanelStore"; -import {EventSubscription} from "fbemitter"; import {RightPanelPhases} from "../../stores/RightPanelStorePhases"; import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanelPhasePayload"; import {useStateArray} from "../../hooks/useStateArray"; @@ -54,6 +54,7 @@ import {EnhancedMap} from "../../utils/maps"; import AutoHideScrollbar from "./AutoHideScrollbar"; import MemberAvatar from "../views/avatars/MemberAvatar"; import {useStateToggle} from "../../hooks/useStateToggle"; +import SpaceStore from "../../stores/SpaceStore"; interface IProps { space: Room; @@ -66,6 +67,7 @@ interface IProps { interface IState { phase: Phase; showRightPanel: boolean; + myMembership: string; } enum Phase { @@ -98,6 +100,8 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => const cli = useContext(MatrixClientContext); const myMembership = useMyRoomMembership(space); + const [busy, setBusy] = useState(false); + let inviterSection; let joinButtons; if (myMembership === "invite") { @@ -121,11 +125,35 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => } joinButtons = <> - - + { + setBusy(true); + onRejectButtonClicked(); + }} /> + { + setBusy(true); + onJoinButtonClicked(); + }} + /> ; } else { - joinButtons = + joinButtons = ( + { + setBusy(true); + onJoinButtonClicked(); + }} + /> + ) + } + + if (busy) { + joinButtons = ; } let visibilitySection; @@ -403,7 +431,7 @@ const SpaceSetupPublicShare = ({ space, onFinished }) => {
- +
; }; @@ -553,17 +581,26 @@ export default class SpaceRoomView extends React.PureComponent { this.state = { phase, showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom, + myMembership: this.props.space.getMyMembership(), }; this.dispatcherRef = defaultDispatcher.register(this.onAction); this.rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelStoreUpdate); + this.context.on("Room.myMembership", this.onMyMembership); } componentWillUnmount() { defaultDispatcher.unregister(this.dispatcherRef); this.rightPanelStoreToken.remove(); + this.context.off("Room.myMembership", this.onMyMembership); } + private onMyMembership = (room: Room, myMembership: string) => { + if (room.roomId === this.props.space.roomId) { + this.setState({ myMembership }); + } + }; + private onRightPanelStoreUpdate = () => { this.setState({ showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom, @@ -600,10 +637,43 @@ export default class SpaceRoomView extends React.PureComponent { } }; + private goToFirstRoom = async () => { + const childRooms = SpaceStore.instance.getChildRooms(this.props.space.roomId); + if (childRooms.length) { + const room = childRooms[0]; + defaultDispatcher.dispatch({ + action: "view_room", + room_id: room.roomId, + }); + return; + } + + let suggestedRooms = SpaceStore.instance.suggestedRooms; + if (SpaceStore.instance.activeSpace !== this.props.space) { + // the space store has the suggested rooms loaded for a different space, fetch the right ones + suggestedRooms = (await SpaceStore.instance.fetchSuggestedRooms(this.props.space, 1)).rooms; + } + + if (suggestedRooms.length) { + const room = suggestedRooms[0]; + defaultDispatcher.dispatch({ + action: "view_room", + room_id: room.room_id, + oobData: { + avatarUrl: room.avatar_url, + name: room.name || room.canonical_alias || room.aliases.pop() || _t("Empty room"), + }, + }); + return; + } + + this.setState({ phase: Phase.Landing }); + }; + private renderBody() { switch (this.state.phase) { case Phase.Landing: - if (this.props.space.getMyMembership() === "join") { + if (this.state.myMembership === "join") { return ; } else { return { onFinished={() => this.setState({ phase: Phase.PublicShare })} />; case Phase.PublicShare: - return this.setState({ phase: Phase.Landing })} - />; + return ; case Phase.PrivateScope: return { } if (space) { - try { - const data: { - rooms: ISpaceSummaryRoom[]; - events: ISpaceSummaryEvent[]; - } = await this.matrixClient.getSpaceSummary(space.roomId, 0, true, false, MAX_SUGGESTED_ROOMS); - if (this._activeSpace === space) { - this._suggestedRooms = data.rooms.filter(roomInfo => { - return roomInfo.room_type !== RoomType.Space && !this.matrixClient.getRoom(roomInfo.room_id); - }); - this.emit(SUGGESTED_ROOMS, this._suggestedRooms); - } - } catch (e) { - console.error(e); + const data = await this.fetchSuggestedRooms(space); + if (this._activeSpace === space) { + this._suggestedRooms = data.rooms.filter(roomInfo => { + return roomInfo.room_type !== RoomType.Space && !this.matrixClient.getRoom(roomInfo.room_id); + }); + this.emit(SUGGESTED_ROOMS, this._suggestedRooms); } } } + public fetchSuggestedRooms = async (space: Room, limit = MAX_SUGGESTED_ROOMS) => { + try { + const data: { + rooms: ISpaceSummaryRoom[]; + events: ISpaceSummaryEvent[]; + } = await this.matrixClient.getSpaceSummary(space.roomId, 0, true, false, limit); + return data; + } catch (e) { + console.error(e); + } + return { + rooms: [], + events: [], + }; + }; + public addRoomToSpace(space: Room, roomId: string, via: string[], suggested = false, autoJoin = false) { return this.matrixClient.sendStateEvent(space.roomId, EventType.SpaceChild, { via, From 31ce19373be030ec2869195545828eadb567cd0a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 16 Mar 2021 16:16:51 +0000 Subject: [PATCH 065/163] Fix space panel spacings --- res/css/structures/_SpacePanel.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index d3e7d7efee..ffe67ce6ab 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -63,7 +63,7 @@ $activeBorderColor: $secondary-fg-color; } .mx_AutoHideScrollbar { - padding: 16px 0; + padding: 8px 0 16px; } .mx_SpaceButton_toggleCollapse { @@ -99,7 +99,6 @@ $activeBorderColor: $secondary-fg-color; .mx_SpaceButton { border-radius: 8px; - margin-bottom: 2px; display: flex; align-items: center; padding: 4px 4px 4px 0; From 88b7c8f53dd8d043abbc4f589cb190e9e7c8b9d9 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 18 Mar 2021 13:17:30 +0000 Subject: [PATCH 066/163] Fix add existing to space dialog showing all spaces additionally as rooms --- src/components/views/dialogs/AddExistingToSpaceDialog.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx index 66efaefd9d..500637244a 100644 --- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx +++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx @@ -69,6 +69,7 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space, const existingRoomsSet = new Set(existingRooms); const rooms = cli.getVisibleRooms().filter(room => { return !existingRoomsSet.has(room) // not already in space + && !room.isSpaceRoom() // not a space itself && room.name.toLowerCase().includes(lcQuery) // contains query && !DMRoomMap.shared().getUserIdForRoomId(room.roomId); // not a DM }); From 3718d550c5b97d722247c03d4a9bfafc03158b1c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 19 Mar 2021 11:42:53 +0000 Subject: [PATCH 067/163] Fix space creation menu shade width --- res/css/views/spaces/_SpaceCreateMenu.scss | 5 +---- src/components/views/spaces/SpacePanel.tsx | 10 ++++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss index 2a11ec9f23..be387d2c26 100644 --- a/res/css/views/spaces/_SpaceCreateMenu.scss +++ b/res/css/views/spaces/_SpaceCreateMenu.scss @@ -14,10 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// TODO: the space panel currently does not have a fixed width, -// just the headers at each level have a max-width of 150px -// so this will look slightly off for now. We should probably use css grid for the whole main layout... -$spacePanelWidth: 200px; +$spacePanelWidth: 71px; .mx_SpaceCreateMenu_wrapper { // background blur everything except SpacePanel diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx index 48e2c86b2c..bacf1bd929 100644 --- a/src/components/views/spaces/SpacePanel.tsx +++ b/src/components/views/spaces/SpacePanel.tsx @@ -220,13 +220,19 @@ const SpacePanel = () => { { + openMenu(); + if (!isPanelCollapsed) setPanelCollapsed(true); + }} isNarrow={isPanelCollapsed} /> setPanelCollapsed(!isPanelCollapsed)} + onClick={() => { + setPanelCollapsed(!isPanelCollapsed); + if (menuDisplayed) closeMenu(); + }} title={expandCollapseButtonTitle} /> { contextMenu } From 2b4c670b8964cf52c4762331f9e566527fdb1ad0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 19 Mar 2021 11:46:44 +0000 Subject: [PATCH 068/163] Fix favourites not showing up in home until a refresh --- src/stores/SpaceStore.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx index a329ee78e1..b82acfd0ed 100644 --- a/src/stores/SpaceStore.tsx +++ b/src/stores/SpaceStore.tsx @@ -394,7 +394,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient { private onRoomAccountData = (ev: MatrixEvent, room: Room, lastEvent: MatrixEvent) => { if (ev.getType() === EventType.Tag && !room.isSpaceRoom()) { // If the room was in favourites and now isn't or the opposite then update its position in the trees - if (!!ev.getContent()[DefaultTagID.Favourite] !== !!lastEvent.getContent()[DefaultTagID.Favourite]) { + const oldTags = lastEvent.getContent()?.tags; + const newTags = ev.getContent()?.tags; + if (!!oldTags[DefaultTagID.Favourite] !== !!newTags[DefaultTagID.Favourite]) { this.onRoomUpdate(room); } } From 1fbbb67e7484115139ecb87d7299c7913b8994d4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 19 Mar 2021 13:16:36 +0000 Subject: [PATCH 069/163] Consolidate button styles in Space creation flows --- res/css/structures/_SpaceRoomView.scss | 105 ++++++++---------- res/css/views/spaces/_SpaceCreateMenu.scss | 44 +------- res/css/views/spaces/_SpacePublicShare.scss | 33 +----- src/components/structures/SpaceRoomView.tsx | 41 +++---- .../views/spaces/SpacePublicShare.tsx | 5 +- 5 files changed, 66 insertions(+), 162 deletions(-) diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss index 60abe36c29..a7ce630b96 100644 --- a/res/css/structures/_SpaceRoomView.scss +++ b/res/css/structures/_SpaceRoomView.scss @@ -16,6 +16,51 @@ limitations under the License. $SpaceRoomViewInnerWidth: 428px; +@define-mixin SpacePillButton { + position: relative; + padding: 16px 32px 16px 72px; + width: 432px; + box-sizing: border-box; + border-radius: 8px; + border: 1px solid $input-darker-bg-color; + font-size: $font-15px; + margin: 20px 0; + + > h3 { + font-weight: $font-semi-bold; + margin: 0 0 4px; + } + + > span { + color: $secondary-fg-color; + } + + &::before { + position: absolute; + content: ''; + width: 32px; + height: 32px; + top: 24px; + left: 20px; + mask-position: center; + mask-repeat: no-repeat; + mask-size: 24px; + background-color: $tertiary-fg-color; + } + + &:hover { + border-color: $accent-color; + + &::before { + background-color: $accent-color; + } + + > span { + color: $primary-fg-color; + } + } +} + .mx_SpaceRoomView { .mx_MainSplit > div:first-child { padding: 80px 60px; @@ -331,64 +376,8 @@ $SpaceRoomViewInnerWidth: 428px; } .mx_SpaceRoomView_privateScope { - .mx_RadioButton { - width: $SpaceRoomViewInnerWidth; - border-radius: 8px; - border: 1px solid $space-button-outline-color; - padding: 16px 16px 16px 72px; - margin-top: 36px; - cursor: pointer; - box-sizing: border-box; - position: relative; - - > div:first-of-type { - // hide radio dot - display: none; - } - - .mx_RadioButton_content { - margin: 0; - - > h3 { - margin: 0 0 4px; - font-size: $font-15px; - font-weight: $font-semi-bold; - line-height: $font-18px; - } - - > div { - color: $secondary-fg-color; - font-size: $font-15px; - line-height: $font-24px; - } - } - - &::before { - content: ""; - position: absolute; - height: 32px; - width: 32px; - top: 24px; - left: 20px; - background-color: $secondary-fg-color; - mask-repeat: no-repeat; - mask-position: center; - mask-size: contain; - } - } - - .mx_RadioButton_checked { - border-color: $accent-color; - - .mx_RadioButton_content { - > div { - color: $primary-fg-color; - } - } - - &::before { - background-color: $accent-color; - } + .mx_AccessibleButton { + @mixin SpacePillButton; } .mx_SpaceRoomView_privateScope_justMeButton::before { diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss index be387d2c26..bea39e2389 100644 --- a/res/css/views/spaces/_SpaceCreateMenu.scss +++ b/res/css/views/spaces/_SpaceCreateMenu.scss @@ -45,53 +45,11 @@ $spacePanelWidth: 71px; } .mx_SpaceCreateMenuType { - position: relative; - padding: 16px 32px 16px 72px; - width: 432px; - box-sizing: border-box; - border-radius: 8px; - border: 1px solid $input-darker-bg-color; - font-size: $font-15px; - margin: 20px 0; - - > h3 { - font-weight: $font-semi-bold; - margin: 0 0 4px; - } - - > span { - color: $secondary-fg-color; - } - - &::before { - position: absolute; - content: ''; - width: 32px; - height: 32px; - top: 24px; - left: 20px; - mask-position: center; - mask-repeat: no-repeat; - mask-size: 32px; - background-color: $tertiary-fg-color; - } - - &:hover { - border-color: $accent-color; - - &::before { - background-color: $accent-color; - } - - > span { - color: $primary-fg-color; - } - } + @mixin SpacePillButton; } .mx_SpaceCreateMenuType_public::before { mask-image: url('$(res)/img/globe.svg'); - mask-size: 26px; } .mx_SpaceCreateMenuType_private::before { mask-image: url('$(res)/img/element-icons/lock.svg'); diff --git a/res/css/views/spaces/_SpacePublicShare.scss b/res/css/views/spaces/_SpacePublicShare.scss index 9ba0549ae3..373fa94e00 100644 --- a/res/css/views/spaces/_SpacePublicShare.scss +++ b/res/css/views/spaces/_SpacePublicShare.scss @@ -16,38 +16,7 @@ limitations under the License. .mx_SpacePublicShare { .mx_AccessibleButton { - border: 1px solid $space-button-outline-color; - box-sizing: border-box; - border-radius: 8px; - padding: 12px 24px 12px 52px; - margin-top: 16px; - width: $SpaceRoomViewInnerWidth; - font-size: $font-15px; - line-height: $font-24px; - position: relative; - display: flex; - - > span { - color: #368bd6; - margin-left: auto; - } - - &:hover { - background-color: rgba(141, 151, 165, 0.1); - } - - &::before { - content: ""; - position: absolute; - width: 30px; - height: 30px; - mask-repeat: no-repeat; - mask-size: contain; - mask-position: center; - background: $muted-fg-color; - left: 12px; - top: 9px; - } + @mixin SpacePillButton; &.mx_SpacePublicShare_shareButton::before { mask-image: url('$(res)/img/element-icons/link.svg'); diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index cfa261bb9b..23cd2f898c 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -32,7 +32,6 @@ import {useRoomMembers} from "../../hooks/useRoomMembers"; import createRoom, {IOpts, Preset} from "../../createRoom"; import Field from "../views/elements/Field"; import {useEventEmitter} from "../../hooks/useEventEmitter"; -import StyledRadioGroup from "../views/elements/StyledRadioGroup"; import withValidation from "../views/elements/Validation"; import * as Email from "../../email"; import defaultDispatcher from "../../dispatcher/dispatcher"; @@ -443,32 +442,20 @@ const SpaceSetupPrivateScope = ({ onFinished }) => {

{ _t("Who are you working with?") }

{ _t("Ensure the right people have access to the space.") }
- -

{ _t("Just Me") }

-
{ _t("A private space just for you") }
- , - }, { - value: "meAndMyTeammates", - className: "mx_SpaceRoomView_privateScope_meAndMyTeammatesButton", - label: -

{ _t("Me and my teammates") }

-
{ _t("A private space for you and your teammates") }
- , - }, - ]} - /> - -
- onFinished(option !== "justMe")} /> -
+ { onFinished(false) }} + > +

{ _t("Just me") }

+
{ _t("A private space to organise your rooms") }
+ + { onFinished(true) }} + > +

{ _t("Me and my teammates") }

+
{ _t("A private space for you and your teammates") }
+
; }; diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx index 3930c1db16..07257d295f 100644 --- a/src/components/views/spaces/SpacePublicShare.tsx +++ b/src/components/views/spaces/SpacePublicShare.tsx @@ -47,7 +47,7 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => { } }} > - { _t("Share invite link") } +

{ _t("Share invite link") }

{ copiedText } { onFinished(); }} > - { _t("Invite by email or username") } +

{ _t("Invite people") }

+ { _t("Invite with email or username") } ; }; From 76dffdcb2c0671ea30d0c77a9b1374fe9c455cf4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 19 Mar 2021 13:20:04 +0000 Subject: [PATCH 070/163] Tweak space creation copy and auto focus fields --- src/components/structures/SpaceRoomView.tsx | 41 +++++++++++-------- .../views/spaces/SpaceCreateMenu.tsx | 2 +- .../views/spaces/SpacePublicShare.tsx | 2 +- src/i18n/strings/en_EN.json | 25 +++++------ 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 23cd2f898c..f0789e1e21 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -364,6 +364,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => { placeholder={placeholders[i]} value={roomNames[i]} onChange={ev => setRoomName(i, ev.target.value)} + autoFocus={i === 2} />; }); @@ -418,13 +419,9 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => { const SpaceSetupPublicShare = ({ space, onFinished }) => { return
-

{ _t("Invite people") }

-
- { - _t("It's just you at the moment.") - } { - _t("%(spaceName)s will be even better with others", { spaceName: space.name }) - } +

{ _t("Share %(name)s", { name: space.name }) }

+
+ { _t("It's just you at the moment, it will be even better with others.") }
@@ -435,12 +432,12 @@ const SpaceSetupPublicShare = ({ space, onFinished }) => {
; }; -const SpaceSetupPrivateScope = ({ onFinished }) => { - const [option, setOption] = useState(null); - +const SpaceSetupPrivateScope = ({ space, onFinished }) => { return

{ _t("Who are you working with?") }

-
{ _t("Ensure the right people have access to the space.") }
+
+ { _t("Make sure the right people have access to %(name)s", { name: space.name }) } +
{ onChange={ev => setEmailAddress(i, ev.target.value)} ref={fieldRefs[i]} onValidate={validateEmailRules} + autoFocus={i === 0} />; }); @@ -522,9 +520,18 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => { setBusy(false); }; + let onClick = onFinished; + let buttonLabel = _t("Skip for now"); + if (emailAddresses.some(name => name.trim())) { + onClick = onNextClick; + buttonLabel = busy ? _t("Inviting...") : _t("Continue") + } + return

{ _t("Invite your teammates") }

-
{ _t("Ensure the right people have access to the space.") }
+
+ { _t("Make sure the right people have access. You can invite more later.") } +
{ error &&
{ error }
} { fields } @@ -539,8 +546,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
- {_t("Skip for now")} - +
; }; @@ -673,7 +679,8 @@ export default class SpaceRoomView extends React.PureComponent { return this.setState({ phase: Phase.PublicShare })} />; case Phase.PublicShare: @@ -681,6 +688,7 @@ export default class SpaceRoomView extends React.PureComponent { case Phase.PrivateScope: return { this.setState({ phase: invite ? Phase.PrivateInvite : Phase.PrivateCreateRooms }); }} @@ -694,7 +702,8 @@ export default class SpaceRoomView extends React.PureComponent { return this.setState({ phase: Phase.Landing })} />; } diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx index ca5b25f128..879cf929e0 100644 --- a/src/components/views/spaces/SpaceCreateMenu.tsx +++ b/src/components/views/spaces/SpaceCreateMenu.tsx @@ -108,7 +108,7 @@ const SpaceCreateMenu = ({ onFinished }) => { body =

{ _t("Create a space") }

{ _t("Spaces are new ways to group rooms and people. " + - "To join an existing space you’ll need an invite") }

+ "To join an existing space you'll need an invite.") }

{ const success = await copyPlaintext(permalinkCreator.forRoom()); const text = success ? _t("Copied!") : _t("Failed to copy"); setCopiedText(text); - await sleep(10); + await sleep(5000); if (copiedText === text) { // if the text hasn't changed by another click then clear it after some time setCopiedText(_t("Click to copy")); } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 4be6e06459..5ba787422f 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -989,7 +989,7 @@ "Name": "Name", "Description": "Description", "Create a space": "Create a space", - "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite", + "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.", "Public": "Public", "Open space for anyone, best for communities": "Open space for anyone, best for communities", "Private": "Private", @@ -1009,10 +1009,10 @@ "Copied!": "Copied!", "Failed to copy": "Failed to copy", "Share invite link": "Share invite link", - "Invite by email or username": "Invite by email or username", + "Invite people": "Invite people", + "Invite with email or username": "Invite with email or username", "Invite members": "Invite members", "Share your public space": "Share your public space", - "Invite people": "Invite people", "Settings": "Settings", "Leave space": "Leave space", "New room": "New room", @@ -2629,23 +2629,24 @@ "Failed to create initial space rooms": "Failed to create initial space rooms", "Skip for now": "Skip for now", "Creating rooms...": "Creating rooms...", - "It's just you at the moment.": "It's just you at the moment.", - "%(spaceName)s will be even better with others": "%(spaceName)s will be even better with others", + "Share %(name)s": "Share %(name)s", + "It's just you at the moment, it will be even better with others.": "It's just you at the moment, it will be even better with others.", "Go to my first room": "Go to my first room", "Who are you working with?": "Who are you working with?", - "Ensure the right people have access to the space.": "Ensure the right people have access to the space.", - "Just Me": "Just Me", - "A private space just for you": "A private space just for you", + "Make sure the right people have access to %(name)s": "Make sure the right people have access to %(name)s", + "Just me": "Just me", + "A private space to organise your rooms": "A private space to organise your rooms", "Me and my teammates": "Me and my teammates", "A private space for you and your teammates": "A private space for you and your teammates", "Failed to invite the following users to your space: %(csvUsers)s": "Failed to invite the following users to your space: %(csvUsers)s", - "Invite your teammates": "Invite your teammates", - "Invite by username": "Invite by username", "Inviting...": "Inviting...", + "Invite your teammates": "Invite your teammates", + "Make sure the right people have access. You can invite more later.": "Make sure the right people have access. You can invite more later.", + "Invite by username": "Invite by username", "What are some things you want to discuss?": "What are some things you want to discuss?", - "We'll create a room for each of them. You can add more later too.": "We'll create a room for each of them. You can add more later too.", + "Let's create a room for each of them. You can add more later too, including already existing ones.": "Let's create a room for each of them. You can add more later too, including already existing ones.", "What projects are you working on?": "What projects are you working on?", - "We'll create rooms for each of them. You can add existing rooms after setup.": "We'll create rooms for each of them. You can add existing rooms after setup.", + "We'll create rooms for each of them. You can add more later too, including already existing ones.": "We'll create rooms for each of them. You can add more later too, including already existing ones.", "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.", "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.", "Failed to load timeline position": "Failed to load timeline position", From 727c189456c6f953993cb72118aae0ba9340e503 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Fri, 19 Mar 2021 16:55:07 -0400 Subject: [PATCH 071/163] apply changes from review --- src/components/views/dialogs/InviteDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx index fa87826c09..41fb1f5ab6 100644 --- a/src/components/views/dialogs/InviteDialog.tsx +++ b/src/components/views/dialogs/InviteDialog.tsx @@ -1316,7 +1316,7 @@ export default class InviteDialog extends React.PureComponent {_t("Note: Decryption keys for old messages will be shared with invited users.")} From 207ba11da12f09e8bd84f057c585f4bb93a85f53 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 19 Mar 2021 17:08:01 -0600 Subject: [PATCH 072/163] Tweak a bunch of settings --- src/voice/VoiceRecorder.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index 66eb64b424..3d1008d45e 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -26,10 +26,15 @@ export class VoiceRecorder { mediaTrackConstraints: { deviceId: CallMediaHandler.getAudioInput(), }, - encoderSampleRate: 16000, // we could go down to 12khz, but we lose quality + encoderSampleRate: 48000, // we could go down to 12khz, but we lose quality. 48khz is a webrtc default encoderApplication: 2048, // voice (default is "audio") streamPages: true, // so we can have a live EQ for the user - encoderFrameSize: 10, // we want updates fairly regularly for the UI + encoderFrameSize: 20, // ms, we want updates fairly regularly for the UI + numberOfChannels: 1, // stereo isn't important for us + //sourceNode: instanceof MediaStreamAudioSourceNode, // TODO: @@ Travis: Use this for EQ stuff. + encoderBitRate: 64000, // 64kbps is average for webrtc + encoderComplexity: 3, // 0-10, 0 is fast and low complexity + resampleQuality: 3, // 0-10, 10 is slow and high quality }); private buffer = new Uint8Array(0); private mxc: string; From 48db1a5967a3565f399de71f9b37aee22b361ac7 Mon Sep 17 00:00:00 2001 From: libexus Date: Fri, 19 Mar 2021 19:43:53 +0000 Subject: [PATCH 073/163] Translated using Weblate (German) Currently translated at 96.7% (2794 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 188 ++++++++++++++++++------------------ 1 file changed, 96 insertions(+), 92 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index a8b2ac7878..22f27823a6 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1,5 +1,5 @@ { - "Filter room members": "Raum-Mitglieder filtern", + "Filter room members": "Raummitglieder filtern", "You have no visible notifications": "Du hast keine sichtbaren Benachrichtigungen", "Invites": "Einladungen", "Favourites": "Favoriten", @@ -97,7 +97,7 @@ "VoIP conference started.": "VoIP-Konferenz gestartet.", "Who can access this room?": "Wer kann diesen Raum betreten?", "Who can read history?": "Wer kann den bisherigen Chatverlauf lesen?", - "You do not have permission to post to this room": "Du hast keine Berechtigung, in diesem Raum etwas zu senden", + "You do not have permission to post to this room": "Du hast keine Berechtigung, etwas in diesen Raum zu senden", "Call Timeout": "Anruf-Timeout", "Existing Call": "Bereits bestehender Anruf", "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast", @@ -193,7 +193,7 @@ "and %(count)s others...|one": "und ein(e) weitere(r)...", "Are you sure?": "Bist du sicher?", "Attachment": "Anhang", - "Ban": "Verbannen", + "Ban": "Bannen", "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Es kann keine Verbindung zum Heimserver via HTTP aufgebaut werden, wenn die Adresszeile des Browsers eine HTTPS-URL enthält. Entweder HTTPS verwenden oder alternativ unsichere Skripte erlauben.", "Click to mute audio": "Klicke um den Ton stumm zu stellen", "Click to mute video": "Klicken, um das Video stummzuschalten", @@ -210,7 +210,7 @@ "Failed to set display name": "Anzeigename konnte nicht gesetzt werden", "Fill screen": "Fülle Bildschirm", "Incorrect verification code": "Falscher Verifizierungscode", - "Join Room": "Dem Raum beitreten", + "Join Room": "Raum beitreten", "Kick": "Kicken", "not specified": "nicht spezifiziert", "No more results": "Keine weiteren Ergebnisse", @@ -218,7 +218,7 @@ "OK": "OK", "Search": "Suchen", "Search failed": "Suche ist fehlgeschlagen", - "Server error": "Server-Fehler", + "Server error": "Serverfehler", "Server may be unavailable, overloaded, or search timed out :(": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(", "Server unavailable, overloaded, or something else went wrong.": "Server ist nicht verfügbar, überlastet oder ein anderer Fehler ist aufgetreten.", "%(count)s of your messages have not been sent.|other": "Einige deiner Nachrichten wurden nicht gesendet.", @@ -255,7 +255,7 @@ "Operation failed": "Aktion fehlgeschlagen", "Unmute": "Stummschalten aufheben", "Invalid file%(extra)s": "Ungültige Datei%(extra)s", - "Please select the destination room for this message": "Bitte den Raum auswählen, an den diese Nachricht gesendet werden soll", + "Please select the destination room for this message": "Wähle den Raum aus, an den du die Nachricht schicken willst", "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s hat den Raum-Namen entfernt.", "Passphrases must match": "Passphrases müssen übereinstimmen", "Passphrase must not be empty": "Passphrase darf nicht leer sein", @@ -280,8 +280,8 @@ "Please enter the code it contains:": "Bitte gib den darin enthaltenen Code ein:", "powered by Matrix": "betrieben mit Matrix", "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Wenn du keine E-Mail-Adresse angibst, wirst du nicht in der Lage sein, dein Passwort zurückzusetzen. Bist du sicher?", - "Error decrypting audio": "Audio-Entschlüsselung fehlgeschlagen", - "Error decrypting image": "Bild-Entschlüsselung fehlgeschlagen", + "Error decrypting audio": "Entschlüsseln des Audios fehlgeschlagen", + "Error decrypting image": "Entschlüsselung des Bilds fehlgeschlagen", "Error decrypting video": "Video-Entschlüsselung fehlgeschlagen", "Import room keys": "Raum-Schlüssel importieren", "File to import": "Zu importierende Datei", @@ -299,14 +299,14 @@ "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Dieser Prozess erlaubt es dir, die zuvor von einem anderen Matrix-Client exportierten Verschlüsselungs-Schlüssel zu importieren. Danach kannst du alle Nachrichten entschlüsseln, die auch bereits auf dem anderen Client entschlüsselt werden konnten.", "If you have previously used a more recent version of %(brand)s, your session may be incompatible with this version. Close this window and return to the more recent version.": "Wenn du zuvor eine aktuellere Version von %(brand)s verwendet hast, ist deine Sitzung eventuell inkompatibel mit dieser Version. Bitte schließe dieses Fenster und kehre zur aktuelleren Version zurück.", "Drop file here to upload": "Datei hier loslassen zum hochladen", - "Idle": "Untätig", + "Idle": "Abwesend", "Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)s.", - "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Benutzerkonto für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?", + "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Um dein Konto für die Verwendung von %(integrationsUrl)s zu authentifizieren, wirst du jetzt auf die Website eines Drittanbieters weitergeleitet. Möchtest du fortfahren?", "Start automatically after system login": "Nach System-Login automatisch starten", "Jump to first unread message.": "Zur ersten ungelesenen Nachricht springen.", "Options": "Optionen", "Invited": "Eingeladen", - "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hat das Raum-Bild entfernt.", + "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hat das Raumbild entfernt.", "No Webcams detected": "Keine Webcam erkannt", "No Microphones detected": "Keine Mikrofone erkannt", "No media permissions": "Keine Medienberechtigungen", @@ -322,14 +322,14 @@ "Anyone": "Jeder", "Are you sure you want to leave the room '%(roomName)s'?": "Bist du sicher, dass du den Raum '%(roomName)s' verlassen möchtest?", "Custom level": "Benutzerdefiniertes Berechtigungslevel", - "Publish this room to the public in %(domain)s's room directory?": "Diesen Raum im Raum-Verzeichnis von %(domain)s veröffentlichen?", + "Publish this room to the public in %(domain)s's room directory?": "Diesen Raum im Raumverzeichnis von %(domain)s veröffentlichen?", "Register": "Registrieren", "Save": "Speichern", "Verified key": "Verifizierter Schlüssel", "You have disabled URL previews by default.": "Du hast die URL-Vorschau standardmäßig deaktiviert.", "You have enabled URL previews by default.": "Du hast die URL-Vorschau standardmäßig aktiviert.", - "%(senderDisplayName)s changed the room avatar to ": "%(senderDisplayName)s hat das Raum-Bild geändert zu ", - "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raum-Bild für %(roomName)s geändert", + "%(senderDisplayName)s changed the room avatar to ": "%(senderDisplayName)s hat das Raumbild zu geändert", + "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raumbild von %(roomName)s geändert", "Add": "Hinzufügen", "Error: Problem communicating with the given homeserver.": "Fehler: Problem bei der Kommunikation mit dem angegebenen Home-Server.", "Failed to fetch avatar URL": "Abrufen der Avatar-URL fehlgeschlagen", @@ -344,14 +344,14 @@ "New Password": "Neues Passwort", "Username available": "Benutzername ist verfügbar", "Username not available": "Benutzername ist nicht verfügbar", - "Something went wrong!": "Etwas ging schief!", + "Something went wrong!": "Etwas ist schiefgelaufen!", "This will be your account name on the homeserver, or you can pick a different server.": "Dies wird dein zukünftiger Benutzername auf dem Heimserver. Alternativ kannst du auch einen anderen Server auswählen.", "If you already have a Matrix account you can log in instead.": "Wenn du bereits ein Matrix-Benutzerkonto hast, kannst du dich stattdessen auch direkt anmelden.", "Home": "Startseite", "Username invalid: %(errMessage)s": "Ungültiger Benutzername: %(errMessage)s", "Accept": "Akzeptieren", "Active call (%(roomName)s)": "Aktiver Anruf (%(roomName)s)", - "Admin Tools": "Admin-Werkzeuge", + "Admin Tools": "Administratorwerkzeuge", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Verbindung zum Heimserver fehlgeschlagen - bitte überprüfe die Internetverbindung und stelle sicher, dass dem SSL-Zertifikat deines Heimservers vertraut wird und dass Anfragen nicht durch eine Browser-Erweiterung blockiert werden.", "Close": "Schließen", "Custom": "Erweitert", @@ -366,9 +366,9 @@ "No display name": "Kein Anzeigename", "Private Chat": "Privater Chat", "Public Chat": "Öffentlicher Chat", - "%(roomName)s does not exist.": "%(roomName)s existert nicht.", - "%(roomName)s is not accessible at this time.": "%(roomName)s ist aktuell nicht zugreifbar.", - "Seen by %(userName)s at %(dateTime)s": "Gesehen von %(userName)s um %(dateTime)s", + "%(roomName)s does not exist.": "%(roomName)s existiert nicht.", + "%(roomName)s is not accessible at this time.": "Auf %(roomName)s kann momentan nicht zugegriffen werden.", + "Seen by %(userName)s at %(dateTime)s": "Von %(userName)s um %(dateTime)s gesehen", "Start authentication": "Authentifizierung beginnen", "This room": "diesen Raum", "unknown caller": "Unbekannter Anrufer", @@ -376,7 +376,7 @@ "Upload new:": "Neue(s) hochladen:", "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (Berechtigungslevel %(powerLevelNumber)s)", "(~%(count)s results)|one": "(~%(count)s Ergebnis)", - "(~%(count)s results)|other": "(~%(count)s Ergebnis)", + "(~%(count)s results)|other": "(~%(count)s Ergebnisse)", "(could not connect media)": "(Medienverbindung konnte nicht hergestellt werden)", "(no answer)": "(keine Antwort)", "(unknown failure: %(reason)s)": "(Unbekannter Fehler: %(reason)s)", @@ -474,7 +474,7 @@ "Invalid community ID": "Ungültige Community-ID", "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID", "New community ID (e.g. +foo:%(localDomain)s)": "Neue Community-ID (z. B. +foo:%(localDomain)s)", - "Remove from community": "Aus der Community entfernen", + "Remove from community": "Aus Community entfernen", "Failed to remove user from community": "Entfernen des Benutzers aus der Community fehlgeschlagen", "Filter community members": "Community-Mitglieder filtern", "Filter community rooms": "Community-Räume filtern", @@ -598,12 +598,12 @@ "%(duration)sh": "%(duration)sh", "%(duration)sd": "%(duration)sT", "Online for %(duration)s": "Online seit %(duration)s", - "Idle for %(duration)s": "Untätig seit %(duration)s", + "Idle for %(duration)s": "Abwesend seit %(duration)s", "Offline for %(duration)s": "Offline seit %(duration)s", "Unknown for %(duration)s": "Unbekannt seit %(duration)s", "Flair": "Abzeichen", "Showing flair for these communities:": "Abzeichen für diese Communities zeigen:", - "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities die Abzeichen an", + "This room is not showing flair for any communities": "Dieser Raum zeigt Abzeichen keiner Communities an", "Something went wrong when trying to get your communities.": "Beim Laden deiner Communities ist etwas schief gelaufen.", "Display your community flair in rooms configured to show it.": "Zeige deinen Community-Flair in den Räumen, die es erlauben.", "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über kein von diesem Client unterstütztes Anmeldeverfahren.", @@ -643,7 +643,7 @@ "Did you know: you can use communities to filter your %(brand)s experience!": "Wusstest du: Du kannst Communities nutzen um deine %(brand)s-Erfahrung zu filtern!", "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Um einen Filter zu setzen, ziehe ein Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken, um nur die Räume und Personen aus der Community zu sehen.", "Clear filter": "Filter zurücksetzen", - "Key request sent.": "Schlüssel-Anfragen gesendet.", + "Key request sent.": "Schlüsselanfrage gesendet.", "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.", "Submit debug logs": "Fehlerberichte einreichen", "Code": "Code", @@ -655,8 +655,8 @@ "Join this community": "Community beitreten", "Leave this community": "Community verlassen", "You don't currently have any stickerpacks enabled": "Du hast aktuell keine Stickerpacks aktiviert", - "Hide Stickers": "Sticker verbergen", - "Show Stickers": "Sticker zeigen", + "Hide Stickers": "Sticker ausblenden", + "Show Stickers": "Sticker anzeigen", "Who can join this community?": "Wer kann dieser Community beitreten?", "Everyone": "Jeder", "Stickerpack": "Stickerpack", @@ -809,7 +809,7 @@ "Terms and Conditions": "Geschäftsbedingungen", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.", "Review terms and conditions": "Geschäftsbedingungen anzeigen", - "Share Link to User": "Link zum Benutzer teilen", + "Share Link to User": "Link zu Benutzer teilen", "Share room": "Raum teilen", "Share Room": "Raum teilen", "Link to most recent message": "Link zur aktuellsten Nachricht", @@ -821,15 +821,15 @@ "Share Message": "Nachricht teilen", "No Audio Outputs detected": "Keine Audioausgabe erkannt", "Audio Output": "Audioausgabe", - "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In verschlüsselten Räumen, wie diesem, ist die Link-Vorschau standardmäßig deaktiviert damit dein Heimserver (auf dem die Vorschau erzeugt wird) keine Informationen über Links in diesem Raum bekommt.", - "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Wenn jemand eine URL in seine Nachricht einfügt, kann eine URL-Vorschau angezeigt werden, um mehr Informationen über diesen Link zu erhalten, wie z.B. den Titel, die Beschreibung und ein Bild von der Website.", + "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In verschlüsselten Räumen wie diesem ist die Link-Vorschau standardmäßig deaktiviert, damit dein Heimserver (der die Vorschau erzeugt) keine Informationen über Links in diesem Raum bekommt.", + "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Wenn jemand eine URL sendet, kann die Vorschau Informationen wie Titel, Beschreibung oder ein Vorschaubild enthalten.", "The email field must not be blank.": "Das E-Mail-Feld darf nicht leer sein.", "The phone number field must not be blank.": "Das Telefonnummern-Feld darf nicht leer sein.", "The password field must not be blank.": "Das Passwort-Feld darf nicht leer sein.", "Call in Progress": "Gespräch läuft", "A call is already in progress!": "Ein Gespräch läuft bereits!", "You can't send any messages until you review and agree to our terms and conditions.": "Du kannst keine Nachrichten senden bis du unsere Geschäftsbedingungen gelesen und akzeptiert hast.", - "Demote yourself?": "Selbst zurückstufen?", + "Demote yourself?": "Dein eigenes Berechtigungslevel herabsetzen?", "Demote": "Zurückstufen", "This event could not be displayed": "Dieses Ereignis konnte nicht angezeigt werden", "A call is currently being placed!": "Ein Anruf wurde schon gestartet!", @@ -837,7 +837,7 @@ "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung, ein Konferenzgespräch in diesem Raum zu starten", "Failed to remove widget": "Widget konnte nicht entfernt werden", "An error ocurred whilst trying to remove the widget from the room": "Ein Fehler trat auf während versucht wurde, das Widget aus diesem Raum zu entfernen", - "System Alerts": "System-Benachrichtigung", + "System Alerts": "Systembenachrichtigung", "Only room administrators will see this warning": "Nur Raum-Administratoren werden diese Nachricht sehen", "Please contact your service administrator to continue using the service.": "Bitte kontaktiere deinen Systemadministrator um diesen Dienst weiter zu nutzen.", "This homeserver has hit its Monthly Active User limit.": "Dieser Heimserver hat sein Limit an monatlich aktiven Nutzern erreicht.", @@ -856,7 +856,7 @@ "This room has been replaced and is no longer active.": "Dieser Raum wurde ersetzt und ist nicht länger aktiv.", "The conversation continues here.": "Die Konversation wird hier fortgesetzt.", "This room is a continuation of another conversation.": "Dieser Raum ist eine Fortsetzung einer anderen Konversation.", - "Click here to see older messages.": "Klicke hier um ältere Nachrichten zu sehen.", + "Click here to see older messages.": "Klicke hier, um ältere Nachrichten zu sehen.", "Failed to upgrade room": "Konnte Raum nicht aufrüsten", "The room upgrade could not be completed": "Die Raum-Aufrüstung konnte nicht fertiggestellt werden", "Upgrade this room to version %(version)s": "Diesen Raum zur Version %(version)s aufrüsten", @@ -938,7 +938,7 @@ "Don't ask again": "Nicht erneut fragen", "Set up": "Einrichten", "Please review and accept all of the homeserver's policies": "Bitte prüfe und akzeptiere alle Richtlinien des Heimservers", - "Failed to load group members": "Konnte Gruppenmitglieder nicht laden", + "Failed to load group members": "Gruppenmitglieder konnten nicht geladen werden", "That doesn't look like a valid email address": "Sieht nicht nach einer gültigen E-Mail-Adresse aus", "Unable to load commit detail: %(msg)s": "Konnte Commit-Details nicht laden: %(msg)s", "Checking...": "Überprüfe...", @@ -1115,8 +1115,8 @@ "Missing media permissions, click the button below to request.": "Fehlende Medienberechtigungen. Drücke auf den Knopf unten, um sie anzufordern.", "Request media permissions": "Medienberechtigungen anfordern", "Main address": "Primäre Adresse", - "Room avatar": "Raum-Bild", - "Room Name": "Raum-Name", + "Room avatar": "Raumbild", + "Room Name": "Raumname", "Room Topic": "Raum-Thema", "Join": "Beitreten", "Waiting for partner to confirm...": "Warte auf Bestätigung des Gesprächspartners...", @@ -1264,13 +1264,13 @@ "Show hidden events in timeline": "Zeige versteckte Ereignisse in der Chronik", "Low bandwidth mode": "Modus für niedrige Bandbreite", "Reset": "Zurücksetzen", - "Joining room …": "Trete Raum bei …", + "Joining room …": "Raum beitreten …", "Rejecting invite …": "Einladung ablehnen…", "Sign Up": "Registrieren", "Sign In": "Anmelden", "Reason: %(reason)s": "Grund: %(reason)s", "Forget this room": "Diesen Raum entfernen", - "Do you want to join %(roomName)s?": "Möchtest du %(roomName)s betreten?", + "Do you want to join %(roomName)s?": "Möchtest du %(roomName)s beitreten?", " invited you": " hat dich eingeladen", "edited": "bearbeitet", "Edit message": "Nachricht bearbeiten", @@ -1288,9 +1288,9 @@ "Add room": "Raum hinzufügen", "Your profile": "Dein Profil", "Registration Successful": "Registrierung erfolgreich", - "Failed to revoke invite": "Einladung zurückziehen fehlgeschlagen", + "Failed to revoke invite": "Einladung konnte nicht zurückgezogen werden", "Revoke invite": "Einladung zurückziehen", - "Invited by %(sender)s": "Eingeladen von %(sender)s", + "Invited by %(sender)s": "%(sender)s eingeladen", "Changes your avatar in all rooms": "Verändert dein Profilbild in allen Räumen", "Messages": "Nachrichten", "Actions": "Aktionen", @@ -1439,7 +1439,7 @@ "Set a new custom sound": "Setze einen neuen benutzerdefinierten Ton", "Browse": "Durchsuchen", "Direct Messages": "Direktnachrichten", - "You can use /help to list available commands. Did you mean to send this as a message?": "Du kannst /help benutzen, um verfügbare Befehle aufzulisten. Willst du dies als Nachricht senden?", + "You can use /help to list available commands. Did you mean to send this as a message?": "Du kannst /help benutzen, um alle verfügbaren Befehle aufzulisten. Willst du es stattdessen als Nachricht senden?", "Direct message": "Direktnachricht", "Suggestions": "Vorschläge", "Recently Direct Messaged": "Kürzlich direkt verschickt", @@ -1515,8 +1515,8 @@ "Messages in this room are not end-to-end encrypted.": "Nachrichten in diesem Raum sind nicht Ende-zu-Ende verschlüsselt.", "Security": "Sicherheit", "Ask %(displayName)s to scan your code:": "Bitte %(displayName)s, deinen Code zu scannen:", - "Verify by emoji": "Verifizierung durch Emojis", - "Verify by comparing unique emoji.": "Verifizierung durch den Vergleich einzigartiger Emojis.", + "Verify by emoji": "Mit Emojis verifizieren", + "Verify by comparing unique emoji.": "Durch den Vergleich einzigartiger Emojis verifizieren.", "You've successfully verified %(displayName)s!": "Du hast %(displayName)s erfolgreich verifiziert!", "Got it": "Verstanden", "Widget added by": "Widget hinzugefügt von", @@ -1544,8 +1544,8 @@ "Discovery options will appear once you have added an email above.": "Entdeckungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde.", "Discovery options will appear once you have added a phone number above.": "Entdeckungsoptionen werden angezeigt, sobald eine Telefonnummer hinzugefügt wurde.", "Close preview": "Vorschau schließen", - "Loading room preview": "Lade Raumvorschau", - "Join the discussion": "Tritt der Diskussion bei", + "Loading room preview": "Raumvorschau wird geladen", + "Join the discussion": "Der Diskussion beitreten", "Remove for everyone": "Für alle entfernen", "Remove for me": "Für mich entfernen", "Create your Matrix account on ": "Erstelle dein Matrix-Konto auf ", @@ -1553,12 +1553,12 @@ "Your Matrix account on ": "Dein Matrix-Konto auf ", "Remove %(email)s?": "%(email)s entfernen?", "Remove %(phone)s?": "%(phone)s entfernen?", - "Remove recent messages by %(user)s": "Letzte Nachrichten von %(user)s entfernen", - "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Du bist dabei %(count)s Nachrichten von %(user)s zu löschen, was nicht rückgängig gemacht werden kann. Fortfahren?", + "Remove recent messages by %(user)s": "Kürzlich gesendete Nachrichten von %(user)s entfernen", + "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Du bist dabei, %(count)s Nachrichten von %(user)s zu löschen, was nicht rückgängig gemacht werden kann. Fortfahren?", "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Du bist dabei, eine Nachricht von %(user)s zu löschen. Das kann nicht rückgängig gemacht werden. Fortfahren?", "Remove %(count)s messages|other": "%(count)s Nachrichten entfernen", "Remove %(count)s messages|one": "Eine Nachricht entfernen", - "Remove recent messages": "Letzte Nachrichten entfernen", + "Remove recent messages": "Kürzlich gesendete Nachrichten entfernen", "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?", "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse 2%(addresses)s für diesen Raum hinzugefügt.", "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.", @@ -1603,9 +1603,9 @@ "Upgrade the room": "Raum hochstufen", "Enable room encryption": "Raumverschlüsselung aktivieren", "This message cannot be decrypted": "Diese Nachricht kann nicht entschlüsselt werden", - "Encrypted by an unverified session": "Verschlüsselt von einer nicht verifizierten Sitzung", + "Encrypted by an unverified session": "Von einer nicht verifizierten Sitzung verschlüsselt", "Unencrypted": "Unverschlüsselt", - "Encrypted by a deleted session": "Verschlüsselt von einer gelöschten Sitzung", + "Encrypted by a deleted session": "Von einer gelöschten Sitzung verschlüsselt", "The encryption used by this room isn't supported.": "Die von diesem Raum verwendete Verschlüsselung wird nicht unterstützt.", "React": "Reagieren", "e.g. my-room": "z.B. mein-raum", @@ -1670,7 +1670,7 @@ "This bridge is managed by .": "Diese Brücke wird von verwaltet.", "Workspace: %(networkName)s": "Arbeitsbereich: %(networkName)s", "Channel: %(channelName)s": "Kanal: %(channelName)s", - "Show less": "Weniger zeigen", + "Show less": "Weniger anzeigen", "Warning: You should only set up key backup from a trusted computer.": "Achtung: Du solltest die Schlüsselsicherung nur von einem vertrauenswürdigen Computer aus einrichten.", "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Melde dich an, um die ausschließlich in dieser Sitzung gespeicherten Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten in jeder Sitzung zu lesen.", "Forgotten your password?": "Passwort vergessen?", @@ -1792,16 +1792,16 @@ "Deactivate user?": "Benutzer deaktivieren?", "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Beim Deaktivieren wird der Benutzer abgemeldet und ein erneutes Anmelden verhindert. Zusätzlich wird er aus allen Räumen entfernt. Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher dass du diesen Benutzer deaktivieren willst?", "Deactivate user": "Benutzer deaktivieren", - "Failed to deactivate user": "Deaktivieren des Benutzers fehlgeschlagen", - "Send a reply…": "Sende eine Antwort…", - "Send a message…": "Sende eine Nachricht…", + "Failed to deactivate user": "Benutzer konnte nicht deaktiviert werden", + "Send a reply…": "Antwort senden…", + "Send a message…": "Nachricht senden…", "Bold": "Fett", "Italics": "Kursiv", "Strikethrough": "Durchgestrichen", "Code block": "Code-Block", "Recent rooms": "Letzte Räume", "Loading …": "Lade …", - "Join the conversation with an account": "Tritt der Unterhaltung mit einem Konto bei", + "Join the conversation with an account": "Unterhaltung mit einem Konto beitreten", "You were kicked from %(roomName)s by %(memberName)s": "Du wurdest von %(memberName)s aus %(roomName)s entfernt", "Re-join": "Wieder beitreten", "You were banned from %(roomName)s by %(memberName)s": "Du wurdest von %(memberName)s aus %(roomName)s verbannt", @@ -1809,16 +1809,16 @@ "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Während der Verifizierung deiner Einladung ist ein Fehler (%(errcode)s) aufgetreten. Du kannst diese Information einem Raum-Administrator weitergeben.", "You can only join it with a working invite.": "Du kannst nur mit einer gültigen Einladung beitreten.", "Try to join anyway": "Dennoch versuchen beizutreten", - "You can still join it because this is a public room.": "Du kannst dennoch beitreten, da es ein öffentlicher Raum ist.", + "You can still join it because this is a public room.": "Du kannst trotzdem beitreten, weil es ein öffentlicher Raum ist.", "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Diese Einladung zu %(roomName)s wurde an die Adresse %(email)s gesendet, die nicht zu deinem Konto gehört", - "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Verbinde diese E-Mail-Adresse in den Einstellungen mit deinem Konto um die Einladungen direkt in %(brand)s zu erhalten.", + "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Verbinde diese E-Mail-Adresse in den Einstellungen mit deinem Konto, um die Einladungen direkt in %(brand)s zu erhalten.", "This invite to %(roomName)s was sent to %(email)s": "Diese Einladung zu %(roomName)s wurde an %(email)s gesendet", "Use an identity server in Settings to receive invites directly in %(brand)s.": "Verknüpfe einen Identitätsserver in den Einstellungen um die Einladungen direkt in %(brand)s zu erhalten.", - "Share this email in Settings to receive invites directly in %(brand)s.": "Teile diese E-Mail-Adresse in den Einstellungen um Einladungen direkt in %(brand)s zu erhalten.", + "Share this email in Settings to receive invites directly in %(brand)s.": "Teile diese E-Mail-Adresse in den Einstellungen, um Einladungen direkt in %(brand)s zu erhalten.", "%(roomName)s can't be previewed. Do you want to join it?": "Vorschau von %(roomName)s kann nicht angezeigt werden. Möchtest du den Raum betreten?", "This room doesn't exist. Are you sure you're at the right place?": "Dieser Raum existiert nicht. Bist du sicher, dass du hier richtig bist?", "Try again later, or ask a room admin to check if you have access.": "Versuche es später erneut oder bitte einen Raum-Administrator zu prüfen, ob du berechtigt bist.", - "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please submit a bug report.": "%(errcode)s wurde, beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, erstelle bitte einen Fehlerbericht.", + "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please submit a bug report.": "%(errcode)s wurde beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, erstelle bitte einen Fehlerbericht.", "%(count)s unread messages including mentions.|other": "%(count)s ungelesene Nachrichten einschließlich Erwähnungen.", "%(count)s unread messages including mentions.|one": "1 ungelesene Erwähnung.", "%(count)s unread messages.|other": "%(count)s ungelesene Nachrichten.", @@ -1838,16 +1838,16 @@ "Published Addresses": "Öffentliche Adresse", "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Öffentliche Adressen können von jedem verwendet werden, um den Raum zu betreten. Um eine Adresse zu veröffentlichen musst du zunächst eine lokale Adresse anlegen.", "Other published addresses:": "Andere öffentliche Adressen:", - "No other published addresses yet, add one below": "Keine anderen öffentlichen Adressen vorhanden, füge unten eine hinzu", + "No other published addresses yet, add one below": "Keine anderen öffentlichen Adressen vorhanden. Du kannst weiter unten eine hinzufügen", "New published address (e.g. #alias:server)": "Neue öffentliche Adresse (z.B. #alias:server)", "Local Addresses": "Lokale Adressen", "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Erstelle Adressen für diesen Raum, damit andere Benutzer den Raum auf deinem Heimserver (%(localDomain)s) finden können", "Waiting for you to accept on your other session…": "Warte auf die Bestätigung in deiner anderen Sitzung…", "Waiting for %(displayName)s to accept…": "Warte auf die Annahme von %(displayName)s …", "Accepting…": "Annehmen…", - "Start Verification": "Starte Verifikation", + "Start Verification": "Verifizierung starten", "Messages in this room are end-to-end encrypted.": "Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt.", - "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der Empfänger habt die Schlüssel, um sie zu entschlüsseln.", + "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der Empfänger könnt sie lesen.", "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In verschlüsselten Räumen sind deine Nachrichten verschlüsselt und nur du und der Empfänger habt die Schlüssel um sie zu entschlüsseln.", "Verify User": "Nutzer verifizieren", "For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit, verifiziere diesen Nutzer, durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.", @@ -1859,10 +1859,10 @@ "Yours, or the other users’ session": "Deine Sitzung oder die des Gegenüber", "%(role)s in %(roomName)s": "%(role)s in %(roomName)s", "This client does not support end-to-end encryption.": "Diese Anwendung unterstützt keine Ende-zu-Ende-Verschlüsselung.", - "Verify by scanning": "Verifizierung durch QR-Code-Scannen", + "Verify by scanning": "Verifizierung durch Scannen eines QR-Codes", "If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obigen Code nicht scannen kannst, verifiziere stattdessen durch den Emoji-Vergleich.", "Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer in einem Raum um die vollständige Sicherheit zu gewährleisten.", - "In encrypted rooms, verify all users to ensure it’s secure.": "Verifiziere alle Benutzer in verschlüsselten Räumen um die vollständige Sicherheit zu gewährleisten.", + "In encrypted rooms, verify all users to ensure it’s secure.": "Verifiziere alle Benutzer in verschlüsselten Räumen, um die vollständige Sicherheit zu gewährleisten.", "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Du hast %(deviceName)s (%(deviceId)s) erfolgreich verifiziert!", "Verified": "Verifiziert", "Start verification again from the notification.": "Starte die Verifikation aus der Benachrichtigung erneut.", @@ -1872,7 +1872,7 @@ "%(displayName)s cancelled verification.": "%(displayName)s hat die Verifikationsanfrage abgelehnt.", "You cancelled verification.": "Du hast die Verifikation abgebrochen.", "Verification cancelled": "Verifikation abgebrochen", - "Compare emoji": "Vergleiche Emojis", + "Compare emoji": "Emojis vergleichen", "Message Actions": "Nachrichtenaktionen", "Show image": "Bild anzeigen", "You have ignored this user, so their message is hidden. Show anyways.": "Du ignorierst diesen Benutzer, deshalb werden seine Nachrichten nicht angezeigt. Trotzdem anzeigen.", @@ -1882,16 +1882,16 @@ "Accepting …": "Annehmen …", "Declining …": "Ablehnen …", "You sent a verification request": "Du hast eine Verifizierungsanfrage gesendet", - "Show all": "Alle zeigen", + "Show all": "Alles zeigen", "Reactions": "Reaktionen", " reacted with %(content)s": " hat mit %(content)s reagiert", "reacted with %(shortName)s": "hat mit %(shortName)s reagiert", "Message deleted": "Nachricht gelöscht", "Message deleted by %(name)s": "Nachricht von %(name)s gelöscht", - "Edited at %(date)s. Click to view edits.": "Am %(date)s geändert. Klicke um Änderungen anzuzeigen.", - "Can't load this message": "Kann diese Nachricht nicht laden", - "Submit logs": "Logs übermitteln", - "Frequently Used": "Häufig verwendet", + "Edited at %(date)s. Click to view edits.": "Am %(date)s geändert. Klicke, um Änderungen anzuzeigen.", + "Can't load this message": "Diese Nachricht kann nicht geladen werden", + "Submit logs": "Log-Dateien senden", + "Frequently Used": "Oft verwendet", "Smileys & People": "Smileys & Leute", "Animals & Nature": "Tiere & Natur", "Food & Drink": "Essen & Trinken", @@ -1900,9 +1900,9 @@ "Objects": "Objekte", "Symbols": "Symbole", "Flags": "Flaggen", - "Quick Reactions": "Praktische Reaktionen", + "Quick Reactions": "Schnelle Reaktionen", "Cancel search": "Suche abbrechen", - "Any of the following data may be shared:": "Die folgenden Daten können geteilt werden:", + "Any of the following data may be shared:": "Die folgenden Informationen können geteilt werden:", "Your avatar URL": "Deine Avatar-URL", "Your user ID": "Deine Nutzer-ID", "Your theme": "Dein Design", @@ -2212,10 +2212,10 @@ "New version available. Update now.": "Neue Version verfügbar. Jetzt aktualisieren.", "Please verify the room ID or address and try again.": "Bitte überprüfe die Raum-ID oder -adresse und versuche es erneut.", "To link to this room, please add an address.": "Um den Raum zu verlinken, füge bitte eine Adresse hinzu.", - "Emoji picker": "Emoji Auswahl", + "Emoji picker": "Emojiauswahl", "Error creating address": "Fehler beim Anlegen der Adresse", "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Es gab einen Fehler beim Anlegen der Adresse. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.", - "You don't have permission to delete the address.": "Du hast nicht die Berechtigung die Adresse zu löschen.", + "You don't have permission to delete the address.": "Du hast nicht die Berechtigung, die Adresse zu löschen.", "Error removing address": "Fehler beim Löschen der Adresse", "Categories": "Kategorien", "Room address": "Raumadresse", @@ -2227,7 +2227,7 @@ "Use a different passphrase?": "Eine andere Passphrase verwenden?", "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Deine Server-Administration hat die Ende-zu-Ende-Verschlüsselung für private Räume und Direktnachrichten standardmäßig deaktiviert.", "People": "Personen", - "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Beim Entfernen dieser Adresse ist ein Fehler aufgetreten. Vielleicht existiert diese nicht mehr oder es kam zu einem temporären Fehler.", + "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Beim Entfernen dieser Adresse ist ein Fehler aufgetreten. Vielleicht existiert sie nicht mehr oder es kam zu einem temporären Fehler.", "Set a room address to easily share your room with other people.": "Vergebe eine Raum-Adresse, um diesen Raum auf einfache Weise mit anderen Personen teilen zu können.", "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Du hast für diese Sitzung zuvor eine neuere Version von %(brand)s verwendet. Um diese Version mit Ende-zu-Ende-Verschlüsselung wieder zu benutzen, musst du dich erst ab- und dann wieder anmelden.", "Delete the room address %(alias)s and remove %(name)s from the directory?": "Soll die Raum-Adresse %(alias)s gelöscht und %(name)s aus dem Raum-Verzeichnis entfernt werden?", @@ -2245,9 +2245,9 @@ "Show": "Zeige", "Message preview": "Nachrichtenvorschau", "List options": "Optionen anzeigen", - "Show %(count)s more|other": "Zeige %(count)s weitere", - "Show %(count)s more|one": "Zeige %(count)s weitere", - "Leave Room": "Verlasse Raum", + "Show %(count)s more|other": "%(count)s weitere anzeigen", + "Show %(count)s more|one": "%(count)s weitere anzeigen", + "Leave Room": "Raum verlassen", "Room options": "Raumoptionen", "Activity": "Aktivität", "A-Z": "A-Z", @@ -2349,15 +2349,15 @@ "Show rooms with unread messages first": "Räume mit ungelesenen Nachrichten zuerst zeigen", "Show previews of messages": "Nachrichtenvorschau anzeigen", "Use default": "Standardeinstellungen benutzen", - "Mentions & Keywords": "Erwähnungen & Schlüsselwörter", + "Mentions & Keywords": "Erwähnungen und Schlüsselwörter", "Notification options": "Benachrichtigungsoptionen", "Forget Room": "Raum vergessen", "Favourited": "Favorisiert", "This room is public": "Dieser Raum ist öffentlich", "Away": "Abwesend", - "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "Die Sitzung, die du verifizieren möchtest, unterstützt weder das scannen eines QR-Codes noch eine Emoji-Verifikation, welche von %(brand)s unterstützt werden. Versuche es mit einer anderen Anwendung.", + "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "Die Sitzung, die du verifizieren möchtest, unterstützt weder das scannen eines QR-Codes noch eine Emoji-Verifikation, welche von %(brand)s unterstützt werden. Versuche es mit einem anderen Client.", "Edited at %(date)s": "Geändert am %(date)s", - "Click to view edits": "Klicke um Änderungen anzuzeigen", + "Click to view edits": "Klicke, um Änderungen anzuzeigen", "%(brand)s encountered an error during upload of:": "%(brand)s hat einen Fehler festgestellt beim hochladen von:", "Use your account to sign in to the latest version of the app at ": "Verwende dein Konto um dich an der neusten Version der App anzumelden", "We’re excited to announce Riot is now Element!": "Wir freuen uns bekanntzugeben: Riot ist jetzt Element!", @@ -2460,7 +2460,7 @@ "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Stellt ( ͡° ͜ʖ ͡°) einer Klartextnachricht voran", "Unknown App": "Unbekannte App", "%(count)s results|one": "%(count)s Ergebnis", - "Room Info": "Raum-Info", + "Room Info": "Rauminfo", "Apps": "Apps", "Unpin app": "App nicht mehr anheften", "Edit apps, bridges & bots": "Apps, Bridges & Bots bearbeiten", @@ -2507,8 +2507,8 @@ "Unable to set up keys": "Schlüssel können nicht eingerichtet werden", "Use the Desktop app to see all encrypted files": "Nutze die Desktop-App um alle verschlüsselten Dateien zu sehen", "Use the Desktop app to search encrypted messages": "Nutze die Desktop-App um verschlüsselte Nachrichten zu suchen", - "This version of %(brand)s does not support viewing some encrypted files": "Diese Version von %(brand)s unterstützt nicht alle verschlüsselten Dateien anzuzeigen", - "This version of %(brand)s does not support searching encrypted messages": "Diese Version von %(brand)s unterstützt nicht verschlüsselte Nachrichten zu durchsuchen", + "This version of %(brand)s does not support viewing some encrypted files": "Diese Version von %(brand)s kann nicht alle verschlüsselten Dateien anzuzeigen", + "This version of %(brand)s does not support searching encrypted messages": "Diese Version von %(brand)s kann verschlüsselte Nachrichten nicht durchsuchen", "Cannot create rooms in this community": "Räume können in dieser Community nicht erstellt werden", "You do not have permission to create rooms in this community.": "Du bist nicht berechtigt Räume in dieser Community zu erstellen.", "End conference": "Konferenzgespräch beenden", @@ -2530,7 +2530,7 @@ "Move left": "Nach links schieben", "Revoke permissions": "Berechtigungen widerrufen", "Unpin a widget to view it in this panel": "Widget nicht mehr anheften, um es in diesem Bereich anzuzeigen", - "You can only pin up to %(count)s widgets|other": "Du kannst nur bis zu %(count)s Widgets anheften", + "You can only pin up to %(count)s widgets|other": "Du kannst nur %(count)s Widgets anheften", "Show Widgets": "Widgets anzeigen", "Hide Widgets": "Widgets verstecken", "%(senderName)s declined the call.": "%(senderName)s hat den Anruf abgelehnt.", @@ -2621,19 +2621,19 @@ "Call Paused": "Anruf pausiert", "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von %(rooms)s Räumen zu speichern.", "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten vom Raum %(rooms)s zu speichern.", - "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur ihr zwei seid in dieser Konversation, außer einer von euch lädt jemanden neues ein.", - "This is the beginning of your direct message history with .": "Dies ist der Beginn deiner Direktnachrichtenhistorie mit .", + "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur ihr zwei seid in dieser Konversation, außer ihr lädt jemanden neues ein.", + "This is the beginning of your direct message history with .": "Dies ist der Beginn deiner Direktnachrichten mit .", "Topic: %(topic)s (edit)": "Thema: %(topic)s (ändern)", "Topic: %(topic)s ": "Thema: %(topic)s ", - "Add a topic to help people know what it is about.": "Füge ein Thema hinzu um Personen zu verdeutlichen um was es in ihm geht.", + "Add a topic to help people know what it is about.": "Füge ein Thema hinzu, um Personen zu verdeutlichen um was es in ihm geht.", "You created this room.": "Du hast diesen Raum erstellt.", - "%(displayName)s created this room.": "%(displayName)s erstellte diesen Raum.", + "%(displayName)s created this room.": "%(displayName)s hat diesen Raum erstellt.", "Add a photo, so people can easily spot your room.": "Füge ein Foto hinzu, sodass Personen deinen Raum einfach finden können.", "This is the start of .": "Dies ist der Beginn von .", "Start a new chat": "Starte einen neuen Chat", "Role": "Rolle", "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Nachrichten hier sind Ende-zu-Ende-verschlüsselt. Verifiziere %(displayName)s im deren Profil - klicke auf deren Avatar.", - "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Wenn Personen beitreten, kannst du sie in ihrem Profil verifizieren, klicke hierfür auf deren Avatar.", + "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Wenn Personen beitreten, kannst du sie in ihrem Profil verifizieren, indem du auf deren Avatar klickst.", "Tell us below how you feel about %(brand)s so far.": "Erzähle uns wie %(brand)s dir soweit gefällt.", "Please go into as much detail as you like, so we can track down the problem.": "Bitte nenne so viele Details wie du möchtest, sodass wir das Problem finden können.", "Comment": "Kommentar", @@ -3023,7 +3023,7 @@ "Access your secure message history and set up secure messaging by entering your Security Key.": "Greife auf deinen sicheren Chatverlauf zu und richte die sichere Nachrichtenübermittlung ein, indem du deinen Sicherheitsschlüssel eingibst.", "If you've forgotten your Security Phrase you can use your Security Key or set up new recovery options": "Wenn du deine Sicherheitsphrase vergessen hast, kannst du deinen Sicherheitsschlüssel nutzen oder neue Wiederherstellungsoptionen einrichten", "Security Key mismatch": "Nicht übereinstimmende Sicherheitsschlüssel", - "Set my room layout for everyone": "Setze mein Raum-Layout für alle", + "Set my room layout for everyone": "Dieses Raum-Layout für alle setzen", "%(senderName)s has updated the widget layout": "%(senderName)s hat das Widget-Layout aktualisiert", "Search (must be enabled)": "Suche (muss aktiviert sein)", "Remember this": "Dies merken", @@ -3045,7 +3045,7 @@ "We couldn't log you in": "Wir konnten dich nicht anmelden", "Windows": "Fenster", "Screens": "Bildschirme", - "Share your screen": "Deinen Bildschirm teilen", + "Share your screen": "Bildschirm teilen", "Recently visited rooms": "Kürzlich besuchte Räume", "Show line numbers in code blocks": "Zeilennummern in Code-Blöcken anzeigen", "Expand code blocks by default": "Code-Blöcke standardmäßig erweitern", @@ -3112,5 +3112,9 @@ "You're already in a call with this person.": "Du bist schon in einem Anruf mit dieser Person.", "Already in call": "Schon im Anruf", "Invite people": "Personen einladen", - "Jump to the bottom of the timeline when you send a message": "Nach dem Senden einer Nachricht im Chatverlauf nach unten scrollen" + "Jump to the bottom of the timeline when you send a message": "Nach dem Senden einer Nachricht im Chatverlauf nach unten scrollen", + "Empty room": "Leerer Raum", + "Your message was sent": "Die Nachricht wurde gesendet", + "Encrypting your message...": "Nachricht wird verschlüsselt...", + "Sending your message...": "Nachricht wird gesendet..." } From 60efd3c4c09269426772d04df127ed2de18020d0 Mon Sep 17 00:00:00 2001 From: "@a2sc:matrix.org" Date: Fri, 19 Mar 2021 16:51:01 +0000 Subject: [PATCH 074/163] Translated using Weblate (German) Currently translated at 96.7% (2794 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 22f27823a6..174c60170f 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1800,7 +1800,7 @@ "Strikethrough": "Durchgestrichen", "Code block": "Code-Block", "Recent rooms": "Letzte Räume", - "Loading …": "Lade …", + "Loading …": "Laden …", "Join the conversation with an account": "Unterhaltung mit einem Konto beitreten", "You were kicked from %(roomName)s by %(memberName)s": "Du wurdest von %(memberName)s aus %(roomName)s entfernt", "Re-join": "Wieder beitreten", From 90c3ca3a2e6cfb93bc4eee0b3ea7e0bc3f08967c Mon Sep 17 00:00:00 2001 From: rkfg Date: Fri, 19 Mar 2021 11:36:03 +0000 Subject: [PATCH 075/163] Translated using Weblate (Russian) Currently translated at 95.6% (2763 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 7cbcb08167..e7c8c2b4d7 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -96,7 +96,7 @@ "Failure to create room": "Не удалось создать комнату", "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s", "click to reveal": "нажмите для открытия", - "%(senderName)s invited %(targetName)s.": "%(senderName)s пригласил %(targetName)s.", + "%(senderName)s invited %(targetName)s.": "%(senderName)s пригласил(а) %(targetName)s.", "%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.", "%(senderName)s kicked %(targetName)s.": "%(senderName)s исключил(а) %(targetName)s.", "%(targetName)s left the room.": "%(targetName)s покинул(а) комнату.", @@ -2613,7 +2613,7 @@ "Unable to validate homeserver": "Невозможно проверить домашний сервер", "Sign into your homeserver": "Войдите на свой домашний сервер", "with state key %(stateKey)s": "с ключом состояния %(stateKey)s", - "%(creator)s created this DM.": "%(creator)s начал этот чат.", + "%(creator)s created this DM.": "%(creator)s начал(а) этот чат.", "Show chat effects": "Показать эффекты чата", "Host account on": "Ваша учётная запись обслуживается", "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s или %(usernamePassword)s", From 90b8a6647689e52cd183db91866cfc02ce810a8e Mon Sep 17 00:00:00 2001 From: Tawfiek Date: Sun, 21 Mar 2021 14:11:45 +0200 Subject: [PATCH 076/163] fix make btns in verify dailog respect system font --- res/css/_common.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/css/_common.scss b/res/css/_common.scss index 36a81e6651..0093bde0ab 100644 --- a/res/css/_common.scss +++ b/res/css/_common.scss @@ -395,6 +395,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus { border: 1px solid $accent-color; color: $accent-color; background-color: $button-secondary-bg-color; + font-family: inherit; } .mx_Dialog button:last-child { From f5911e6446a430003243ed359664b6f5a7d8e6ec Mon Sep 17 00:00:00 2001 From: Ayush PS Date: Mon, 22 Mar 2021 00:33:09 +0530 Subject: [PATCH 077/163] Fixing the minor UI issues in the email discovery --- src/components/views/settings/discovery/EmailAddresses.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/views/settings/discovery/EmailAddresses.js b/src/components/views/settings/discovery/EmailAddresses.js index 0493597537..b8d91aae2a 100644 --- a/src/components/views/settings/discovery/EmailAddresses.js +++ b/src/components/views/settings/discovery/EmailAddresses.js @@ -203,6 +203,7 @@ export class EmailAddress extends React.Component { className="mx_ExistingEmailAddress_confirmBtn" kind="primary_sm" onClick={this.onContinueClick} + disabled={this.state.continueDisabled} > {_t("Complete")} From 497caf5645874d5614eb43d220dc8a18eda6149f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 22 Mar 2021 13:22:16 +0000 Subject: [PATCH 078/163] Fix redaction event list summaries breaking sender profiles --- src/components/structures/MessagePanel.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index 63f23f22f3..0a9af413d8 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -1044,6 +1044,10 @@ class RedactionGrouper { } shouldGroup(ev) { + // absorb hidden events so that they do not break up streams of messages & redaction events being grouped + if (!this.panel._shouldShowEvent(ev)) { + return true; + } if (this.panel._wantsDateSeparator(this.events[0], ev.getDate())) { return false; } @@ -1055,6 +1059,9 @@ class RedactionGrouper { ev.getId(), ev === this.lastShownEvent, ); + if (!this.panel._shouldShowEvent(ev)) { + return; + } this.events.push(ev); } @@ -1080,13 +1087,9 @@ class RedactionGrouper { ); const senders = new Set(); - let eventTiles = this.events.map((e) => { + let eventTiles = this.events.map((e, i) => { senders.add(e.sender); - // In order to prevent DateSeparators from appearing in the expanded form, - // render each member event as if the previous one was itself. - // This way, the timestamp of the previous event === the - // timestamp of the current event, and no DateSeparator is inserted. - return panel._getTilesForEvent(e, e, e === lastShownEvent); + return panel._getTilesForEvent(i === 0 ? this.prevEvent : this.events[i - 1], e, e === lastShownEvent); }).reduce((a, b) => a.concat(b), []); if (eventTiles.length === 0) { From cfbcf12e1d6ffe5fa078976182cd847faf4c2530 Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Mon, 22 Mar 2021 15:02:28 +0000 Subject: [PATCH 079/163] docs: update file extensions in CIDER editor documentation --- docs/ciderEditor.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/ciderEditor.md b/docs/ciderEditor.md index f522dc2fc4..379b6f5b51 100644 --- a/docs/ciderEditor.md +++ b/docs/ciderEditor.md @@ -21,14 +21,14 @@ caret nodes (more on that later). For these reasons it doesn't use `innerText`, `textContent` or anything similar. The model addresses any content in the editor within as an offset within this string. The caret position is thus also converted from a position in the DOM tree -to an offset in the content string. This happens in `getCaretOffsetAndText` in `dom.js`. +to an offset in the content string. This happens in `getCaretOffsetAndText` in `dom.ts`. Once the content string and caret offset is calculated, it is passed to the `update()` method of the model. The model first calculates the same content string of its current parts, basically just concatenating their text. It then looks for differences between the current and the new content string. The diffing algorithm is very basic, and assumes there is only one change around the caret offset, -so this should be very inexpensive. See `diff.js` for details. +so this should be very inexpensive. See `diff.ts` for details. The result of the diffing is the strings that were added and/or removed from the current content. These differences are then applied to the parts, @@ -51,7 +51,7 @@ which relate poorly to text input or changes, and don't need the `beforeinput` e which isn't broadly supported yet. Once the parts of the model are updated, the DOM of the editor is then reconciled -with the new model state, see `renderModel` in `render.js` for this. +with the new model state, see `renderModel` in `render.ts` for this. If the model didn't reject the input and didn't make any additional changes, this won't make any changes to the DOM at all, and should thus be fairly efficient. From 0db31dfeaeb656418c5f2690eb73a3b13ded285c Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Mon, 22 Mar 2021 15:05:22 +0000 Subject: [PATCH 080/163] fix: CIDER formatting buttons on Safari --- res/css/views/rooms/_MessageComposerFormatBar.scss | 2 ++ src/components/views/rooms/MessageComposerFormatBar.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/res/css/views/rooms/_MessageComposerFormatBar.scss b/res/css/views/rooms/_MessageComposerFormatBar.scss index d97c49630a..b305e91db0 100644 --- a/res/css/views/rooms/_MessageComposerFormatBar.scss +++ b/res/css/views/rooms/_MessageComposerFormatBar.scss @@ -60,6 +60,8 @@ limitations under the License. width: 27px; height: 24px; box-sizing: border-box; + background: none; + vertical-align: middle; } .mx_MessageComposerFormatBar_button::after { diff --git a/src/components/views/rooms/MessageComposerFormatBar.js b/src/components/views/rooms/MessageComposerFormatBar.js index d2539b1ef4..fc0f785b08 100644 --- a/src/components/views/rooms/MessageComposerFormatBar.js +++ b/src/components/views/rooms/MessageComposerFormatBar.js @@ -85,8 +85,8 @@ class FormatButton extends React.PureComponent { return ( Date: Mon, 22 Mar 2021 17:46:50 +0000 Subject: [PATCH 081/163] Fix space hierarchy exploding when encountering an empty subspace --- src/components/structures/SpaceRoomDirectory.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx index 0a53f38238..ab273887c2 100644 --- a/src/components/structures/SpaceRoomDirectory.tsx +++ b/src/components/structures/SpaceRoomDirectory.tsx @@ -260,7 +260,7 @@ export const HierarchyLevel = ({ const space = cli.getRoom(spaceId); const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId()) - const sortedChildren = sortBy([...relations.get(spaceId)?.values()], ev => ev.content.order || null); + const sortedChildren = sortBy([...(relations.get(spaceId)?.values() || [])], ev => ev.content.order || null); const [subspaces, childRooms] = sortedChildren.reduce((result, ev: ISpaceSummaryEvent) => { const roomId = ev.state_key; if (!rooms.has(roomId)) return result; From 796bfd851de39878ae8d082a9a3eb72f3d53cd1a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 22 Mar 2021 17:47:48 +0000 Subject: [PATCH 082/163] Fix left spaces not disappearing from the space panel --- src/stores/SpaceStore.tsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx index b82acfd0ed..dba3f1d8a9 100644 --- a/src/stores/SpaceStore.tsx +++ b/src/stores/SpaceStore.tsx @@ -196,13 +196,16 @@ export class SpaceStoreClass extends AsyncStoreWithClient { }; public rebuild = throttle(() => { // exported for tests - const visibleRooms = this.matrixClient.getVisibleRooms(); + // get all most-upgraded rooms & spaces except spaces which have been left (historical) + const visibleRooms = this.matrixClient.getVisibleRooms().filter(r => { + return !r.isSpaceRoom() || r.getMyMembership() === "join"; + }); + + const unseenChildren = new Set(visibleRooms); + const backrefs = new EnhancedMap>(); // Sort spaces by room ID to force the loop breaking to be deterministic - const spaces = sortBy(this.getSpaces(), space => space.roomId); - const unseenChildren = new Set([...visibleRooms, ...spaces]); - - const backrefs = new EnhancedMap>(); + const spaces = sortBy(visibleRooms.filter(r => r.isSpaceRoom()), space => space.roomId); // TODO handle cleaning up links when a Space is removed spaces.forEach(space => { From d5b115dd084c94fcfe301ee15ca8cdc9269eb84f Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Mon, 22 Mar 2021 19:52:09 -0400 Subject: [PATCH 083/163] don't overwrite callback with undefined if no customization provided --- src/MatrixClientPeg.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts index de1d573d40..7db5ed1a4e 100644 --- a/src/MatrixClientPeg.ts +++ b/src/MatrixClientPeg.ts @@ -296,10 +296,11 @@ class _MatrixClientPeg implements IMatrixClientPeg { // These are always installed regardless of the labs flag so that // cross-signing features can toggle on without reloading and also be // accessed immediately after login. - const customisedCallbacks = { - getDehydrationKey: SecurityCustomisations.getDehydrationKey, - }; - Object.assign(opts.cryptoCallbacks, crossSigningCallbacks, customisedCallbacks); + Object.assign(opts.cryptoCallbacks, crossSigningCallbacks); + if (SecurityCustomisations.getDehydrationKey) { + opts.cryptoCallbacks.getDehydrationKey = + SecurityCustomisations.getDehydrationKey; + } this.matrixClient = createMatrixClient(opts); From e352ed19085c76522a5963e89594cd09bfb18c9a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 22 Mar 2021 19:32:24 -0600 Subject: [PATCH 084/163] Run audio through the Web Audio API instead This leads to more reliable frequency/timing information, and involves a whole lot less decoding. We still maintain ongoing encoded frames to avoid having to do one giant encode at the end, as that could take long enough to be disruptive. --- .../views/rooms/VoiceRecordComposerTile.tsx | 4 +- src/voice/VoiceRecorder.ts | 101 +++++++++++++----- 2 files changed, 79 insertions(+), 26 deletions(-) diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx index a1d0e8c12f..7327bf2380 100644 --- a/src/components/views/rooms/VoiceRecordComposerTile.tsx +++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx @@ -58,8 +58,8 @@ export default class VoiceRecordComposerTile extends React.PureComponent { - // console.log('@@ FRAME', frame); + // recorder.frequencyData.onUpdate((freq) => { + // console.log('@@ UPDATE', freq); // }); this.setState({recorder}); }; diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index 3d1008d45e..5646b53cbe 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -20,40 +20,74 @@ import {MatrixClient} from "matrix-js-sdk/src/client"; import CallMediaHandler from "../CallMediaHandler"; import {SimpleObservable} from "matrix-widget-api"; +const CHANNELS = 1; // stereo isn't important +const SAMPLE_RATE = 48000; // 48khz is what WebRTC uses. 12khz is where we lose quality. +const BITRATE = 64000; // 64kbps is average for WebRTC, so we might as well use it too. +const FREQ_SAMPLE_RATE = 4; // Target rate of frequency data. We don't need this super often. + +export interface IFrequencyPackage { + dbBars: Float32Array; + dbMin: number; + dbMax: number; + + // TODO: @@ TravisR: Generalize this for a timing package? +} + export class VoiceRecorder { - private recorder = new Recorder({ - encoderPath, // magic from webpack - mediaTrackConstraints: { - deviceId: CallMediaHandler.getAudioInput(), - }, - encoderSampleRate: 48000, // we could go down to 12khz, but we lose quality. 48khz is a webrtc default - encoderApplication: 2048, // voice (default is "audio") - streamPages: true, // so we can have a live EQ for the user - encoderFrameSize: 20, // ms, we want updates fairly regularly for the UI - numberOfChannels: 1, // stereo isn't important for us - //sourceNode: instanceof MediaStreamAudioSourceNode, // TODO: @@ Travis: Use this for EQ stuff. - encoderBitRate: 64000, // 64kbps is average for webrtc - encoderComplexity: 3, // 0-10, 0 is fast and low complexity - resampleQuality: 3, // 0-10, 10 is slow and high quality - }); + private recorder: Recorder; + private recorderContext: AudioContext; + private recorderSource: MediaStreamAudioSourceNode; + private recorderStream: MediaStream; + private recorderFreqNode: AnalyserNode; private buffer = new Uint8Array(0); private mxc: string; private recording = false; - private observable: SimpleObservable; + private observable: SimpleObservable; + private freqTimerId: number; public constructor(private client: MatrixClient) { + } + + private async makeRecorder() { + this.recorderStream = await navigator.mediaDevices.getUserMedia({ + audio: { + // specify some audio settings so we're feeding the recorder with the + // best possible values. The browser will handle resampling for us. + sampleRate: SAMPLE_RATE, + channelCount: CHANNELS, + noiseSuppression: true, // browsers ignore constraints they can't honour + deviceId: CallMediaHandler.getAudioInput(), + }, + }); + this.recorderContext = new AudioContext({ + latencyHint: "interactive", + sampleRate: SAMPLE_RATE, // once again, the browser will resample for us + }); + this.recorderSource = this.recorderContext.createMediaStreamSource(this.recorderStream); + this.recorderFreqNode = this.recorderContext.createAnalyser(); + this.recorderSource.connect(this.recorderFreqNode); + this.recorder = new Recorder({ + encoderPath, // magic from webpack + encoderSampleRate: SAMPLE_RATE, + encoderApplication: 2048, // voice (default is "audio") + streamPages: true, // this speeds up the encoding process by using CPU over time + encoderFrameSize: 20, // ms, arbitrary frame size we send to the encoder + numberOfChannels: CHANNELS, + sourceNode: this.recorderSource, + encoderBitRate: BITRATE, + encoderComplexity: 3, // 0-10, 0 is fast and low complexity + resampleQuality: 3, // 0-10, 10 is slow and high quality + }); this.recorder.ondataavailable = (a: ArrayBuffer) => { - // TODO: @@ TravisR: We'll have to decode each frame and convert it to an EQ to observe const buf = new Uint8Array(a); const newBuf = new Uint8Array(this.buffer.length + buf.length); newBuf.set(this.buffer, 0); newBuf.set(buf, this.buffer.length); this.buffer = newBuf; - this.observable.update(buf); // send the frame over the observable }; } - public get rawData(): SimpleObservable { + public get frequencyData(): SimpleObservable { if (!this.recording) throw new Error("No observable when not recording"); return this.observable; } @@ -83,7 +117,18 @@ export class VoiceRecorder { if (this.observable) { this.observable.close(); } - this.observable = new SimpleObservable(); + this.observable = new SimpleObservable(); + await this.makeRecorder(); + this.freqTimerId = setInterval(() => { + if (!this.recording) return; + const data = new Float32Array(this.recorderFreqNode.frequencyBinCount); + this.recorderFreqNode.getFloatFrequencyData(data); + this.observable.update({ + dbBars: data, + dbMin: this.recorderFreqNode.minDecibels, + dbMax: this.recorderFreqNode.maxDecibels, + }); + }, 1000 / FREQ_SAMPLE_RATE) as any as number; // XXX: Linter doesn't understand timer environment return this.recorder.start().then(() => this.recording = true); } @@ -91,12 +136,20 @@ export class VoiceRecorder { if (!this.recording) { throw new Error("No recording to stop"); } - return new Promise(resolve => { - this.recorder.stop().then(() => { + // Disconnect the source early to start shutting down resources + this.recorderSource.disconnect(); + return this.recorder.stop() + // close the context after the recorder so the recorder doesn't try to + // connect anything to the context (this would generate a warning) + .then(() => this.recorderContext.close()) + // Now stop all the media tracks so we can release them back to the user/OS + .then(() => this.recorderStream.getTracks().forEach(t => t.stop())) + // Finally do our post-processing and clean up + .then(() => { + clearInterval(this.freqTimerId); this.recording = false; return this.recorder.close(); - }).then(() => resolve(this.buffer)); - }); + }).then(() => this.buffer); } public async upload(): Promise { From 090cf28af497678ce7ebaa132b01112228faa5a2 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 22 Mar 2021 19:36:58 -0600 Subject: [PATCH 085/163] Appease the linter --- src/voice/VoiceRecorder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index 5646b53cbe..ec1a745272 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -146,7 +146,7 @@ export class VoiceRecorder { .then(() => this.recorderStream.getTracks().forEach(t => t.stop())) // Finally do our post-processing and clean up .then(() => { - clearInterval(this.freqTimerId); + clearInterval(this.freqTimerId); this.recording = false; return this.recorder.close(); }).then(() => this.buffer); From 026aa6f88d76bc404b0b2789b9599bbf0af59f59 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 22 Mar 2021 21:39:07 -0600 Subject: [PATCH 086/163] Track next event [tile] over group boundaries Fixes https://github.com/vector-im/element-web/issues/16745 --- src/components/structures/MessagePanel.js | 38 +++++++++++++++-------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index 0a9af413d8..6951aff357 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -452,6 +452,20 @@ export default class MessagePanel extends React.Component { }); }; + _getNextEventInfo(arr, i) { + const nextEvent = i < arr.length - 1 + ? arr[i + 1] + : null; + + // The next event with tile is used to to determine the 'last successful' flag + // when rendering the tile. The shouldShowEvent function is pretty quick at what + // it does, so this should have no significant cost even when a room is used for + // not-chat purposes. + const nextTile = arr.slice(i + 1).find(e => this._shouldShowEvent(e)); + + return {nextEvent, nextTile}; + } + _getEventTiles() { this.eventNodes = {}; @@ -503,6 +517,7 @@ export default class MessagePanel extends React.Component { const mxEv = this.props.events[i]; const eventId = mxEv.getId(); const last = (mxEv === lastShownEvent); + const {nextEvent, nextTile} = this._getNextEventInfo(this.props.events, i); if (grouper) { if (grouper.shouldGroup(mxEv)) { @@ -519,21 +534,13 @@ export default class MessagePanel extends React.Component { for (const Grouper of groupers) { if (Grouper.canStartGroup(this, mxEv)) { - grouper = new Grouper(this, mxEv, prevEvent, lastShownEvent); + grouper = new Grouper(this, mxEv, prevEvent, lastShownEvent, nextEvent, nextTile); } } if (!grouper) { const wantTile = this._shouldShowEvent(mxEv); if (wantTile) { - const nextEvent = i < this.props.events.length - 1 - ? this.props.events[i + 1] - : null; - - // The next event with tile is used to to determine the 'last successful' flag - // when rendering the tile. The shouldShowEvent function is pretty quick at what - // it does, so this should have no significant cost even when a room is used for - // not-chat purposes. - const nextTile = this.props.events.slice(i + 1).find(e => this._shouldShowEvent(e)); + const {nextEvent, nextTile} = this._getNextEventInfo(this.props.events, i); // make sure we unpack the array returned by _getTilesForEvent, // otherwise react will auto-generate keys and we will end up @@ -982,7 +989,7 @@ class CreationGrouper { )); } - const eventTiles = this.events.map((e) => { + const eventTiles = this.events.map((e, i) => { // In order to prevent DateSeparators from appearing in the expanded form // of EventListSummary, render each member event as if the previous // one was itself. This way, the timestamp of the previous event === the @@ -1032,7 +1039,7 @@ class RedactionGrouper { return panel._shouldShowEvent(ev) && ev.isRedacted(); } - constructor(panel, ev, prevEvent, lastShownEvent) { + constructor(panel, ev, prevEvent, lastShownEvent, nextEvent, nextEventTile) { this.panel = panel; this.readMarker = panel._readMarkerForEvent( ev.getId(), @@ -1041,6 +1048,8 @@ class RedactionGrouper { this.events = [ev]; this.prevEvent = prevEvent; this.lastShownEvent = lastShownEvent; + this.nextEvent = nextEvent; + this.nextEventTile = nextEventTile; } shouldGroup(ev) { @@ -1089,7 +1098,10 @@ class RedactionGrouper { const senders = new Set(); let eventTiles = this.events.map((e, i) => { senders.add(e.sender); - return panel._getTilesForEvent(i === 0 ? this.prevEvent : this.events[i - 1], e, e === lastShownEvent); + return panel._getTilesForEvent( + i === 0 ? this.prevEvent : this.events[i - 1], + e, e === lastShownEvent, + this.nextEvent, this.nextEventTile); }).reduce((a, b) => a.concat(b), []); if (eventTiles.length === 0) { From fa54ca615a48cda4ff64357bb12b87b6b6871cce Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 22 Mar 2021 21:41:13 -0600 Subject: [PATCH 087/163] Appease the linter --- src/components/structures/MessagePanel.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index 6951aff357..671d895a21 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -989,7 +989,7 @@ class CreationGrouper { )); } - const eventTiles = this.events.map((e, i) => { + const eventTiles = this.events.map((e) => { // In order to prevent DateSeparators from appearing in the expanded form // of EventListSummary, render each member event as if the previous // one was itself. This way, the timestamp of the previous event === the @@ -1098,10 +1098,8 @@ class RedactionGrouper { const senders = new Set(); let eventTiles = this.events.map((e, i) => { senders.add(e.sender); - return panel._getTilesForEvent( - i === 0 ? this.prevEvent : this.events[i - 1], - e, e === lastShownEvent, - this.nextEvent, this.nextEventTile); + const prevEvent = i === 0 ? this.prevEvent : this.events[i - 1]; + return panel._getTilesForEvent(prevEvent, e, e === lastShownEvent, this.nextEvent, this.nextEventTile); }).reduce((a, b) => a.concat(b), []); if (eventTiles.length === 0) { From 1f6f9ca9838b830f33a8e364c21e405f97eda434 Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Tue, 23 Mar 2021 18:24:05 +0000 Subject: [PATCH 088/163] Only show the ask anyway modal for explicit user lookup failures --- src/utils/MultiInviter.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js index 63d3942b37..05fa06ee14 100644 --- a/src/utils/MultiInviter.js +++ b/src/utils/MultiInviter.js @@ -111,17 +111,10 @@ export default class MultiInviter { } if (!ignoreProfile && SettingsStore.getValue("promptBeforeInviteUnknownUsers", this.roomId)) { - try { - const profile = await MatrixClientPeg.get().getProfileInfo(addr); - if (!profile) { - // noinspection ExceptionCaughtLocallyJS - throw new Error("User has no profile"); - } - } catch (e) { - throw { - errcode: "RIOT.USER_NOT_FOUND", - error: "User does not have a profile or does not exist." - }; + const profile = await MatrixClientPeg.get().getProfileInfo(addr); + if (!profile) { + // noinspection ExceptionCaughtLocallyJS + throw new Error("User has no profile"); } } From b8692bdf175ce27e78bfb27102ef61445b947503 Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Tue, 23 Mar 2021 18:25:03 +0000 Subject: [PATCH 089/163] Prevent state to be toggled whilst a request is pending --- src/components/views/dialogs/InviteDialog.tsx | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx index de0b5b237b..4ea53349bd 100644 --- a/src/components/views/dialogs/InviteDialog.tsx +++ b/src/components/views/dialogs/InviteDialog.tsx @@ -886,19 +886,21 @@ export default class InviteDialog extends React.PureComponent { - let filterText = this.state.filterText; - const targets = this.state.targets.map(t => t); // cheap clone for mutation - const idx = targets.indexOf(member); - if (idx >= 0) { - targets.splice(idx, 1); - } else { - targets.push(member); - filterText = ""; // clear the filter when the user accepts a suggestion - } - this.setState({targets, filterText}); + if (!this.state.busy) { + let filterText = this.state.filterText; + const targets = this.state.targets.map(t => t); // cheap clone for mutation + const idx = targets.indexOf(member); + if (idx >= 0) { + targets.splice(idx, 1); + } else { + targets.push(member); + filterText = ""; // clear the filter when the user accepts a suggestion + } + this.setState({targets, filterText}); - if (this._editorRef && this._editorRef.current) { - this._editorRef.current.focus(); + if (this._editorRef && this._editorRef.current) { + this._editorRef.current.focus(); + } } }; From 2f2bb9456ff2757e752fa3f8910706b8ebfac14c Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 23 Mar 2021 18:17:41 -0600 Subject: [PATCH 090/163] Reduce code duplication --- src/components/structures/MessagePanel.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index 671d895a21..6d03c849c4 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -540,8 +540,6 @@ export default class MessagePanel extends React.Component { if (!grouper) { const wantTile = this._shouldShowEvent(mxEv); if (wantTile) { - const {nextEvent, nextTile} = this._getNextEventInfo(this.props.events, i); - // make sure we unpack the array returned by _getTilesForEvent, // otherwise react will auto-generate keys and we will end up // replacing all of the DOM elements every time we paginate. From b7e653268b6c8e41fd22db365813b586beba1fbb Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 23 Mar 2021 18:19:14 -0600 Subject: [PATCH 091/163] Rename function --- src/components/views/rooms/VoiceRecordComposerTile.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx index 7327bf2380..0d381001a1 100644 --- a/src/components/views/rooms/VoiceRecordComposerTile.tsx +++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx @@ -40,7 +40,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent { + private onStartStopVoiceMessage = async () => { // TODO: @@ TravisR: We do not want to auto-send on stop. if (this.state.recorder) { await this.state.recorder.stop(); @@ -80,7 +80,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent ); From c9938ff704765414ad119e0ea42822d96eefc23f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 23 Mar 2021 18:24:40 -0600 Subject: [PATCH 092/163] Adjust settings/docs for encoder --- src/voice/VoiceRecorder.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index ec1a745272..9fa2faad1e 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -22,8 +22,8 @@ import {SimpleObservable} from "matrix-widget-api"; const CHANNELS = 1; // stereo isn't important const SAMPLE_RATE = 48000; // 48khz is what WebRTC uses. 12khz is where we lose quality. -const BITRATE = 64000; // 64kbps is average for WebRTC, so we might as well use it too. -const FREQ_SAMPLE_RATE = 4; // Target rate of frequency data. We don't need this super often. +const BITRATE = 24000; // 24kbps is pretty high quality for our use case in opus. +const FREQ_SAMPLE_RATE = 4; // Target rate of frequency data (samples / sec). We don't need this super often. export interface IFrequencyPackage { dbBars: Float32Array; @@ -75,7 +75,11 @@ export class VoiceRecorder { numberOfChannels: CHANNELS, sourceNode: this.recorderSource, encoderBitRate: BITRATE, - encoderComplexity: 3, // 0-10, 0 is fast and low complexity + + // We use low values for the following to ease CPU usage - the resulting waveform + // is indistinguishable for a voice message. Note that the underlying library will + // pick defaults which prefer the highest possible quality, CPU be damned. + encoderComplexity: 3, // 0-10, 10 is slow and high quality. resampleQuality: 3, // 0-10, 10 is slow and high quality }); this.recorder.ondataavailable = (a: ArrayBuffer) => { From d929d4839154927c415110ea89db90160fe934dc Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 23 Mar 2021 18:26:43 -0600 Subject: [PATCH 093/163] Clean up promises --- src/voice/VoiceRecorder.ts | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts index 9fa2faad1e..06c0d939fc 100644 --- a/src/voice/VoiceRecorder.ts +++ b/src/voice/VoiceRecorder.ts @@ -133,27 +133,32 @@ export class VoiceRecorder { dbMax: this.recorderFreqNode.maxDecibels, }); }, 1000 / FREQ_SAMPLE_RATE) as any as number; // XXX: Linter doesn't understand timer environment - return this.recorder.start().then(() => this.recording = true); + await this.recorder.start(); + this.recording = true; } public async stop(): Promise { if (!this.recording) { throw new Error("No recording to stop"); } + // Disconnect the source early to start shutting down resources this.recorderSource.disconnect(); - return this.recorder.stop() - // close the context after the recorder so the recorder doesn't try to - // connect anything to the context (this would generate a warning) - .then(() => this.recorderContext.close()) - // Now stop all the media tracks so we can release them back to the user/OS - .then(() => this.recorderStream.getTracks().forEach(t => t.stop())) - // Finally do our post-processing and clean up - .then(() => { - clearInterval(this.freqTimerId); - this.recording = false; - return this.recorder.close(); - }).then(() => this.buffer); + await this.recorder.stop(); + + // close the context after the recorder so the recorder doesn't try to + // connect anything to the context (this would generate a warning) + await this.recorderContext.close(); + + // Now stop all the media tracks so we can release them back to the user/OS + this.recorderStream.getTracks().forEach(t => t.stop()); + + // Finally do our post-processing and clean up + clearInterval(this.freqTimerId); + this.recording = false; + await this.recorder.close(); + + return this.buffer; } public async upload(): Promise { From d836ca19d86fc65c4bea99a50de37f0958b036af Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Wed, 24 Mar 2021 08:58:08 +0000 Subject: [PATCH 094/163] remove references to disused RIOT.USER_NOT_FOUND error code --- src/utils/MultiInviter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js index 05fa06ee14..3d3a5f4137 100644 --- a/src/utils/MultiInviter.js +++ b/src/utils/MultiInviter.js @@ -164,7 +164,7 @@ export default class MultiInviter { this._doInvite(address, ignoreProfile).then(resolve, reject); }, 5000); return; - } else if (['M_NOT_FOUND', 'M_USER_NOT_FOUND', 'RIOT.USER_NOT_FOUND'].includes(err.errcode)) { + } else if (['M_NOT_FOUND', 'M_USER_NOT_FOUND'].includes(err.errcode)) { errorText = _t("User %(user_id)s does not exist", {user_id: address}); } else if (err.errcode === 'M_PROFILE_UNDISCLOSED') { errorText = _t("User %(user_id)s may or may not exist", {user_id: address}); @@ -205,7 +205,7 @@ export default class MultiInviter { if (Object.keys(this.errors).length > 0 && !this.groupId) { // There were problems inviting some people - see if we can invite them // without caring if they exist or not. - const unknownProfileErrors = ['M_NOT_FOUND', 'M_USER_NOT_FOUND', 'M_PROFILE_UNDISCLOSED', 'M_PROFILE_NOT_FOUND', 'RIOT.USER_NOT_FOUND']; + const unknownProfileErrors = ['M_NOT_FOUND', 'M_USER_NOT_FOUND', 'M_PROFILE_UNDISCLOSED', 'M_PROFILE_NOT_FOUND']; const unknownProfileUsers = Object.keys(this.errors).filter(a => unknownProfileErrors.includes(this.errors[a].errcode)); if (unknownProfileUsers.length > 0) { From 5104d7bed85f744f3cd6d72635712eed0e23b983 Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Wed, 24 Mar 2021 11:51:39 +0000 Subject: [PATCH 095/163] Improve error reporting when EventIndex fails on a supported environment --- .../views/settings/EventIndexPanel.js | 19 ++++++++++++++++++- src/i18n/strings/en_EN.json | 1 + src/indexing/EventIndexPeg.js | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js index d78b99fc5d..a48583b61d 100644 --- a/src/components/views/settings/EventIndexPanel.js +++ b/src/components/views/settings/EventIndexPanel.js @@ -190,7 +190,7 @@ export default class EventIndexPanel extends React.Component { }
); - } else { + } else if (!EventIndexPeg.platformHasSupport()) { eventIndexingSettings = (
{ @@ -208,6 +208,23 @@ export default class EventIndexPanel extends React.Component { }
); + } else { + eventIndexingSettings = ( +
+

+ {_t("Message search initilisation failed")} +

+ {EventIndexPeg.error && ( +
+ {_t("Advanced")} + + {EventIndexPeg.error.message} + +
+ )} + +
+ ); } return eventIndexingSettings; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 5f1003bf29..f0d7922836 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1081,6 +1081,7 @@ "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.", "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with search components added.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with search components added.", "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use %(brand)s Desktop for encrypted messages to appear in search results.": "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use %(brand)s Desktop for encrypted messages to appear in search results.", + "Message search initilisation failed": "Message search initilisation failed", "Connecting to integration manager...": "Connecting to integration manager...", "Cannot connect to integration manager": "Cannot connect to integration manager", "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.", diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js index 443daa8f43..7004efc554 100644 --- a/src/indexing/EventIndexPeg.js +++ b/src/indexing/EventIndexPeg.js @@ -31,6 +31,7 @@ class EventIndexPeg { constructor() { this.index = null; this._supportIsInstalled = false; + this.error = null; } /** @@ -96,6 +97,7 @@ class EventIndexPeg { await index.init(); } catch (e) { console.log("EventIndex: Error initializing the event index", e); + this.error = e; return false; } From fb46815b6a5bbc2b17286f67b3fef70af53111bc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 13:15:31 +0000 Subject: [PATCH 096/163] Spaces move away from Form Buttons --- res/css/structures/_SpaceRoomView.scss | 2 +- .../views/dialogs/_SpaceSettingsDialog.scss | 2 +- res/css/views/spaces/_SpaceCreateMenu.scss | 2 +- src/components/structures/SpaceRoomView.tsx | 41 ++++++++++++------- .../dialogs/AddExistingToSpaceDialog.tsx | 9 ++-- .../views/dialogs/SpaceSettingsDialog.tsx | 12 +++--- .../views/spaces/SpaceCreateMenu.tsx | 9 ++-- 7 files changed, 44 insertions(+), 33 deletions(-) diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss index a7ce630b96..080773b49b 100644 --- a/res/css/structures/_SpaceRoomView.scss +++ b/res/css/structures/_SpaceRoomView.scss @@ -89,7 +89,7 @@ $SpaceRoomViewInnerWidth: 428px; width: $SpaceRoomViewInnerWidth; text-align: right; // button alignment right - .mx_FormButton { + .mx_AccessibleButton_hasKind { padding: 8px 22px; margin-left: 16px; } diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.scss b/res/css/views/dialogs/_SpaceSettingsDialog.scss index c1fa539e9b..6e5fd9c8c8 100644 --- a/res/css/views/dialogs/_SpaceSettingsDialog.scss +++ b/res/css/views/dialogs/_SpaceSettingsDialog.scss @@ -49,7 +49,7 @@ limitations under the License. } } - .mx_FormButton { + .mx_AccessibleButton_hasKind { padding: 8px 22px; } } diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss index bea39e2389..ef3fea351b 100644 --- a/res/css/views/spaces/_SpaceCreateMenu.scss +++ b/res/css/views/spaces/_SpaceCreateMenu.scss @@ -79,7 +79,7 @@ $spacePanelWidth: 71px; } } - .mx_FormButton { + .mx_AccessibleButton_kind_primary { padding: 8px 22px; margin-left: auto; display: block; diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 95846d8e21..46ff37dc14 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -26,7 +26,6 @@ import AccessibleButton from "../views/elements/AccessibleButton"; import RoomName from "../views/elements/RoomName"; import RoomTopic from "../views/elements/RoomTopic"; import InlineSpinner from "../views/elements/InlineSpinner"; -import FormButton from "../views/elements/FormButton"; import {inviteMultipleToRoom, showRoomInviteDialog} from "../../RoomInvite"; import {useRoomMembers} from "../../hooks/useRoomMembers"; import createRoom, {IOpts, Preset} from "../../createRoom"; @@ -124,30 +123,36 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => } joinButtons = <> - { setBusy(true); onRejectButtonClicked(); - }} /> - + { _t("Reject") } + + { setBusy(true); onJoinButtonClicked(); }} - /> + > + { _t("Accept") } + ; } else { joinButtons = ( - { setBusy(true); onJoinButtonClicked(); }} - /> + > + { _t("Join") } + ) } @@ -407,11 +412,13 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => { { fields }
- + > + { buttonLabel } +
; }; @@ -426,7 +433,9 @@ const SpaceSetupPublicShare = ({ space, onFinished }) => {
- + + { _t("Go to my first room") } +
; }; @@ -545,7 +554,9 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
- + + { buttonLabel } +
; }; diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx index 500637244a..e3e28e4fbe 100644 --- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx +++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx @@ -22,7 +22,6 @@ import {MatrixClient} from "matrix-js-sdk/src/client"; import {_t} from '../../../languageHandler'; import {IDialogProps} from "./IDialogProps"; import BaseDialog from "./BaseDialog"; -import FormButton from "../elements/FormButton"; import Dropdown from "../elements/Dropdown"; import SearchBox from "../../structures/SearchBox"; import SpaceStore from "../../../stores/SpaceStore"; @@ -185,8 +184,8 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space, - { setBusy(true); @@ -200,7 +199,9 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space, } setBusy(false); }} - /> + > + { busy ? _t("Adding...") : _t("Add") } + ; }; diff --git a/src/components/views/dialogs/SpaceSettingsDialog.tsx b/src/components/views/dialogs/SpaceSettingsDialog.tsx index f6bf5b87e6..b016e320eb 100644 --- a/src/components/views/dialogs/SpaceSettingsDialog.tsx +++ b/src/components/views/dialogs/SpaceSettingsDialog.tsx @@ -28,7 +28,6 @@ import {getTopic} from "../elements/RoomTopic"; import {avatarUrlForRoom} from "../../../Avatar"; import ToggleSwitch from "../elements/ToggleSwitch"; import AccessibleButton from "../elements/AccessibleButton"; -import FormButton from "../elements/FormButton"; import Modal from "../../../Modal"; import defaultDispatcher from "../../../dispatcher/dispatcher"; import {allSettled} from "../../../utils/promise"; @@ -134,16 +133,17 @@ const SpaceSettingsDialog: React.FC = ({ matrixClient: cli, space, onFin /> - { defaultDispatcher.dispatch({ action: "leave_room", room_id: space.roomId, }); }} - /> + > + { _t("Leave Space") } +
Modal.createDialog(DevtoolsDialog, {roomId: space.roomId})}> @@ -152,7 +152,9 @@ const SpaceSettingsDialog: React.FC = ({ matrixClient: cli, space, onFin { _t("Cancel") } - + + { busy ? _t("Saving...") : _t("Save Changes") } +
; diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx index 879cf929e0..6269de1c50 100644 --- a/src/components/views/spaces/SpaceCreateMenu.tsx +++ b/src/components/views/spaces/SpaceCreateMenu.tsx @@ -21,7 +21,6 @@ import {EventType, RoomType, RoomCreateTypeField} from "matrix-js-sdk/src/@types import {_t} from "../../../languageHandler"; import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; import {ChevronFace, ContextMenu} from "../../structures/ContextMenu"; -import FormButton from "../elements/FormButton"; import createRoom, {IStateEvent, Preset} from "../../../createRoom"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import SpaceBasicSettings from "./SpaceBasicSettings"; @@ -148,11 +147,9 @@ const SpaceCreateMenu = ({ onFinished }) => { - + + { busy ? _t("Creating...") : _t("Create") } + ; } From 4e9a2df3b0689e11dfb18241a5c8a86a6d6b4a2f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 14:00:52 +0000 Subject: [PATCH 097/163] Spaces autofocus and prefill the search box --- src/components/structures/SearchBox.js | 5 ++++- src/components/structures/SpaceRoomDirectory.tsx | 2 ++ src/components/views/dialogs/AddExistingToSpaceDialog.tsx | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js index 6daa8526bc..abeb858274 100644 --- a/src/components/structures/SearchBox.js +++ b/src/components/structures/SearchBox.js @@ -32,6 +32,8 @@ export default class SearchBox extends React.Component { onKeyDown: PropTypes.func, className: PropTypes.string, placeholder: PropTypes.string.isRequired, + autoFocus: PropTypes.bool, + initialValue: PropTypes.string, // If true, the search box will focus and clear itself // on room search focus action (it would be nicer to take @@ -49,7 +51,7 @@ export default class SearchBox extends React.Component { this._search = createRef(); this.state = { - searchTerm: "", + searchTerm: this.props.initialValue || "", blurred: true, }; } @@ -158,6 +160,7 @@ export default class SearchBox extends React.Component { onBlur={this._onBlur} placeholder={ placeholder } autoComplete="off" + autoFocus={this.props.autoFocus} /> { clearButton } diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx index ab273887c2..2fb0101f88 100644 --- a/src/components/structures/SpaceRoomDirectory.tsx +++ b/src/components/structures/SpaceRoomDirectory.tsx @@ -570,6 +570,8 @@ const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinis className="mx_textinput_icon mx_textinput_search" placeholder={ _t("Search names and description") } onSearch={setQuery} + autoFocus={true} + initialValue={initialText} /> { content } diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx index e3e28e4fbe..fec1a178ca 100644 --- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx +++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx @@ -127,6 +127,7 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space, className="mx_textinput_icon mx_textinput_search" placeholder={ _t("Filter your rooms and spaces") } onSearch={setQuery} + autoComplete={true} /> { spaces.length > 0 ? ( From d8737913693551141841100554527e7515423e8f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 14:01:24 +0000 Subject: [PATCH 098/163] update comments --- src/stores/SpaceStore.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx index dba3f1d8a9..e4b537169e 100644 --- a/src/stores/SpaceStore.tsx +++ b/src/stores/SpaceStore.tsx @@ -195,7 +195,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { return this.spaceFilteredRooms.get(space?.roomId || HOME_SPACE) || new Set(); }; - public rebuild = throttle(() => { // exported for tests + private rebuild = throttle(() => { // get all most-upgraded rooms & spaces except spaces which have been left (historical) const visibleRooms = this.matrixClient.getVisibleRooms().filter(r => { return !r.isSpaceRoom() || r.getMyMembership() === "join"; @@ -204,7 +204,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { const unseenChildren = new Set(visibleRooms); const backrefs = new EnhancedMap>(); - // Sort spaces by room ID to force the loop breaking to be deterministic + // Sort spaces by room ID to force the cycle breaking to be deterministic const spaces = sortBy(visibleRooms.filter(r => r.isSpaceRoom()), space => space.roomId); // TODO handle cleaning up links when a Space is removed @@ -219,7 +219,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { const [rootSpaces, orphanedRooms] = partitionSpacesAndRooms(Array.from(unseenChildren)); - // untested algorithm to handle full-cycles + // somewhat algorithm to handle full-cycles const detachedNodes = new Set(spaces); const markTreeChildren = (rootSpace: Room, unseen: Set) => { From f7a3805eed1b987d644f81cbdcd3d3c14fc32709 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 14:02:25 +0000 Subject: [PATCH 099/163] Fix styling inconsistency in space room view --- res/css/structures/_SpaceRoomView.scss | 2 +- src/components/structures/SpaceRoomView.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss index 080773b49b..3d3b5d1bb8 100644 --- a/res/css/structures/_SpaceRoomView.scss +++ b/res/css/structures/_SpaceRoomView.scss @@ -22,7 +22,7 @@ $SpaceRoomViewInnerWidth: 428px; width: 432px; box-sizing: border-box; border-radius: 8px; - border: 1px solid $input-darker-bg-color; + border: 1px solid $space-button-outline-color; font-size: $font-15px; margin: 20px 0; diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 46ff37dc14..0c2f1638d1 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -426,7 +426,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => { const SpaceSetupPublicShare = ({ space, onFinished }) => { return

{ _t("Share %(name)s", { name: space.name }) }

-
+
{ _t("It's just you at the moment, it will be even better with others.") }
From 6e0ab8616866e0d37a9998837e847e131cab3cd3 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 14:10:26 +0000 Subject: [PATCH 100/163] Small usability tweaks to the add existing to space dialog --- .../dialogs/_AddExistingToSpaceDialog.scss | 25 ++++++++--- .../dialogs/AddExistingToSpaceDialog.tsx | 44 +++++++++---------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss index 0c9d8e3840..a7cfd7bde6 100644 --- a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss +++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss @@ -28,22 +28,23 @@ limitations under the License. flex-direction: column; flex-wrap: nowrap; min-height: 0; + height: 80vh; .mx_Dialog_title { display: flex; - .mx_BaseAvatar { - display: inline-flex; - margin: 5px 16px 5px 5px; - vertical-align: middle; - } - .mx_BaseAvatar_image { border-radius: 8px; margin: 0; vertical-align: unset; } + .mx_BaseAvatar { + display: inline-flex; + margin: 5px 16px 5px 5px; + vertical-align: middle; + } + > div { > h1 { font-weight: $font-semi-bold; @@ -101,6 +102,7 @@ limitations under the License. .mx_SearchBox { margin: 0; + flex-grow: 0; } .mx_AddExistingToSpaceDialog_errorText { @@ -112,7 +114,10 @@ limitations under the License. } .mx_AddExistingToSpaceDialog_content { + flex-grow: 1; + .mx_AddExistingToSpaceDialog_noResults { + display: block; margin-top: 24px; } } @@ -162,8 +167,14 @@ limitations under the License. > span { flex-grow: 1; - font-size: $font-12px; + font-size: $font-14px; line-height: $font-15px; + font-weight: $font-semi-bold; + + .mx_AccessibleButton { + font-size: inherit; + display: inline-block; + } > * { vertical-align: middle; diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx index fec1a178ca..04bec39238 100644 --- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx +++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx @@ -109,7 +109,7 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space, const title =
-

{ _t("Add existing spaces/rooms") }

+

{ _t("Add existing rooms") }

{ spaceOptionSection }
; @@ -130,27 +130,6 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space, autoComplete={true} /> - { spaces.length > 0 ? ( -
-

{ _t("Spaces") }

- { spaces.map(space => { - return { - if (checked) { - selectedToAdd.add(space); - } else { - selectedToAdd.delete(space); - } - setSelectedToAdd(new Set(selectedToAdd)); - }} - />; - }) } -
- ) : null } - { rooms.length > 0 ? (

{ _t("Rooms") }

@@ -172,6 +151,27 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space,
) : undefined } + { spaces.length > 0 ? ( +
+

{ _t("Spaces") }

+ { spaces.map(space => { + return { + if (checked) { + selectedToAdd.add(space); + } else { + selectedToAdd.delete(space); + } + setSelectedToAdd(new Set(selectedToAdd)); + }} + />; + }) } +
+ ) : null } + { spaces.length + rooms.length < 1 ? { _t("No results") } : undefined } From a2a1e37fa3cb3011508e93043ce507b6a0b64249 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 14:18:06 +0000 Subject: [PATCH 101/163] Add prompt to bottom of room list to invite to space --- res/css/views/rooms/_RoomList.scss | 24 +++++++--- res/img/element-icons/roomlist/browse.svg | 4 ++ src/components/views/rooms/RoomList.tsx | 55 +++++++++++++++++++++-- 3 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 res/img/element-icons/roomlist/browse.svg diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss index d49ed4b736..641b434af4 100644 --- a/res/css/views/rooms/_RoomList.scss +++ b/res/css/views/rooms/_RoomList.scss @@ -35,28 +35,32 @@ limitations under the License. margin: 4px 12px 4px; padding-top: 12px; border-top: 1px solid $tertiary-fg-color; - font-size: $font-13px; + font-size: $font-14px; div:first-child { font-weight: $font-semi-bold; + line-height: $font-18px; + color: $primary-fg-color; } .mx_AccessibleButton { - color: $secondary-fg-color; + color: $primary-fg-color; position: relative; - padding: 0 0 0 24px; + padding: 8px 8px 8px 32px; font-size: inherit; - margin-top: 8px; + margin-top: 12px; display: block; text-align: start; + background-color: $roomlist-button-bg-color; + border-radius: 4px; &::before { content: ''; width: 16px; height: 16px; position: absolute; - top: 0; - left: 0; + top: 8px; + left: 8px; background: $secondary-fg-color; mask-position: center; mask-size: contain; @@ -70,5 +74,13 @@ limitations under the License. &.mx_RoomList_explorePrompt_explore::before { mask-image: url('$(res)/img/element-icons/roomlist/explore.svg'); } + + &.mx_RoomList_explorePrompt_spaceInvite::before { + mask-image: url('$(res)/img/element-icons/room/invite.svg'); + } + + &.mx_RoomList_explorePrompt_spaceExplore::before { + mask-image: url('$(res)/img/element-icons/roomlist/browse.svg'); + } } } diff --git a/res/img/element-icons/roomlist/browse.svg b/res/img/element-icons/roomlist/browse.svg new file mode 100644 index 0000000000..04714e2881 --- /dev/null +++ b/res/img/element-icons/roomlist/browse.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx index 4378154d8f..01affc8b2f 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx @@ -20,6 +20,7 @@ import React, { ReactComponentElement } from "react"; import { Dispatcher } from "flux"; import { Room } from "matrix-js-sdk/src/models/room"; import * as fbEmitter from "fbemitter"; +import { EventType } from "matrix-js-sdk/src/@types/event"; import { _t, _td } from "../../../languageHandler"; import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex"; @@ -48,12 +49,15 @@ import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../con import AccessibleButton from "../elements/AccessibleButton"; import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore"; import CallHandler from "../../../CallHandler"; -import SpaceStore, { SUGGESTED_ROOMS } from "../../../stores/SpaceStore"; +import SpaceStore, {SUGGESTED_ROOMS, UPDATE_SELECTED_SPACE} from "../../../stores/SpaceStore"; import { showAddExistingRooms, showCreateNewRoom } from "../../../utils/space"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import {replaceableComponent} from "../../../utils/replaceableComponent"; import RoomAvatar from "../avatars/RoomAvatar"; import { ISpaceSummaryRoom } from "../../structures/SpaceRoomDirectory"; +import { showRoomInviteDialog } from "../../../RoomInvite"; +import Modal from "../../../Modal"; +import SpacePublicShare from "../spaces/SpacePublicShare"; +import InfoDialog from "../dialogs/InfoDialog"; interface IProps { onKeyDown: (ev: React.KeyboardEvent) => void; @@ -68,6 +72,7 @@ interface IState { sublists: ITagMap; isNameFiltering: boolean; currentRoomId?: string; + activeSpace: Room; suggestedRooms: ISpaceSummaryRoom[]; } @@ -194,7 +199,7 @@ const TAG_AESTHETICS: ITagAestheticsMap = { : _t("You do not have permissions to add rooms to this space")} /> { e.preventDefault(); @@ -282,6 +287,7 @@ export default class RoomList extends React.PureComponent { this.state = { sublists: {}, isNameFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(), + activeSpace: SpaceStore.instance.activeSpace, suggestedRooms: SpaceStore.instance.suggestedRooms, }; @@ -294,6 +300,7 @@ export default class RoomList extends React.PureComponent { } public componentDidMount(): void { + SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.updateActiveSpace); SpaceStore.instance.on(SUGGESTED_ROOMS, this.updateSuggestedRooms); RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.updateLists); this.customTagStoreRef = CustomRoomTagStore.addListener(this.updateLists); @@ -301,6 +308,7 @@ export default class RoomList extends React.PureComponent { } public componentWillUnmount() { + SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.updateActiveSpace); SpaceStore.instance.off(SUGGESTED_ROOMS, this.updateSuggestedRooms); RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists); defaultDispatcher.unregister(this.dispatcherRef); @@ -366,6 +374,10 @@ export default class RoomList extends React.PureComponent { return room; }; + private updateActiveSpace = (activeSpace: Room) => { + this.setState({ activeSpace }); + }; + private updateSuggestedRooms = (suggestedRooms: ISpaceSummaryRoom[]) => { this.setState({ suggestedRooms }); }; @@ -424,6 +436,25 @@ export default class RoomList extends React.PureComponent { dis.dispatch({ action: Action.ViewRoomDirectory, initialText }); }; + private onSpaceInviteClick = () => { + const initialText = RoomListStore.instance.getFirstNameFilterCondition()?.search; + if (this.state.activeSpace.getJoinRule() === "public") { + const modal = Modal.createTrackedDialog("Space Invite", "User Menu", InfoDialog, { + title: _t("Invite to %(spaceName)s", { spaceName: this.state.activeSpace.name }), + description: + { _t("Share your public space") } + modal.close()} /> + , + fixedWidth: false, + button: false, + className: "mx_SpacePanel_sharePublicSpace", + hasCloseButton: true, + }); + } else { + showRoomInviteDialog(this.state.activeSpace.roomId, initialText); + } + }; + private renderSuggestedRooms(): ReactComponentElement[] { return this.state.suggestedRooms.map(room => { const name = room.name || room.canonical_alias || room.aliases.pop() || _t("Empty room"); @@ -569,7 +600,23 @@ export default class RoomList extends React.PureComponent { kind="link" onClick={this.onExplore} > - {_t("Explore all public rooms")} + { this.state.activeSpace ? _t("Explore rooms") : _t("Explore all public rooms") } + +
; + } else if (this.state.activeSpace) { + explorePrompt =
+
{ _t("Quick actions") }
+ { this.state.activeSpace.canInvite(MatrixClientPeg.get().getUserId()) && + {_t("Invite people")} + } + + {_t("Explore rooms")}
; } else if (Object.values(this.state.sublists).some(list => list.length > 0)) { From 3df3baea14f931251b1a76cc995a52f0fb2ea7bf Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 14:19:10 +0000 Subject: [PATCH 102/163] Tweak behaviour during space creation --- src/components/structures/SpaceRoomView.tsx | 2 +- src/components/views/spaces/SpacePublicShare.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 0c2f1638d1..16028f0975 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -430,7 +430,7 @@ const SpaceSetupPublicShare = ({ space, onFinished }) => { { _t("It's just you at the moment, it will be even better with others.") }
- +
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx index b2d3b7ce29..fa81b75525 100644 --- a/src/components/views/spaces/SpacePublicShare.tsx +++ b/src/components/views/spaces/SpacePublicShare.tsx @@ -26,7 +26,7 @@ import {showRoomInviteDialog} from "../../../RoomInvite"; interface IProps { space: Room; - onFinished(): void; + onFinished?(): void; } const SpacePublicShare = ({ space, onFinished }: IProps) => { @@ -54,7 +54,7 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => { className="mx_SpacePublicShare_inviteButton" onClick={() => { showRoomInviteDialog(space.roomId); - onFinished(); + if (onFinished) onFinished(); }} >

{ _t("Invite people") }

From ea760e8f296cfbcf0b8acc172c7a3b16e8a54adf Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 15:26:56 +0000 Subject: [PATCH 103/163] Fix space room directory behaviour --- src/components/structures/SpaceRoomDirectory.tsx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx index 2fb0101f88..877a4283f1 100644 --- a/src/components/structures/SpaceRoomDirectory.tsx +++ b/src/components/structures/SpaceRoomDirectory.tsx @@ -77,7 +77,6 @@ export interface ISpaceSummaryEvent { interface ITileProps { room: ISpaceSummaryRoom; - editing?: boolean; suggested?: boolean; selected?: boolean; numChildRooms?: number; @@ -88,7 +87,6 @@ interface ITileProps { const Tile: React.FC = ({ room, - editing, suggested, selected, hasPermissions, @@ -170,12 +168,6 @@ const Tile: React.FC = ({
; - if (editing) { - return
- { content } -
- } - let childToggle; let childSection; if (children) { @@ -201,7 +193,7 @@ const Tile: React.FC = ({ className={classNames("mx_SpaceRoomDirectory_roomTile", { mx_SpaceRoomDirectory_subspace: room.room_type === RoomType.Space, })} - onClick={hasPermissions ? onToggleClick : onPreviewClick} + onClick={(hasPermissions && onToggleClick) ? onToggleClick : onPreviewClick} > { content } { childToggle } From 65a7d0621d5b14b340a9647049cc85b350ba7381 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 15:30:03 +0000 Subject: [PATCH 104/163] Add invite to space button to room intro --- res/css/views/rooms/_NewRoomIntro.scss | 7 +++- src/components/views/rooms/NewRoomIntro.tsx | 46 +++++++++++++++++---- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/res/css/views/rooms/_NewRoomIntro.scss b/res/css/views/rooms/_NewRoomIntro.scss index 4322ba341c..9c2a428cb3 100644 --- a/res/css/views/rooms/_NewRoomIntro.scss +++ b/res/css/views/rooms/_NewRoomIntro.scss @@ -33,8 +33,13 @@ limitations under the License. .mx_AccessibleButton { line-height: $font-24px; + display: inline-block; - &::before { + & + .mx_AccessibleButton { + margin-left: 12px; + } + + &:not(.mx_AccessibleButton_kind_primary_outline)::before { content: ''; display: inline-block; background-color: $button-fg-color; diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx index ce426a64ed..c85b9d7868 100644 --- a/src/components/views/rooms/NewRoomIntro.tsx +++ b/src/components/views/rooms/NewRoomIntro.tsx @@ -28,6 +28,7 @@ import defaultDispatcher from "../../../dispatcher/dispatcher"; import {ViewUserPayload} from "../../../dispatcher/payloads/ViewUserPayload"; import {Action} from "../../../dispatcher/actions"; import dis from "../../../dispatcher/dispatcher"; +import SpaceStore from "../../../stores/SpaceStore"; const NewRoomIntro = () => { const cli = useContext(MatrixClientContext); @@ -100,17 +101,48 @@ const NewRoomIntro = () => { }); } - let buttons; - if (room.canInvite(cli.getUserId())) { - const onInviteClick = () => { - dis.dispatch({ action: "view_invite", roomId }); - }; + let parentSpace; + if ( + SpaceStore.instance.activeSpace?.canInvite(cli.getUserId()) && + SpaceStore.instance.getSpaceFilteredRoomIds(SpaceStore.instance.activeSpace).has(room.roomId) + ) { + parentSpace = SpaceStore.instance.activeSpace; + } + let buttons; + if (parentSpace) { buttons =
- + { + dis.dispatch({ action: "view_invite", roomId }); + }} + > + {_t("Invite to %(spaceName)s", { spaceName: parentSpace.name })} + + { room.canInvite(cli.getUserId()) && { + dis.dispatch({ action: "view_invite", roomId }); + }} + > + {_t("Invite to just this room")} + } +
; + } else if (room.canInvite(cli.getUserId())) { + buttons =
+ { + dis.dispatch({ action: "view_invite", roomId }); + }} + > {_t("Invite to this room")} -
+ ; } const avatarUrl = room.currentState.getStateEvents(EventType.RoomAvatar, "")?.getContent()?.url; From 11fbd081f146bce1ce53c07a064300afacf8036f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 15:30:36 +0000 Subject: [PATCH 105/163] Iterate space panel context menu --- .../views/spaces/SpaceTreeLevel.tsx | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx index 83bc2296e7..1b86bb7898 100644 --- a/src/components/views/spaces/SpaceTreeLevel.tsx +++ b/src/components/views/spaces/SpaceTreeLevel.tsx @@ -30,7 +30,12 @@ import IconizedContextMenu, { import {_t} from "../../../languageHandler"; import {ContextMenuTooltipButton} from "../../../accessibility/context_menu/ContextMenuTooltipButton"; import {toRightOf} from "../../structures/ContextMenu"; -import {shouldShowSpaceSettings, showCreateNewRoom, showSpaceSettings} from "../../../utils/space"; +import { + shouldShowSpaceSettings, + showAddExistingRooms, + showCreateNewRoom, + showSpaceSettings, +} from "../../../utils/space"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import {ButtonEvent} from "../elements/AccessibleButton"; import defaultDispatcher from "../../../dispatcher/dispatcher"; @@ -127,7 +132,7 @@ export class SpaceItem extends React.PureComponent { if (this.props.space.getJoinRule() === "public") { const modal = Modal.createTrackedDialog("Space Invite", "User Menu", InfoDialog, { - title: _t("Invite members"), + title: _t("Invite to %(spaceName)s", { spaceName: this.props.space.name }), description: { _t("Share your public space") } modal.close()} /> @@ -170,6 +175,14 @@ export class SpaceItem extends React.PureComponent { this.setState({contextMenuPosition: null}); // also close the menu }; + private onAddExistingRoomClick = (ev: ButtonEvent) => { + ev.preventDefault(); + ev.stopPropagation(); + + showAddExistingRooms(this.context, this.props.space); + this.setState({contextMenuPosition: null}); // also close the menu + }; + private onMembersClick = (ev: ButtonEvent) => { ev.preventDefault(); ev.stopPropagation(); @@ -236,15 +249,20 @@ export class SpaceItem extends React.PureComponent { ; } - let newRoomOption; + let newRoomSection; if (this.props.space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) { - newRoomOption = ( + newRoomSection = - ); + + ; } contextMenu = { label={_t("Explore rooms")} onClick={this.onExploreRoomsClick} /> - { newRoomOption } + { newRoomSection } { leaveSection } ; } From 31dd224cc98c4fc7d44ac1296abe338593ca0751 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 15:36:20 +0000 Subject: [PATCH 106/163] Wire up passing through initialText for room invite dialog helper method --- src/RoomInvite.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/RoomInvite.js b/src/RoomInvite.js index 9ae41b851a..aa758ecbdc 100644 --- a/src/RoomInvite.js +++ b/src/RoomInvite.js @@ -49,11 +49,12 @@ export function showStartChatInviteDialog(initialText) { ); } -export function showRoomInviteDialog(roomId) { +export function showRoomInviteDialog(roomId, initialText = "") { // This dialog handles the room creation internally - we don't need to worry about it. Modal.createTrackedDialog( "Invite Users", "", InviteDialog, { kind: KIND_INVITE, + initialText, roomId, }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true, From d7484607165c32103f5f344d1fea05116c874a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= Date: Tue, 23 Mar 2021 17:02:21 +0000 Subject: [PATCH 107/163] Translated using Weblate (Hungarian) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index e5901ef9a3..ccc871d097 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1953,7 +1953,7 @@ "Accepting…": "Elfogadás…", "Accepting …": "Elfogadás …", "Declining …": "Elutasítás …", - "Verification Requests": "Hitelesítés Kérések", + "Verification Requests": "Hitelesítéskérések", "Your account is not secure": "A fiókod nem biztonságos", "Your password": "A jelszavad", "This session, or the other session": "Ez vagy másik munkamenet", @@ -3079,9 +3079,9 @@ "Setting:": "Beállítás:", "Value in this room": "Érték ebben a szobában", "Value": "Érték", - "Setting ID": "Beállítás azon.", - "Failed to save settings": "A beállítások elmentése nem sikerült", - "Settings Explorer": "Beállítás Böngésző", + "Setting ID": "Beállításazonosító", + "Failed to save settings": "A beállítások mentése sikertelen", + "Settings Explorer": "Beállításböngésző", "Show chat effects (animations when receiving e.g. confetti)": "Csevegés effektek megjelenítése (mint a konfetti animáció)", "Original event source": "Eredeti esemény forráskód", "Decrypted event source": "Visszafejtett esemény forráskód", From efa57e5121e87c26e757eaf15cdf2b8139c791d7 Mon Sep 17 00:00:00 2001 From: Marcelo Filho Date: Tue, 23 Mar 2021 19:37:38 +0000 Subject: [PATCH 108/163] Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.1% (2865 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/ --- src/i18n/strings/pt_BR.json | 75 ++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index f054fa31e6..0ec835362a 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -3037,5 +3037,78 @@ "Delete": "Excluir", "This homeserver has been blocked by it's administrator.": "Este servidor local foi bloqueado pelo seu administrador.", "This homeserver has been blocked by its administrator.": "Este servidor local foi bloqueado pelo seu administrador.", - "You're already in a call with this person.": "Você já está em uma chamada com essa pessoa." + "You're already in a call with this person.": "Você já está em uma chamada com essa pessoa.", + "At the moment only you can see it.": "No momento, só você pode ver.", + "Failed to create initial space rooms": "Falha ao criar salas de espaço iniciais", + "Your private space ": "Seu espaço privado ", + "Your public space ": "Seu espaço público ", + "You have been invited to ": "Você foi convidado para ", + " invited you to ": " convidou você para ", + "%(count)s members|one": "%(count)s integrante", + "%(count)s members|other": "%(count)s integrantes", + "Add existing rooms & spaces": "Adicionar salas & espaços já existentes", + "Accept Invite": "Aceitar o convite", + "Save changes": "Salvar alterações", + "You're in this room": "Você está nesta sala", + "You're in this space": "Você está neste espaço", + "No permissions": "Sem permissões", + "Undo": "Desfazer", + "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please contact your service administrator to continue using the service.": "A sua mensagem não foi enviada porque este servidor local foi bloqueado pelo seu administrador. Entre em contato com o administrador do serviço para continuar usando o serviço.", + "Are you sure you want to leave the space '%(spaceName)s'?": "Tem certeza de que deseja sair desse espaço '%(spaceName)s'?", + "This space is not public. You will not be able to rejoin without an invite.": "Este espaço não é público. Você não poderá entrar novamente sem um convite.", + "Save Changes": "Salvar alterações", + "Saving...": "Salvando...", + "View dev tools": "Ver ferramentas de desenvolvimento", + "Leave space": "Sair desse espaço", + "Leave Space": "Sair desse espaço", + "Make this space private": "Tornar este espaço privado", + "Edit settings relating to your space.": "Editar configurações relacionadas ao seu espaço.", + "Space settings": "Configurações desse espaço", + "Failed to save space settings.": "Falha ao salvar as configurações desse espaço.", + "Invite someone using their name, username (like ) or share this space.": "Convide alguém a partir do nome, nome de usuário (como ) ou compartilhe este espaço.", + "Invite someone using their name, email address, username (like ) or share this space.": "Convide alguém a partir do nome, endereço de e-mail, nome de usuário (como ) ou compartilhe este espaço.", + "Unnamed Space": "Espaço sem nome", + "Invite to %(spaceName)s": "Convidar para %(spaceName)s", + "Failed to add rooms to space": "Falha ao adicionar salas ao espaço", + "Create a new room": "Criar uma nova sala", + "Don't want to add an existing room?": "Não deseja adicionar uma sala já existente?", + "Spaces": "Espaços", + "Filter your rooms and spaces": "Pesquisar suas salas e espaços", + "Add existing spaces/rooms": "Adicionar espaços/salas já existentes", + "Explore space rooms": "Explorar as salas deste espaço", + "You do not have permissions to add rooms to this space": "Você não tem permissão para adicionar salas neste espaço", + "You do not have permissions to create new rooms in this space": "Você não tem permissão para criar novas salas neste espaço", + "Invite to this space": "Convidar para este espaço", + "Your message was sent": "A sua mensagem foi enviada", + "Encrypting your message...": "Criptografando a sua mensagem...", + "Sending your message...": "Enviando a sua mensagem...", + "Spell check dictionaries": "Dicionários de verificação ortográfica", + "Space options": "Opções do espaço", + "New room": "Nova sala", + "Invite people": "Convidar pessoas", + "Share your public space": "Compartilhar o seu espaço público", + "Invite members": "Convidar integrantes", + "Invite by email or username": "Convidar por e-mail ou nome de usuário", + "Share invite link": "Compartilhar link de convite", + "Click to copy": "Clique para copiar", + "Collapse space panel": "Fechar o painel do espaço", + "Expand space panel": "Expandir o painel do espaço", + "You can change these at any point.": "Você pode alterar esses dados a qualquer momento.", + "Give it a photo, name and description to help you identify it.": "Insira uma foto, nome e descrição para ajudar a identificar o espaço.", + "Your private space": "O seu espaço privado", + "Your public space": "O seu espaço público", + "You can change this later": "Você pode mudar isso depois", + "Open space for anyone, best for communities": "Abra espaços para todos, especialmente para comunidades", + "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Espaços são novas formas de agrupar salas e pessoas. Para entrar em um espaço existente, você precisará de um convite", + "Create a space": "Criar um espaço", + "Jump to the bottom of the timeline when you send a message": "Vá para o final da linha do tempo ao enviar uma mensagem", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Protótipo de Espaços. Incompatível com Comunidades, Comunidades v2 e tags personalizadas. Requer um servidor compatível com os recursos necessários.", + "Decrypted event source": "Fonte de evento descriptografada", + "We'll create rooms for each of them. You can add existing rooms after setup.": "Criaremos salas para cada um deles. Você pode adicionar salas já existentes após a configuração.", + "What projects are you working on?": "Em quais projetos você trabalha no momento?", + "We'll create rooms for each topic.": "Nós criaremos salas para cada tópico.", + "Inviting...": "Convidando...", + "Invite by username": "Convidar por nome de usuário", + "Support": "Suporte", + "Original event source": "Fonte do evento original" } From 3a401a31518473f8585edcecb26498d2442a0d7f Mon Sep 17 00:00:00 2001 From: Nikita Epifanov Date: Wed, 24 Mar 2021 05:23:15 +0000 Subject: [PATCH 109/163] Translated using Weblate (Russian) Currently translated at 95.6% (2763 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index e7c8c2b4d7..4cf444ac0e 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -2064,7 +2064,7 @@ "You changed your avatar": "Вы поменяли свой аватар", "%(targetName)s changed their avatar": "%(targetName)s поменял(а) свой аватар", "You changed the room name": "Вы поменяли имя комнаты", - "Enable experimental, compact IRC style layout": "Включите экспериментальный, компактный стиль IRC", + "Enable experimental, compact IRC style layout": "Включить экспериментальный, компактный стиль IRC", "Unknown caller": "Неизвестный абонент", "Incoming call": "Входящий звонок", "Waiting for your other session to verify…": "Ожидание вашей другой сессии для начала подтверждения…", From 3ec45eda6a783000a5e927412e8c90a5c7fdebfd Mon Sep 17 00:00:00 2001 From: RainSlide Date: Wed, 24 Mar 2021 14:08:40 +0000 Subject: [PATCH 110/163] Translated using Weblate (Chinese (Simplified)) Currently translated at 86.4% (2497 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/ --- src/i18n/strings/zh_Hans.json | 243 ++++++++++++++++++++++++++++++---- 1 file changed, 214 insertions(+), 29 deletions(-) diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index a22e600865..d07d6c83b6 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -166,7 +166,7 @@ "New passwords don't match": "两次输入的新密码不符", "not specified": "未指定", "Notifications": "通知", - "(not supported by this browser)": "（未被此浏览器支持）", + "(not supported by this browser)": "（此浏览器不支持）", "": "<不支持>", "No display name": "无昵称", "No results": "没有更多结果", @@ -910,10 +910,10 @@ "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s 将此聊天室对知道此聊天室链接的人公开。", "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s 将此聊天室改为仅限邀请。", "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s 将加入规则改为 %(rule)s", - "%(displayName)s is typing …": "%(displayName)s 正在打字…", - "%(names)s and %(count)s others are typing …|other": "%(names)s 与其他 %(count)s 位正在打字…", - "%(names)s and %(count)s others are typing …|one": "%(names)s 与另一位正在打字…", - "%(names)s and %(lastPerson)s are typing …": "%(names)s 和 %(lastPerson)s正在打字…", + "%(displayName)s is typing …": "%(displayName)s 正在输入…", + "%(names)s and %(count)s others are typing …|other": "%(names)s 与其他 %(count)s 位正在输入…", + "%(names)s and %(count)s others are typing …|one": "%(names)s 与另一位正在输入…", + "%(names)s and %(lastPerson)s are typing …": "%(names)s 和 %(lastPerson)s 正在输入…", "Unrecognised address": "无法识别地址", "User %(user_id)s may or may not exist": "用户 %(user_id)s 不一定存在", "Predictable substitutions like '@' instead of 'a' don't help very much": "可预见的替换如将 '@' 替换为 'a' 并不会有太大效果", @@ -942,7 +942,7 @@ "Short keyboard patterns are easy to guess": "键位短序列很容易被猜到", "Group & filter rooms by custom tags (refresh to apply changes)": "按自定义标签分组和过滤聊天室（刷新以应用更改）", "Render simple counters in room header": "在聊天室标题中显示简单计数", - "Enable Emoji suggestions while typing": "键入时启用表情符号建议", + "Enable Emoji suggestions while typing": "启用实时表情符号建议", "Show a placeholder for removed messages": "已移除的消息显示为一个占位符", "Show join/leave messages (invites/kicks/bans unaffected)": "显示 加入/离开 信息（邀请/踢出/禁止 不受影响）", "Show avatar changes": "显示头像更改", @@ -951,7 +951,7 @@ "Show a reminder to enable Secure Message Recovery in encrypted rooms": "在加密聊天室中显示一条允许恢复安全消息的提醒", "Show avatars in user and room mentions": "在用户和聊天室提及中显示头像", "Enable big emoji in chat": "在聊天中启用大型表情符号", - "Send typing notifications": "发送键入状态通知", + "Send typing notifications": "发送正在输入通知", "Enable Community Filter Panel": "启用社区筛选器面板", "Allow Peer-to-Peer for 1:1 calls": "允许一对一通话使用 P2P", "Prompt before sending invites to potentially invalid matrix IDs": "在发送邀请之前提示可能无效的 Matrix ID", @@ -1259,14 +1259,14 @@ "Alternatively, you can try to use the public server at turn.matrix.org, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "您也可以尝试使用turn.matrix.org公共服务器，但通话质量稍差，并且其将会得知您的 IP。您可以在设置中更改此选项。", "Try using turn.matrix.org": "尝试使用 turn.matrix.org", "Your %(brand)s is misconfigured": "您的 %(brand)s 配置有错误", - "Use Single Sign On to continue": "使用单点登陆继续", - "Confirm adding this email address by using Single Sign On to prove your identity.": "通过使用单点登陆来证明您的身份，并确认添加此邮件地址。", - "Single Sign On": "单点登陆", + "Use Single Sign On to continue": "使用单点登录继续", + "Confirm adding this email address by using Single Sign On to prove your identity.": "通过使用单点登录来证明您的身份，并确认添加此邮件地址。", + "Single Sign On": "单点登录", "Confirm adding email": "确认使用邮件", - "Click the button below to confirm adding this email address.": "点击下面的按钮，添加此邮箱地址。", + "Click the button below to confirm adding this email address.": "点击下面的按钮以确认添加此邮箱地址。", "Confirm adding this phone number by using Single Sign On to prove your identity.": "通过单点登录以证明您的身份，并确认添加此电话号码。", "Confirm adding phone number": "确认添加电话号码", - "Click the button below to confirm adding this phone number.": "点击下面的按钮，确认添加此电话号码。", + "Click the button below to confirm adding this phone number.": "点击下面的按钮以确认添加此电话号码。", "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "是否在触屏设备上使用 %(brand)s", "Whether you're using %(brand)s as an installed Progressive Web App": "您是否已经安装 %(brand)s 作为一种渐进式的 Web 应用", "Your user agent": "您的代理用户", @@ -1282,14 +1282,14 @@ "Verify this session": "验证此会话", "Encryption upgrade available": "提供加密升级", "Set up encryption": "设置加密", - "Review where you’re logged in": "查看您的登陆位置", - "New login. Was this you?": "现在登陆。请问是您本人吗？", - "Name or Matrix ID": "姓名或Matrix账号", + "Review where you’re logged in": "查看您的登录位置", + "New login. Was this you?": "现在登录。请问是您本人吗？", + "Name or Matrix ID": "姓名或 Matrix ID", "Identity server has no terms of service": "身份服务器无服务条款", - "This action requires accessing the default identity server to validate an email address or phone number, but the server does not have any terms of service.": "此操作需要访问默认的身份服务器以验证电子邮件地址或电话号码，但是此服务器无任何服务条款。", + "This action requires accessing the default identity server to validate an email address or phone number, but the server does not have any terms of service.": "此操作需要访问默认的身份服务器 以验证邮箱地址或电话号码，但是此服务器无任何服务条款。", "Only continue if you trust the owner of the server.": "只有您信任服务器所有者才能继续。", "Trust": "信任", - "%(name)s is requesting verification": "%(name)s请求验证", + "%(name)s is requesting verification": "%(name)s 正在请求验证", "Sign In or Create Account": "登录或创建账户", "Use your account or create a new one to continue.": "使用已有账户或创建一个新账户。", "Create Account": "创建账户", @@ -1301,7 +1301,7 @@ "Sends a message as html, without interpreting it as markdown": "以html格式发送消息，而不是markdown", "You do not have the required permissions to use this command.": "您没有权限使用此命令。", "Error upgrading room": "升级聊天室出错", - "Double check that your server supports the room version chosen and try again.": "再次检查您的服务器是否支持所选聊天室版本，然后重试。", + "Double check that your server supports the room version chosen and try again.": "请再次检查您的服务器是否支持所选聊天室版本，然后再试一次。", "Changes the avatar of the current room": "更改当前聊天室头像", "Changes your avatar in this current room only": "仅改变您在当前聊天室的头像", "Changes your avatar in all rooms": "改变您在所有聊天室的头像", @@ -1351,14 +1351,14 @@ "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s 创建了因为%(reason)s而禁止用户匹配%(glob)s的规则", "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止聊天室匹配%(glob)s的规则", "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止服务器匹配%(glob)s的规则", - "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止匹配%(glob)s的股则", + "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止匹配%(glob)s的规则", "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 更改了一个由于%(reason)s而禁止用户%(oldGlob)s跟%(newGlob)s匹配的规则", "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s更改了一个由于%(reason)s而禁止聊天室%(oldGlob)s跟%(newGlob)s匹配的规则", "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 更新了一个由于%(reason)s而禁止服务器%(oldGlob)s跟%(newGlob)s匹配的规则", "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 更新了一个由于%(reason)s而禁止%(oldGlob)s跟%(newGlob)s匹配的规则", - "You signed in to a new session without verifying it:": "您登陆了未经过验证的新会话：", + "You signed in to a new session without verifying it:": "您登录了未经过验证的新会话：", "Verify your other session using one of the options below.": "使用以下选项之一验证您的其他会话。", - "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s(%(userId)s)登陆到未验证的新会话：", + "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s(%(userId)s)登录到未验证的新会话：", "Ask this user to verify their session, or manually verify it below.": "要求该用户验证其会话，或在下面手动进行验证。", "Not Trusted": "不可信任", "Manually Verify by Text": "手动验证文字", @@ -1404,7 +1404,7 @@ "about a day from now": "从现在开始约一天", "%(num)s days from now": "从现在开始%(num)s天", "%(name)s (%(userId)s)": "%(name)s%(userId)s", - "Your browser does not support the required cryptography extensions": "您的浏览器不支持必需的加密插件", + "Your browser does not support the required cryptography extensions": "您的浏览器不支持所需的密码学扩展", "The user's homeserver does not support the version of the room.": "用户的主服务器不支持该聊天室版本。", "Help us improve %(brand)s": "请协助我们改进%(brand)s", "Send anonymous usage data which helps us improve %(brand)s. This will use a cookie.": "发送匿名使用情况数据，以协助我们改进%(brand)s。这将使用cookie。", @@ -1666,7 +1666,7 @@ "Enable advanced debugging for the room list": "为此聊天室列表启用高级调试", "Show info about bridges in room settings": "在聊天室设置中显示桥接信息", "Use a more compact ‘Modern’ layout": "使用更紧凑的「现代」布局", - "Show typing notifications": "显示输入通知", + "Show typing notifications": "显示正在输入通知", "Show shortcuts to recently viewed rooms above the room list": "在聊天室列表上方显示最近浏览过的聊天室的快捷方式", "Show hidden events in timeline": "显示时间线中的隐藏事件", "Low bandwidth mode": "低带宽模式", @@ -2416,17 +2416,17 @@ "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s 为此聊天室设置了服务器 ACL。", "Hong Kong": "香港", "Cook Islands": "库克群岛", - "Congo - Kinshasa": "刚果金", - "Congo - Brazzaville": "刚果布拉柴维尔", + "Congo - Kinshasa": "刚果 - 金沙萨", + "Congo - Brazzaville": "刚果 - 布拉柴维尔", "Comoros": "科摩罗", "Colombia": "哥伦比亚", - "Cocos (Keeling) Islands": "科科斯基林群岛", + "Cocos (Keeling) Islands": "科科斯（基林）群岛", "Christmas Island": "圣诞岛", "China": "中国", "Chile": "智利", "Chad": "乍得", "Central African Republic": "中非共和国", - "Cayman Islands": "开曼群岛(英)", + "Cayman Islands": "开曼群岛", "Caribbean Netherlands": "荷兰加勒比区", "Cape Verde": "佛得角", "Canada": "加拿大", @@ -2472,7 +2472,7 @@ "United States": "美国", "United Kingdom": "英国", "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "您的主服务器已拒绝您的登入尝试。请重试。如果此情况持续发生，请联系您的主服务器管理员。", - "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "您的主服务器不可达，无法使您登入。请重试。如果此情况持续发生，请联系您的主服务器管理员。", + "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "无法访问您的主服务器，因而无法登入。请重试。如果此情况持续发生，请联系您的主服务器管理员。", "Try again": "重试", "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "我们已要求浏览器记住您使用的主服务器，但不幸的是您的浏览器已忘记。请前往登录页面重试。", "We couldn't log you in": "我们无法使您登入", @@ -2555,5 +2555,190 @@ "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "在纯文字信息前添加 ┬──┬ ノ( ゜-゜ノ)", "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "在纯文字信息前添加 (╯°□°）╯︵ ┻━┻", "You're already in a call with this person.": "您与此人已处在通话中。", - "Already in call": "已在通话中" + "Already in call": "已在通话中", + "Navigate composer history": "浏览编辑区历史", + "Go to Home View": "转到主视图", + "Search (must be enabled)": "搜索（必须启用）", + "Your Security Key": "您的安全密钥", + "Use Security Key": "使用安全密钥", + "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s 或 %(usernamePassword)s", + "User settings": "用户设置", + "Creating rooms...": "正在创建聊天室…", + "Room name": "聊天室名称", + "Random": "随机", + "%(count)s members|one": "%(count)s 位成员", + "%(count)s members|other": "%(count)s 位成员", + "Default Rooms": "默认聊天室", + "Accept Invite": "接受邀请", + "Manage rooms": "管理聊天室", + "Save changes": "保存修改", + "Remove from Space": "从空间中移除", + "Undo": "撤销", + "Welcome %(name)s": "欢迎 %(name)s", + "Create community": "创建社区", + "Forgot password?": "忘记密码？", + "Enter Security Key": "输入安全密钥", + "Invalid Security Key": "安全密钥无效", + "Wrong Security Key": "安全密钥错误", + "Save Changes": "保存修改", + "Saving...": "正在保存…", + "View dev tools": "查看开发者工具", + "Leave Space": "离开空间", + "Space settings": "空间设置", + "Learn more": "了解更多", + "Other homeserver": "其他主服务器", + "Specify a homeserver": "指定主服务器", + "Transfer": "传输", + "Unnamed Space": "未命名空间", + "Cookie Policy": "Cookie 政策", + "Privacy Policy": "隐私政策", + "Abort": "放弃", + "Send feedback": "发送反馈", + "Report a bug": "反馈问题", + "Edit Values": "编辑值", + "Value:": "值：", + "Setting definition:": "设置定义：", + "Caution:": "警告：", + "Setting:": "设置：", + "Value": "值", + "Setting ID": "设置 ID", + "Enter name": "输入名称", + "Community ID: +:%(domain)s": "社区 ID：+:%(domain)s", + "Reason (optional)": "理由（可选）", + "Show": "显示", + "Apply": "应用", + "Applying...": "正在应用…", + "Create a new room": "创建新聊天室", + "Spaces": "空间", + "Continue with %(provider)s": "使用 %(provider)s 继续", + "Homeserver": "主服务器", + "Server Options": "服务器选项", + "Information": "信息", + "Windows": "窗口", + "Screens": "屏幕", + "Share your screen": "共享屏幕", + "Role": "角色", + "Not encrypted": "未加密", + "Unpin": "取消置顶", + "Empty room": "空聊天室", + "Add existing room": "添加现有的聊天室", + "Open dial pad": "打开拨号键盘", + "Start a Conversation": "开始对话", + "Show Widgets": "显示小挂件", + "Hide Widgets": "隐藏小挂件", + "%(displayName)s created this room.": "%(displayName)s 创建了此聊天室。", + "You created this room.": "你创建了此聊天室。", + "Remove messages sent by others": "移除其他人的消息", + "Sending your message...": "正在发送消息…", + "Encrypting your message...": "正在加密消息…", + "Send message": "发送消息", + "Invite to this space": "邀请至此空间", + "Your message was sent": "消息已发送", + "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "请使用您的帐户数据备份加密密钥，以免您无法访问您的会话。密钥将通过一个唯一的安全密钥进行保护。", + "Spell check dictionaries": "拼写检查字典", + "Failed to save your profile": "个人资料保存失败", + "The operation could not be completed": "操作无法完成", + "Space options": "空间选项", + "Space Home": "空间首页", + "New room": "新建聊天室", + "Leave space": "离开空间", + "Share your public space": "分享你的公共空间", + "Collapse space panel": "收起空间面板", + "Expand space panel": "展开空间面板", + "Create a space": "创建空间", + "Fill Screen": "填充屏幕", + "sends snowfall": "发送雪球", + "Sends the given message with snowfall": "附加雪球发送", + "sends confetti": "发送五彩纸屑", + "Sends the given message with confetti": "附加五彩纸屑发送", + "Sends the given message with fireworks": "附加烟火发送", + "sends fireworks": "发送烟火", + "Offline encrypted messaging using dehydrated devices": "需要离线设备（dehydrated devices）的加密消息离线传递", + "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "正在开发的空间功能的原型。与社区、社区 V2 和自定义标签功能不兼容。需要主服务器兼容才能使用某些功能。", + "The %(capability)s capability": "%(capability)s 容量", + "%(senderName)s has updated the widget layout": "%(senderName)s 已更新小挂件布局", + "Support": "支持", + "Your server does not support showing space hierarchies.": "您的服务器不支持显示空间层次结构。", + "This version of %(brand)s does not support searching encrypted messages": "当前版本的 %(brand)s 不支持搜索加密消息", + "This version of %(brand)s does not support viewing some encrypted files": "当前版本的 %(brand)s 不支持查看某些加密文件", + "Effects": "效果", + "Pakistan": "巴基斯坦", + "United Arab Emirates": "阿拉伯联合酋长国", + "Yemen": "也门", + "Ukraine": "乌克兰", + "Turkmenistan": "土库曼斯坦", + "Uganda": "乌干达", + "Turkey": "土耳其", + "U.S. Virgin Islands": "美属维尔京群岛", + "Taiwan": "台湾", + "Sweden": "瑞典", + "Spain": "西班牙", + "South Korea": "韩国", + "South Africa": "南非", + "Russia": "俄罗斯", + "Romania": "罗马尼亚", + "Philippines": "菲律宾", + "North Korea": "朝鲜", + "Norway": "挪威", + "New Zealand": "新西兰", + "Netherlands": "荷兰", + "Mexico": "墨西哥", + "Malaysia": "马来西亚", + "Macau": "澳门", + "Luxembourg": "卢森堡", + "Lebanon": "黎巴嫩", + "Lithuania": "立陶宛", + "Latvia": "拉脱维亚", + "Liechtenstein": "列支敦士登", + "Laos": "老挝", + "Libya": "利比亚", + "Liberia": "利比里亚", + "Japan": "日本", + "Jamaica": "牙买加", + "Italy": "意大利", + "Israel": "以色列", + "Ireland": "爱尔兰", + "Iraq": "伊拉克", + "Indonesia": "印度尼西亚", + "India": "印度", + "Iceland": "冰岛", + "Iran": "伊朗", + "Guatemala": "危地马拉", + "Guam": "关岛", + "Guadeloupe": "瓜德罗普", + "Grenada": "格林纳达", + "Greenland": "格陵兰", + "Greece": "希腊", + "Gibraltar": "直布罗陀", + "Ghana": "加纳", + "Germany": "德国", + "Georgia": "格鲁吉亚", + "Gambia": "冈比亚", + "Gabon": "加蓬", + "French Southern Territories": "法属南部领地", + "French Polynesia": "法属波利尼西亚", + "French Guiana": "法属圭亚那", + "France": "法国", + "Finland": "芬兰", + "Fiji": "斐济", + "Faroe Islands": "法罗群岛", + "Falkland Islands": "福克兰群岛", + "Ethiopia": "埃塞俄比亚", + "Estonia": "爱沙尼亚", + "Eritrea": "厄立特里亚", + "Equatorial Guinea": "赤道几内亚", + "El Salvador": "萨尔瓦多", + "Egypt": "埃及", + "Ecuador": "厄瓜多尔", + "Dominican Republic": "多明尼加共和国", + "Dominica": "多米尼加", + "Djibouti": "吉布提", + "Denmark": "丹麦", + "Côte d’Ivoire": "科特迪瓦", + "Czech Republic": "捷克共和国", + "Cyprus": "塞浦路斯", + "Curaçao": "库拉索", + "Cuba": "古巴", + "Croatia": "克罗地亚", + "Costa Rica": "哥斯达黎加" } From 563403cee81f14506d8e101238f3bd128468099f Mon Sep 17 00:00:00 2001 From: RainSlide Date: Wed, 24 Mar 2021 13:18:58 +0000 Subject: [PATCH 111/163] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index e7d94be8e2..3a4e346761 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -2742,7 +2742,7 @@ "Gibraltar": "直布羅陀", "Ghana": "迦納", "Germany": "德國", - "Georgia": "喬治亞", + "Georgia": "格魯吉亞", "Gambia": "甘比亞", "Gabon": "加彭", "French Southern Territories": "法屬南部領地", @@ -2760,11 +2760,11 @@ "El Salvador": "薩爾瓦多", "Egypt": "埃及", "Ecuador": "厄瓜多", - "Dominican Republic": "多明尼加", + "Dominican Republic": "多明尼加共和國", "Dominica": "多米尼克", "Djibouti": "吉布地", "Denmark": "丹麥", - "Côte d’Ivoire": "象牙海岸", + "Côte d’Ivoire": "科特迪瓦", "Czech Republic": "捷克", "Cyprus": "賽普勒斯", "Curaçao": "古拉索", From af0b4ef41083a71b7872cf5b2ae83c87ac303be6 Mon Sep 17 00:00:00 2001 From: BinotaLIU Date: Sun, 21 Mar 2021 20:27:53 +0000 Subject: [PATCH 112/163] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 3a4e346761..6932b1ba9a 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -25,7 +25,7 @@ "Click here to fix": "點擊這里修復", "Confirm password": "確認密碼", "Continue": "繼續", - "Create Room": "創建聊天室", + "Create Room": "建立聊天室", "Cryptography": "加密", "Current password": "當前密碼", "/ddg is not a command": "/ddg 不是一個命令", @@ -109,7 +109,7 @@ "Someone": "某人", "Submit": "提交", "Success": "成功", - "This email address is already in use": "這個電子郵件地址已被使用", + "This email address is already in use": "該電子郵件位址已被使用", "This email address was not found": "未找到此電子郵件地址", "The email address linked to your account must be entered.": "必須輸入和你帳號關聯的電子郵件地址。", "Unable to add email address": "無法新增電郵地址", @@ -259,7 +259,7 @@ "This room has no local addresses": "此房間沒有本機地址", "This room is not recognised.": "此聊天室不被認可。", "This doesn't appear to be a valid email address": "這似乎不是有效的電子郵件地址", - "This phone number is already in use": "這個電話號碼已在使用中", + "This phone number is already in use": "該電話號碼已被使用", "This room": "此房間", "This room is not accessible by remote Matrix servers": "此房間無法被遠端的 Matrix 伺服器存取", "To use it, just wait for autocomplete results to load and tab through them.": "要使用它，只要等待自動完成的結果載入並在它們上面按 Tab。", @@ -625,7 +625,7 @@ "Room Notification": "聊天室通知", "The information being sent to us to help make %(brand)s better includes:": "傳送給我們以協助改進 %(brand)s 的資訊包含了：", "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "這個頁面包含了可識別的資訊，如聊天室、使用者或群組 ID，這些資料會在傳到伺服器前被刪除。", - "The platform you're on": "您使用的平臺是", + "The platform you're on": "您使用的平台是", "The version of %(brand)s": "%(brand)s 版本", "Your language of choice": "您選擇的語言", "Which officially provided instance you are using, if any": "您正在使用的任何官方實體，如果有的話", @@ -1520,8 +1520,8 @@ "Create a private room": "建立私人聊天室", "Topic (optional)": "主題（選擇性）", "Make this room public": "讓聊天室公開", - "Hide advanced": "隱藏進階的", - "Show advanced": "顯示進階的", + "Hide advanced": "隱藏進階", + "Show advanced": "顯示進階", "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "阻擋其他 matrix 伺服器上的使用加入此聊天室（此設定無法在之後變更！）", "Close dialog": "關閉對話框", "To continue you need to accept the terms of this service.": "要繼續，您必須同意本服務的條款。", @@ -1543,7 +1543,7 @@ "Click the link in the email you received to verify and then click continue again.": "點擊您收到的電子郵件中的連結以驗證然後再次點擊繼續。", "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "您將要移除 %(user)s 的 1 則訊息。這無法復原。您想要繼續嗎？", "Remove %(count)s messages|one": "移除 1 則訊息", - "Add Email Address": "新增電子郵件地址", + "Add Email Address": "新增電子郵件位址", "Add Phone Number": "新增電話號碼", "%(creator)s created and configured the room.": "%(creator)s 建立並設定了聊天室。", "You should remove your personal data from identity server before disconnecting. Unfortunately, identity server is currently offline or cannot be reached.": "您應該在斷線前從身份識別伺服器 上移除您的個人資料。不幸的是，身份識別伺服器 目前離線中或無法連線。", @@ -1847,7 +1847,7 @@ "Bridges": "橋接", "This user has not verified all of their sessions.": "此使用者尚未驗證他們的所有工作階段。", "You have verified this user. This user has verified all of their sessions.": "您已驗證此使用者。此使用者已驗證他們所有的工作階段。", - "Someone is using an unknown session": "某人正仔使用未知的工作階段", + "Someone is using an unknown session": "某人正在使用未知的工作階段", "Your key share request has been sent - please check your other sessions for key share requests.": "您的金鑰分享請求已傳送，請檢查您其他的工作階段以取得金鑰分享請求。", "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "金鑰分享請求已自動傳送到您其他的工作階段。如果您在您其他的工作階段上拒絕或忽略金鑰分享請求，點擊此處以再此請求此工作階段的金鑰。", "If your other sessions do not have the key for this message you will not be able to decrypt them.": "如果您的其他工作階段沒有此訊息的金鑰，您就無法解密它們。", @@ -2079,11 +2079,11 @@ "Sends a message as html, without interpreting it as markdown": "以 html 形式傳送訊息，不將其翻譯為 markdown", "Cancel replying to a message": "取消回覆訊息", "Sign in with SSO": "使用單一登入系統登入", - "Use Single Sign On to continue": "使用單一登入繼續", - "Confirm adding this email address by using Single Sign On to prove your identity.": "透過使用單一登入來證明您的身份以確認新增此電子郵件地址。", + "Use Single Sign On to continue": "使用單一登入來繼續", + "Confirm adding this email address by using Single Sign On to prove your identity.": "使用單一登入來證明身份，以確認新增該電子郵件位址。", "Single Sign On": "單一登入", "Confirm adding email": "確任新增電子郵件", - "Click the button below to confirm adding this email address.": "點擊下方按鈕以確認新增此電子郵件地址。", + "Click the button below to confirm adding this email address.": "點擊下方按鈕以確認新增此電子郵件位址。", "Confirm adding this phone number by using Single Sign On to prove your identity.": "透過使用單一登入來證明您的身份以確認新增此電話號碼。", "Confirm adding phone number": "確任新增電話號碼", "Click the button below to confirm adding this phone number.": "點擊下方按鈕以確認新增此電話號碼。", From 1f489662fb9d61e6ac81ca35c2b17f5b913d5a8b Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Mon, 22 Mar 2021 20:31:02 +0000 Subject: [PATCH 113/163] Translated using Weblate (Czech) Currently translated at 100.0% (2889 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/ --- src/i18n/strings/cs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index 90941ced30..0efb3df22a 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -50,7 +50,7 @@ "unknown error code": "neznámý kód chyby", "OK": "OK", "Failed to forget room %(errCode)s": "Nepodařilo se zapomenout místnost %(errCode)s", - "Dismiss": "Zahodit", + "Dismiss": "Zavřít", "powered by Matrix": "používá protokol Matrix", "Custom Server Options": "Vlastní nastavení serveru", "Add a widget": "Přidat widget", From 8e33e0343dcc1a064a36ca0b38cad9157380578d Mon Sep 17 00:00:00 2001 From: Graeme Power Date: Mon, 22 Mar 2021 17:44:49 +0000 Subject: [PATCH 114/163] Translated using Weblate (Irish) Currently translated at 23.2% (671 of 2889 strings) Translation: Element Web/matrix-react-sdk Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/ --- src/i18n/strings/ga.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json index 4580e538ce..c98107b767 100644 --- a/src/i18n/strings/ga.json +++ b/src/i18n/strings/ga.json @@ -3,7 +3,7 @@ "Signing In...": "ag Síniú Isteach…", "Sign in": "Sínigh Isteach", "Already have an account? Sign in here": "An bhfuil cuntas agat cheana? Sínigh isteach anseo", - "Show less": "Taispeái níos lú", + "Show less": "Taispeáin níos lú", "Show more": "Taispeáin níos mó", "Show %(count)s more|one": "Taispeáin %(count)s níos mó", "Show %(count)s more|other": "Taispeáin %(count)s níos mó", @@ -662,5 +662,14 @@ "Dismiss": "Cuir uait", "Use Single Sign On to continue": "Lean ar aghaidh le SSO", "This phone number is already in use": "Úsáidtear an uimhir ghutháin seo chean féin", - "This email address is already in use": "Úsáidtear an seoladh ríomhphoist seo chean féin" + "This email address is already in use": "Úsáidtear an seoladh ríomhphoist seo chean féin", + "Sign out and remove encryption keys?": "Sínigh amach agus scrios eochracha criptiúcháin?", + "Clear Storage and Sign Out": "Scrios Stóras agus Sínigh Amach", + "You're signed out": "Tá tú sínithe amach", + "Sign out": "Sínigh amach", + "Are you sure you want to sign out?": "An bhfuil tú cinnte go dteastaíonn uait sínigh amach?", + "Signed Out": "Sínithe Amach", + "Unable to query for supported registration methods.": "Ní féidir iarratas a dhéanamh faoi modhanna cláraithe tacaithe.", + "Host account on": "Óstáil cuntas ar", + "Create account": "Déan cuntas a chruthú" } From f340b8f7edfb339cf4c168bdeaf5e73c27d273b4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 16:42:21 +0000 Subject: [PATCH 115/163] Set invite PL requirement for public spaces to 0 explicitly --- src/components/views/spaces/SpaceCreateMenu.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx index 6269de1c50..9ee6edc489 100644 --- a/src/components/views/spaces/SpaceCreateMenu.tsx +++ b/src/components/views/spaces/SpaceCreateMenu.tsx @@ -88,6 +88,7 @@ const SpaceCreateMenu = ({ onFinished }) => { power_level_content_override: { // Only allow Admins to write to the timeline to prevent hidden sync spam events_default: 100, + ...Visibility.Public ? { invite: 0 } : {}, }, }, spinner: false, From 56dbd5f628713816cfdc7773716b41dc5bcb6eb5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 16:45:53 +0000 Subject: [PATCH 116/163] Remove unused autoJoin prop and move viaServers logic into RVS this fixes the issue where autoJoining ignored viaServers --- src/components/structures/LoggedInView.tsx | 6 ------ src/components/structures/MatrixChat.tsx | 2 -- src/components/structures/RoomView.tsx | 10 ++-------- src/stores/RoomViewStore.tsx | 5 ++++- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index 60a2bf4ada..20a3b811c5 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -74,7 +74,6 @@ function canElementReceiveInput(el) { interface IProps { matrixClient: MatrixClient; onRegistered: (credentials: IMatrixClientCreds) => Promise; - viaServers?: string[]; hideToSRUsers: boolean; resizeNotifier: ResizeNotifier; // eslint-disable-next-line camelcase @@ -143,9 +142,6 @@ class LoggedInView extends React.Component { // transitioned to PWLU) onRegistered: PropTypes.func, - // Used by the RoomView to handle joining rooms - viaServers: PropTypes.arrayOf(PropTypes.string), - // and lots and lots of other stuff. }; @@ -625,11 +621,9 @@ class LoggedInView extends React.Component { case PageTypes.RoomView: pageElement = { page_type: PageTypes.RoomView, threepidInvite: roomInfo.threepid_invite, roomOobData: roomInfo.oob_data, - viaServers: roomInfo.via_servers, ready: true, roomJustCreatedOpts: roomInfo.justCreatedOpts, }, () => { diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 706cd5ded8..8a9c7cabd9 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -112,10 +112,6 @@ interface IProps { inviterName?: string; }; - // Servers the RoomView can use to try and assist joins - viaServers?: string[]; - - autoJoin?: boolean; resizeNotifier: ResizeNotifier; justCreatedOpts?: IOpts; @@ -450,9 +446,7 @@ export default class RoomView extends React.Component { // now not joined because the js-sdk peeking API will clobber our historical room, // making it impossible to indicate a newly joined room. if (!joining && roomId) { - if (this.props.autoJoin) { - this.onJoinButtonClicked(); - } else if (!room && shouldPeek) { + if (!room && shouldPeek) { console.info("Attempting to peek into room %s", roomId); this.setState({ peekLoading: true, @@ -1123,7 +1117,7 @@ export default class RoomView extends React.Component { const signUrl = this.props.threepidInvite?.signUrl; dis.dispatch({ action: 'join_room', - opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers }, + opts: { inviteSignUrl: signUrl }, _type: "unknown", // TODO: instrumentation }); return Promise.resolve(); diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx index f4c0c1b15c..601c77cdf3 100644 --- a/src/stores/RoomViewStore.tsx +++ b/src/stores/RoomViewStore.tsx @@ -273,7 +273,10 @@ class RoomViewStore extends Store { const cli = MatrixClientPeg.get(); const address = this.state.roomAlias || this.state.roomId; try { - await retry(() => cli.joinRoom(address, payload.opts), NUM_JOIN_RETRY, (err) => { + await retry(() => cli.joinRoom(address, { + viaServers: payload.via_servers, + ...payload.opts, + }), NUM_JOIN_RETRY, (err) => { // if we received a Gateway timeout then retry return err.httpStatus === 504; }); From d9f3e70b0bf165ff809d05e4294557cf6ea7ded5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 16:46:30 +0000 Subject: [PATCH 117/163] Fix joining over federation from Space Home (via servers) --- src/components/structures/SpaceRoomView.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 16028f0975..06b4fe5983 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -258,20 +258,26 @@ const SpaceLanding = ({ space }) => { ; } - const [loading, roomsMap, relations, numRooms] = useAsyncMemo(async () => { + const [loading, roomsMap, relations, viaMap, numRooms] = useAsyncMemo(async () => { try { const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join"); const parentChildRelations = new EnhancedMap>(); + const viaMap = new EnhancedMap>(); data.events.map((ev: ISpaceSummaryEvent) => { if (ev.type === EventType.SpaceChild) { parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev); } + + if (Array.isArray(ev.content["via"])) { + const set = viaMap.getOrCreate(ev.state_key, new Set()); + ev.content["via"].forEach(via => set.add(via)); + } }); const roomsMap = new Map(data.rooms.map(r => [r.room_id, r])); const numRooms = data.rooms.filter(r => r.room_type !== RoomType.Space).length; - return [false, roomsMap, parentChildRelations, numRooms]; + return [false, roomsMap, parentChildRelations, viaMap, numRooms]; } catch (e) { console.error(e); // TODO } @@ -292,7 +298,7 @@ const SpaceLanding = ({ space }) => { relations={relations} parents={new Set()} onViewRoomClick={(roomId, autoJoin) => { - showRoom(roomsMap.get(roomId), [], autoJoin); + showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), autoJoin); }} /> ; From 6d9496cc224fbfe23c29800b9fe24aadc7e14906 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 17:02:12 +0000 Subject: [PATCH 118/163] Consolidate space summary api logic between space room view and directory --- .../structures/SpaceRoomDirectory.tsx | 51 +++++++++++-------- src/components/structures/SpaceRoomView.tsx | 43 +++++----------- 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx index 877a4283f1..0dfb33379d 100644 --- a/src/components/structures/SpaceRoomDirectory.tsx +++ b/src/components/structures/SpaceRoomDirectory.tsx @@ -15,7 +15,8 @@ limitations under the License. */ import React, {useMemo, useState} from "react"; -import Room from "matrix-js-sdk/src/models/room"; +import {Room} from "matrix-js-sdk/src/models/room"; +import {MatrixClient} from "matrix-js-sdk/src/client"; import {EventType, RoomType} from "matrix-js-sdk/src/@types/event"; import classNames from "classnames"; import {sortBy} from "lodash"; @@ -232,7 +233,7 @@ export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoi interface IHierarchyLevelProps { spaceId: string; rooms: Map; - relations: EnhancedMap>; + relations: Map>; parents: Set; selectedMap?: Map>; onViewRoomClick(roomId: string, autoJoin: boolean): void; @@ -308,23 +309,15 @@ export const HierarchyLevel = ({ }; -const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinished }) => { +// mutate argument refreshToken to force a reload +export const useSpaceSummary = (cli: MatrixClient, space: Room, refreshToken?: any): [ + ISpaceSummaryRoom[], + Map>, + Map>, + Map>, +] | [] => { // TODO pagination - const cli = MatrixClientPeg.get(); - const userId = cli.getUserId(); - const [query, setQuery] = useState(initialText); - - const onCreateRoomClick = () => { - dis.dispatch({ - action: 'view_create_room', - public: true, - }); - onFinished(); - }; - - const [selected, setSelected] = useState(new Map>()); // Map> - - const [rooms, parentChildMap, childParentMap, viaMap] = useAsyncMemo(async () => { + return useAsyncMemo(async () => { try { const data = await cli.getSpaceSummary(space.roomId); @@ -342,13 +335,31 @@ const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinis } }); - return [data.rooms as ISpaceSummaryRoom[], parentChildRelations, childParentRelations, viaMap]; + return [data.rooms as ISpaceSummaryRoom[], parentChildRelations, viaMap, childParentRelations]; } catch (e) { console.error(e); // TODO } return []; - }, [space], []); + }, [space, refreshToken], []); +}; + +const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinished }) => { + const cli = MatrixClientPeg.get(); + const userId = cli.getUserId(); + const [query, setQuery] = useState(initialText); + + const onCreateRoomClick = () => { + dis.dispatch({ + action: 'view_create_room', + public: true, + }); + onFinished(); + }; + + const [selected, setSelected] = useState(new Map>()); // Map> + + const [rooms, parentChildMap, viaMap, childParentMap] = useSpaceSummary(cli, space); const roomsMap = useMemo(() => { if (!rooms) return null; diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 06b4fe5983..3ef10363b9 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React, {RefObject, useContext, useRef, useState} from "react"; +import React, {RefObject, useContext, useMemo, useRef, useState} from "react"; import {EventType, RoomType} from "matrix-js-sdk/src/@types/event"; import {Room} from "matrix-js-sdk/src/models/room"; import {EventSubscription} from "fbemitter"; @@ -46,7 +46,7 @@ import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanel import {useStateArray} from "../../hooks/useStateArray"; import SpacePublicShare from "../views/spaces/SpacePublicShare"; import {showAddExistingRooms, showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space"; -import {HierarchyLevel, ISpaceSummaryEvent, ISpaceSummaryRoom, showRoom} from "./SpaceRoomDirectory"; +import {HierarchyLevel, ISpaceSummaryEvent, ISpaceSummaryRoom, showRoom, useSpaceSummary} from "./SpaceRoomDirectory"; import {useAsyncMemo} from "../../hooks/useAsyncMemo"; import {EnhancedMap} from "../../utils/maps"; import AutoHideScrollbar from "./AutoHideScrollbar"; @@ -228,7 +228,7 @@ const SpaceLanding = ({ space }) => { const canAddRooms = myMembership === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId); - const [_, forceUpdate] = useStateToggle(false); // TODO + const [refreshToken, forceUpdate] = useStateToggle(false); let addRoomButtons; if (canAddRooms) { @@ -258,32 +258,13 @@ const SpaceLanding = ({ space }) => { ; } - const [loading, roomsMap, relations, viaMap, numRooms] = useAsyncMemo(async () => { - try { - const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join"); - - const parentChildRelations = new EnhancedMap>(); - const viaMap = new EnhancedMap>(); - data.events.map((ev: ISpaceSummaryEvent) => { - if (ev.type === EventType.SpaceChild) { - parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev); - } - - if (Array.isArray(ev.content["via"])) { - const set = viaMap.getOrCreate(ev.state_key, new Set()); - ev.content["via"].forEach(via => set.add(via)); - } - }); - - const roomsMap = new Map(data.rooms.map(r => [r.room_id, r])); - const numRooms = data.rooms.filter(r => r.room_type !== RoomType.Space).length; - return [false, roomsMap, parentChildRelations, viaMap, numRooms]; - } catch (e) { - console.error(e); // TODO - } - - return [false]; - }, [space, _], [true]); + const [rooms, relations, viaMap] = useSpaceSummary(cli, space, refreshToken); + const [roomsMap, numRooms] = useMemo(() => { + if (!rooms) return []; + const roomsMap = new Map(rooms.map(r => [r.room_id, r])); + const numRooms = rooms.filter(r => r.room_type !== RoomType.Space).length; + return [roomsMap, numRooms]; + }, [rooms]); let previewRooms; if (roomsMap) { @@ -302,7 +283,7 @@ const SpaceLanding = ({ space }) => { }} /> ; - } else if (loading) { + } else if (!rooms) { previewRooms = ; } else { previewRooms =

{_t("Your server does not support showing space hierarchies.")}

; @@ -647,6 +628,8 @@ export default class SpaceRoomView extends React.PureComponent { }; private goToFirstRoom = async () => { + // TODO actually go to the first room + const childRooms = SpaceStore.instance.getChildRooms(this.props.space.roomId); if (childRooms.length) { const room = childRooms[0]; From ee5d0d68421f0510d8a084f77954a9869e9e67a4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 24 Mar 2021 17:05:21 +0000 Subject: [PATCH 119/163] Fix alignment bug with space panel on spaces with subspaces in Chrome --- res/css/structures/_SpacePanel.scss | 3 --- src/components/views/spaces/SpaceTreeLevel.tsx | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index ffe67ce6ab..33f4dc0588 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -146,9 +146,6 @@ $activeBorderColor: $secondary-fg-color; .mx_SpaceButton_toggleCollapse { width: $gutterSize; - // negative margin to place it correctly even with the complex - // 4px selection border each space button has when active - margin-right: -4px; height: 20px; mask-position: center; mask-size: 20px; diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx index 1b86bb7898..1da6720eea 100644 --- a/src/components/views/spaces/SpaceTreeLevel.tsx +++ b/src/components/views/spaces/SpaceTreeLevel.tsx @@ -37,7 +37,7 @@ import { showSpaceSettings, } from "../../../utils/space"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; -import {ButtonEvent} from "../elements/AccessibleButton"; +import AccessibleButton, {ButtonEvent} from "../elements/AccessibleButton"; import defaultDispatcher from "../../../dispatcher/dispatcher"; import Modal from "../../../Modal"; import SpacePublicShare from "./SpacePublicShare"; @@ -353,7 +353,7 @@ export class SpaceItem extends React.PureComponent { const avatarSize = isNested ? 24 : 32; const toggleCollapseButton = childSpaces && childSpaces.length ? -