diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index b006fe8c8d..c0b60a3247 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -16,7 +16,7 @@ limitations under the License.
*/
import React from 'react';
import * as sdk from '../../../index';
-import {_t} from '../../../languageHandler';
+import {_t, _td} from '../../../languageHandler';
import PropTypes from 'prop-types';
import dis from '../../../dispatcher/dispatcher';
import EditorModel from '../../../editor/model';
@@ -24,16 +24,18 @@ import {getCaretOffsetAndText} from '../../../editor/dom';
import {htmlSerializeIfNeeded, textSerialize, containsEmote, stripEmoteCommand} from '../../../editor/serialize';
import {findEditableEvent} from '../../../utils/EventUtils';
import {parseEvent} from '../../../editor/deserialize';
-import {PartCreator} from '../../../editor/parts';
+import {CommandPartCreator} from '../../../editor/parts';
import EditorStateTransfer from '../../../utils/EditorStateTransfer';
import classNames from 'classnames';
import {EventStatus} from 'matrix-js-sdk/src/models/event';
import BasicMessageComposer from "./BasicMessageComposer";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {CommandCategories, getCommand} from '../../../SlashCommands';
import {Action} from "../../../dispatcher/actions";
import CountlyAnalytics from "../../../CountlyAnalytics";
import {getKeyBindingsManager, MessageComposerAction} from '../../../KeyBindingsManager';
import {replaceableComponent} from "../../../utils/replaceableComponent";
+import Modal from '../../../Modal';
function _isReply(mxEvent) {
const relatesTo = mxEvent.getContent()["m.relates_to"];
@@ -178,6 +180,22 @@ export default class EditMessageComposer extends React.Component {
dis.fire(Action.FocusComposer);
}
+ _isSlashCommand() {
+ const parts = this.model.parts;
+ const firstPart = parts[0];
+ if (firstPart) {
+ if (firstPart.type === "command" && firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")) {
+ return true;
+ }
+
+ if (firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")
+ && (firstPart.type === "plain" || firstPart.type === "pill-candidate")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
_isContentModified(newContent) {
// if nothing has changed then bail
const oldContent = this.props.editState.getEvent().getContent();
@@ -190,19 +208,112 @@ export default class EditMessageComposer extends React.Component {
return true;
}
- _sendEdit = () => {
+ _getSlashCommand() {
+ const commandText = this.model.parts.reduce((text, part) => {
+ // use mxid to textify user pills in a command
+ if (part.type === "user-pill") {
+ return text + part.resourceId;
+ }
+ return text + part.text;
+ }, "");
+ const {cmd, args} = getCommand(commandText);
+ return [cmd, args, commandText];
+ }
+
+ async _runSlashCommand(cmd, args, roomId) {
+ const result = cmd.run(roomId, args);
+ let messageContent;
+ let error = result.error;
+ if (result.promise) {
+ try {
+ if (cmd.category === CommandCategories.messages) {
+ messageContent = await result.promise;
+ } else {
+ await result.promise;
+ }
+ } catch (err) {
+ error = err;
+ }
+ }
+ if (error) {
+ 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 = !!result.promise;
+ const title = isServerError ? _td("Server error") : _td("Command error");
+
+ let errText;
+ if (typeof error === 'string') {
+ errText = error;
+ } else if (error.message) {
+ errText = error.message;
+ } else {
+ errText = _t("Server unavailable, overloaded, or something else went wrong.");
+ }
+
+ Modal.createTrackedDialog(title, '', ErrorDialog, {
+ title: _t(title),
+ description: errText,
+ });
+ } else {
+ console.log("Command success.");
+ if (messageContent) return messageContent;
+ }
+ }
+
+ _sendEdit = async () => {
const startTime = CountlyAnalytics.getTimestamp();
const editedEvent = this.props.editState.getEvent();
const editContent = createEditContent(this.model, editedEvent);
const newContent = editContent["m.new_content"];
+ let shouldSend = true;
// If content is modified then send an updated event into the room
if (this._isContentModified(newContent)) {
const roomId = editedEvent.getRoomId();
- this._cancelPreviousPendingEdit();
- const prom = this.context.sendMessage(roomId, editContent);
- dis.dispatch({action: "message_sent"});
- CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, true, false, editContent);
+ if (!containsEmote(this.model) && this._isSlashCommand()) {
+ const [cmd, args, commandText] = this._getSlashCommand();
+ if (cmd) {
+ if (cmd.category === CommandCategories.messages) {
+ editContent["m.new_content"] = await this._runSlashCommand(cmd, args, roomId);
+ } else {
+ this._runSlashCommand(cmd, args, roomId);
+ shouldSend = false;
+ }
+ } else {
+ // ask the user if their unknown command should be sent as a message
+ const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+ const {finished} = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
+ title: _t("Unknown Command"),
+ description:
+
+ { _t("Unrecognised command: %(commandText)s", {commandText}) }
+
+
+ { _t("You can use /help to list available commands. " +
+ "Did you mean to send this as a message?", {}, {
+ code: t => { t },
+ }) }
+
+
+ { _t("Hint: Begin your message with // to start it with a slash.", {}, {
+ code: t => { t },
+ }) }
+
+
,
+ button: _t('Send as message'),
+ });
+ const [sendAnyway] = await finished;
+ // if !sendAnyway bail to let the user edit the composer and try again
+ if (!sendAnyway) return;
+ }
+ }
+ if (shouldSend) {
+ this._cancelPreviousPendingEdit();
+ const prom = this.context.sendMessage(roomId, editContent);
+ dis.dispatch({action: "message_sent"});
+ CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, true, false, editContent);
+ }
}
// close the event editing and focus composer
@@ -240,7 +351,7 @@ export default class EditMessageComposer extends React.Component {
_createEditorModel() {
const {editState} = this.props;
const room = this._getRoom();
- const partCreator = new PartCreator(room, this.context);
+ const partCreator = new CommandPartCreator(room, this.context);
let parts;
if (editState.hasEditorState()) {
// if restoring state from a previous editor,
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 593132a283..fbc0e477a1 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -30,6 +30,7 @@ import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
import RoomAvatar from "../avatars/RoomAvatar";
import RoomName from "../elements/RoomName";
import {replaceableComponent} from "../../../utils/replaceableComponent";
+import SettingsStore from "../../../settings/SettingsStore";
const INITIAL_LOAD_NUM_MEMBERS = 30;
const INITIAL_LOAD_NUM_INVITED = 5;
@@ -460,7 +461,7 @@ export default class MemberList extends React.Component {
const chat = CommunityPrototypeStore.instance.getSelectedCommunityGeneralChat();
if (chat && chat.roomId === this.props.roomId) {
inviteButtonText = _t("Invite to this community");
- } else if (room.isSpaceRoom()) {
+ } else if (SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()) {
inviteButtonText = _t("Invite to this space");
}
@@ -492,7 +493,7 @@ export default class MemberList extends React.Component {
let previousPhase = RightPanelPhases.RoomSummary;
// We have no previousPhase for when viewing a MemberList from a Space
let scopeHeader;
- if (room?.isSpaceRoom()) {
+ if (SettingsStore.getValue("feature_spaces") && room?.isSpaceRoom()) {
previousPhase = undefined;
scopeHeader =
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index a155e1b5cd..fdf38784cf 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -539,6 +539,7 @@ export default class RoomList extends React.PureComponent
{
onResize={this.props.onResize}
showSkeleton={showSkeleton}
extraTiles={extraTiles}
+ resizeNotifier={this.props.resizeNotifier}
alwaysVisible={ALWAYS_VISIBLE_TAGS.includes(orderedTagId)}
/>
});
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index fb367349a2..dd80e9d40a 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -44,6 +44,7 @@ import { ActionPayload } from "../../../dispatcher/payloads";
import { Enable, Resizable } from "re-resizable";
import { Direction } from "re-resizable/lib/resizer";
import { polyfillTouchEvent } from "../../../@types/polyfill";
+import { ResizeNotifier } from "../../../utils/ResizeNotifier";
import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
import RoomListLayoutStore from "../../../stores/room-list/RoomListLayoutStore";
import { arrayFastClone, arrayHasOrderChange } from "../../../utils/arrays";
@@ -75,7 +76,7 @@ interface IProps {
onResize: () => void;
showSkeleton?: boolean;
alwaysVisible?: boolean;
-
+ resizeNotifier: ResizeNotifier;
extraTiles?: ReactComponentElement[];
// TODO: Account for https://github.com/vector-im/element-web/issues/14179
@@ -528,6 +529,7 @@ export default class RoomSublist extends React.Component {
tiles.push(;
@@ -102,6 +104,9 @@ export default class RoomTile extends React.PureComponent {
};
this.notificationState = RoomNotificationStateStore.instance.getRoomState(this.props.room);
this.roomProps = EchoChamber.forRoom(this.props.room);
+ if (this.props.resizeNotifier) {
+ this.props.resizeNotifier.on("middlePanelResized", this.onResize);
+ }
}
private countUnsentEvents(): number {
@@ -116,6 +121,12 @@ export default class RoomTile extends React.PureComponent {
this.forceUpdate(); // notification state changed - update
};
+ private onResize = () => {
+ if (this.showMessagePreview && !this.state.messagePreview) {
+ this.setState({messagePreview: this.generatePreview()});
+ }
+ };
+
private onLocalEchoUpdated = (ev: MatrixEvent, room: Room) => {
if (!room?.roomId === this.props.room.roomId) return;
this.setState({hasUnsentEvents: this.countUnsentEvents() > 0});
@@ -195,6 +206,9 @@ export default class RoomTile extends React.PureComponent {
);
this.props.room.off("Room.name", this.onRoomNameUpdate);
}
+ if (this.props.resizeNotifier) {
+ this.props.resizeNotifier.off("middlePanelResized", this.onResize);
+ }
ActiveRoomObserver.removeListener(this.props.room.roomId, this.onActiveRoomUpdate);
defaultDispatcher.unregister(this.dispatcherRef);
this.notificationState.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.tsx b/src/components/views/rooms/ThirdPartyMemberInfo.tsx
index 78fdc8b404..792e6ac8f7 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.tsx
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.tsx
@@ -26,6 +26,7 @@ import {isValid3pidInvite} from "../../../RoomInvite";
import RoomAvatar from "../avatars/RoomAvatar";
import RoomName from "../elements/RoomName";
import {replaceableComponent} from "../../../utils/replaceableComponent";
+import SettingsStore from "../../../settings/SettingsStore";
interface IProps {
event: MatrixEvent;
@@ -135,7 +136,7 @@ export default class ThirdPartyMemberInfo extends React.Component
diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index bab95291ba..2102071bf3 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -27,6 +27,10 @@ import LiveRecordingClock from "../voice_messages/LiveRecordingClock";
import {VoiceRecordingStore} from "../../../stores/VoiceRecordingStore";
import {UPDATE_EVENT} from "../../../stores/AsyncStore";
import RecordingPlayback from "../voice_messages/RecordingPlayback";
+import {MsgType} from "matrix-js-sdk/src/@types/event";
+import Modal from "../../../Modal";
+import ErrorDialog from "../dialogs/ErrorDialog";
+import CallMediaHandler from "../../../CallMediaHandler";
interface IProps {
room: Room;
@@ -64,8 +68,8 @@ export default class VoiceRecordComposerTile extends React.PureComponent Math.round(v * 1024)),
},
+ "org.matrix.msc2516.voice": {}, // No content, this is a rendering hint
});
await this.disposeRecording();
}
@@ -115,16 +116,59 @@ export default class VoiceRecordComposerTile extends React.PureComponent {
- if (ev === RecordingState.EndingSoon) return; // ignore this state: it has no UI purpose here
- this.setState({recordingPhase: ev});
- });
+ // The "microphone access error" dialogs are used a lot, so let's functionify them
+ const accessError = () => {
+ Modal.createTrackedDialog('Microphone Access Error', '', ErrorDialog, {
+ title: _t("Unable to access your microphone"),
+ description: <>
+ {_t(
+ "We were unable to access your microphone. Please check your browser settings and try again.",
+ )}
+ ,
+ });
+ };
- this.setState({recorder, recordingPhase: RecordingState.Started});
+ // Do a sanity test to ensure we're about to grab a valid microphone reference. Things might
+ // change between this and recording, but at least we will have tried.
+ try {
+ const devices = await CallMediaHandler.getDevices();
+ if (!devices?.['audioinput']?.length) {
+ Modal.createTrackedDialog('No Microphone Error', '', ErrorDialog, {
+ title: _t("No microphone found"),
+ description: <>
+ {_t(
+ "We didn't find a microphone on your device. Please check your settings and try again.",
+ )}
+ ,
+ });
+ return;
+ }
+ // else we probably have a device that is good enough
+ } catch (e) {
+ console.error("Error getting devices: ", e);
+ accessError();
+ return;
+ }
+
+ try {
+ const recorder = VoiceRecordingStore.instance.startRecording();
+ await recorder.start();
+
+ // We don't need to remove the listener: the recorder will clean that up for us.
+ recorder.on(UPDATE_EVENT, (ev: RecordingState) => {
+ if (ev === RecordingState.EndingSoon) return; // ignore this state: it has no UI purpose here
+ this.setState({recordingPhase: ev});
+ });
+
+ this.setState({recorder, recordingPhase: RecordingState.Started});
+ } catch (e) {
+ console.error("Error starting recording: ", e);
+ accessError();
+
+ // noinspection ES6MissingAwait - if this goes wrong we don't want it to affect the call stack
+ VoiceRecordingStore.instance.disposeRecording();
+ }
};
private renderWaveformArea(): ReactNode {
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index a009ead064..3fa0be478c 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -18,6 +18,7 @@ import React from 'react';
import {_t, getCurrentLanguage} from "../../../../../languageHandler";
import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
import AccessibleButton from "../../../elements/AccessibleButton";
+import AccessibleTooltipButton from '../../../elements/AccessibleTooltipButton';
import SdkConfig from "../../../../../SdkConfig";
import createRoom from "../../../../../createRoom";
import Modal from "../../../../../Modal";
@@ -26,6 +27,9 @@ import PlatformPeg from "../../../../../PlatformPeg";
import * as KeyboardShortcuts from "../../../../../accessibility/KeyboardShortcuts";
import UpdateCheckButton from "../../UpdateCheckButton";
import { replaceableComponent } from "../../../../../utils/replaceableComponent";
+import { copyPlaintext } from "../../../../../utils/strings";
+import * as ContextMenu from "../../../../structures/ContextMenu";
+import { toRightOf } from "../../../../structures/ContextMenu";
interface IProps {
closeSettingsFn: () => {};
@@ -38,6 +42,8 @@ interface IState {
@replaceableComponent("views.settings.tabs.user.HelpUserSettingsTab")
export default class HelpUserSettingsTab extends React.Component {
+ protected closeCopiedTooltip: () => void;
+
constructor(props) {
super(props);
@@ -56,6 +62,12 @@ export default class HelpUserSettingsTab extends React.Component
});
}
+ componentWillUnmount() {
+ // if the Copied tooltip is open then get rid of it, there are ways to close the modal which wouldn't close
+ // the tooltip otherwise, such as pressing Escape
+ if (this.closeCopiedTooltip) this.closeCopiedTooltip();
+ }
+
private onClearCacheAndReload = (e) => {
if (!PlatformPeg.get()) return;
@@ -153,6 +165,20 @@ export default class HelpUserSettingsTab extends React.Component
);
}
+ onAccessTokenCopyClick = async (e) => {
+ e.preventDefault();
+ const target = e.target; // copy target before we go async and React throws it away
+
+ const successful = await copyPlaintext(MatrixClientPeg.get().getAccessToken());
+ const buttonRect = target.getBoundingClientRect();
+ const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
+ const {close} = ContextMenu.createMenu(GenericTextContextMenu, {
+ ...toRightOf(buttonRect, 2),
+ message: successful ? _t('Copied!') : _t('Failed to copy'),
+ });
+ this.closeCopiedTooltip = target.onmouseleave = close;
+ }
+
render() {
const brand = SdkConfig.get().brand;
@@ -269,12 +295,20 @@ export default class HelpUserSettingsTab extends React.Component
{_t("Homeserver is")}
{MatrixClientPeg.get().getHomeserverUrl()}
{_t("Identity Server is")}
{MatrixClientPeg.get().getIdentityServerUrl()}
- {_t("Access Token:") + ' '}
-
- <{ _t("click to reveal") }>
-
+
+
+ {_t("Access Token")}
+ {_t("Your access token gives full access to your account."
+ + " Do not share it with anyone." )}
+
+
{MatrixClientPeg.get().getAccessToken()}
+
+
{_t("Clear cache and reload")}
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index 36ab423885..411b0f9b5e 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -26,13 +26,11 @@ import {SpaceItem} from "./SpaceTreeLevel";
import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
import {useEventEmitter} from "../../../hooks/useEventEmitter";
import SpaceStore, {
- HOME_SPACE,
UPDATE_INVITED_SPACES,
UPDATE_SELECTED_SPACE,
UPDATE_TOP_LEVEL_SPACES,
} from "../../../stores/SpaceStore";
import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import {SpaceNotificationState} from "../../../stores/notifications/SpaceNotificationState";
import NotificationBadge from "../rooms/NotificationBadge";
import {
RovingAccessibleButton,
@@ -40,13 +38,15 @@ import {
RovingTabIndexProvider,
} from "../../../accessibility/RovingTabIndex";
import {Key} from "../../../Keyboard";
+import {RoomNotificationStateStore} from "../../../stores/notifications/RoomNotificationStateStore";
+import {NotificationState} from "../../../stores/notifications/NotificationState";
interface IButtonProps {
space?: Room;
className?: string;
selected?: boolean;
tooltip?: string;
- notificationState?: SpaceNotificationState;
+ notificationState?: NotificationState;
isNarrow?: boolean;
onClick(): void;
}
@@ -212,8 +212,8 @@ const SpacePanel = () => {
className="mx_SpaceButton_home"
onClick={() => SpaceStore.instance.setActiveSpace(null)}
selected={!activeSpace}
- tooltip={_t("Home")}
- notificationState={SpaceStore.instance.getNotificationState(HOME_SPACE)}
+ tooltip={_t("All rooms")}
+ notificationState={RoomNotificationStateStore.instance.globalState}
isNarrow={isPanelCollapsed}
/>
{ invites.map(s => {
const isActive = activeSpaces.includes(space);
const itemClasses = classNames({
"mx_SpaceItem": true,
+ "mx_SpaceItem_narrow": isNarrow,
"collapsed": collapsed,
"hasSubSpaces": childSpaces && childSpaces.length,
});
+
+ const isInvite = space.getMyMembership() === "invite";
const classes = classNames("mx_SpaceButton", {
mx_SpaceButton_active: isActive,
mx_SpaceButton_hasMenuOpen: !!this.state.contextMenuPosition,
mx_SpaceButton_narrow: isNarrow,
+ mx_SpaceButton_invite: isInvite,
});
- const notificationState = space.getMyMembership() === "invite"
+ const notificationState = isInvite
? StaticNotificationState.forSymbol("!", NotificationColor.Red)
: SpaceStore.instance.getNotificationState(space.roomId);
diff --git a/src/components/views/voice_messages/LiveRecordingWaveform.tsx b/src/components/views/voice_messages/LiveRecordingWaveform.tsx
index e7c34c9177..aab89f6ab1 100644
--- a/src/components/views/voice_messages/LiveRecordingWaveform.tsx
+++ b/src/components/views/voice_messages/LiveRecordingWaveform.tsx
@@ -15,12 +15,11 @@ limitations under the License.
*/
import React from "react";
-import {IRecordingUpdate, VoiceRecording} from "../../../voice/VoiceRecording";
+import {IRecordingUpdate, RECORDING_PLAYBACK_SAMPLES, VoiceRecording} from "../../../voice/VoiceRecording";
import {replaceableComponent} from "../../../utils/replaceableComponent";
import {arrayFastResample, arraySeed} from "../../../utils/arrays";
import {percentageOf} from "../../../utils/numbers";
import Waveform from "./Waveform";
-import {PLAYBACK_WAVEFORM_SAMPLES} from "../../../voice/Playback";
interface IProps {
recorder: VoiceRecording;
@@ -38,14 +37,14 @@ export default class LiveRecordingWaveform extends React.PureComponent {
// The waveform and the downsample target are pretty close, so we should be fine to
// do this, despite the docs on arrayFastResample.
- const bars = arrayFastResample(Array.from(update.waveform), PLAYBACK_WAVEFORM_SAMPLES);
+ const bars = arrayFastResample(Array.from(update.waveform), RECORDING_PLAYBACK_SAMPLES);
this.setState({
// The incoming data is between zero and one, but typically even screaming into a
// microphone won't send you over 0.6, so we artificially adjust the gain for the
diff --git a/src/components/views/voip/AudioFeed.tsx b/src/components/views/voip/AudioFeed.tsx
new file mode 100644
index 0000000000..c78f0c0fc8
--- /dev/null
+++ b/src/components/views/voip/AudioFeed.tsx
@@ -0,0 +1,97 @@
+/*
+Copyright 2021 Šimon Brandner
+
+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 React, {createRef} from 'react';
+import { CallFeed, CallFeedEvent } from 'matrix-js-sdk/src/webrtc/callFeed';
+import { logger } from 'matrix-js-sdk/src/logger';
+import CallMediaHandler from "../../../CallMediaHandler";
+
+interface IProps {
+ feed: CallFeed,
+}
+
+export default class AudioFeed extends React.Component {
+ private element = createRef();
+
+ componentDidMount() {
+ this.props.feed.addListener(CallFeedEvent.NewStream, this.onNewStream);
+ this.playMedia();
+ }
+
+ componentWillUnmount() {
+ this.props.feed.removeListener(CallFeedEvent.NewStream, this.onNewStream);
+ this.stopMedia();
+ }
+
+ private playMedia() {
+ const element = this.element.current;
+ const audioOutput = CallMediaHandler.getAudioOutput();
+
+ if (audioOutput) {
+ try {
+ // This seems quite unreliable in Chrome, although I haven't yet managed to make a jsfiddle where
+ // it fails.
+ // It seems reliable if you set the sink ID after setting the srcObject and then set the sink ID
+ // back to the default after the call is over - Dave
+ element.setSinkId(audioOutput);
+ } catch (e) {
+ console.error("Couldn't set requested audio output device: using default", e);
+ logger.warn("Couldn't set requested audio output device: using default", e);
+ }
+ }
+
+ element.muted = false;
+ element.srcObject = this.props.feed.stream;
+ element.autoplay = true;
+
+ try {
+ // A note on calling methods on media elements:
+ // We used to have queues per media element to serialise all calls on those elements.
+ // The reason given for this was that load() and play() were racing. However, we now
+ // never call load() explicitly so this seems unnecessary. However, serialising every
+ // operation was causing bugs where video would not resume because some play command
+ // had got stuck and all media operations were queued up behind it. If necessary, we
+ // should serialise the ones that need to be serialised but then be able to interrupt
+ // them with another load() which will cancel the pending one, but since we don't call
+ // load() explicitly, it shouldn't be a problem. - Dave
+ element.play()
+ } catch (e) {
+ logger.info("Failed to play media element with feed", this.props.feed, e);
+ }
+ }
+
+ private stopMedia() {
+ const element = this.element.current;
+
+ element.pause();
+ element.src = null;
+
+ // As per comment in componentDidMount, setting the sink ID back to the
+ // default once the call is over makes setSinkId work reliably. - Dave
+ // Since we are not using the same element anymore, the above doesn't
+ // seem to be necessary - Šimon
+ }
+
+ private onNewStream = () => {
+ this.playMedia();
+ };
+
+ render() {
+ return (
+
+ );
+ }
+}
diff --git a/src/components/views/voip/AudioFeedArrayForCall.tsx b/src/components/views/voip/AudioFeedArrayForCall.tsx
new file mode 100644
index 0000000000..bfe232d799
--- /dev/null
+++ b/src/components/views/voip/AudioFeedArrayForCall.tsx
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 Šimon Brandner
+
+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 React from "react";
+import AudioFeed from "./AudioFeed"
+import { CallEvent, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
+import { CallFeed } from "matrix-js-sdk/src/webrtc/callFeed";
+
+interface IProps {
+ call: MatrixCall;
+}
+
+interface IState {
+ feeds: Array;
+}
+
+export default class AudioFeedArrayForCall extends React.Component {
+ constructor(props: IProps) {
+ super(props);
+
+ this.state = {
+ feeds: [],
+ };
+ }
+
+ componentDidMount() {
+ this.props.call.addListener(CallEvent.FeedsChanged, this.onFeedsChanged);
+ }
+
+ componentWillUnmount() {
+ this.props.call.removeListener(CallEvent.FeedsChanged, this.onFeedsChanged);
+ }
+
+ onFeedsChanged = () => {
+ this.setState({
+ feeds: this.props.call.getRemoteFeeds(),
+ });
+ }
+
+ render() {
+ return this.state.feeds.map((feed, i) => {
+ return (
+
+ );
+ });
+ }
+}
diff --git a/src/components/views/voip/CallPreview.tsx b/src/components/views/voip/CallPreview.tsx
index d31afddec9..80fd64a820 100644
--- a/src/components/views/voip/CallPreview.tsx
+++ b/src/components/views/voip/CallPreview.tsx
@@ -19,7 +19,7 @@ import React from 'react';
import CallView from "./CallView";
import RoomViewStore from '../../../stores/RoomViewStore';
-import CallHandler from '../../../CallHandler';
+import CallHandler, { CallHandlerEvent } from '../../../CallHandler';
import dis from '../../../dispatcher/dispatcher';
import { ActionPayload } from '../../../dispatcher/payloads';
import PersistentApp from "../elements/PersistentApp";
@@ -27,7 +27,6 @@ import SettingsStore from "../../../settings/SettingsStore";
import { CallEvent, CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import {replaceableComponent} from "../../../utils/replaceableComponent";
-import { Action } from '../../../dispatcher/actions';
const SHOW_CALL_IN_STATES = [
CallState.Connected,
@@ -110,12 +109,14 @@ export default class CallPreview extends React.Component {
}
public componentDidMount() {
+ CallHandler.sharedInstance().addListener(CallHandlerEvent.CallChangeRoom, this.updateCalls);
this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
this.dispatcherRef = dis.register(this.onAction);
MatrixClientPeg.get().on(CallEvent.RemoteHoldUnhold, this.onCallRemoteHold);
}
public componentWillUnmount() {
+ CallHandler.sharedInstance().removeListener(CallHandlerEvent.CallChangeRoom, this.updateCalls);
MatrixClientPeg.get().removeListener(CallEvent.RemoteHoldUnhold, this.onCallRemoteHold);
if (this.roomStoreToken) {
this.roomStoreToken.remove();
@@ -143,21 +144,24 @@ export default class CallPreview extends React.Component {
switch (payload.action) {
// listen for call state changes to prod the render method, which
// may hide the global CallView if the call it is tracking is dead
- case Action.CallChangeRoom:
case 'call_state': {
- const [primaryCall, secondaryCalls] = getPrimarySecondaryCalls(
- CallHandler.sharedInstance().getAllActiveCallsNotInRoom(this.state.roomId),
- );
-
- this.setState({
- primaryCall: primaryCall,
- secondaryCall: secondaryCalls[0],
- });
+ this.updateCalls();
break;
}
}
};
+ private updateCalls = () => {
+ const [primaryCall, secondaryCalls] = getPrimarySecondaryCalls(
+ CallHandler.sharedInstance().getAllActiveCallsNotInRoom(this.state.roomId),
+ );
+
+ this.setState({
+ primaryCall: primaryCall,
+ secondaryCall: secondaryCalls[0],
+ });
+ };
+
private onCallRemoteHold = () => {
const [primaryCall, secondaryCalls] = getPrimarySecondaryCalls(
CallHandler.sharedInstance().getAllActiveCallsNotInRoom(this.state.roomId),
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index 6745713845..c084dacaa8 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -20,10 +20,9 @@ import dis from '../../../dispatcher/dispatcher';
import CallHandler from '../../../CallHandler';
import {MatrixClientPeg} from '../../../MatrixClientPeg';
import { _t, _td } from '../../../languageHandler';
-import VideoFeed, { VideoFeedType } from "./VideoFeed";
+import VideoFeed from './VideoFeed';
import RoomAvatar from "../avatars/RoomAvatar";
-import { CallState, CallType, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
-import { CallEvent } from 'matrix-js-sdk/src/webrtc/call';
+import { CallState, CallType, MatrixCall, CallEvent } from 'matrix-js-sdk/src/webrtc/call';
import classNames from 'classnames';
import AccessibleButton from '../elements/AccessibleButton';
import {isOnlyCtrlOrCmdKeyEvent, Key} from '../../../Keyboard';
@@ -31,6 +30,7 @@ import {alwaysAboveLeftOf, alwaysAboveRightOf, ChevronFace, ContextMenuButton} f
import CallContextMenu from '../context_menus/CallContextMenu';
import { avatarUrlForMember } from '../../../Avatar';
import DialpadContextMenu from '../context_menus/DialpadContextMenu';
+import { CallFeed } from 'matrix-js-sdk/src/webrtc/callFeed';
import {replaceableComponent} from "../../../utils/replaceableComponent";
interface IProps {
@@ -40,11 +40,11 @@ interface IProps {
// Another ongoing call to display information about
secondaryCall?: MatrixCall,
- // a callback which is called when the content in the callview changes
+ // a callback which is called when the content in the CallView changes
// in a way that is likely to cause a resize.
onResize?: any;
- // Whether this call view is for picture-in-pictue mode
+ // Whether this call view is for picture-in-picture mode
// otherwise, it's the larger call view when viewing the room the call is in.
// This is sort of a proxy for a number of things but we currently have no
// need to control those things separately, so this is simpler.
@@ -60,6 +60,7 @@ interface IState {
controlsVisible: boolean,
showMoreMenu: boolean,
showDialpad: boolean,
+ feeds: CallFeed[],
}
function getFullScreenElement() {
@@ -115,6 +116,7 @@ export default class CallView extends React.Component {
controlsVisible: true,
showMoreMenu: false,
showDialpad: false,
+ feeds: this.props.call.getFeeds(),
}
this.updateCallListeners(null, this.props.call);
@@ -172,11 +174,13 @@ export default class CallView extends React.Component {
oldCall.removeListener(CallEvent.State, this.onCallState);
oldCall.removeListener(CallEvent.LocalHoldUnhold, this.onCallLocalHoldUnhold);
oldCall.removeListener(CallEvent.RemoteHoldUnhold, this.onCallRemoteHoldUnhold);
+ oldCall.removeListener(CallEvent.FeedsChanged, this.onFeedsChanged);
}
if (newCall) {
newCall.on(CallEvent.State, this.onCallState);
newCall.on(CallEvent.LocalHoldUnhold, this.onCallLocalHoldUnhold);
newCall.on(CallEvent.RemoteHoldUnhold, this.onCallRemoteHoldUnhold);
+ newCall.on(CallEvent.FeedsChanged, this.onFeedsChanged);
}
}
@@ -186,6 +190,10 @@ export default class CallView extends React.Component {
});
};
+ private onFeedsChanged = (newFeeds: Array) => {
+ this.setState({feeds: newFeeds});
+ };
+
private onCallLocalHoldUnhold = () => {
this.setState({
isLocalOnHold: this.props.call.isLocalOnHold(),
@@ -304,7 +312,7 @@ export default class CallView extends React.Component {
}
// we register global shortcuts here, they *must not conflict* with local shortcuts elsewhere or both will fire
- // Note that this assumes we always have a callview on screen at any given time
+ // Note that this assumes we always have a CallView on screen at any given time
// CallHandler would probably be a better place for this
private onNativeKeyDown = ev => {
let handled = false;
@@ -474,6 +482,8 @@ export default class CallView extends React.Component {
{contextMenuButton}
;
+ const avatarSize = this.props.pipMode ? 76 : 160;
+
// The 'content' for the call, ie. the videos for a video call and profile picture
// for voice calls (fills the bg)
let contentView: React.ReactNode;
@@ -524,41 +534,85 @@ export default class CallView extends React.Component
{
- {onHoldBackground}
-
- {localVideoFeed}
- {holdTransferContent}
- {callControls}
-
;
- } else {
- const avatarSize = this.props.pipMode ? 76 : 160;
+ contentView = (
+
+ {onHoldBackground}
+ {holdTransferContent}
+ {callControls}
+
+ );
+ } else {
+ const classes = classNames({
+ mx_CallView_content: true,
+ mx_CallView_voice: true,
+ mx_CallView_voice_hold: isOnHold,
+ });
+
+ contentView =(
+
+
+ {holdTransferContent}
+ {callControls}
+
+ {feeds}
- {holdTransferContent}
+
{_t("Connecting")}
+ {callControls}
+
+ {feeds}
{callControls}
;
}
diff --git a/src/components/views/voip/CallViewForRoom.tsx b/src/components/views/voip/CallViewForRoom.tsx
index 7540dbc8d9..0c785f758d 100644
--- a/src/components/views/voip/CallViewForRoom.tsx
+++ b/src/components/views/voip/CallViewForRoom.tsx
@@ -16,13 +16,12 @@ limitations under the License.
import { CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
import React from 'react';
-import CallHandler from '../../../CallHandler';
+import CallHandler, { CallHandlerEvent } from '../../../CallHandler';
import CallView from './CallView';
import dis from '../../../dispatcher/dispatcher';
import {Resizable} from "re-resizable";
import ResizeNotifier from "../../../utils/ResizeNotifier";
import {replaceableComponent} from "../../../utils/replaceableComponent";
-import { Action } from '../../../dispatcher/actions';
interface IProps {
// What room we should display the call for
@@ -55,25 +54,30 @@ export default class CallViewForRoom extends React.Component {
public componentDidMount() {
this.dispatcherRef = dis.register(this.onAction);
+ CallHandler.sharedInstance().addListener(CallHandlerEvent.CallChangeRoom, this.updateCall);
}
public componentWillUnmount() {
dis.unregister(this.dispatcherRef);
+ CallHandler.sharedInstance().removeListener(CallHandlerEvent.CallChangeRoom, this.updateCall);
}
private onAction = (payload) => {
switch (payload.action) {
- case Action.CallChangeRoom:
case 'call_state': {
- const newCall = this.getCall();
- if (newCall !== this.state.call) {
- this.setState({call: newCall});
- }
+ this.updateCall();
break;
}
}
};
+ private updateCall = () => {
+ const newCall = this.getCall();
+ if (newCall !== this.state.call) {
+ this.setState({call: newCall});
+ }
+ };
+
private getCall(): MatrixCall {
const call = CallHandler.sharedInstance().getCallForRoom(this.props.roomId);
diff --git a/src/components/views/voip/VideoFeed.tsx b/src/components/views/voip/VideoFeed.tsx
index 2981fb6c04..d22fa055ce 100644
--- a/src/components/views/voip/VideoFeed.tsx
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -18,52 +18,102 @@ import classnames from 'classnames';
import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
import React, {createRef} from 'react';
import SettingsStore from "../../../settings/SettingsStore";
+import { CallFeed, CallFeedEvent } from 'matrix-js-sdk/src/webrtc/callFeed';
+import { logger } from 'matrix-js-sdk/src/logger';
+import MemberAvatar from "../avatars/MemberAvatar"
import {replaceableComponent} from "../../../utils/replaceableComponent";
-export enum VideoFeedType {
- Local,
- Remote,
-}
-
interface IProps {
call: MatrixCall,
- type: VideoFeedType,
+ feed: CallFeed,
+
+ // Whether this call view is for picture-in-picture mode
+ // otherwise, it's the larger call view when viewing the room the call is in.
+ // This is sort of a proxy for a number of things but we currently have no
+ // need to control those things separately, so this is simpler.
+ pipMode?: boolean;
// a callback which is called when the video element is resized
// due to a change in video metadata
onResize?: (e: Event) => void,
}
-@replaceableComponent("views.voip.VideoFeed")
-export default class VideoFeed extends React.Component {
- private vid = createRef();
+interface IState {
+ audioMuted: boolean;
+ videoMuted: boolean;
+}
- componentDidMount() {
- this.vid.current.addEventListener('resize', this.onResize);
- this.setVideoElement();
+@replaceableComponent("views.voip.VideoFeed")
+export default class VideoFeed extends React.Component {
+ private element = createRef();
+
+ constructor(props: IProps) {
+ super(props);
+
+ this.state = {
+ audioMuted: this.props.feed.isAudioMuted(),
+ videoMuted: this.props.feed.isVideoMuted(),
+ };
}
- componentDidUpdate(prevProps) {
- if (this.props.call !== prevProps.call) {
- this.setVideoElement();
- }
+ componentDidMount() {
+ this.props.feed.addListener(CallFeedEvent.NewStream, this.onNewStream);
+ this.playMedia();
}
componentWillUnmount() {
- this.vid.current.removeEventListener('resize', this.onResize);
+ this.props.feed.removeListener(CallFeedEvent.NewStream, this.onNewStream);
+ this.element.current?.removeEventListener('resize', this.onResize);
+ this.stopMedia();
}
- private setVideoElement() {
- if (this.props.type === VideoFeedType.Local) {
- this.props.call.setLocalVideoElement(this.vid.current);
- } else {
- this.props.call.setRemoteVideoElement(this.vid.current);
+ private playMedia() {
+ const element = this.element.current;
+ if (!element) return;
+ // We play audio in AudioFeed, not here
+ element.muted = true;
+ element.srcObject = this.props.feed.stream;
+ element.autoplay = true;
+ try {
+ // A note on calling methods on media elements:
+ // We used to have queues per media element to serialise all calls on those elements.
+ // The reason given for this was that load() and play() were racing. However, we now
+ // never call load() explicitly so this seems unnecessary. However, serialising every
+ // operation was causing bugs where video would not resume because some play command
+ // had got stuck and all media operations were queued up behind it. If necessary, we
+ // should serialise the ones that need to be serialised but then be able to interrupt
+ // them with another load() which will cancel the pending one, but since we don't call
+ // load() explicitly, it shouldn't be a problem. - Dave
+ element.play()
+ } catch (e) {
+ logger.info("Failed to play media element with feed", this.props.feed, e);
}
}
- onResize = (e) => {
- if (this.props.onResize) {
+ private stopMedia() {
+ const element = this.element.current;
+ if (!element) return;
+
+ element.pause();
+ element.src = null;
+
+ // As per comment in componentDidMount, setting the sink ID back to the
+ // default once the call is over makes setSinkId work reliably. - Dave
+ // Since we are not using the same element anymore, the above doesn't
+ // seem to be necessary - Šimon
+ }
+
+ private onNewStream = () => {
+ this.setState({
+ audioMuted: this.props.feed.isAudioMuted(),
+ videoMuted: this.props.feed.isVideoMuted(),
+ });
+ this.playMedia();
+ };
+
+ private onResize = (e) => {
+ if (this.props.onResize && !this.props.feed.isLocal()) {
this.props.onResize(e);
}
};
@@ -71,14 +121,33 @@ export default class VideoFeed extends React.Component {
render() {
const videoClasses = {
mx_VideoFeed: true,
- mx_VideoFeed_local: this.props.type === VideoFeedType.Local,
- mx_VideoFeed_remote: this.props.type === VideoFeedType.Remote,
+ mx_VideoFeed_local: this.props.feed.isLocal(),
+ mx_VideoFeed_remote: !this.props.feed.isLocal(),
+ mx_VideoFeed_voice: this.state.videoMuted,
+ mx_VideoFeed_video: !this.state.videoMuted,
mx_VideoFeed_mirror: (
- this.props.type === VideoFeedType.Local &&
+ this.props.feed.isLocal() &&
SettingsStore.getValue('VideoView.flipVideoHorizontally')
),
};
- return ;
+ if (this.state.videoMuted) {
+ const member = this.props.feed.getMember();
+ const avatarSize = this.props.pipMode ? 76 : 160;
+
+ return (
+
+
+
+ );
+ } else {
+ return (
+
+ );
+ }
}
}
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 46c962f160..cd32c3743f 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -114,9 +114,6 @@ export enum Action {
*/
VirtualRoomSupportUpdated = "virtual_room_support_updated",
- // Probably would be better to have a VoIP states in a store and have the store emit changes
- CallChangeRoom = "call_change_room",
-
/**
* Fired when an upload has started. Should be used with UploadStartedPayload.
*/
diff --git a/src/editor/model.ts b/src/editor/model.ts
index 2e70b872e9..f1b6f90957 100644
--- a/src/editor/model.ts
+++ b/src/editor/model.ts
@@ -158,7 +158,7 @@ export default class EditorModel {
}
}
- reset(serializedParts: SerializedPart[], caret: Caret, inputType: string) {
+ reset(serializedParts: SerializedPart[], caret?: Caret, inputType?: string) {
this._parts = serializedParts.map(p => this._partCreator.deserializePart(p));
if (!caret) {
caret = this.getPositionAtEnd();
diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index 02c5d64895..6e3f35371d 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -34,7 +34,7 @@ interface ISerializedPart {
interface ISerializedPillPart {
type: Type.AtRoomPill | Type.RoomPill | Type.UserPill;
text: string;
- resourceId: string;
+ resourceId?: string;
}
export type SerializedPart = ISerializedPart | ISerializedPillPart;
@@ -287,6 +287,14 @@ abstract class PillPart extends BasePart implements IPillPart {
}
}
+ serialize(): ISerializedPillPart {
+ return {
+ type: this.type,
+ text: this.text,
+ resourceId: this.resourceId,
+ };
+ }
+
get canEdit() {
return false;
}
@@ -366,6 +374,13 @@ class AtRoomPillPart extends RoomPillPart {
get type(): IPillPart["type"] {
return Type.AtRoomPill;
}
+
+ serialize(): ISerializedPillPart {
+ return {
+ type: this.type,
+ text: this.text,
+ };
+ }
}
class UserPillPart extends PillPart {
@@ -394,14 +409,6 @@ class UserPillPart extends PillPart {
get className() {
return "mx_UserPill mx_Pill";
}
-
- serialize(): ISerializedPillPart {
- return {
- type: this.type,
- text: this.text,
- resourceId: this.resourceId,
- };
- }
}
class PillCandidatePart extends PlainBasePart implements IPillCandidatePart {
@@ -495,7 +502,7 @@ export class PartCreator {
case Type.PillCandidate:
return this.pillCandidate(part.text);
case Type.RoomPill:
- return this.roomPill(part.text);
+ return this.roomPill(part.resourceId);
case Type.UserPill:
return this.userPill(part.text, part.resourceId);
}
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 7f9ff9341c..8633146420 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -323,7 +323,7 @@
"%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstranil(a) své zobrazované jméno (%(oldDisplayName)s).",
"%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s zrušil(a) pozvání pro uživatele %(targetName)s.",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy, a to od chvíle jejich pozvání.",
- "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy, a to od chvíle jejich vstupu.",
+ "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy od chvíle jejich vstupu.",
"%(senderName)s made future room history visible to all room members.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy.",
"%(senderName)s made future room history visible to anyone.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv pro kohokoliv.",
"%(senderName)s changed the pinned messages for the room.": "%(senderName)s změnil(a) připíchnuté zprávy této místnosti.",
@@ -744,7 +744,7 @@
"e.g. ": "např. ",
"Your device resolution": "Rozlišení obrazovky vašeho zařízení",
"The information being sent to us to help make %(brand)s better includes:": "Abychom mohli %(brand)s zlepšovat, posíláte nám následující informace:",
- "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "V případě, že se na stránce vyskytují identifikační údaje, jako například název místnosti, ID uživatele, místnosti a nebo skupiny, jsou tyto údaje před odesláním na server odstraněny.",
+ "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Pokud tato stránka obsahuje identifikovatelné údaje, například ID místnosti, uživatele nebo skupiny, jsou tyto údaje před odesláním na server odstraněny.",
"Call in Progress": "Probíhající hovor",
"A call is currently being placed!": "Právě probíhá jiný hovor!",
"A call is already in progress!": "Jeden hovor už probíhá!",
@@ -896,7 +896,7 @@
"Prompt before sending invites to potentially invalid matrix IDs": "Potvrdit odeslání pozvánky potenciálně neplatným Matrix ID",
"Show avatar changes": "Zobrazovat změny avatarů",
"Show join/leave messages (invites/kicks/bans unaffected)": "Zobrazovat zprávy o vstupu/opuštění (netýká se pozvánek/vykopnutí/vykázání)",
- "Show a placeholder for removed messages": "Zobrazovat smazané zprávy jako zamazané",
+ "Show a placeholder for removed messages": "Zobrazovat smazané zprávy",
"Show display name changes": "Zobrazovat změny zobrazovaného jména",
"Messages containing my username": "Zprávy obsahující moje uživatelské jméno",
"Messages containing @room": "Zprávy obsahující @room",
@@ -990,7 +990,7 @@
"Straight rows of keys are easy to guess": "Řádky na klávesnici je moc jednoduché uhodnout",
"Short keyboard patterns are easy to guess": "Krátké sekvence kláves je moc jednoduché uhodnout",
"There was an error joining the room": "Při vstupu do místnosti došlo k chybě",
- "Sorry, your homeserver is too old to participate in this room.": "Jejda, váš domovský server je moc zastaralý abyste do této místnosti mohli vstoupit.",
+ "Sorry, your homeserver is too old to participate in this room.": "Omlouváme se, ale váš domovský server je příliš zastaralý pro vstup do této místnosti.",
"Please contact your homeserver administrator.": "Kontaktujte prosím správce domovského serveru.",
"The other party cancelled the verification.": "Druhá strana ověření zrušila.",
"Verified!": "Ověřeno!",
@@ -1130,9 +1130,9 @@
"Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Bez nastavení bezpečného obnovení zpráv přijdete po odhlášení o historii šifrované komunikace.",
"Show a reminder to enable Secure Message Recovery in encrypted rooms": "V šifrovaných konverzacích zobrazovat upozornění na možnost aktivovat bezpečné obnovení zpráv",
"Gets or sets the room topic": "Nastaví nebo zjistí téma místnosti",
- "Forces the current outbound group session in an encrypted room to be discarded": "Zahodí aktuálně používanou kryptografickou session na odchozí zprávy",
+ "Forces the current outbound group session in an encrypted room to be discarded": "Vynutí zahození aktuálně používané relace skupiny v zašifrované místnosti",
"Custom user status messages": "Vlastní statusy",
- "Group & filter rooms by custom tags (refresh to apply changes)": "Skupinkování a filtování místností podle štítků (vyžaduje znovunačtení stránky)",
+ "Group & filter rooms by custom tags (refresh to apply changes)": "Seskupování a filtrování místností podle vlastních štítků (vyžaduje znovunačtení stránky)",
"Render simple counters in room header": "Zobrazovat stavová počítadla v hlavičce místnosti",
"Enable Community Filter Panel": "Povolit panel Filtr skupiny",
"Show developer tools": "Zobrazit nástroje pro vývojáře",
@@ -1205,7 +1205,7 @@
"Remove messages": "Mazat zprávy",
"Notify everyone": "Oznámení pro celou místnost",
"Enable encryption?": "Povolit šifrování?",
- "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. Learn more about encryption.": "Po zapnutí už nelze šifrování v této místnosti vypnout. Zprávy v šifrovaných místnostech mohou číst jenom členové místnosti, server se k obsahu nedostane. Šifrování místností nepodporuje většina botů a propojení. Více informací o šifrování.",
+ "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. Learn more about encryption.": "Po zapnutí již nelze šifrování v této místnosti vypnout. Zprávy v šifrovaných místnostech mohou číst jen členové místnosti, server se k obsahu nedostane. Šifrování místností nepodporuje většina botů a propojení. Více informací o šifrování.",
"Error updating main address": "Nepovedlo se změnit hlavní adresu",
"There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Nastala chyba při pokusu o nastavení hlavní adresy místnosti. Mohl to zakázat server, nebo to může být dočasná chyba.",
"Power level": "Úroveň oprávnění",
@@ -1219,7 +1219,7 @@
"Your Matrix account on %(serverName)s": "Váš účet Matrix na serveru %(serverName)s",
"Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Zda používáte funkci „breadcrumb“ (ikony nad seznamem místností)",
"Replying With Files": "Odpovídání souborem",
- "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Aktuálně nelze odpovědět souborem. Chcete soubor nahrát a poslat bez odpovídání?",
+ "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "V tuto chvíli není možné odpovědět souborem. Chcete tento soubor nahrát bez odpovědi?",
"The file '%(fileName)s' failed to upload.": "Soubor '%(fileName)s' se nepodařilo nahrát.",
"The server does not support the room version specified.": "Server nepodporuje určenou verzi místnosti.",
"Name or Matrix ID": "Jméno nebo Matrix ID",
@@ -1354,12 +1354,12 @@
"Unexpected error resolving identity server configuration": "Chyba při hledání konfigurace serveru identity",
"Use lowercase letters, numbers, dashes and underscores only": "Používejte pouze malá písmena, čísla, pomlčky a podtržítka",
"Cannot reach identity server": "Nelze se připojit k serveru identity",
- "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.": "Můžete se zaregistrovat, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte správce serveru.",
- "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.": "Můžete si změnit heslo, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte správce serveru.",
- "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.": "Můžete se přihlásit, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte správce serveru.",
+ "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.": "Můžete se zaregistrovat, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje i nadále, zkontrolujte svojí konfiguraci nebo kontaktujte správce serveru.",
+ "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.": "Můžete si změnit heslo, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se toto varování zobrazuje i nadále, zkontrolujte svojí konfiguraci nebo kontaktujte správce serveru.",
+ "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.": "Můžete se přihlásit, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje i nadále, zkontrolujte svojí konfiguraci nebo kontaktujte správce serveru.",
"Call failed due to misconfigured server": "Volání selhalo, protože je rozbitá konfigurace serveru",
- "Please ask the administrator of your homeserver (%(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Zeptejte se správce (%(homeserverDomain)s) jestli by nemohl nakonfigurovat server TURN, aby začalo fungoval volání.",
- "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.": "Případně můžete zkusit použít veřejný server turn.matrix.org, což nemusí fungovat tak spolehlivě a řekne to tomu cizímu serveru vaší IP adresu. Můžete to udělat v Nastavení.",
+ "Please ask the administrator of your homeserver (%(homeserverDomain)s) to configure a TURN server in order for calls to work reliably.": "Požádejte správce svého homeserveru (%(homeserverDomain)s) jestli by nemohl nakonfigurovat TURN server, aby volání fungovala spolehlivě.",
+ "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.": "Můžete také zkusit použít veřejný server na adrese turn.matrix.org, ale ten nebude tak spolehlivý a bude sdílet vaši IP adresu s tímto serverem. To můžete spravovat také v Nastavení.",
"Try using turn.matrix.org": "Zkuste použít turn.matrix.org",
"Messages": "Zprávy",
"Actions": "Akce",
@@ -1368,7 +1368,7 @@
"Changes the avatar of the current room": "Změní avatar této místnosti",
"Changes your avatar in all rooms": "Změní váš avatar pro všechny místnosti",
"Use an identity server": "Používat server identit",
- "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Použít server identit k odeslání e-mailové pozvánky. Pokračováním použijete výchozí server identit (%(defaultIdentityServerName)s) nebo ho můžete změnit v Nastavení.",
+ "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "K pozvání e-mailem použijte server identit. Pokračováním použijete výchozí server identit (%(defaultIdentityServerName)s) nebo ho můžete změnit v Nastavení.",
"Use an identity server to invite by email. Manage in Settings.": "Použít server identit na odeslání e-mailové pozvánky. Můžete spravovat v Nastavení.",
"Displays list of commands with usages and descriptions": "Zobrazuje seznam příkazu s popiskem",
"%(senderName)s made no change.": "%(senderName)s neudělal žádnou změnu.",
@@ -1708,7 +1708,7 @@
"Backup has a invalid signature from this user": "Záloha má neplatný podpis od tohoto uživatele",
"Backup has a signature from unknown user with ID %(deviceId)s": "Záloha je podepsaná neznámým uživatelem %(deviceId)s",
"Close preview": "Zavřít náhled",
- "Hide verified sessions": "Schovat ověřené relace",
+ "Hide verified sessions": "Skrýt ověřené relace",
"%(count)s verified sessions|other": "%(count)s ověřených relací",
"%(count)s verified sessions|one": "1 ověřená relace",
"Language Dropdown": "Menu jazyků",
@@ -1721,8 +1721,8 @@
"Unknown (user, session) pair:": "Neznámý pár (uživatel, relace):",
"Session already verified!": "Relace je už ověřená!",
"WARNING: Session already verified, but keys do NOT MATCH!": "VAROVÁNÍ: Relace je už ověřená, ale klíče NEODPOVÍDAJÍ!",
- "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROVÁNÍ: OVĚŘENÍ KLÍČŮ SELHALO! Podpisový klíč pro uživatele %(userId)s a relaci %(deviceId)s je „%(fprint)s“, což neodpovídá klíči „%(fingerprint)s“. Může to znamenat, že je vaše komunikace rušena!",
- "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Zadaný podpisový klíč odpovídá klíči relace %(deviceId)s od uživatele %(userId)s. Relace byla označena za platnou.",
+ "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROVÁNÍ: OVĚŘENÍ KLÍČE SE NEZDAŘILO! Podpisový klíč pro uživatele %(userId)s a relaci %(deviceId)s je „%(fprint)s“, což neodpovídá klíči „%(fingerprint)s“. To by mohlo znamenat, že vaše komunikace je zachycována!",
+ "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Zadaný podpisový klíč odpovídá klíči relace %(deviceId)s od uživatele %(userId)s. Relace byla označena jako ověřená.",
"a few seconds ago": "před pár vteřinami",
"about a minute ago": "před minutou",
"%(num)s minutes ago": "před %(num)s minutami",
@@ -1917,8 +1917,8 @@
"Compare unique emoji": "Porovnejte jedinečnou kombinaci emoji",
"Compare a unique set of emoji if you don't have a camera on either device": "Pokud na žádném zařízení nemáte kameru, porovnejte jedinečnou kombinaci emoji",
"Not Trusted": "Nedůvěryhodné",
- "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) se přihlásil do nové relace a neověřil ji:",
- "Ask this user to verify their session, or manually verify it below.": "Poproste tohoto uživatele aby svojí relaci ověřil a nebo jí níže můžete ověřit manuálně.",
+ "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) se přihlásil do nové relace bez ověření:",
+ "Ask this user to verify their session, or manually verify it below.": "Požádejte tohoto uživatele, aby ověřil svou relaci, nebo jí níže můžete ověřit manuálně.",
"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.": "Relace, kterou se snažíte ověřit, neumožňuje ověření QR kódem ani pomocí emoji, což je to, co %(brand)s podporuje. Zkuste použít jiného klienta.",
"Verify by scanning": "Ověřte naskenováním",
"You declined": "Odmítli jste",
@@ -1936,7 +1936,7 @@
"If disabled, messages from encrypted rooms won't appear in search results.": "Když je to zakázané, zprávy v šifrovaných místnostech se nebudou objevovat ve výsledcích vyhledávání.",
"Disable": "Zakázat",
"%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s si bezpečně uchovává šifrované zprávy lokálně, aby v nich mohl vyhledávat:",
- "Space used:": "Použitý prostor:",
+ "Space used:": "Použité místo:",
"Indexed messages:": "Indexované zprávy:",
"Indexed rooms:": "Indexované místnosti:",
"Message downloading sleep time(ms)": "Čas na stažení zprávy (ms)",
@@ -2032,8 +2032,8 @@
"Could not find user in room": "Nepovedlo se najít uživatele v místnosti",
"Please supply a widget URL or embed code": "Zadejte prosím URL widgetu nebo jeho kód",
"Send a bug report with logs": "Zaslat hlášení o chybě",
- "You signed in to a new session without verifying it:": "Přihlásili jste se do nové relace, ale neoveřili jste ji:",
- "Verify your other session using one of the options below.": "Ověřte ostatní relací jedním z následujících způsobů.",
+ "You signed in to a new session without verifying it:": "Přihlásili jste se do nové relace, aniž byste ji ověřili:",
+ "Verify your other session using one of the options below.": "Ověřte další relaci jedním z následujících způsobů.",
"Click the button below to confirm deleting these sessions.|other": "Zmáčknutím tlačítka potvrdíte smazání těchto relací.",
"Click the button below to confirm deleting these sessions.|one": "Zmáčknutím tlačítka potvrdíte smazání této relace.",
"Delete sessions|other": "Smazat relace",
@@ -2093,7 +2093,7 @@
"Please verify the room ID or address and try again.": "Ověřte prosím, že ID místnosti je správné a zkuste to znovu.",
"Room ID or address of ban list": "ID nebo adresa seznamu zablokovaných",
"Help us improve %(brand)s": "Pomozte nám zlepšovat %(brand)s",
- "Send anonymous usage data which helps us improve %(brand)s. This will use a cookie.": "Zasílat anonymní data o použití aplikace, která nám pomáhají %(brand)s zlepšovat. Bedeme na to používat soubory cookie.",
+ "Send anonymous usage data which helps us improve %(brand)s. This will use a cookie.": "Zasílat anonymní údaje o použití aplikace, která nám pomáhají %(brand)s zlepšovat. K tomu se použije soubor cookie.",
"I want to help": "Chci pomoci",
"Your homeserver has exceeded its user limit.": "Na vašem domovském serveru byl překročen limit počtu uživatelů.",
"Your homeserver has exceeded one of its resource limits.": "Na vašem domovském serveru byl překročen limit systémových požadavků.",
@@ -2166,8 +2166,8 @@
"Signature upload failed": "Podpis se nepodařilo nahrát",
"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.": "Je-li jiná verze programu %(brand)s stále otevřená na jiné kartě, tak ji prosím zavřete, neboť užívání programu %(brand)s stejným hostitelem se zpožděným nahráváním současně povoleným i zakázaným bude působit problémy.",
"Unexpected server error trying to leave the room": "Neočekávaná chyba serveru při odcházení z místnosti",
- "The person who invited you already left the room.": "Uživatel který vás pozval už místnosti není.",
- "The person who invited you already left the room, or their server is offline.": "Uživatel který vás pozvat už odešel z místnosti a nebo je jeho server offline.",
+ "The person who invited you already left the room.": "Uživatel, který vás pozval, již opustil místnost.",
+ "The person who invited you already left the room, or their server is offline.": "Uživatel, který vás pozval, již opustil místnost nebo je jeho server offline.",
"You left the call": "Odešli jste z hovoru",
"%(senderName)s left the call": "%(senderName)s opustil/a hovor",
"Call ended": "Hovor skončil",
@@ -2954,13 +2954,13 @@
"Mobile experience": "Zážitek na mobilních zařízeních",
"Element Web is currently experimental on mobile. The native apps are recommended for most people.": "Element Web je v současné době experimentální na mobilních zařízeních. Nativní aplikace se doporučují pro většinu lidí.",
"Use app for a better experience": "Pro lepší zážitek použijte aplikaci",
- "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web je experimentální na mobilních zařízeních. Pro lepší zážitek a nejnovější funkce použijte naši bezplatnou nativní aplikaci.",
+ "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web je v mobilní verzi experimentální. Chcete-li získat lepší zážitek a nejnovější funkce, použijte naši bezplatnou nativní aplikaci.",
"Use app": "Použijte aplikaci",
"Something went wrong in confirming your identity. Cancel and try again.": "Při ověřování vaší identity se něco pokazilo. Zrušte to a zkuste to znovu.",
- "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.": "Váš domovský server odmítl váš pokus o přihlášení. Může to být způsobeno tím, že věci trvají příliš dlouho. Prosím zkuste to znovu. Pokud to bude pokračovat, obraťte se na správce domovského serveru.",
+ "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.": "Váš domovský server odmítl váš pokus o přihlášení. To může to být způsobeno tím, že vše trvá příliš dlouho. Zkuste to prosím znovu. Pokud tento problém přetrvává, obraťte se na správce domovského serveru.",
"Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Váš domovský server nebyl dosažitelný a nemohl vás přihlásit. Zkuste to prosím znovu. Pokud to bude pokračovat, obraťte se na správce domovského serveru.",
"Try again": "Zkuste to znovu",
- "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.": "Požádali jsme prohlížeč, aby si pamatoval, který domovský server používáte k přihlášení, ale váš prohlížeč to bohužel zapomněl. Přejděte na přihlašovací stránku a zkuste to znovu.",
+ "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.": "Požádali jsme prohlížeč, aby si zapamatoval, který domovský server používáte k přihlášení, ale váš prohlížeč to bohužel zapomněl. Přejděte na přihlašovací stránku a zkuste to znovu.",
"We couldn't log you in": "Nemohli jsme vás přihlásit",
"Show stickers button": "Tlačítko Zobrazit nálepky",
"Windows": "Okna",
@@ -3012,8 +3012,8 @@
"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",
+ "Failed to invite the following users to your space: %(csvUsers)s": "Nepodařilo se pozvat následující uživatele do vašeho prostoru: %(csvUsers)s",
+ "A private space for you and your teammates": "Soukromý prostor 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á",
@@ -3022,7 +3022,7 @@
"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",
+ "Failed to create initial space rooms": "Vytvoření počátečních místností v prostoru se nezdařilo",
"Random": "Náhodný",
"Your private space ": "Váš soukromý space ",
"Your public space ": "Váš veřejný space ",
@@ -3030,9 +3030,9 @@
" 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.",
+ "Your server does not support showing space hierarchies.": "Váš server nepodporuje zobrazování hierarchií prostorů.",
"Default Rooms": "Výchozí místnosti",
- "Add existing rooms & spaces": "Přidat stávající místnosti a spaces",
+ "Add existing rooms & spaces": "Přidat stávající místnosti a prostory",
"Accept Invite": "Přijmout pozvání",
"Find a room...": "Najít místnost...",
"Manage rooms": "Spravovat místnosti",
@@ -3044,68 +3044,68 @@
"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.",
+ "Are you sure you want to leave the space '%(spaceName)s'?": "Opravdu chcete opustit prostor '%(spaceName)s'?",
+ "This space is not public. You will not be able to rejoin without an invite.": "Tento prostor 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",
+ "Leave Space": "Opustit prostor",
+ "Make this space private": "Nastavit tento prostor jako soukromý",
+ "Edit settings relating to your space.": "Upravte nastavení týkající se vašeho prostoru.",
+ "Space settings": "Nastavení prostoru",
+ "Failed to save space settings.": "Nastavení prostoru 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 prostor.",
+ "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 prostor.",
+ "Unnamed Space": "Nejmenovaný prostor",
"Invite to %(spaceName)s": "Pozvat do %(spaceName)s",
- "Failed to add rooms to space": "Nepodařilo se přidat místnosti do space",
+ "Failed to add rooms to space": "Nepodařilo se přidat místnosti do prostoru",
"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",
+ "Spaces": "Prostory",
+ "Filter your rooms and spaces": "Filtrujte své místnosti a prostory",
"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í.",
+ "Space selection": "Výběr prostoru",
+ "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 prostoru, 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",
+ "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 prostoru",
"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",
+ "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 prostoru",
"Send message": "Poslat zprávu",
- "Invite to this space": "Pozvat do tohoto space",
+ "Invite to this space": "Pozvat do tohoto prostoru",
"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 options": "Nastavení prostoru",
"Space Home": "Domov space",
"New room": "Nová místnost",
- "Leave space": "Opusit space",
+ "Leave space": "Opusit prostor",
"Invite people": "Pozvat lidi",
- "Share your public space": "Sdílejte svůj veřejný space",
+ "Share your public space": "Sdílejte svůj veřejný prostor",
"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",
+ "Expand space panel": "Rozbalit panel prostoru",
+ "Collapse space panel": "Sbalit panel prostoru",
"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",
+ "Your private space": "Váš soukromý prostor",
+ "Your public space": "Váš veřejný prostor",
"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",
+ "Open space for anyone, best for communities": "Otevřený prostor pro kohokoli, nejlepší pro komunity",
"Public": "Veřejný",
- "Create a space": "Vytvořit space",
+ "Create a space": "Vytvořit prostor",
"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.",
+ "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototyp prostorů. 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",
@@ -3123,13 +3123,13 @@
"We'll create rooms for each of them. You can add more later too, including already existing ones.": "Pro každého z nich vytvoříme místnost. Později můžete přidat další, včetně již existujících.",
"Let's create a room for each of them. You can add more later too, including already existing ones.": "Vytvořme místnost pro každého z nich. Později můžete přidat i další, včetně již existujících.",
"Make sure the right people have access. You can invite more later.": "Zajistěte přístup pro správné lidi. Další můžete pozvat později.",
- "A private space to organise your rooms": "Soukromý space pro uspořádání vašich místností",
+ "A private space to organise your rooms": "Soukromý prostor pro uspořádání vašich místností",
"Make sure the right people have access to %(name)s": "Zajistěte, aby do %(name)s měli přístup správní lidé",
"Go to my first room": "Jít do mé první místnosti",
"It's just you at the moment, it will be even better with others.": "V tuto chvíli to jste jen vy, s ostatními to bude ještě lepší.",
"Share %(name)s": "Sdílet %(name)s",
- "Private space": "Soukromý space",
- "Public space": "Veřejný space",
+ "Private space": "Soukromý prostor",
+ "Public space": "Veřejný prostor",
" invites you": " vás zve",
"Search names and description": "Prohledat jména a popisy",
"Create room": "Vytvořit místnost",
@@ -3139,10 +3139,10 @@
"Mark as not suggested": "Označit jako nedoporučené",
"Removing...": "Odebírání...",
"Failed to remove some rooms. Try again later": "Odebrání některých místností se nezdařilo. Zkuste to později znovu",
- "%(count)s rooms and 1 space|one": "%(count)s místnost a 1 space",
- "%(count)s rooms and 1 space|other": "%(count)s místností a 1 space",
- "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s místnost a %(numSpaces)s space",
- "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s místností a %(numSpaces)s spaces",
+ "%(count)s rooms and 1 space|one": "%(count)s místnost a 1 prostor",
+ "%(count)s rooms and 1 space|other": "%(count)s místností a 1 prostor",
+ "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s místnost a %(numSpaces)s prostorů",
+ "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s místností a %(numSpaces)s prostorů",
"If you can't find the room you're looking for, ask for an invite or create a new room.": "Pokud nemůžete najít místnost, kterou hledáte, požádejte o pozvánku nebo vytvořte novou místnost.",
"This room is suggested as a good one to join": "Tato místnost je doporučena jako dobrá pro připojení",
"Suggested": "Doporučeno",
@@ -3156,7 +3156,7 @@
"Invite with email or username": "Pozvěte e-mailem nebo uživatelským jménem",
"You can change these anytime.": "Tyto údaje můžete kdykoli změnit.",
"Add some details to help people recognise it.": "Přidejte několik podrobností, aby to lidé lépe rozpoznali.",
- "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 ke stávajícímu space, budete potřebovat pozvánku.",
+ "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Prostory jsou nový způsob, jak seskupovat místnosti a lidi. Chcete-li se připojit ke stávajícímu prostoru, budete potřebovat pozvánku.",
"A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "K vašemu účtu přistupuje nové přihlášení: %(name)s (%(deviceID)s) pomocí %(ip)s",
"From %(deviceName)s (%(deviceId)s) at %(ip)s": "Z %(deviceName)s (%(deviceId)s) pomocí %(ip)s",
"Verify this login to access your encrypted messages and prove to others that this login is really you.": "Ověřte toto přihlášení, abyste získali přístup k šifrovaným zprávám a dokázali ostatním, že jste to opravdu vy.",
@@ -3202,5 +3202,28 @@
"What are some things you want to discuss in %(spaceName)s?": "O kterých tématech chcete diskutovat v %(spaceName)s?",
"Let's create a room for each of them.": "Vytvořme pro každé z nich místnost.",
"Use another login": "Použijte jiné přihlašovací jméno",
- "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Bez ověření nebudete mít přístup ke všem svým zprávám a ostatním se můžete zobrazit jako nedůvěryhodný."
+ "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Bez ověření nebudete mít přístup ke všem svým zprávám a ostatním se můžete zobrazit jako nedůvěryhodný.",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Jste zde jediná osoba. Pokud odejdete, nikdo se v budoucnu nebude moci připojit, včetně vás.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Pokud vše resetujete, začnete bez důvěryhodných relací, bez důvěryhodných uživatelů a možná nebudete moci zobrazit minulé zprávy.",
+ "Only do this if you have no other device to complete verification with.": "Udělejte to, pouze pokud nemáte žádné jiné zařízení, se kterým byste mohli dokončit ověření.",
+ "Reset everything": "Resetovat vše",
+ "Forgotten or lost all recovery methods? Reset all": "Zapomněli nebo ztratili jste všechny metody obnovy? Obnovit vše",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Pokud tak učiníte, nezapomeňte, že žádná z vašich zpráv nebude smazána, ale vyhledávání může být na několik okamžiků zpomaleno během opětovného vytvoření indexu",
+ "View message": "Zobrazit zprávu",
+ "Zoom in": "Přiblížit",
+ "Zoom out": "Oddálit",
+ "%(seconds)ss left": "Zbývá %(seconds)ss",
+ "Change server ACLs": "Změnit seznamy přístupů serveru",
+ "Show options to enable 'Do not disturb' mode": "Zobrazit možnosti pro povolení režimu „Nerušit“",
+ "You can select all or individual messages to retry or delete": "Můžete vybrat všechny nebo jednotlivé zprávy, které chcete zkusit poslat znovu nebo odstranit",
+ "Sending": "Odesílání",
+ "Retry all": "Zkusit všechny znovu",
+ "Delete all": "Smazat všechny",
+ "Some of your messages have not been sent": "Některé z vašich zpráv nebyly odeslány",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s členů včetně %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Včetně %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "Zobrazit jednoho člena",
+ "View all %(count)s members|other": "Zobrazit všech %(count)s členů",
+ "Failed to send": "Odeslání se nezdařilo"
}
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index ca28295c4f..15ce2986da 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -71,7 +71,7 @@
"No rooms to show": "Ingen rum at vise",
"This email address is already in use": "Denne email adresse er allerede i brug",
"This phone number is already in use": "Dette telefonnummer er allerede i brug",
- "Failed to verify email address: make sure you clicked the link in the email": "Kunne ikke bekræfte emailaddressen: vær sikker på at klikke på linket i emailen",
+ "Failed to verify email address: make sure you clicked the link in the email": "Kunne ikke bekræfte emailaddressen: vær sikker på at klikke på linket i e-mailen",
"Call Timeout": "Opkalds Timeout",
"The remote side failed to pick up": "Den anden side tog den ikke",
"Unable to capture screen": "Kunne ikke optage skærm",
@@ -473,9 +473,9 @@
"Show a placeholder for removed messages": "Vis en pladsholder for fjernede beskeder",
"Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Hvorvidt du benytter %(brand)s på en enhed, hvor touch er den primære input-grænseflade",
"Your user agent": "Din user agent",
- "Use Single Sign On to continue": "Brug Single Sign On til at fortsætte",
+ "Use Single Sign On to continue": "Brug engangs login for at fortsætte",
"Confirm adding this email address by using Single Sign On to prove your identity.": "Bekræft tilføjelsen af denne email adresse ved at bruge Single Sign On til at bevise din identitet.",
- "Single Sign On": "Single Sign On",
+ "Single Sign On": "Engangs login",
"Confirm adding email": "Bekræft tilføjelse af email",
"Click the button below to confirm adding this email address.": "Klik på knappen herunder for at bekræfte tilføjelsen af denne email adresse.",
"Confirm": "Bekræft",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9551f00e55..7f0d6a2747 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -47,7 +47,7 @@
"For security, this session has been signed out. Please sign in again.": "Aus Sicherheitsgründen wurde diese Sitzung beendet. Bitte melde dich erneut an.",
"Guests cannot join this room even if explicitly invited.": "Gäste können diesem Raum nicht beitreten, auch wenn sie explizit eingeladen wurden.",
"Hangup": "Auflegen",
- "Homeserver is": "Der Heimserver ist",
+ "Homeserver is": "Dein Heimserver ist",
"Identity Server is": "Der Identitätsserver ist",
"I have verified my email address": "Ich habe meine E-Mail-Adresse verifiziert",
"Import E2E room keys": "E2E-Raumschlüssel importieren",
@@ -78,7 +78,7 @@
"Someone": "Jemand",
"Success": "Erfolg",
"This doesn't appear to be a valid email address": "Dies scheint keine gültige E-Mail-Adresse zu sein",
- "This room is not accessible by remote Matrix servers": "Ferngesteuerte Matrixserver können auf diesen Raum nicht zugreifen",
+ "This room is not accessible by remote Matrix servers": "Dieser Raum ist von Personen auf anderen Matrix-Servern nicht betretbar",
"Admin": "Administrator",
"Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Softwarefehler gestoßen.",
"Labs": "Labor",
@@ -125,7 +125,7 @@
"Sat": "Sa",
"Jan": "Jan",
"Feb": "Feb",
- "Mar": "Mrz",
+ "Mar": "Mär",
"Apr": "Apr",
"May": "Mai",
"Jun": "Jun",
@@ -207,7 +207,7 @@
"Failed to kick": "Rauswurf fehlgeschlagen",
"Failed to mute user": "Stummschalten des Nutzers fehlgeschlagen",
"Failed to reject invite": "Ablehnen der Einladung ist fehlgeschlagen",
- "Failed to set display name": "Anzeigename konnte nicht gesetzt werden",
+ "Failed to set display name": "Anzeigename konnte nicht geändert werden",
"Fill screen": "Fülle Bildschirm",
"Incorrect verification code": "Falscher Verifizierungscode",
"Join Room": "Raum beitreten",
@@ -215,7 +215,7 @@
"not specified": "nicht angegeben",
"No more results": "Keine weiteren Ergebnisse",
"No results": "Keine Ergebnisse",
- "OK": "OK",
+ "OK": "Ok",
"Search": "Suchen",
"Search failed": "Suche ist fehlgeschlagen",
"Server error": "Serverfehler",
@@ -349,7 +349,7 @@
"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",
+ "Accept": "Annehmen",
"Active call (%(roomName)s)": "Aktiver Anruf (%(roomName)s)",
"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.",
@@ -362,7 +362,7 @@
"Incoming video call from %(name)s": "Eingehender Videoanruf von %(name)s",
"Incoming voice call from %(name)s": "Eingehender Sprachanruf von %(name)s",
"Join as voice or video.": "Per Sprachanruf oder Videoanruf beitreten.",
- "Last seen": "Zuletzt gesehen",
+ "Last seen": "Zuletzt gesehen um",
"No display name": "Kein Anzeigename",
"Private Chat": "Privater Chat",
"Public Chat": "Öffentlicher Chat",
@@ -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": "Einige Leute 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": "Einige Leute 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",
@@ -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 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 des Widgets entfernt es für alle in diesem Raum. 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 '=_-./'",
@@ -582,13 +582,13 @@
"Notify the whole room": "Alle im Raum benachrichtigen",
"Room Notification": "Raum-Benachrichtigung",
"These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Diese Räume werden Community-Mitgliedern auf der Community-Seite angezeigt. Community-Mitglieder können diesen Räumen beitreten, indem sie diese anklicken.",
- "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume öffentlich auf der Community-Seite und in der Raum-Liste angezeigt werden?",
+ "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume öffentlich auf der Communityseite und in der Raumliste angezeigt werden?",
"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 für deine Community-Seite
\n\n Nutze die ausführliche Beschreibung, um neuen Mitgliedern diese Community vorzustellen\n oder um wichtige Links bereitzustellen.\n
\n\n Du kannst sogar 'img'-Tags (HTML) verwenden\n
\n",
"Your community hasn't got a Long Description, a HTML page to show to community members.
Click here to open settings and give it one!": "Deine Community hat noch keine ausführliche Beschreibung, d. h. eine HTML-Seite, die Community-Mitgliedern angezeigt wird.
Hier klicken, um die Einstellungen zu öffnen und eine Beschreibung zu erstellen!",
"Enable inline URL previews by default": "URL-Vorschau standardmäßig aktivieren",
"Enable URL previews for this room (only affects you)": "URL-Vorschau für dich in diesem Raum",
"Enable URL previews by default for participants in this room": "URL-Vorschau für Raummitglieder",
- "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.",
+ "Please note you are logging into the %(hs)s server, not matrix.org.": "Du meldest dich gerade am Server von %(hs)s 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 des Raumes standardmäßig deaktiviert.",
"URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder des Raumes standardmäßig aktiviert.",
@@ -647,14 +647,14 @@
"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-IDs und Aliase, die du besucht hast sowie Nutzernamen anderer Nutzer mit denen du schreibst. Sie enthalten keine Nachrichten.",
"Submit debug logs": "Fehlerberichte einreichen",
"Code": "Code",
- "Opens the Developer Tools dialog": "Öffnet die Entwicklerwerkzeuge",
+ "Opens the Developer Tools dialog": "Entwickler-Werkzeuge öffnen",
"Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Von %(displayName)s (%(userName)s) um %(dateTime)s gesehen",
"Unable to join community": "Community konnte nicht betreten werden",
"Unable to leave community": "Community konnte nicht verlassen werden",
"Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Änderungen am Namen und Bild deiner Community werden evtl. erst nach 30 Minuten von anderen Nutzern gesehen werden.",
"Join this community": "Community beitreten",
"Leave this community": "Community verlassen",
- "You don't currently have any stickerpacks enabled": "Du hast aktuell keine Stickerpakete aktiviert",
+ "You don't currently have any stickerpacks enabled": "Keine Stickerpakete aktiviert",
"Hide Stickers": "Sticker ausblenden",
"Show Stickers": "Sticker anzeigen",
"Who can join this community?": "Wer kann dieser Community beitreten?",
@@ -708,7 +708,7 @@
"Messages containing keywords": "Nachrichten mit Schlüsselwörtern",
"Error saving email notification preferences": "Fehler beim Speichern der E-Mail-Benachrichtigungseinstellungen",
"Tuesday": "Dienstag",
- "Enter keywords separated by a comma:": "Schlüsselwörter kommagetrennt eingeben:",
+ "Enter keywords separated by a comma:": "Gib die Schlüsselwörter durch einen Beistrich getrennt ein:",
"Forward Message": "Nachricht weiterleiten",
"You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
"Remove %(name)s from the directory?": "Soll der Raum %(name)s aus dem Verzeichnis entfernt werden?",
@@ -781,7 +781,7 @@
"Thank you!": "Danke!",
"Uploaded on %(date)s by %(user)s": "Hochgeladen: %(date)s von %(user)s",
"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!": "In deinem aktuell verwendeten Browser können Aussehen und Handhabung der Anwendung unter Umständen noch komplett fehlerhaft sein, so dass einige bzw. im Extremfall alle Funktionen nicht zur Verfügung stehen. Du kannst es trotzdem versuchen und fortfahren, bist dabei aber bezüglich aller auftretenden Probleme auf dich allein gestellt!",
- "Checking for an update...": "Nach Aktualisierung suchen...",
+ "Checking for an update...": "Nach Aktualisierungen suchen...",
"Missing roomId.": "Fehlende Raum-ID.",
"Every page you use in the app": "Jede Seite, die du in der App benutzt",
"e.g. ": "z. B. ",
@@ -903,7 +903,7 @@
"Avoid repeated words and characters": "Vermeide wiederholte Worte und Zeichen",
"Avoid sequences": "Vermeide Sätze",
"Avoid recent years": "Vermeide die letzten Jahre",
- "Avoid years that are associated with you": "Vermeide Jahre, die mit dir zusammenhängen",
+ "Avoid years that are associated with you": "Vermeide Jahreszahlen, die mit dir zu tun haben",
"Avoid dates and years that are associated with you": "Vermeide Daten und Jahre, die mit dir in Verbindung stehen",
"Capitalization doesn't help very much": "Großschreibung hilft nicht viel",
"All-uppercase is almost as easy to guess as all-lowercase": "Alles groß zu schreiben ist genauso einfach zu erraten, wie alles klein zu schreiben",
@@ -978,7 +978,7 @@
"%(names)s and %(lastPerson)s are typing …": "%(names)s und %(lastPerson)s tippen…",
"Render simple counters in room header": "Einfache Zähler in Raumkopfzeile anzeigen",
"Enable Emoji suggestions while typing": "Emojivorschläge während Eingabe",
- "Show a placeholder for removed messages": "Zeigt einen Platzhalter für gelöschte Nachrichten an",
+ "Show a placeholder for removed messages": "Platzhalter für gelöschte Nachrichten",
"Show join/leave messages (invites/kicks/bans unaffected)": "Betreten oder Verlassen von Benutzern (ausgen. Einladungen/Rauswürfe/Banne)",
"Show avatar changes": "Avataränderungen anzeigen",
"Show display name changes": "Änderungen von Anzeigenamen",
@@ -1036,7 +1036,7 @@
"%(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'",
- "Group & filter rooms by custom tags (refresh to apply changes)": "Gruppiere und filtere Räume nach eigenen Tags (neu laden um Änderungen zu übernehmen)",
+ "Group & filter rooms by custom tags (refresh to apply changes)": "[Veraltet] Gruppiere und filtere Räume nach eigenen Tags (neu laden um Änderungen zu übernehmen)",
"Unable to find a supported verification method.": "Konnte keine unterstützte Verifikationsmethode finden.",
"Dog": "Hund",
"Cat": "Katze",
@@ -1101,12 +1101,12 @@
"Folder": "Ordner",
"Pin": "Anheften",
"Timeline": "Chatverlauf",
- "Autocomplete delay (ms)": "Verzögerung zur Autovervollständigung (ms)",
+ "Autocomplete delay (ms)": "Verzögerung vor Autovervollständigung (ms)",
"Roles & Permissions": "Rollen und 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 an der Sichtbarkeit des Chatverlaufs gelten nur für zukünftige Nachrichten. Die Sichtbarkeit des existierenden Verlaufs bleibt unverändert.",
"Security & Privacy": "Sicherheit",
"Encryption": "Verschlüsselung",
- "Once enabled, encryption cannot be disabled.": "Sobald aktiviert, kann die Verschlüsselung nicht mehr deaktiviert werden.",
+ "Once enabled, encryption cannot be disabled.": "Sobald du die Verschlüsselung aktivierst, kann du sie nicht mehr deaktivieren.",
"Encrypted": "Verschlüsselt",
"Ignored users": "Blockierte Benutzer",
"Key backup": "Schlüsselsicherung",
@@ -1190,7 +1190,7 @@
"Bulk options": "Sammeloptionen",
"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",
+ "Changes your display nickname in the current room only": "Ändert deinen Anzeigenamen nur für den aktuellen 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.",
@@ -1203,9 +1203,9 @@
"Change room avatar": "Ändere Raumbild",
"Change room name": "Ändere Raumname",
"Change main address for the room": "Ändere Hauptadresse für den Raum",
- "Change history visibility": "Ändere Sichtbarkeit der Historie",
+ "Change history visibility": "Sichtbarkeit des Verlaufs ändern",
"Change permissions": "Ändere Berechtigungen",
- "Change topic": "Ändere das Thema",
+ "Change topic": "Thema ändern",
"Modify widgets": "Widgets bearbeiten",
"Default role": "Standard-Rolle",
"Send messages": "Nachrichten senden",
@@ -1249,7 +1249,7 @@
"Please supply a https:// or http:// widget URL": "Bitte gib eine mit https:// oder http:// beginnende Widget-URL an",
"Sends the given emote coloured as a rainbow": "Zeigt Aktionen in Regenbogenfarben",
"%(senderName)s made no change.": "%(senderName)s hat keine Änderung vorgenommen.",
- "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s hat die Einladung zum Raumbeitritt für %(targetDisplayName)s zurückgezogen.",
+ "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s hat die Einladung für %(targetDisplayName)s zurückgezogen.",
"Cannot reach homeserver": "Der Heimserver ist nicht erreichbar",
"Ensure you have a stable internet connection, or get in touch with the server admin": "Stelle sicher, dass du eine stabile Internetverbindung hast oder wende dich an deinen Serveradministrator",
"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.",
@@ -1446,7 +1446,7 @@
"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 die Protokolldateien.",
- "Notification settings": "Benachrichtigungseinstellungen",
+ "Notification settings": "Benachrichtigungen",
"Help": "Hilf uns",
"Filter": "Filtern",
"Filter rooms…": "Räume filtern…",
@@ -1459,7 +1459,7 @@
"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.",
- "Re-request encryption keys from your other sessions.": "Fordere die Schlüssel aus deinen anderen Sitzungen erneut an.",
+ "Re-request encryption keys from your other sessions.": "Schlüssel aus deinen anderen Sitzungen erneut anfordern.",
"Room %(name)s": "Raum %(name)s",
"Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Ein Aktualisierung dieses Raums deaktiviert die aktuelle Instanz des Raums und erstellt einen aktualisierten Raum mit demselben Namen.",
"%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) hat sich zu einer neuen Sitzung angemeldet, ohne sie zu verifizieren:",
@@ -2028,7 +2028,7 @@
"Doesn't look like a valid email address": "Das sieht nicht nach einer gültigen E-Mail-Adresse aus",
"Enter phone number (required on this homeserver)": "Telefonnummer eingeben (auf diesem Heimserver erforderlich)",
"Doesn't look like a valid phone number": "Das sieht nicht nach einer gültigen Telefonnummer aus",
- "Sign in with SSO": "Mit Single-Sign-On anmelden",
+ "Sign in with SSO": "Einmalanmeldung verwenden",
"Welcome to %(appName)s": "Willkommen bei %(appName)s",
"Send a Direct Message": "Direktnachricht senden",
"Create a Group Chat": "Gruppenchat erstellen",
@@ -2107,7 +2107,7 @@
"Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Problems im Heimserver fehlgeschlagen",
"Failed to re-authenticate": "Erneute Authentifizierung fehlgeschlagen",
"Command Autocomplete": "Autovervollständigung aktivieren",
- "Community Autocomplete": "Community-Auto-Vervollständigung",
+ "Community Autocomplete": "Community-Autovervollständigung",
"DuckDuckGo Results": "DuckDuckGo Ergebnisse",
"Great! This recovery passphrase looks strong enough.": "Super! Diese Wiederherstellungspassphrase sieht stark genug aus.",
"Enter a recovery passphrase": "Gib eine Wiederherstellungspassphrase ein",
@@ -2129,12 +2129,12 @@
"Navigation": "Navigation",
"Calls": "Anrufe",
"Room List": "Raumliste",
- "Autocomplete": "Auto-Vervollständigung",
+ "Autocomplete": "Autovervollständigung",
"Alt": "Alt",
- "Toggle microphone mute": "Schalte Mikrofon stumm/an",
- "Toggle video on/off": "Schalte Video an/aus",
+ "Toggle microphone mute": "Mikrofon an-/ausschalten",
+ "Toggle video on/off": "Video an-/ausschalten",
"Jump to room search": "Zur Raumsuche springen",
- "Close dialog or context menu": "Schließe Dialog oder Kontextmenü",
+ "Close dialog or context menu": "Dialog oder Kontextmenü schließen",
"Cancel autocomplete": "Autovervollständigung deaktivieren",
"Unable to revoke sharing for email address": "Dem Teilen der E-Mail-Adresse kann nicht widerrufen werden",
"Unable to validate homeserver/identity server": "Heimserver/Identitätsserver nicht validierbar",
@@ -2172,13 +2172,13 @@
"Activate selected button": "Ausgewählten Button aktivieren",
"Toggle right panel": "Rechtes Panel ein-/ausblenden",
"Toggle this dialog": "Diesen Dialog ein-/ausblenden",
- "Move autocomplete selection up/down": "Auto-Vervollständigung nach oben/unten verschieben",
+ "Move autocomplete selection up/down": "Autovervollstä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 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",
- "To continue, use Single Sign On to prove your identity.": "Zum Fortfahren, nutze Single Sign-On um deine Identität zu bestätigen.",
+ "To continue, use Single Sign On to prove your identity.": "Zum Fortfahren nutze die Einmalanmeldung um deine Identität zu bestätigen.",
"Confirm to continue": "Bestätige um fortzufahren",
"Click the button below to confirm your identity.": "Klicke den Button unten um deine Identität zu bestätigen.",
"Confirm encryption setup": "Bestätige die Einrichtung der Verschlüsselung",
@@ -2257,8 +2257,8 @@
"Light": "Hell",
"Dark": "Dunkel",
"Use the improved room list (will refresh to apply changes)": "Verwende die verbesserte Raumliste (lädt die Anwendung neu)",
- "Use custom size": "Verwende individuelle Größe",
- "Hey you. You're the best!": "Hey du. Du bist großartig.",
+ "Use custom size": "Andere Schriftgröße verwenden",
+ "Hey you. You're the best!": "Hey du. Du bist großartig!",
"Message layout": "Nachrichtenlayout",
"Compact": "Kompakt",
"Modern": "Modern",
@@ -2421,7 +2421,7 @@
"Download logs": "Protokolle herunterladen",
"Unexpected server error trying to leave the room": "Unerwarteter Serverfehler beim Versuch den Raum zu verlassen",
"Error leaving room": "Fehler beim Verlassen des Raums",
- "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 Prototyp. Benötigt einen kompatiblen Heimserver. Höchst experimentell - mit Vorsicht verwenden.",
+ "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "[Veraltet] Communities v2 Prototyp. Benötigt einen kompatiblen Heimserver. Höchst experimentell - mit Vorsicht verwenden.",
"Explore rooms in %(communityName)s": "Räume in %(communityName)s erkunden",
"Set up Secure Backup": "Schlüsselsicherung einrichten",
"Information": "Information",
@@ -2570,7 +2570,7 @@
"Change the avatar of this room": "Icon von diesem Raum ändern",
"See when the avatar changes in this room": "Sehen, wenn sich das Icon des Raums ä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",
+ "See when the avatar changes in your active room": "Sehen, wenn das Icon in deinem aktiven Raum geändert wird",
"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",
@@ -2597,7 +2597,7 @@
"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",
"Send images as you in this room": "Bilder als du in diesen Raum senden",
- "Send images as you in your active room": "Bilder als du in deinem aktiven Raum senden",
+ "Send images as you in your active room": "Sende Bilder als deine Person in den aktiven Raum.",
"See images posted to this room": "In diesen Raum gesendete Bilder anzeigen",
"See images posted to your active room": "In deinen aktiven Raum gesendete Bilder anzeigen",
"Send videos as you in this room": "Videos als du in diesen Raum senden",
@@ -2621,7 +2621,7 @@
"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 ihr ladet jemanden Neues ein.",
+ "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur ihr beide nehmt an dieser Konversation teil, es sei denn, ihr ladet jemanden 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 ",
@@ -2945,7 +2945,7 @@
"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.": "Du kannst in den benutzerdefinierten Serveroptionen eine andere Heimserver-URL angeben, um dich bei anderen Matrixservern anzumelden.",
"Server Options": "Servereinstellungen",
"No other application is using the webcam": "keine andere Anwendung auf die Webcam zugreift",
- "Permission is granted to use the webcam": "auf die Webcam zugegriffen werden darf",
+ "Permission is granted to use the webcam": "Zugriff auf die Webcam ist gestattet.",
"A microphone and webcam are plugged in and set up correctly": "Mikrofon und Webcam eingesteckt und richtig eingerichtet sind",
"Call failed because no 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. Stelle sicher, dass das Mikrofon richtig eingesteckt und eingerichtet ist.",
"Call failed because no webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen weil nicht auf das Mikrofon oder die Webcam zugegriffen werden konnte. Stelle sicher, dass:",
@@ -2954,7 +2954,7 @@
"Host account on": "Benutzer*innenkonto betreiben an",
"Hold": "Halten",
"Resume": "Fortsetzen",
- "We call the places where you can host your account ‘homeservers’.": "Den Ort, an dem du dein Benutzer*innenkonto betreibst, nennen wir „Heimserver“.",
+ "We call the places where you can host your account ‘homeservers’.": "Den Ort, an dem du dein Konto betreibst, nennen wir „Heimserver“.",
"Invalid URL": "Ungültiger Link",
"Unable to validate homeserver": "Überprüfung des Heimservers nicht möglich",
"%(name)s paused": "%(name)s hat pausiert",
@@ -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 du siehst",
+ "Change which room, message, or user you're viewing": "Ändere den sichtbaren Raum, Nachricht oder Nutzer",
"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.",
@@ -3025,7 +3025,7 @@
"Security Key mismatch": "Nicht übereinstimmende Sicherheitsschlüssel",
"Set my room layout for everyone": "Diese Raumgestaltung 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)",
+ "Search (must be enabled)": "Suchen (muss in den Einstellungen aktiviert sein)",
"Remember this": "Dies merken",
"The widget will verify your user ID, but won't be able to perform actions for you:": "Das Widget überprüft deine Nutzer-ID, kann jedoch keine Aktionen für dich ausführen:",
"Allow this widget to verify your identity": "Erlaube diesem Widget deine Identität zu überprüfen",
@@ -3085,7 +3085,7 @@
"Save changes": "Änderungen speichern",
"Undo": "Rückgängig",
"Save Changes": "Änderungen Speichern",
- "View dev tools": "Entwicklerwerkzeuge anzeigen",
+ "View dev tools": "Entwicklerwerkzeuge",
"Apply": "Anwenden",
"Create a new room": "Neuen Raum erstellen",
"Suggested Rooms": "Vorgeschlagene Räume",
@@ -3094,7 +3094,7 @@
"New room": "Neuer Raum",
"Share invite link": "Einladungslink teilen",
"Click to copy": "Klicken um zu kopieren",
- "Collapse space panel": "Space-Feld zuklappen",
+ "Collapse space panel": "Space-Feld einklappen",
"Expand space panel": "Space-Feld aufklappen",
"Creating...": "Erstelle...",
"You can change these at any point.": "Du kannst diese jederzeit ändern.",
@@ -3161,7 +3161,7 @@
"Invite to %(spaceName)s": "Leute zu %(spaceName)s einladen",
"Spaces": "Spaces",
"Invite People": "Personen einladen",
- "Invite with email or username": "Personen mit E-Mail oder Benutzername einladen",
+ "Invite with email or username": "Personen mit E-Mail oder Benutzernamen einladen",
"You can change these anytime.": "Du kannst diese jederzeit ändern.",
"From %(deviceName)s (%(deviceId)s) at %(ip)s": "Von %(deviceName)s (%(deviceId)s) mit der Adresse %(ip)s",
"A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Neue Anmeldung: %(name)s (%(deviceID)s) mit der IP-Adresse %(ip)s",
@@ -3222,7 +3222,7 @@
"Manage & explore rooms": "Räume entdecken und verwalten",
"unknown person": "unbekannte Person",
"Send and receive voice messages (in development)": "Sprachnachrichten senden und empfangen (in der Entwicklung)",
- "Check your devices": "Überprüfe dein Gerät",
+ "Check your devices": "Überprüfe deine Sitzungen",
"%(deviceId)s from %(ip)s": "%(deviceId)s von %(ip)s",
"This homeserver has been blocked by it's administrator.": "Dieser Heimserver wurde von seiner Administration blockiert.",
"You have unverified logins": "Du hast nicht-bestätigte Anmeldungen",
@@ -3243,8 +3243,44 @@
"Are you sure you wish to abort creation of the host? The process cannot be continued.": "Soll die Host-Erstellung wirklich abgebrochen werden? Dieser Prozess kann nicht wieder fortgesetzt werden.",
"Invite to just this room": "Nur für diesen Raum einladen",
"Consult first": "Konsultiere zuerst",
- "Reset event store?": "Ereigniss-Speicher zurück setzen?",
- "You most likely do not want to reset your event index store": "Es ist wahrscheinlich, dass du den Ereigniss-Index-Speicher nicht zurück setzen möchtest",
+ "Reset event store?": "Ereignisspeicher zurück setzen?",
+ "You most likely do not want to reset your event index store": "Es ist wahrscheinlich, dass du den Ereignis-Indexspeicher nicht zurück setzen möchtest",
"If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "Falls du dies tust, werden keine deiner Nachrichten gelöscht. Allerdings wird die Such-Funktion eine Weile lang schlecht funktionieren, bis der Index wieder hergestellt ist",
- "Reset event store": "Ereignis-Speicher zurück setzen"
+ "Reset event store": "Ereignisspeicher zurück setzen",
+ "Show options to enable 'Do not disturb' mode": "Optionen für den \"Nicht-Stören-Modus\" anzeigen",
+ "You can add more later too, including already existing ones.": "Natürlich kannst du jederzeit weitere Räume hinzufügen.",
+ "Let's create a room for each of them.": "Wir erstellen dir für jedes Thema einen Raum.",
+ "What are some things you want to discuss in %(spaceName)s?": "Welche Themen willst du in %(spaceName)s besprechen?",
+ "Inviting...": "Einladen...",
+ "Failed to create initial space rooms": "Fehler beim Initialisieren des Space",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Du bist hier noch alleine. Wenn du den Space verlässt, ist er für immer verloren (eine lange Zeit).",
+ "Edit settings relating to your space.": "Einstellungen vom Space bearbeiten.",
+ "Please choose a strong password": "Bitte gib ein sicheres Passwort ein",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Wenn du alles zurücksetzt, gehen alle verifizierten Anmeldungen, Benutzer und verschlüsselte Nachrichten verloren.",
+ "Only do this if you have no other device to complete verification with.": "Verwende es nur, wenn du kein Gerät, mit dem du dich verifizieren, kannst bei dir hast.",
+ "Reset everything": "Alles zurücksetzen",
+ "Forgotten or lost all recovery methods? Reset all": "Hast du alle Wiederherstellungsmethoden vergessen? Setze sie hier zurück",
+ "View message": "Nachricht anzeigen",
+ "Zoom in": "Vergrößern",
+ "Zoom out": "Verkleinern",
+ "%(seconds)ss left": "%(seconds)s vergangen",
+ "Change server ACLs": "ACLs des Servers bearbeiten",
+ "Failed to send": "Fehler beim Senden",
+ "View all %(count)s members|other": "Alle %(count)s Mitglieder anzeigen",
+ "View all %(count)s members|one": "Mitglied anzeigen",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "Some of your messages have not been sent": "Einige Nachrichten konnten nicht gesendet werden",
+ "Original event source": "Ursprüngliche Rohdaten",
+ "Decrypted event source": "Entschlüsselte Rohdaten",
+ "Sending": "Senden",
+ "You can select all or individual messages to retry or delete": "Du kannst einzelne oder alle Nachrichten erneut senden oder löschen",
+ "Delete all": "Alle löschen",
+ "Retry all": "Alle erneut senden",
+ "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Ohne deine Verifikation kannst du keine deiner verschlüsselten Nachrichten lesen und andere vertrauen dir möglicherweise nicht.",
+ "Verify your identity to access encrypted messages and prove your identity to others.": "Verifiziere diese Anmeldung, um auf verschlüsselte Nachrichten zuzugreifen und dich anderen gegenüber zu identifizieren.",
+ "Use another login": "Mit anderem Gerät verifizeren",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Falls du es wirklich willst: Es werden keine Nachrichten gelöscht. Außerdem wird die Suche, während der Index erstellt wird, etwas langsamer sein",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s Mitglieder inklusive %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Inklusive%(commaSeparatedMembers)s",
+ "Consulting with %(transferTarget)s. Transfer to %(transferee)s": "Beratung mit %(transferTarget)s. Übertragung zu %(transferee)s"
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5863f2a834..f60770acf6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -833,7 +833,7 @@
"Match system theme": "Match system theme",
"Use a system font": "Use a system font",
"System font name": "System font name",
- "Allow Peer-to-Peer for 1:1 calls": "Allow Peer-to-Peer for 1:1 calls",
+ "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)": "Allow Peer-to-Peer for 1:1 calls (if you enable this, the other party might be able to see your IP address)",
"Send analytics data": "Send analytics data",
"Never send encrypted messages to unverified sessions from this session": "Never send encrypted messages to unverified sessions from this session",
"Never send encrypted messages to unverified sessions in this room from this session": "Never send encrypted messages to unverified sessions in this room from this session",
@@ -885,6 +885,7 @@
"You held the call Switch": "You held the call Switch",
"You held the call Resume": "You held the call Resume",
"%(peerName)s held the call": "%(peerName)s held the call",
+ "Connecting": "Connecting",
"Video Call": "Video Call",
"Voice Call": "Voice Call",
"Fill Screen": "Fill Screen",
@@ -1011,7 +1012,7 @@
"Create": "Create",
"Expand space panel": "Expand space panel",
"Collapse space panel": "Collapse space panel",
- "Home": "Home",
+ "All rooms": "All rooms",
"Click to copy": "Click to copy",
"Copied!": "Copied!",
"Failed to copy": "Failed to copy",
@@ -1252,8 +1253,9 @@
"olm version:": "olm version:",
"Homeserver is": "Homeserver is",
"Identity Server is": "Identity Server is",
- "Access Token:": "Access Token:",
- "click to reveal": "click to reveal",
+ "Access Token": "Access Token",
+ "Your access token gives full access to your account. Do not share it with anyone.": "Your access token gives full access to your account. Do not share it with anyone.",
+ "Copy": "Copy",
"Clear cache and reload": "Clear cache and reload",
"Labs": "Labs",
"Customise your experience with experimental labs features. Learn more.": "Customise your experience with experimental labs features. Learn more.",
@@ -1439,6 +1441,13 @@
"Someone is using an unknown session": "Someone is using an unknown session",
"This room is end-to-end encrypted": "This room is end-to-end encrypted",
"Everyone in this room is verified": "Everyone in this room is verified",
+ "Server error": "Server error",
+ "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
+ "Unknown Command": "Unknown Command",
+ "Unrecognised command: %(commandText)s": "Unrecognised command: %(commandText)s",
+ "You can use /help to list available commands. Did you mean to send this as a message?": "You can use /help to list available commands. Did you mean to send this as a message?",
+ "Hint: Begin your message with // to start it with a slash.": "Hint: Begin your message with // to start it with a slash.",
+ "Send as message": "Send as message",
"Edit message": "Edit message",
"Mod": "Mod",
"This event could not be displayed": "This event could not be displayed",
@@ -1629,13 +1638,6 @@
"This Room": "This Room",
"All Rooms": "All Rooms",
"Search…": "Search…",
- "Server error": "Server error",
- "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
- "Unknown Command": "Unknown Command",
- "Unrecognised command: %(commandText)s": "Unrecognised command: %(commandText)s",
- "You can use /help to list available commands. Did you mean to send this as a message?": "You can use /help to list available commands. Did you mean to send this as a message?",
- "Hint: Begin your message with // to start it with a slash.": "Hint: Begin your message with // to start it with a slash.",
- "Send as message": "Send as message",
"Failed to connect to integration manager": "Failed to connect to integration manager",
"You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
"Add some now": "Add some now",
@@ -1649,6 +1651,10 @@
"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",
+ "Unable to access your microphone": "Unable to access your microphone",
+ "We were unable to access your microphone. Please check your browser settings and try again.": "We were unable to access your microphone. Please check your browser settings and try again.",
+ "No microphone found": "No microphone found",
+ "We didn't find a microphone on your device. Please check your settings and try again.": "We didn't find a microphone on your device. Please check your settings and try again.",
"Record a voice message": "Record a voice message",
"Stop the recording": "Stop the recording",
"Delete recording": "Delete recording",
@@ -1848,6 +1854,7 @@
"%(name)s wants to verify": "%(name)s wants to verify",
"You sent a verification request": "You sent a verification request",
"Error decrypting video": "Error decrypting video",
+ "Error processing voice message": "Error processing voice message",
"Show all": "Show all",
"Reactions": "Reactions",
" reacted with %(content)s": " reacted with %(content)s",
@@ -2009,10 +2016,10 @@
"Continue with %(provider)s": "Continue with %(provider)s",
"Sign in with single sign-on": "Sign in with single sign-on",
"And %(count)s more...|other": "And %(count)s more...",
+ "Home": "Home",
"Enter a server name": "Enter a server name",
"Looks good": "Looks good",
"Can't find this server or its room list": "Can't find this server or its room list",
- "All rooms": "All rooms",
"Your server": "Your server",
"Are you sure you want to remove %(serverName)s": "Are you sure you want to remove %(serverName)s",
"Remove server": "Remove server",
@@ -2028,10 +2035,11 @@
"Direct Messages": "Direct Messages",
"Space selection": "Space selection",
"Add existing rooms": "Add existing rooms",
- "Don't want to add an existing room?": "Don't want to add an existing room?",
+ "Not all selected were added": "Not all selected were added",
+ "Adding rooms... (%(progress)s out of %(count)s)|other": "Adding rooms... (%(progress)s out of %(count)s)",
+ "Adding rooms... (%(progress)s out of %(count)s)|one": "Adding room...",
+ "Want to add a new room instead?": "Want to add a new room instead?",
"Create a new room": "Create a new room",
- "Failed to add rooms to space": "Failed to add rooms to space",
- "Adding...": "Adding...",
"Matrix ID": "Matrix ID",
"Matrix Room ID": "Matrix Room ID",
"email address": "email address",
@@ -2342,7 +2350,6 @@
"Share Community": "Share Community",
"Share Room Message": "Share Room Message",
"Link to selected message": "Link to selected message",
- "Copy": "Copy",
"Command Help": "Command Help",
"Failed to save space settings.": "Failed to save space settings.",
"Space settings": "Space settings",
@@ -2650,6 +2657,7 @@
"%(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",
+ "Select a room below first": "Select a room below first",
"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",
@@ -2662,7 +2670,6 @@
"Public space": "Public space",
"Private space": "Private space",
" invites you": " invites you",
- "Add existing rooms & spaces": "Add existing rooms & spaces",
"Welcome to ": "Welcome to ",
"Random": "Random",
"Support": "Support",
@@ -2670,6 +2677,8 @@
"Failed to create initial space rooms": "Failed to create initial space rooms",
"Skip for now": "Skip for now",
"Creating rooms...": "Creating rooms...",
+ "Failed to add rooms to space": "Failed to add rooms to space",
+ "Adding...": "Adding...",
"What do you want to organise?": "What do you want to organise?",
"Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.": "Pick rooms or conversations to add. This is just a space for you, no one will be informed. You can add more later.",
"Share %(name)s": "Share %(name)s",
@@ -2808,7 +2817,7 @@
"Use a different passphrase?": "Use a different passphrase?",
"That doesn't match.": "That doesn't match.",
"Go back to set it again.": "Go back to set it again.",
- "Please enter your Security Phrase a second time to confirm.": "Please enter your Security Phrase a second time to confirm.",
+ "Enter your Security Phrase a second time to confirm it.": "Enter your Security Phrase a second time to confirm it.",
"Repeat your Security Phrase...": "Repeat your Security Phrase...",
"Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.",
"Keep a copy of it somewhere secure, like a password manager or even a safe.": "Keep a copy of it somewhere secure, like a password manager or even a safe.",
@@ -2838,8 +2847,6 @@
"You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
"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 this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
"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.": "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.",
- "Enter your recovery passphrase a second time to confirm it.": "Enter your recovery passphrase a second time to confirm it.",
- "Confirm your recovery passphrase": "Confirm your recovery passphrase",
"Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.",
"Unable to query secret storage status": "Unable to query secret storage status",
"If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 003da7ef8f..4a97b60a2e 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -657,5 +657,13 @@
"Confirm adding email": "Confirm adding email",
"Single Sign On": "Single Sign On",
"Confirm adding this email address by using Single Sign On to prove your identity.": "Confirm adding this email address by using Single Sign On to prove your identity.",
- "Use Single Sign On to continue": "Use Single Sign On to continue"
+ "Use Single Sign On to continue": "Use Single Sign On to continue",
+ "Message search initilisation failed": "Message search initialization failed",
+ "%(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 now uses 3-5x less memory, by only loading information about other users when needed. Please wait while we resynchronize with the server!",
+ "Customise your experience with experimental labs features. Learn more.": "Customize your experience with experimental labs features. Learn more.",
+ "Customise your appearance": "Customize your appearance",
+ "Unrecognised command: %(commandText)s": "Unrecognized command: %(commandText)s",
+ "Add some details to help people recognise it.": "Add some details to help people recognize it.",
+ "Unrecognised room address:": "Unrecognized room address:",
+ "A private space to organise your rooms": "A private space to organize your rooms"
}
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 62e8e1f98a..f4d30b40b7 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -3188,5 +3188,35 @@
"Space options": "Agordoj de aro",
"Space Home": "Hejmo de aro",
"with state key %(stateKey)s": "kun statŝlosilo %(stateKey)s",
- "with an empty state key": "kun malplena statŝlosilo"
+ "with an empty state key": "kun malplena statŝlosilo",
+ "Invited people will be able to read old messages.": "Invititoj povos legi malnovajn mesaĝojn.",
+ "Adding...": "Aldonante…",
+ "Add existing rooms": "Aldoni jamajn ĉambrojn",
+ "View message": "Montri mesaĝon",
+ "Zoom in": "Zomi",
+ "Zoom out": "Malzomi",
+ "%(count)s people you know have already joined|one": "%(count)s persono, kiun vi konas, jam aliĝis",
+ "%(count)s people you know have already joined|other": "%(count)s personoj, kiujn vi konas, jam aliĝis",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s anoj inkluzive je %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Inkluzive je %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "Montri 1 anon",
+ "View all %(count)s members|other": "Montri ĉiujn %(count)s anojn",
+ "Accept on your other login…": "Akceptu per via alia saluto…",
+ "Stop & send recording": "Ĉesi kaj sendi registrajon",
+ "Record a voice message": "Registri voĉmesaĝon",
+ "Quick actions": "Rapidaj agoj",
+ "Invite to just this room": "Inviti nur al ĉi tiu ĉambro",
+ "%(seconds)ss left": "%(seconds)s sekundoj restas",
+ "Failed to send": "Malsukcesis sendi",
+ "Change server ACLs": "Ŝanĝi servilblokajn listojn",
+ "Warn before quitting": "Averti antaŭ ĉesigo",
+ "Workspace: ": "Laborspaco: ",
+ "Manage & explore rooms": "Administri kaj esplori ĉambrojn",
+ "unknown person": "nekonata persono",
+ "Send and receive voice messages (in development)": "Sendi kaj ricevi voĉmesaĝojn (evoluigate)",
+ "Show options to enable 'Do not disturb' mode": "Montri elekteblojn por ŝalti sendistran reĝimon",
+ "%(deviceId)s from %(ip)s": "%(deviceId)s de %(ip)s",
+ "Review to ensure your account is safe": "Kontrolu por certigi sekurecon de via konto",
+ "Sends the given message as a spoiler": "Sendas la donitan mesaĝon kiel malkaŝon de intrigo"
}
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index d396cc318f..155aed321b 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -3225,5 +3225,28 @@
"Use another login": "Usar otro inicio de sesión",
"Verify your identity to access encrypted messages and prove your identity to others.": "Verifica tu identidad para acceder a mensajes cifrados y probar tu identidad a otros.",
"Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Si no verificas no tendrás acceso a todos tus mensajes y puede que aparezcas como no confiable para otros usuarios.",
- "Invite messages are hidden by default. Click to show the message.": "Los mensajes de invitación no se muestran por defecto. Haz clic para mostrarlo."
+ "Invite messages are hidden by default. Click to show the message.": "Los mensajes de invitación no se muestran por defecto. Haz clic para mostrarlo.",
+ "You can select all or individual messages to retry or delete": "Puedes seleccionar uno o todos los mensajes para reintentar o eliminar",
+ "Sending": "Enviando",
+ "Retry all": "Reintentar todo",
+ "Delete all": "Borrar todo",
+ "Some of your messages have not been sent": "Algunos de tus mensajes no se han enviado",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Eres la única persona aquí. Si te vas, no podrá unirse nadie en el futuro, incluyéndote a ti.",
+ "Forgotten or lost all recovery methods? Reset all": "¿Has olvidado o perdido todos los métodos de recuperación? Restablecer todo",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Si restableces todo, volverás a empezar sin sesiones ni usuarios de confianza, y puede que no puedas ver mensajes anteriores.",
+ "Only do this if you have no other device to complete verification with.": "Solo haz esto si no tienes ningún otro dispositivo con el que completar la verificación.",
+ "Reset everything": "Restablecer todo",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Si lo haces, ten en cuenta que ninguno de tus mensajes serán eliminados, pero la experiencia de búsqueda será peor durante unos momentos mientras recreamos el índice",
+ "View message": "Ver mensaje",
+ "Zoom in": "Acercar",
+ "Zoom out": "Alejar",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s miembros, incluyendo a %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Incluyendo %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "Ver 1 miembro",
+ "View all %(count)s members|other": "Ver los %(count)s miembros",
+ "%(seconds)ss left": "%(seconds)ss restantes",
+ "Failed to send": "No se ha podido mandar",
+ "Change server ACLs": "Cambiar los ACLs del servidor",
+ "Show options to enable 'Do not disturb' mode": "Mostrar opciones para activar el modo «no molestar»"
}
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 444475deea..56f456b6e4 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -3263,5 +3263,28 @@
"Use another login": "Pruugi muud kasutajakontot",
"Verify your identity to access encrypted messages and prove your identity to others.": "Tagamaks ligipääsu oma krüptitud sõnumitele ja tõestamaks oma isikut teistele kasutajatale, verifitseeri end.",
"Let's create a room for each of them.": "Teeme siis iga teema jaoks oma jututoa.",
- "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Ilma verifitseerimiseta sul puudub ligipääs kõikidele oma sõnumitele ning teised ei näe sinu kasutajakontot usaldusväärsena."
+ "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Ilma verifitseerimiseta sul puudub ligipääs kõikidele oma sõnumitele ning teised ei näe sinu kasutajakontot usaldusväärsena.",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Sa oled siin viimane osaleja. Kui sa nüüd lahkud, siis mitte keegi, kaasa arvatud sa ise, ei saa hiljem enam liituda.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Kui sa kõik krüptoseosed lähtestad, siis sul esimese hooga pole ühtegi usaldusväärseks tunnistatud sessiooni ega kasutajat ning ilmselt ei saa sa lugeda vanu sõnumeid.",
+ "Only do this if you have no other device to complete verification with.": "Toimi nii vaid siis, kui sul pole jäänud ühtegi seadet, millega verifitseerimist lõpuni teha.",
+ "Reset everything": "Alusta kõigega algusest",
+ "Forgotten or lost all recovery methods? Reset all": "Unustasid või oled kaotanud kõik võimalused ligipääsu taastamiseks? Lähtesta kõik ühe korraga",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Kui sa siiski soovid seda teha, siis sinu sõnumeid me ei kustuta, aga seniks kuni sõnumite indeks taustal uuesti luuakse, toimib otsing aeglaselt ja ebatõhusalt",
+ "View message": "Vaata sõnumit",
+ "Zoom in": "Suumi sisse",
+ "Zoom out": "Suumi välja",
+ "%(seconds)ss left": "jäänud %(seconds)s sekundit",
+ "Change server ACLs": "Muuda serveri ligipääsuõigusi",
+ "Show options to enable 'Do not disturb' mode": "Näita valikuid „Ära sega“ režiimi sisse lülitamiseks",
+ "You can select all or individual messages to retry or delete": "Sa võid valida kas kõik või mõned sõnumid kas kustutamiseks või uuesti saatmiseks",
+ "Sending": "Saadan",
+ "Retry all": "Proovi kõikidega uuesti",
+ "Delete all": "Kustuta kõik",
+ "Some of your messages have not been sent": "Mõned sinu sõnumid on saatmata",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s liiget, sealhulgas %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Sealhulgas %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "Vaata üht liiget",
+ "View all %(count)s members|other": "Vaata kõiki %(count)s liiget",
+ "Failed to send": "Saatmine ei õnnestunud"
}
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index d036a55c23..5948048561 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -223,7 +223,7 @@
"Home": "خانه",
"Hangup": "قطع",
"For security, this session has been signed out. Please sign in again.": "برای امنیت، این نشست نامعتبر شده است. لطفاً دوباره وارد سیستم شوید.",
- "We couldn't log you in": "ما نتوانستیم شما را وارد حسابتان کنیم",
+ "We couldn't log you in": "نتوانستیم شما را وارد کنیم",
"Trust": "اعتماد کن",
"Only continue if you trust the owner of the server.": "تنها در صورتی که به صاحب سرور اطمینان دارید، ادامه دهید.",
"Identity server has no terms of service": "سرور هویتسنجی، شرایط استفاده از خدمت (terms of service) را مشخص نکردهاست",
@@ -314,5 +314,323 @@
"e.g. %(exampleValue)s": "برای مثال %(exampleValue)s",
"Explore rooms": "کاوش اتاق",
"Sign In": "ورود",
- "Create Account": "ایجاد اکانت"
+ "Create Account": "ایجاد اکانت",
+ "Use an identity server": "از سرور هویتسنجی استفاده کنید",
+ "Invites user with given id to current room": "کاربر با شناسه داده شده را به اتاق فعلی دعوت کن",
+ "Sets the room name": "نام اتاق را تنظیم می کند",
+ "This room has no topic.": "این اتاق هیچ موضوعی ندارد.",
+ "Failed to set topic": "تنظیم موضوع موفقیتآمیز نبود",
+ "Gets or sets the room topic": "موضوع اتاق را دریافت یا تنظیم میکند",
+ "Changes your avatar in all rooms": "تصویر نمایه خود را در همهی اتاقها تغییر دهید",
+ "Changes your avatar in this current room only": "تصویر نمایه خود را تنها در این اتاق تغییر دهید",
+ "Changes the avatar of the current room": "تصویر نمایه اتاق فعلی را تغییر دهید",
+ "Changes your display nickname": "نام نمایشی خود را تغییر دهید",
+ "Changes your display nickname in the current room only": "نام نمایشی خود را تنها در اتاق فعلی تغییر دهید",
+ "Double check that your server supports the room version chosen and try again.": "بررسی کنید که کارگزار شما از نسخه اتاق انتخابشده پشتیبانی کرده و دوباره امتحان کنید.",
+ "Error upgrading room": "خطا در ارتقاء نسخه اتاق",
+ "You do not have the required permissions to use this command.": "شما مجوزهای لازم را برای استفاده از این دستور ندارید.",
+ "Upgrades a room to a new version": "یک اتاق را به نسخه جدید ارتقا دهید",
+ "To use it, just wait for autocomplete results to load and tab through them.": "برای استفاده از آن ، لطفا منتظر بمانید تا نتایج تکمیل خودکار بارگیری شده و آنها را مرور کنید.",
+ "Searches DuckDuckGo for results": "در سایت DuckDuckGo جستجو میکند",
+ "Sends a message as html, without interpreting it as markdown": "پیام را به صورت html می فرستد ، بدون اینکه آن را به عنوان markdown تفسیر کند",
+ "Sends a message as plain text, without interpreting it as markdown": "پیام را به صورت متن ساده و بدون تفسیر آن به عنوان markdown ارسال می کند",
+ "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "(͡ ° ͜ʖ ͡ °) را به ابتدای یک پیام متنی ساده اضافه میکند",
+ "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "┬──┬ ノ (゜ - ゜ ノ) را به ابتدای یک پیام متنی ساده اضافه میکند",
+ "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "(╯ ° □ °） ╯︵ ┻━┻) را به ابتدای یک پیام متنی ساده اضافه میکند",
+ "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "¯ \\ _ (ツ) _ / ¯ را به ابتدای یک پیام متنی ساده اضافه میکند",
+ "Sends the given message as a spoiler": "پیام داده شده را به عنوان اسپویلر ارسال می کند",
+ "Usage": "استفاده",
+ "Other": "دیگر",
+ "Effects": "جلوهها",
+ "Actions": "اقدامات",
+ "Messages": "پیام ها",
+ "Setting up keys": "تنظیم کلیدها",
+ "Go Back": "برگرد",
+ "Are you sure you want to cancel entering passphrase?": "آیا مطمئن هستید که می خواهید وارد کردن عبارت امنیتی را لغو کنید؟",
+ "Cancel entering passphrase?": "وارد کردن عبارت امنیتی لغو شود؟",
+ "Missing room_id in request": "room_id در صورت درخواست وجود ندارد",
+ "Missing user_id in request": "user_id در صورت درخواست وجود ندارد",
+ "Room %(roomId)s not visible": "اتاق %(roomId)s قابل مشاهده نیست",
+ "You do not have permission to do that in this room.": "شما مجاز به انجام این کار در این اتاق نیستید.",
+ "You are not in this room.": "شما در این اتاق نیستید.",
+ "Power level must be positive integer.": "سطح قدرت باید عدد صحیح مثبت باشد.",
+ "This room is not recognised.": "این اتاق شناخته نشده است.",
+ "Missing roomId.": "شناسهی اتاق گمشده",
+ "Unable to create widget.": "ایجاد ابزارک امکان پذیر نیست.",
+ "You need to be able to invite users to do that.": "نیاز است که شما قادر به دعوت کاربران به آن باشید.",
+ "You need to be logged in.": "شما باید وارد شوید.",
+ "Failed to invite the following users to the %(roomName)s room:": "دعوت کاربران زیر به اتاق %(roomName)s موفقیتآمیز نبود:",
+ "Failed to invite users to the room:": "دعوت کاربران به اتاق موفقیتآمیز نبود:",
+ "Failed to invite": "دعوت موفقیتآمیز نبود",
+ "Custom (%(level)s)": "%(level)s دلخواه",
+ "Moderator": "معاون",
+ "Restricted": "ممنوع",
+ "Use your account or create a new one to continue.": "برای ادامه کار از حساب کاربری خود استفاده کرده و یا حساب کاربری جدیدی ایجاد کنید.",
+ "Sign In or Create Account": "وارد شوید یا حساب کاربری بسازید",
+ "Zimbabwe": "زیمبابوه",
+ "Zambia": "زامبیا",
+ "Yemen": "یمن",
+ "Western Sahara": "صحرای غربی",
+ "Wallis & Futuna": "والیس و فوتونا",
+ "Vietnam": "ویتنام",
+ "Venezuela": "ونزوئلا",
+ "Vatican City": "شهر واتیکان",
+ "Vanuatu": "وانواتو",
+ "Uzbekistan": "ازبکستان",
+ "Uruguay": "اروگوئه",
+ "United Arab Emirates": "امارات متحده عربی",
+ "Ukraine": "اوکراین",
+ "Uganda": "اوگاندا",
+ "U.S. Virgin Islands": "جزایر ویرجین ایالات متحده",
+ "Tuvalu": "تووالو",
+ "Turks & Caicos Islands": "جزایر ترک و کایکوس",
+ "Turkmenistan": "ترکمنستان",
+ "Turkey": "بوقلمون",
+ "Tunisia": "تونس",
+ "Trinidad & Tobago": "ترینیداد و توباگو",
+ "Tonga": "تونگا",
+ "Tokelau": "توكلائو",
+ "Togo": "رفتن",
+ "Timor-Leste": "تیمور-لسته",
+ "Thailand": "تایلند",
+ "Tanzania": "تانزانیا",
+ "Tajikistan": "تاجیکستان",
+ "Taiwan": "تایوان",
+ "São Tomé & Príncipe": "سائو تومه و پرنسیپ",
+ "Syria": "سوریه",
+ "Switzerland": "سوئیس",
+ "Sweden": "سوئد",
+ "Swaziland": "سوازیلند",
+ "Svalbard & Jan Mayen": "سوالبارد و جان ماین",
+ "Suriname": "سورینام",
+ "Sudan": "سودان",
+ "St. Vincent & Grenadines": "سنت وینسنت و گرنادین ها",
+ "St. Pierre & Miquelon": "سنت پیر و میکلون",
+ "St. Martin": "سنت مارتین",
+ "St. Lucia": "سنت لوسیا",
+ "St. Kitts & Nevis": "سنت کیتس و نویس",
+ "St. Helena": "سنت هلنا",
+ "St. Barthélemy": "سنت بارتلمی",
+ "Sri Lanka": "سری لانکا",
+ "Spain": "اسپانیا",
+ "South Sudan": "سودان جنوبی",
+ "South Korea": "کره جنوبی",
+ "South Georgia & South Sandwich Islands": "جزایر جورجیا جنوبی",
+ "South Africa": "آفریقای جنوبی",
+ "Somalia": "سومالی",
+ "Solomon Islands": "جزایر سلیمان",
+ "Slovenia": "اسلوونی",
+ "Slovakia": "اسلواکی",
+ "Sint Maarten": "سینت مارتن",
+ "Singapore": "سنگاپور",
+ "Sierra Leone": "سیرا لئون",
+ "Seychelles": "سیشل",
+ "Serbia": "صربستان",
+ "Senegal": "سنگال",
+ "Saudi Arabia": "عربستان سعودی",
+ "San Marino": "سان مارینو",
+ "Samoa": "ساموآ",
+ "Réunion": "ریونیون",
+ "Rwanda": "رواندا",
+ "Russia": "روسیه",
+ "Romania": "رومانی",
+ "Qatar": "قطر",
+ "Puerto Rico": "پورتوریکو",
+ "Portugal": "کشور پرتغال",
+ "Poland": "لهستان",
+ "Pitcairn Islands": "جزایر پیتکرن",
+ "Philippines": "فیلیپین",
+ "Peru": "پرو",
+ "Paraguay": "پاراگوئه",
+ "Papua New Guinea": "پاپوآ گینه نو",
+ "Panama": "پاناما",
+ "Palestine": "فلسطین",
+ "Palau": "پالائو",
+ "Pakistan": "پاکستان",
+ "Oman": "عمان",
+ "Norway": "نروژ",
+ "Northern Mariana Islands": "جزایر ماریانای شمالی",
+ "North Korea": "کره شمالی",
+ "Norfolk Island": "جزیره نورفولک",
+ "Niue": "نیوئه",
+ "Nigeria": "نیجریه",
+ "Niger": "نیجر",
+ "Nicaragua": "نیکاراگوئه",
+ "New Zealand": "نیوزلند",
+ "New Caledonia": "کالدونیای جدید",
+ "Netherlands": "هلند",
+ "Nepal": "نپال",
+ "Nauru": "نائورو",
+ "Namibia": "ناميبيا",
+ "Myanmar": "میانمار",
+ "Mozambique": "موزامبیک",
+ "Morocco": "مراکش",
+ "Montserrat": "مونتسرات",
+ "Montenegro": "مونته نگرو",
+ "Mongolia": "مغولستان",
+ "Monaco": "موناکو",
+ "Moldova": "مولداوی",
+ "Micronesia": "میکرونزی",
+ "Mexico": "مکزیک",
+ "Mayotte": "مایوت",
+ "Mauritius": "موریس",
+ "Mauritania": "موریتانی",
+ "Martinique": "مارتینیک",
+ "Marshall Islands": "جزایر مارشال",
+ "Malta": "مالت",
+ "Mali": "مالی",
+ "Maldives": "مالدیو",
+ "Malaysia": "مالزی",
+ "Malawi": "مالاوی",
+ "Madagascar": "ماداگاسکار",
+ "Macedonia": "مقدونیه",
+ "Macau": "ماکائو",
+ "Luxembourg": "لوکزامبورگ",
+ "Lithuania": "لیتوانی",
+ "Liechtenstein": "لیختن اشتاین",
+ "Libya": "لیبی",
+ "Liberia": "لیبریا",
+ "Lesotho": "لسوتو",
+ "Lebanon": "لبنان",
+ "Latvia": "لتونی",
+ "Laos": "لائوس",
+ "Kyrgyzstan": "قرقیزستان",
+ "Kuwait": "کویت",
+ "Kosovo": "کوزوو",
+ "Kiribati": "کیریباتی",
+ "Kenya": "کنیا",
+ "Kazakhstan": "قزاقستان",
+ "Jordan": "اردن",
+ "Jersey": "جرسی",
+ "Japan": "ژاپن",
+ "Jamaica": "جامائیکا",
+ "Italy": "ایتالیا",
+ "Israel": "رژیم غاصب صهیونیستی",
+ "Isle of Man": "جزیره من",
+ "Ireland": "ایرلند",
+ "Iraq": "عراق",
+ "Iran": "ایران",
+ "Indonesia": "اندونزی",
+ "India": "هند",
+ "Iceland": "ایسلند",
+ "Hungary": "مجارستان",
+ "Hong Kong": "هنگ کنگ",
+ "Honduras": "هندوراس",
+ "Heard & McDonald Islands": "جزایر هرد و مک دونالد",
+ "Haiti": "هائیتی",
+ "Guyana": "گویان",
+ "Guinea-Bissau": "گینه بیسائو",
+ "Guinea": "گینه",
+ "Guernsey": "گرنزی",
+ "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": "کاستاریکا",
+ "Cook Islands": "جزایر کوک",
+ "Congo - Kinshasa": "کنگو - کینشاسا",
+ "Congo - Brazzaville": "کنگو - برازاویل",
+ "Comoros": "کومور",
+ "Colombia": "کلمبیا",
+ "Cocos (Keeling) Islands": "جزایر کوکوس (کیلینگ)",
+ "Christmas Island": "جزیره کریسمس",
+ "China": "چین",
+ "Chile": "شیلی",
+ "Chad": "چاد",
+ "Central African Republic": "جمهوری آفریقای مرکزی",
+ "Cayman Islands": "جزایر کیمن",
+ "Caribbean Netherlands": "کارائیب هلند",
+ "Cape Verde": "کیپ ورد",
+ "Canada": "کانادا",
+ "Cameroon": "کامرون",
+ "Cambodia": "کامبوج",
+ "Burundi": "بوروندی",
+ "Burkina Faso": "بورکینافاسو",
+ "Bulgaria": "بلغارستان",
+ "Brunei": "برونئی",
+ "British Virgin Islands": "جزایر ویرجین بریتانیا",
+ "British Indian Ocean Territory": "قلمرو اقیانوس هند بریتانیا",
+ "Brazil": "برزیل",
+ "Bouvet Island": "جزیره بووت",
+ "Botswana": "بوتسوانا",
+ "Bosnia": "بوسنی",
+ "Bolivia": "بولیوی",
+ "Bhutan": "بوتان",
+ "Bermuda": "برمودا",
+ "Benin": "بنین",
+ "Belize": "بلیز",
+ "Belgium": "بلژیک",
+ "Belarus": "بلاروس",
+ "Barbados": "باربادوس",
+ "Bangladesh": "بنگلادش",
+ "Bahrain": "بحرین",
+ "Bahamas": "باهاما",
+ "Azerbaijan": "آذربایجان",
+ "Austria": "اتریش",
+ "Australia": "استرالیا",
+ "Aruba": "آروبا",
+ "Armenia": "ارمنستان",
+ "Argentina": "آرژانتین",
+ "Antigua & Barbuda": "آنتیگوا و باربودا",
+ "Antarctica": "جنوبگان",
+ "Anguilla": "آنگویلا",
+ "Angola": "آنگولا",
+ "Andorra": "آندورا",
+ "American Samoa": "ساموآ آمریکایی",
+ "Algeria": "الجزایر",
+ "Albania": "آلبانی",
+ "Åland Islands": "جزایر الند",
+ "Afghanistan": "افغانستان",
+ "United States": "ایالات متحده",
+ "United Kingdom": "انگلستان",
+ "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "به نظر نمیرسد آدرس ایمیل شما با هیچ کدام از شناسه ماتریکس در این سرور مرتبط باشد.",
+ "This email address was not found": "این آدرس ایمیل یافت نشد",
+ "Unable to enable Notifications": "فعال کردن اعلان ها امکان پذیر نیست",
+ "%(brand)s was not given permission to send notifications - please try again": "به %(brand)s اجازه ارسال اعلان داده نشده است - لطفاً دوباره امتحان کنید",
+ "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s اجازه ارسال اعلان به شما را ندارد - لطفاً تنظیمات مرورگر خود را بررسی کنید",
+ "%(name)s is requesting verification": "%(name)s درخواست تائید دارد",
+ "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.": "سرور شما در دسترس نبود و امکان ورود شما میسر نیست. لطفا دوباره امتحان کنید. اگر مشکل ادامه داشت، لطفا با مدیر سرور تماس بگیرید.",
+ "Try again": "دوباره امتحان کنید",
+ "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "این که شما از %(brand)s روی دستگاهی استفاده میکنید که در آن لامسه مکانیزم اصلی ورودی است",
+ "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.": "ما از مرورگر خواستیم تا سروری را که شما برای ورود استفاده میکنید به خاطر بسپارد، اما متاسفانه مرورگر شما آن را فراموش کردهاست. به صفحهی ورود بروید و دوباره امتحان کنید.",
+ "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.": "این اقدام نیاز به دسترسی به سرور هویتسنجی پیشفرض برای تایید آدرس ایمیل یا شماره تماس دارد، اما کارگزار هیچ گونه شرایط خدماتی (terms of service) ندارد.",
+ "The remote side failed to pick up": "طرف دیگر قادر به پاسخدادن نیست",
+ "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "هرگاه این صفحه شامل اطلاعات قابل شناسایی مانند شناسهی اتاق ، کاربر یا گروه باشد ، این دادهها قبل از ارسال به سرور حذف می شوند.",
+ "Your user agent": "نماینده کاربری شما",
+ "Whether you're using %(brand)s as an installed Progressive Web App": "این که آیا شما از%(brand)s به عنوان یک PWA استفاده میکنید یا نه",
+ "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "این که آیا از ویژگی 'breadcrumbs' (نمایهی کاربری بالای فهرست اتاقها) استفاده میکنید یا خیر"
}
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index fcc5ec9afe..984dce8595 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -3043,7 +3043,7 @@
"Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Votre serveur d’accueil n’est pas accessible, nous n’avons pas pu vous connecter. Merci de réessayer. Si cela persiste, merci de contacter l’administrateur de votre serveur d’accueil.",
"Try again": "Réessayez",
"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.": "Nous avons demandé à votre navigateur de mémoriser votre serveur d’accueil, mais il semble l’avoir oublié. Rendez-vous à la page de connexion et réessayez.",
- "We couldn't log you in": "Impossible de vous déconnecter",
+ "We couldn't log you in": "Nous n’avons pas pu vous connecter",
"Upgrade to %(hostSignupBrand)s": "Mettre à jour vers %(hostSignupBrand)s",
"Edit Values": "Modifier les valeurs",
"Values at explicit levels in this room:": "Valeurs pour les rangs explicites de ce salon :",
@@ -3071,7 +3071,7 @@
"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 ?",
+ "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…",
@@ -3083,7 +3083,7 @@
"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 ?",
+ "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…",
@@ -3112,7 +3112,7 @@
"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 » ?",
+ "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",
@@ -3188,7 +3188,7 @@
"This room is suggested as a good one to join": "Ce salon recommandé peut être intéressant à rejoindre",
"Verify this login to access your encrypted messages and prove to others that this login is really you.": "Vérifiez cette connexion pour accéder à vos messages chiffrés et prouver aux autres qu’il s’agit bien de vous.",
"Verify with another session": "Vérifier avec une autre session",
- "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Nous allons créer un salon pour chaque. Vous pourrez en ajouter plus tard, y compris certains déjà existant.",
+ "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Nous allons créer un salon pour chacun d’entre eux. Vous pourrez aussi en ajouter plus tard, y compris certains déjà existant.",
"Let's create a room for each of them. You can add more later too, including already existing ones.": "Créons un salon pour chacun d’entre eux. Vous pourrez en ajouter plus tard, y compris certains déjà existant.",
"Make sure the right people have access. You can invite more later.": "Assurez-vous que les accès sont accordés aux bonnes personnes. Vous pourrez en inviter d’autres plus tard.",
"A private space to organise your rooms": "Un espace privé pour organiser vos salons",
@@ -3232,7 +3232,7 @@
"Please choose a strong password": "Merci de choisir un mot de passe fort",
"You can add more later too, including already existing ones.": "Vous pourrez en ajouter plus tard, y compris certains déjà existant.",
"Let's create a room for each of them.": "Créons un salon pour chacun d’entre eux.",
- "What are some things you want to discuss in %(spaceName)s?": "De quoi voulez vous discuter dans %(spaceName)s ?",
+ "What are some things you want to discuss in %(spaceName)s?": "De quoi voulez-vous discuter dans %(spaceName)s ?",
"Verification requested": "Vérification requise",
"Avatar": "Avatar",
"Verify other login": "Vérifier l’autre connexion",
@@ -3262,5 +3262,28 @@
"Send and receive voice messages (in development)": "Envoyez et recevez des messages vocaux (en développement)",
"%(deviceId)s from %(ip)s": "%(deviceId)s depuis %(ip)s",
"Review to ensure your account is safe": "Vérifiez pour assurer la sécurité de votre compte",
- "Sends the given message as a spoiler": "Envoie le message flouté"
+ "Sends the given message as a spoiler": "Envoie le message flouté",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Vous êtes la seule personne ici. Si vous partez, plus personne ne pourra rejoindre cette conversation, y compris vous.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Si vous réinitialisez tout, vous allez repartir sans session et utilisateur de confiance. Vous pourriez ne pas voir certains messages passés.",
+ "Only do this if you have no other device to complete verification with.": "Poursuivez seulement si vous n’avez aucun autre appareil avec lequel procéder à la vérification.",
+ "Reset everything": "Tout réinitialiser",
+ "Forgotten or lost all recovery methods? Reset all": "Vous avez perdu ou oublié tous vos moyens de récupération ? Tout réinitialiser",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Si vous le faites, notez qu’aucun de vos messages ne sera supprimé, mais la recherche pourrait être dégradée pendant quelques instants, le temps de recréer l’index",
+ "View message": "Afficher le message",
+ "Zoom in": "Zoomer",
+ "Zoom out": "Dé-zoomer",
+ "%(seconds)ss left": "%(seconds)s secondes restantes",
+ "Change server ACLs": "Modifier les ACL du serveur",
+ "Show options to enable 'Do not disturb' mode": "Afficher une option pour activer le mode « Ne pas déranger »",
+ "You can select all or individual messages to retry or delete": "Vous pouvez choisir de renvoyer ou supprimer tous les messages ou seulement certains",
+ "Sending": "Envoi",
+ "Retry all": "Tout renvoyer",
+ "Delete all": "Tout supprimer",
+ "Some of your messages have not been sent": "Certains de vos messages n’ont pas été envoyés",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s membres dont %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Dont %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "Afficher le membre",
+ "View all %(count)s members|other": "Afficher les %(count)s membres",
+ "Failed to send": "Échec de l’envoi"
}
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index f6ebce684f..7b816e94cd 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -3285,5 +3285,28 @@
"What are some things you want to discuss in %(spaceName)s?": "Sobre que temas queres conversar en %(spaceName)s?",
"Let's create a room for each of them.": "Crea unha sala para cada un deles.",
"You can add more later too, including already existing ones.": "Podes engadir máis posteriormente, incluíndo os xa existentes.",
- "Use another login": "Usar outra conexión"
+ "Use another login": "Usar outra conexión",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Es a única persoa aquí. Se saes, ninguén poderá unirse no futuro, incluíndote a ti.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Se restableces todo, volverás a comezar sen sesións verificadas, usuarias de confianza, e poderías non poder ver as mensaxes anteriores.",
+ "Only do this if you have no other device to complete verification with.": "Fai isto únicamente se non tes outro dispositivo co que completar a verificación.",
+ "Reset everything": "Restablecer todo",
+ "Forgotten or lost all recovery methods? Reset all": "Perdidos ou esquecidos tódolos métodos de recuperación? Restabléceos",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Se o fas, ten en conta que non se borrará ningunha das túas mensaxes, mais a experiencia de busca podería degradarse durante uns momentos ata que se recrea o índice",
+ "View message": "Ver mensaxe",
+ "Zoom in": "Achegar",
+ "Zoom out": "Alonxar",
+ "%(seconds)ss left": "%(seconds)ss restantes",
+ "Change server ACLs": "Cambiar ACLs do servidor",
+ "Show options to enable 'Do not disturb' mode": "Mostrar opcións para activar o modo 'Non molestar'",
+ "You can select all or individual messages to retry or delete": "Podes elexir todo ou mensaxes individuais para reintentar ou eliminar",
+ "Sending": "Enviando",
+ "Retry all": "Reintentar todo",
+ "Delete all": "Eliminar todo",
+ "Some of your messages have not been sent": "Algunha das túas mensaxes non se enviou",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s membros, incluíndo a %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Incluíndo a %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "Ver 1 membro",
+ "View all %(count)s members|other": "Ver tódolos %(count)s membros",
+ "Failed to send": "Fallou o envío"
}
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2ec5af8a17..e6e5575674 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -3280,5 +3280,28 @@
"Send and receive voice messages (in development)": "Hang üzenetek küldése és fogadása (fejlesztés alatt)",
"%(deviceId)s from %(ip)s": "%(deviceId)s innen: %(ip)s",
"Review to ensure your account is safe": "Tekintse át, hogy meggyőződjön arról, hogy a fiókja biztonságban van",
- "Sends the given message as a spoiler": "A megadott üzenet szpojlerként küldése"
+ "Sends the given message as a spoiler": "A megadott üzenet szpojlerként küldése",
+ "Change server ACLs": "Kiszolgáló ACL-ek módosítása",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Csak ön van itt. Ha kilép, akkor a jövőben senki nem tud majd ide belépni, beleértve önt is.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Ha mindent alapállapotba helyez, nem lesz megbízható munkamenete, nem lesznek megbízható felhasználók és a régi üzenetekhez sem biztos, hogy hozzáfér majd.",
+ "Only do this if you have no other device to complete verification with.": "Csak akkor tegye meg, ha nincs egyetlen másik eszköze sem az ellenőrzés elvégzéséhez.",
+ "Reset everything": "Minden visszaállítása",
+ "Forgotten or lost all recovery methods? Reset all": "Elfelejtette vagy elveszett minden visszaállítási lehetőség? Mind alaphelyzetbe állítása",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Ha ezt teszi, tudnia kell, hogy az üzenetek nem kerülnek törlésre de keresés nem lesz tökéletes amíg az indexek nem készülnek el újra",
+ "View message": "Üzenet megjelenítése",
+ "Zoom in": "Nagyít",
+ "Zoom out": "Kicsinyít",
+ "%(seconds)ss left": "%(seconds)s mp van vissza",
+ "Show options to enable 'Do not disturb' mode": "Mutassa a lehetőséget a „Ne zavarjanak” módhoz",
+ "You can select all or individual messages to retry or delete": "Újraküldéshez vagy törléshez kiválaszthatja az üzeneteket egyenként vagy az összeset együtt",
+ "Retry all": "Mind újraküldése",
+ "Sending": "Küldés",
+ "Delete all": "Mind törlése",
+ "Some of your messages have not been sent": "Néhány üzenete nem lett elküldve",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s résztvevő beleértve: %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Beleértve: %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "1 résztvevő megmutatása",
+ "View all %(count)s members|other": "Az összes %(count)s résztvevő megmutatása",
+ "Failed to send": "Küldés sikertelen"
}
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 2d0edb77e6..98272f9e49 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -3285,5 +3285,28 @@
"You can add more later too, including already existing ones.": "Puoi aggiungerne anche altri in seguito, inclusi quelli già esistenti.",
"Use another login": "Usa un altro accesso",
"Verify your identity to access encrypted messages and prove your identity to others.": "Verifica la tua identità per accedere ai messaggi cifrati e provare agli altri che sei tu.",
- "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Senza la verifica, non avrai accesso a tutti i tuoi messaggi e potresti apparire agli altri come non fidato."
+ "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Senza la verifica, non avrai accesso a tutti i tuoi messaggi e potresti apparire agli altri come non fidato.",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Sei l'unica persona qui. Se esci, nessuno potrà entrare in futuro, incluso te.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Se reimposti tutto, ricomincerai senza sessioni fidate, senza utenti fidati e potresti non riuscire a vedere i messaggi passati.",
+ "Only do this if you have no other device to complete verification with.": "Fallo solo se non hai altri dispositivi con cui completare la verifica.",
+ "Reset everything": "Reimposta tutto",
+ "Forgotten or lost all recovery methods? Reset all": "Hai dimenticato o perso tutti i metodi di recupero? Reimposta tutto",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Se lo fai, ricorda che nessuno dei tuoi messaggi verrà eliminato, ma l'esperienza di ricerca potrà peggiorare per qualche momento mentre l'indice viene ricreato",
+ "View message": "Vedi messaggio",
+ "Zoom in": "Ingrandisci",
+ "Zoom out": "Rimpicciolisci",
+ "%(seconds)ss left": "%(seconds)ss rimanenti",
+ "Change server ACLs": "Modifica le ACL del server",
+ "Show options to enable 'Do not disturb' mode": "Mostra opzioni per attivare la modalità \"Non disturbare\"",
+ "You can select all or individual messages to retry or delete": "Puoi selezionare tutti o alcuni messaggi da riprovare o eliminare",
+ "Sending": "Invio in corso",
+ "Retry all": "Riprova tutti",
+ "Delete all": "Elimina tutti",
+ "Some of your messages have not been sent": "Alcuni tuoi messaggi non sono stati inviati",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s membri inclusi %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Inclusi %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "Vedi 1 membro",
+ "View all %(count)s members|other": "Vedi tutti i %(count)s membri",
+ "Failed to send": "Invio fallito"
}
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index de98a878e8..8b2dea7885 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -3171,5 +3171,28 @@
"Send and receive voice messages (in development)": "Verstuur en ontvang audioberichten (in ontwikkeling)",
"%(deviceId)s from %(ip)s": "%(deviceId)s van %(ip)s",
"Review to ensure your account is safe": "Controleer om u te verzekeren dat uw account veilig is",
- "Sends the given message as a spoiler": "Verstuurt het bericht als een spoiler"
+ "Sends the given message as a spoiler": "Verstuurt het bericht als een spoiler",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "U bent de enige persoon hier. Als u weggaat, zal niemand in de toekomst kunnen toetreden, u ook niet.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Als u alles reset, zult u opnieuw opstarten zonder vertrouwde sessies, zonder vertrouwde gebruikers, en zult u misschien geen vroegere berichten meer kunnen zien.",
+ "Only do this if you have no other device to complete verification with.": "Doe dit alleen als u geen ander apparaat hebt om de verificatie mee uit te voeren.",
+ "Reset everything": "Alles opnieuw instellen",
+ "Forgotten or lost all recovery methods? Reset all": "Alles vergeten of alle herstelmethoden verloren? Alles opnieuw instellen",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Als u dat doet, let wel geen van uw berichten wordt verwijderd, maar de zoekresultaten zullen gedurende enkele ogenblikken verslechteren terwijl de index opnieuw wordt aangemaakt",
+ "View message": "Bericht bekijken",
+ "Zoom in": "Inzoomen",
+ "Zoom out": "Uitzoomen",
+ "%(seconds)ss left": "%(seconds)s's over",
+ "Change server ACLs": "Wijzig server ACL's",
+ "Show options to enable 'Do not disturb' mode": "Toon opties om de 'Niet storen' modus in te schakelen",
+ "You can select all or individual messages to retry or delete": "U kunt alles selecteren of per individueel bericht opnieuw verzenden of verwijderen",
+ "Sending": "Wordt verstuurd",
+ "Retry all": "Alles opnieuw proberen",
+ "Delete all": "Verwijder alles",
+ "Some of your messages have not been sent": "Enkele van uw berichten zijn niet verstuurd",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s leden inclusief %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Inclusief %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "Bekijk 1 lid",
+ "View all %(count)s members|other": "Bekijk alle %(count)s leden",
+ "Failed to send": "Verzenden is mislukt"
}
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 7db3758fd8..da42347b49 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -3210,5 +3210,6 @@
"Removing...": "Удаление…",
"Failed to remove some rooms. Try again later": "Не удалось удалить несколько комнат. Попробуйте позже",
"%(count)s rooms and 1 space|one": "%(count)s комната и одно пространство",
- "%(count)s rooms and 1 space|other": "%(count)s комнат и одно пространство"
+ "%(count)s rooms and 1 space|other": "%(count)s комнат и одно пространство",
+ "Sends the given message as a spoiler": "Отправить данное сообщение под спойлером"
}
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index ad768b59cb..305e7dc610 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -3272,5 +3272,27 @@
"Share decryption keys for room history when inviting users": "Ndani me përdorues kyçe shfshehtëzimi, kur ftohen përdorues",
"Send and receive voice messages (in development)": "Dërgoni dhe merrni mesazhe zanorë (në zhvillim)",
"%(deviceId)s from %(ip)s": "%(deviceId)s prej %(ip)s",
- "Review to ensure your account is safe": "Shqyrtojeni për t’u siguruar se llogaria është e parrezik"
+ "Review to ensure your account is safe": "Shqyrtojeni për t’u siguruar se llogaria është e parrezik",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Jeni i vetmi person këtu. Nëse e braktisni, askush s’do të jetë në gjendje të hyjë në të ardhmen, përfshi ju.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Nëse riktheni gjithçka te parazgjedhjet, do të rifilloni pa sesione të besuara, pa përdorues të besuar, dhe mund të mos jeni në gjendje të shihni mesazhe të dikurshëm.",
+ "Only do this if you have no other device to complete verification with.": "Bëjeni këtë vetëm nëse s’keni pajisje tjetër me të cilën të plotësoni verifikimin.",
+ "Reset everything": "Kthe gjithçka te parazgjedhjet",
+ "Forgotten or lost all recovery methods? Reset all": "Harruat, ose humbët krejt metodat e rimarrjes? Riujdisini të gjitha",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Nëse e bëni, ju lutemi, kini parasysh se s’do të fshihet asnjë nga mesazhet tuaj, por puna me kërkimin mund degradojë për pak çaste, ndërkohë që rikrijohet treguesi",
+ "View message": "Shihni mesazh",
+ "%(seconds)ss left": "Edhe %(seconds)ss",
+ "Change server ACLs": "Ndryshoni ACL-ra shërbyesi",
+ "Consulting with %(transferTarget)s. Transfer to %(transferee)s": "Po kryhet këshillim me %(transferTarget)s. Shpërngule te %(transferee)s",
+ "Show options to enable 'Do not disturb' mode": "Shfaq mundësi për aktivizim të mënyrës “Mos më shqetësoni”",
+ "You can select all or individual messages to retry or delete": "Për riprovim ose fshirje mund të përzgjidhni krejt mesazhet, ose të tillë individualë",
+ "Sending": "Po dërgohet",
+ "Retry all": "Riprovoji krejt",
+ "Delete all": "Fshiji krejt",
+ "Some of your messages have not been sent": "Disa nga mesazhet tuaj s’janë dërguar",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s anëtarë, përfshi %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Prfshi %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "Shihni 1 anëtar",
+ "View all %(count)s members|other": "Shihni krejt %(count)s anëtarët",
+ "Failed to send": "S’u arrit të dërgohet"
}
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 42a7f78268..64cd8ae6ac 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -3216,5 +3216,28 @@
"Please choose a strong password": "Vänligen välj ett starkt lösenord",
"Use another login": "Använd annan inloggning",
"Verify your identity to access encrypted messages and prove your identity to others.": "Verifiera din identitet för att komma åt krypterade meddelanden och bevisa din identitet för andra.",
- "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Om du inte verifierar så kommer du inte ha åtkomst till alla dina meddelanden och kan synas som ej betrodd för andra."
+ "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Om du inte verifierar så kommer du inte ha åtkomst till alla dina meddelanden och kan synas som ej betrodd för andra.",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "Du är den enda personen här. Om du lämnar så kommer ingen kunna gå med igen, inklusive du.",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "Om du återställer allt så kommer du att börja om utan betrodda sessioner eller betrodda användare, och kommer kanske inte kunna se gamla meddelanden.",
+ "Only do this if you have no other device to complete verification with.": "Gör detta endast om du inte har någon annan enhet att slutföra verifikationen med.",
+ "Reset everything": "Återställ allt",
+ "Forgotten or lost all recovery methods? Reset all": "Glömt eller förlorat alla återställningsalternativ? Återställ allt",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "Om du gör det, observera att inga av dina meddelanden kommer att raderas, men sökupplevelsen kan degraderas en stund medans registret byggs upp igen",
+ "View message": "Visa meddelande",
+ "Zoom in": "Zooma in",
+ "Zoom out": "Zooma ut",
+ "%(seconds)ss left": "%(seconds)ss kvar",
+ "Change server ACLs": "Ändra server-ACLer",
+ "Show options to enable 'Do not disturb' mode": "Visa alternativ för att aktivera 'Stör ej'-läget",
+ "Delete all": "Radera alla",
+ "View all %(count)s members|one": "Visa 1 medlem",
+ "View all %(count)s members|other": "Visa alla %(count)s medlemmar",
+ "You can select all or individual messages to retry or delete": "Du kan välja alla eller individuella meddelanden att försöka igen eller radera",
+ "Sending": "Skickar",
+ "Retry all": "Försök alla igen",
+ "Some of your messages have not been sent": "Vissa av dina meddelanden har inte skickats",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s medlemmar inklusive %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "Inklusive %(commaSeparatedMembers)s",
+ "Failed to send": "Misslyckades att skicka"
}
diff --git a/src/i18n/strings/tzm.json b/src/i18n/strings/tzm.json
index ba63af5fb0..f9ac9cf574 100644
--- a/src/i18n/strings/tzm.json
+++ b/src/i18n/strings/tzm.json
@@ -4,7 +4,7 @@
"Actions": "Tugawin",
"Messages": "Tuzinin",
"Cancel": "Sser",
- "Create Account": "Ssenflul amiḍan",
+ "Create Account": "senflul amiḍan",
"Sign In": "Kcem",
"Name or Matrix ID": "Isem neɣ ID Matrix",
"Dec": "Duj",
@@ -35,5 +35,122 @@
"The version of %(brand)s": "Taleqqemt n %(brand)s",
"Add Phone Number": "Rnu uṭṭun n utilifun",
"Add Email Address": "Rnu tasna imayl",
- "Open": "Ṛẓem"
+ "Open": "Ṛẓem",
+ "Permissions": "Tisirag",
+ "Subscribe": "Zemmem",
+ "Change": "Senfel",
+ "Disconnect": "Kkes azday",
+ "exists": "illa",
+ "Santa": "Santa",
+ "Pizza": "Tapizzat",
+ "Corn": "Akbal",
+ "Cloud": "Tagut",
+ "Globe": "Amaḍal",
+ "Flower": "Ajeǧǧig",
+ "Butterfly": "Aferteṭṭu",
+ "Rooster": "Ayaẓiḍ",
+ "Panda": "Apanda",
+ "Upgrade": "Leqqem",
+ "Confirm": "Sentem",
+ "Brazil": "Brazil",
+ "Bolivia": "Bulivya",
+ "Bhutan": "Buṭan",
+ "Bermuda": "Birmuda",
+ "Benin": "Binin",
+ "Belize": "Biliz",
+ "Belgium": "Beljika",
+ "Belarus": "Bilarusya",
+ "Bahamas": "Bahamas",
+ "Aruba": "Aruba",
+ "Angola": "Angula",
+ "Andorra": "Andura",
+ "Algeria": "Dzayer",
+ "Albania": "Albanya",
+ "End": "End",
+ "Space": "Space",
+ "Shift": "Shift",
+ "Super": "Super",
+ "Ctrl": "Ctrl",
+ "Esc": "Esc",
+ "Calls": "Iɣuṛiten",
+ "Emoji": "Imuji",
+ "Afghanistan": "Afɣanistan",
+ "Logout": "Ffeɣ",
+ "Leave": "Fel",
+ "Phone": "Atilifun",
+ "Email": "Imayl",
+ "Go": "Ddu",
+ "Send": "Azen",
+ "example": "amedya",
+ "Example": "Amedya",
+ "Hide": "Ffer",
+ "Name": "Isem",
+ "Flags": "Icenyalen",
+ "Join": "Lkem",
+ "edited": "infel",
+ "Copied!": "inɣel!",
+ "Home": "Asnubeg",
+ "Reply": "Rar",
+ "Yes": "Yah",
+ "About": "Xef",
+ "Search…": "Arezzu…",
+ "A-Z": "A-Ẓ",
+ "Settings": "Tisɣal",
+ "Reject": "Agy",
+ "Re-join": "als-lkem",
+ "People": "Midden",
+ "Search": "Rzu",
+ "%(duration)sd": "%(duration)sas",
+ "Loading...": "Azdam...",
+ "Share": "Bḍu",
+ "Camera": "Takamiṛa",
+ "Microphone": "Amikṛu",
+ "Add": "Rnu",
+ "Ignore": "Nexxel",
+ "None": "Walu",
+ "Account": "Amiḍan",
+ "Theme": "Asgum",
+ "Algorithm:": "Talguritmit:",
+ "Save": "Ḥḍu",
+ "Profile": "Ifres",
+ "ID": "ID",
+ "Remove": "KKes",
+ "Folder": "Asdaw",
+ "Guitar": "Agiṭaṛ",
+ "Ball": "Tacama",
+ "Flag": "Acenyal",
+ "Telephone": "Atilifun",
+ "Key": "Tasarut",
+ "Book": "Adlis",
+ "Gift": "Timucit",
+ "Hat": "Tarazal",
+ "Robot": "Aṛubu",
+ "Heart": "Ul",
+ "Apple": "Tadeffuyt",
+ "Banana": "Tabanant",
+ "Fire": "Timessi",
+ "Moon": "Ayyur",
+ "Mushroom": "Agursel",
+ "Tree": "Aseklu",
+ "Fish": "Aselm",
+ "Turtle": "Ifker",
+ "Rabbit": "Agnin",
+ "Elephant": "Ilew",
+ "Pig": "Ilef",
+ "Close": "Rgel",
+ "Horse": "Ayyis",
+ "Lion": "Izem",
+ "Cat": "Amuc",
+ "Dog": "Aydi",
+ "or": "neɣ",
+ "Decline": "Agy",
+ "Guest": "Anebgi",
+ "Ok": "Wax",
+ "Notifications": "Tineɣmisin",
+ "No": "Uhu",
+ "Dark": "Adeɣmum",
+ "Usage": "Asemres",
+ "Feb": "Bṛa",
+ "Jan": "Yen",
+ "Continue": "Kemmel"
}
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index c9bb9bb2d7..134f61a435 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -3288,5 +3288,28 @@
"You can add more later too, including already existing ones.": "您稍後可以新增更多內容，包含既有的。",
"Please choose a strong password": "請選擇強密碼",
"Use another login": "使用其他登入",
- "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "未經驗證，您將無法存取您的所有訊息，且可能不被其他人信任。"
+ "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "未經驗證，您將無法存取您的所有訊息，且可能不被其他人信任。",
+ "You are the only person here. If you leave, no one will be able to join in the future, including you.": "您是這裡唯一的人。如果您離開，包含您在內的任何人都無法加入。",
+ "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "如果您重設所有東西，您將會在沒有受信任的工作階段、沒有受信任的使用者，且可能會看不到過去的訊息。",
+ "Only do this if you have no other device to complete verification with.": "當您沒有其他裝置可以完成驗證時，才執行此動作。",
+ "Reset everything": "重設所有東西",
+ "Forgotten or lost all recovery methods? Reset all": "忘記或遺失了所有復原方法？重設全部",
+ "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst the index is recreated": "如果這樣做，請注意，您的訊息不會被刪除，但在重新建立索引時，搜尋體驗可能會降低片刻",
+ "View message": "檢視訊息",
+ "Zoom in": "放大",
+ "Zoom out": "縮小",
+ "%(seconds)ss left": "剩%(seconds)s秒",
+ "Change server ACLs": "變更伺服器 ACL",
+ "Show options to enable 'Do not disturb' mode": "顯示啟用「勿打擾」模式的選項",
+ "You can select all or individual messages to retry or delete": "您可以選取全部或單獨的訊息來重試或刪除",
+ "Sending": "正在傳送",
+ "Retry all": "重試全部",
+ "Delete all": "刪除全部",
+ "Some of your messages have not been sent": "您的部份訊息未傳送",
+ "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+ "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s 個成員包含 %(commaSeparatedMembers)s",
+ "Including %(commaSeparatedMembers)s": "包含 %(commaSeparatedMembers)s",
+ "View all %(count)s members|one": "檢視 1 個成員",
+ "View all %(count)s members|other": "檢視全部 %(count)s 個成員",
+ "Failed to send": "傳送失敗"
}
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 2a26eeac13..1497a2208d 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -438,7 +438,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
},
"webRtcAllowPeerToPeer": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
- displayName: _td('Allow Peer-to-Peer for 1:1 calls'),
+ displayName: _td(
+ "Allow Peer-to-Peer for 1:1 calls " +
+ "(if you enable this, the other party might be able to see your IP address)",
+ ),
default: true,
invertedSettingName: 'webRtcForceTURN',
},
diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
index 393f4f27a1..1a78a1b485 100644
--- a/src/stores/BreadcrumbsStore.ts
+++ b/src/stores/BreadcrumbsStore.ts
@@ -122,7 +122,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient {
}
private async appendRoom(room: Room) {
- if (room.isSpaceRoom() && SettingsStore.getValue("feature_spaces")) return; // hide space rooms
+ if (SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()) return; // hide space rooms
let updated = false;
const rooms = (this.state.rooms || []).slice(); // cheap clone
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index ec6227e45e..b1b8199f93 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import {sortBy, throttle} from "lodash";
+import {ListIteratee, Many, sortBy, throttle} from "lodash";
import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
import {Room} from "matrix-js-sdk/src/models/room";
import {MatrixEvent} from "matrix-js-sdk/src/models/event";
@@ -31,28 +31,23 @@ import {RoomNotificationStateStore} from "./notifications/RoomNotificationStateS
import {DefaultTagID} from "./room-list/models";
import {EnhancedMap, mapDiff} from "../utils/maps";
import {setHasDiff} from "../utils/sets";
-import {objectDiff} from "../utils/objects";
-import {arrayHasDiff} from "../utils/arrays";
import {ISpaceSummaryEvent, ISpaceSummaryRoom} from "../components/structures/SpaceRoomDirectory";
import RoomViewStore from "./RoomViewStore";
-type SpaceKey = string | symbol;
-
interface IState {}
const ACTIVE_SPACE_LS_KEY = "mx_active_space";
-export const HOME_SPACE = Symbol("home-space");
export const SUGGESTED_ROOMS = Symbol("suggested-rooms");
export const UPDATE_TOP_LEVEL_SPACES = Symbol("top-level-spaces");
export const UPDATE_INVITED_SPACES = Symbol("invited-spaces");
export const UPDATE_SELECTED_SPACE = Symbol("selected-space");
-// Space Room ID/HOME_SPACE will be emitted when a Space's children change
+// Space Room ID will be emitted when a Space's children change
const MAX_SUGGESTED_ROOMS = 20;
-const getSpaceContextKey = (space?: Room) => `mx_space_context_${space?.roomId || "home_space"}`;
+const getSpaceContextKey = (space?: Room) => `mx_space_context_${space?.roomId || "ALL_ROOMS"}`;
const partitionSpacesAndRooms = (arr: Room[]): [Room[], Room[]] => { // [spaces, rooms]
return arr.reduce((result, room: Room) => {
@@ -61,15 +56,18 @@ const partitionSpacesAndRooms = (arr: Room[]): [Room[], Room[]] => { // [spaces,
}, [[], []]);
};
-const getOrder = (ev: MatrixEvent): string | null => {
- const content = ev.getContent();
- if (typeof content.order === "string" && Array.from(content.order).every((c: string) => {
+// For sorting space children using a validated `order`, `m.room.create`'s `origin_server_ts`, `room_id`
+export const getOrder = (order: string, creationTs: number, roomId: string): Array>> => {
+ let validatedOrder: string = null;
+
+ if (typeof order === "string" && Array.from(order).every((c: string) => {
const charCode = c.charCodeAt(0);
return charCode >= 0x20 && charCode <= 0x7F;
})) {
- return content.order;
+ validatedOrder = order;
}
- return null;
+
+ return [validatedOrder, creationTs, roomId];
}
const getRoomFn: FetchRoomFn = (room: Room) => {
@@ -83,15 +81,13 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
// The spaces representing the roots of the various tree-like hierarchies
private rootSpaces: Room[] = [];
- // The list of rooms not present in any currently joined spaces
- private orphanedRooms = new Set();
// Map from room ID to set of spaces which list it as a child
private parentMap = new EnhancedMap>();
- // Map from space key to SpaceNotificationState instance representing that space
- private notificationStateMap = new Map();
+ // Map from spaceId to SpaceNotificationState instance representing that space
+ private notificationStateMap = new Map();
// Map from space key to Set of room IDs that should be shown as part of that space's filter
- private spaceFilteredRooms = new Map>();
- // The space currently selected in the Space Panel - if null then `Home` is selected
+ private spaceFilteredRooms = new Map>();
+ // The space currently selected in the Space Panel - if null then All Rooms is selected
private _activeSpace?: Room = null;
private _suggestedRooms: ISpaceSummaryRoom[] = [];
private _invitedSpaces = new Set();
@@ -112,6 +108,13 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
return this._suggestedRooms;
}
+ /**
+ * Sets the active space, updates room list filters,
+ * optionally switches the user's room back to where they were when they last viewed that space.
+ * @param space which space to switch to.
+ * @param contextSwitch whether to switch the user's context,
+ * should not be done when the space switch is done implicitly due to another event like switching room.
+ */
public async setActiveSpace(space: Room | null, contextSwitch = true) {
if (space === this.activeSpace || (space && !space?.isSpaceRoom())) return;
@@ -193,9 +196,16 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
private getChildren(spaceId: string): Room[] {
const room = this.matrixClient?.getRoom(spaceId);
const childEvents = room?.currentState.getStateEvents(EventType.SpaceChild).filter(ev => ev.getContent()?.via);
- return sortBy(childEvents, getOrder)
- .map(ev => this.matrixClient.getRoom(ev.getStateKey()))
- .filter(room => room?.getMyMembership() === "join" || room?.getMyMembership() === "invite") || [];
+ return sortBy(childEvents, ev => {
+ const roomId = ev.getStateKey();
+ const childRoom = this.matrixClient?.getRoom(roomId);
+ const createTs = childRoom?.currentState.getStateEvents(EventType.RoomCreate, "")?.getTs();
+ return getOrder(ev.getContent().order, createTs, roomId);
+ }).map(ev => {
+ return this.matrixClient.getRoom(ev.getStateKey());
+ }).filter(room => {
+ return room?.getMyMembership() === "join" || room?.getMyMembership() === "invite";
+ }) || [];
}
public getChildRooms(spaceId: string): Room[] {
@@ -227,7 +237,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
}
public getSpaceFilteredRoomIds = (space: Room | null): Set => {
- return this.spaceFilteredRooms.get(space?.roomId || HOME_SPACE) || new Set();
+ if (!space) {
+ return new Set(this.matrixClient.getVisibleRooms().map(r => r.roomId));
+ }
+ return this.spaceFilteredRooms.get(space.roomId) || new Set();
};
private rebuild = throttle(() => {
@@ -258,7 +271,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
});
});
- const [rootSpaces, orphanedRooms] = partitionSpacesAndRooms(Array.from(unseenChildren));
+ const [rootSpaces] = partitionSpacesAndRooms(Array.from(unseenChildren));
// somewhat algorithm to handle full-cycles
const detachedNodes = new Set(spaces);
@@ -299,13 +312,12 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
// rootSpaces.push(space);
// });
- this.orphanedRooms = new Set(orphanedRooms);
this.rootSpaces = rootSpaces;
this.parentMap = backrefs;
// if the currently selected space no longer exists, remove its selection
if (this._activeSpace && detachedNodes.has(this._activeSpace)) {
- this.setActiveSpace(null);
+ this.setActiveSpace(null, false);
}
this.onRoomsUpdate(); // TODO only do this if a change has happened
@@ -320,25 +332,6 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
this.rebuild();
}
- private showInHomeSpace = (room: Room) => {
- if (room.isSpaceRoom()) return false;
- return !this.parentMap.get(room.roomId)?.size // put all orphaned rooms in the Home Space
- || DMRoomMap.shared().getUserIdForRoomId(room.roomId) // put all DMs in the Home Space
- || RoomListStore.instance.getTagsForRoom(room).includes(DefaultTagID.Favourite) // show all favourites
- };
-
- // Update a given room due to its tag changing (e.g DM-ness or Fav-ness)
- // This can only change whether it shows up in the HOME_SPACE or not
- private onRoomUpdate = (room: Room) => {
- if (this.showInHomeSpace(room)) {
- this.spaceFilteredRooms.get(HOME_SPACE)?.add(room.roomId);
- this.emit(HOME_SPACE);
- } else if (!this.orphanedRooms.has(room.roomId)) {
- this.spaceFilteredRooms.get(HOME_SPACE)?.delete(room.roomId);
- this.emit(HOME_SPACE);
- }
- };
-
private onSpaceMembersChange = (ev: MatrixEvent) => {
// skip this update if we do not have a DM with this user
if (DMRoomMap.shared().getDMRoomsForUserId(ev.getStateKey()).length < 1) return;
@@ -352,16 +345,6 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
const oldFilteredRooms = this.spaceFilteredRooms;
this.spaceFilteredRooms = new Map();
- // put all room invites in the Home Space
- const invites = visibleRooms.filter(r => !r.isSpaceRoom() && r.getMyMembership() === "invite");
- this.spaceFilteredRooms.set(HOME_SPACE, new Set(invites.map(room => room.roomId)));
-
- visibleRooms.forEach(room => {
- if (this.showInHomeSpace(room)) {
- this.spaceFilteredRooms.get(HOME_SPACE).add(room.roomId);
- }
- });
-
this.rootSpaces.forEach(s => {
// traverse each space tree in DFS to build up the supersets as you go up,
// reusing results from like subtrees.
@@ -406,10 +389,33 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
this.spaceFilteredRooms.forEach((roomIds, s) => {
// Update NotificationStates
- this.getNotificationState(s)?.setRooms(visibleRooms.filter(room => roomIds.has(room.roomId)));
+ this.getNotificationState(s)?.setRooms(visibleRooms.filter(room => {
+ if (roomIds.has(room.roomId)) {
+ return !DMRoomMap.shared().getUserIdForRoomId(room.roomId)
+ || RoomListStore.instance.getTagsForRoom(room).includes(DefaultTagID.Favourite);
+ }
+
+ return false;
+ }));
});
}, 100, {trailing: true, leading: true});
+ private switchToRelatedSpace = (roomId: string) => {
+ if (this.suggestedRooms.find(r => r.room_id === roomId)) return;
+
+ let parent = this.getCanonicalParent(roomId);
+ if (!parent) {
+ parent = this.rootSpaces.find(s => this.spaceFilteredRooms.get(s.roomId)?.has(roomId));
+ }
+ if (!parent) {
+ const parents = Array.from(this.parentMap.get(roomId) || []);
+ parent = parents.find(p => this.matrixClient.getRoom(p));
+ }
+
+ // don't trigger a context switch when we are switching a space to match the chosen room
+ this.setActiveSpace(parent || null, false);
+ };
+
private onRoom = (room: Room, newMembership?: string, oldMembership?: string) => {
const membership = newMembership || room.getMyMembership();
@@ -424,6 +430,11 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
if (numSuggestedRooms !== this._suggestedRooms.length) {
this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
}
+
+ // if the room currently being viewed was just joined then switch to its related space
+ if (newMembership === "join" && room.roomId === RoomViewStore.getRoomId()) {
+ this.switchToRelatedSpace(room.roomId);
+ }
}
return;
}
@@ -442,7 +453,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
if (membership === "join" && room.roomId === RoomViewStore.getRoomId()) {
// if the user was looking at the space and then joined: select that space
- this.setActiveSpace(room);
+ this.setActiveSpace(room, false);
}
};
@@ -463,8 +474,6 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
// TODO confirm this after implementing parenting behaviour
if (room.isSpaceRoom()) {
this.onSpaceUpdate();
- } else {
- this.onRoomUpdate(room);
}
this.emit(room.roomId);
break;
@@ -477,38 +486,8 @@ 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
- const oldTags = lastEvent?.getContent()?.tags || {};
- const newTags = ev.getContent()?.tags || {};
- if (!!oldTags[DefaultTagID.Favourite] !== !!newTags[DefaultTagID.Favourite]) {
- this.onRoomUpdate(room);
- }
- }
- }
-
- private onAccountData = (ev: MatrixEvent, lastEvent: MatrixEvent) => {
- if (ev.getType() === EventType.Direct) {
- const lastContent = lastEvent.getContent();
- const content = ev.getContent();
-
- const diff = objectDiff>(lastContent, content);
- // filter out keys which changed by reference only by checking whether the sets differ
- const changed = diff.changed.filter(k => arrayHasDiff(lastContent[k], content[k]));
- // DM tag changes, refresh relevant rooms
- new Set([...diff.added, ...diff.removed, ...changed]).forEach(roomId => {
- const room = this.matrixClient?.getRoom(roomId);
- if (room) {
- this.onRoomUpdate(room);
- }
- });
- }
- };
-
protected async reset() {
this.rootSpaces = [];
- this.orphanedRooms = new Set();
this.parentMap = new EnhancedMap();
this.notificationStateMap = new Map();
this.spaceFilteredRooms = new Map();
@@ -523,8 +502,6 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
this.matrixClient.removeListener("Room", this.onRoom);
this.matrixClient.removeListener("Room.myMembership", this.onRoom);
this.matrixClient.removeListener("RoomState.events", this.onRoomState);
- this.matrixClient.removeListener("Room.accountData", this.onRoomAccountData);
- this.matrixClient.removeListener("accountData", this.onAccountData);
}
await this.reset();
}
@@ -534,18 +511,13 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
this.matrixClient.on("Room", this.onRoom);
this.matrixClient.on("Room.myMembership", this.onRoom);
this.matrixClient.on("RoomState.events", this.onRoomState);
- this.matrixClient.on("Room.accountData", this.onRoomAccountData);
- this.matrixClient.on("accountData", this.onAccountData);
await this.onSpaceUpdate(); // trigger an initial update
// restore selected state from last session if any and still valid
const lastSpaceId = window.localStorage.getItem(ACTIVE_SPACE_LS_KEY);
if (lastSpaceId) {
- const space = this.rootSpaces.find(s => s.roomId === lastSpaceId);
- if (space) {
- this.setActiveSpace(space);
- }
+ this.setActiveSpace(this.matrixClient.getRoom(lastSpaceId));
}
}
@@ -553,27 +525,18 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
if (!SettingsStore.getValue("feature_spaces")) return;
switch (payload.action) {
case "view_room": {
- const room = this.matrixClient?.getRoom(payload.room_id);
-
// Don't auto-switch rooms when reacting to a context-switch
// as this is not helpful and can create loops of rooms/space switching
- if (!room || payload.context_switch) break;
+ if (payload.context_switch) break;
- if (room.isSpaceRoom()) {
+ const roomId = payload.room_id;
+ const room = this.matrixClient?.getRoom(roomId);
+ if (room?.isSpaceRoom()) {
// Don't context switch when navigating to the space room
// as it will cause you to end up in the wrong room
this.setActiveSpace(room, false);
- } else if (!this.getSpaceFilteredRoomIds(this.activeSpace).has(room.roomId)) {
- let parent = this.getCanonicalParent(room.roomId);
- if (!parent) {
- parent = this.rootSpaces.find(s => this.spaceFilteredRooms.get(s.roomId)?.has(room.roomId));
- }
- if (!parent) {
- const parents = Array.from(this.parentMap.get(room.roomId) || []);
- parent = parents.find(p => this.matrixClient.getRoom(p));
- }
- // don't trigger a context switch when we are switching a space to match the chosen room
- this.setActiveSpace(parent || null, false);
+ } else if (this.activeSpace && !this.getSpaceFilteredRoomIds(this.activeSpace).has(roomId)) {
+ this.switchToRelatedSpace(roomId);
}
// Persist last viewed room from a space
@@ -584,13 +547,13 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
}
case "after_leave_room":
if (this._activeSpace && payload.room_id === this._activeSpace.roomId) {
- this.setActiveSpace(null);
+ this.setActiveSpace(null, false);
}
break;
}
}
- public getNotificationState(key: SpaceKey): SpaceNotificationState {
+ public getNotificationState(key: string): SpaceNotificationState {
if (this.notificationStateMap.has(key)) {
return this.notificationStateMap.get(key);
}
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 6e9216423a..a23401e4c9 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -426,6 +426,10 @@ export class RoomListStoreClass extends AsyncStoreWithClient {
return; // don't do anything on rooms that aren't visible
}
+ if (cause === RoomUpdateCause.NewRoom && !this.prefilterConditions.every(c => c.isVisible(room))) {
+ return; // don't do anything on new rooms which ought not to be shown
+ }
+
const shouldUpdate = await this.algorithm.handleRoomUpdate(room, cause);
if (shouldUpdate) {
if (SettingsStore.getValue("advancedRoomListLogging")) {
@@ -664,7 +668,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient {
* and thus might not cause an update to the store immediately.
* @param {IFilterCondition} filter The filter condition to add.
*/
- public addFilter(filter: IFilterCondition): void {
+ public async addFilter(filter: IFilterCondition): Promise {
if (SettingsStore.getValue("advancedRoomListLogging")) {
// TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
console.log("Adding filter condition:", filter);
@@ -676,13 +680,15 @@ export class RoomListStoreClass extends AsyncStoreWithClient {
promise = this.recalculatePrefiltering();
} else {
this.filterConditions.push(filter);
+ // Runtime filters with spaces disable prefiltering for the search all spaces feature
+ if (SettingsStore.getValue("feature_spaces")) {
+ // this has to be awaited so that `setKnownRooms` is called in time for the `addFilterCondition` below
+ // this way the runtime filters are only evaluated on one dataset and not both.
+ await this.recalculatePrefiltering();
+ }
if (this.algorithm) {
this.algorithm.addFilterCondition(filter);
}
- // Runtime filters with spaces disable prefiltering for the search all spaces effect
- if (SettingsStore.getValue("feature_spaces")) {
- promise = this.recalculatePrefiltering();
- }
}
promise.then(() => this.updateFn.trigger());
}
@@ -706,10 +712,10 @@ export class RoomListStoreClass extends AsyncStoreWithClient {
if (this.algorithm) {
this.algorithm.removeFilterCondition(filter);
- // Runtime filters with spaces disable prefiltering for the search all spaces effect
- if (SettingsStore.getValue("feature_spaces")) {
- promise = this.recalculatePrefiltering();
- }
+ }
+ // Runtime filters with spaces disable prefiltering for the search all spaces feature
+ if (SettingsStore.getValue("feature_spaces")) {
+ promise = this.recalculatePrefiltering();
}
}
idx = this.prefilterConditions.indexOf(filter);
diff --git a/src/stores/room-list/SpaceWatcher.ts b/src/stores/room-list/SpaceWatcher.ts
index 13e1d83901..0b1b78bc75 100644
--- a/src/stores/room-list/SpaceWatcher.ts
+++ b/src/stores/room-list/SpaceWatcher.ts
@@ -24,26 +24,34 @@ import SpaceStore, { UPDATE_SELECTED_SPACE } from "../SpaceStore";
* Watches for changes in spaces to manage the filter on the provided RoomListStore
*/
export class SpaceWatcher {
- private filter = new SpaceFilterCondition();
+ private filter: SpaceFilterCondition;
private activeSpace: Room = SpaceStore.instance.activeSpace;
constructor(private store: RoomListStoreClass) {
- this.updateFilter(); // get the filter into a consistent state
- store.addFilter(this.filter);
SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdated);
}
- private onSelectedSpaceUpdated = (activeSpace: Room) => {
+ private onSelectedSpaceUpdated = (activeSpace?: Room) => {
this.activeSpace = activeSpace;
- this.updateFilter();
+
+ if (this.filter) {
+ if (activeSpace) {
+ this.updateFilter();
+ } else {
+ this.store.removeFilter(this.filter);
+ this.filter = null;
+ }
+ } else if (activeSpace) {
+ this.filter = new SpaceFilterCondition();
+ this.updateFilter();
+ this.store.addFilter(this.filter);
+ }
};
private updateFilter = () => {
- if (this.activeSpace) {
- SpaceStore.instance.traverseSpace(this.activeSpace.roomId, roomId => {
- this.store.matrixClient?.getRoom(roomId)?.loadMembersIfNeeded();
- });
- }
+ SpaceStore.instance.traverseSpace(this.activeSpace.roomId, roomId => {
+ this.store.matrixClient?.getRoom(roomId)?.loadMembersIfNeeded();
+ });
this.filter.updateSpace(this.activeSpace);
};
}
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index 83ee803115..024c484c41 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -199,8 +199,10 @@ export class Algorithm extends EventEmitter {
}
private async doUpdateStickyRoom(val: Room) {
- // no-op sticky rooms for spaces - they're effectively virtual rooms
- if (val?.isSpaceRoom() && val.getMyMembership() !== "invite") val = null;
+ if (SettingsStore.getValue("feature_spaces") && val?.isSpaceRoom() && val.getMyMembership() !== "invite") {
+ // no-op sticky rooms for spaces - they're effectively virtual rooms
+ val = null;
+ }
// Note throughout: We need async so we can wait for handleRoomUpdate() to do its thing,
// otherwise we risk duplicating rooms.
@@ -577,9 +579,8 @@ export class Algorithm extends EventEmitter {
await this.generateFreshTags(newTags);
- this.cachedRooms = newTags;
+ this.cachedRooms = newTags; // this recalculates the filtered rooms for us
this.updateTagsFromCache();
- this.recalculateFilteredRooms();
// Now that we've finished generation, we need to update the sticky room to what
// it was. It's entirely possible that it changed lists though, so if it did then
diff --git a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
index 7c8c879cf6..49cfd9e520 100644
--- a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
+++ b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
@@ -21,79 +21,83 @@ import { MatrixClientPeg } from "../../../../MatrixClientPeg";
import * as Unread from "../../../../Unread";
import { EffectiveMembership, getEffectiveMembership } from "../../../../utils/membership";
+export const sortRooms = (rooms: Room[]): Room[] => {
+ // We cache the timestamp lookup to avoid iterating forever on the timeline
+ // of events. This cache only survives a single sort though.
+ // We wouldn't need this if `.sort()` didn't constantly try and compare all
+ // of the rooms to each other.
+
+ // TODO: We could probably improve the sorting algorithm here by finding changes.
+ // See https://github.com/vector-im/element-web/issues/14459
+ // For example, if we spent a little bit of time to determine which elements have
+ // actually changed (probably needs to be done higher up?) then we could do an
+ // insertion sort or similar on the limited set of changes.
+
+ // TODO: Don't assume we're using the same client as the peg
+ // See https://github.com/vector-im/element-web/issues/14458
+ let myUserId = '';
+ if (MatrixClientPeg.get()) {
+ myUserId = MatrixClientPeg.get().getUserId();
+ }
+
+ const tsCache: { [roomId: string]: number } = {};
+ const getLastTs = (r: Room) => {
+ if (tsCache[r.roomId]) {
+ return tsCache[r.roomId];
+ }
+
+ const ts = (() => {
+ // Apparently we can have rooms without timelines, at least under testing
+ // environments. Just return MAX_INT when this happens.
+ if (!r || !r.timeline) {
+ return Number.MAX_SAFE_INTEGER;
+ }
+
+ // If the room hasn't been joined yet, it probably won't have a timeline to
+ // parse. We'll still fall back to the timeline if this fails, but chances
+ // are we'll at least have our own membership event to go off of.
+ const effectiveMembership = getEffectiveMembership(r.getMyMembership());
+ if (effectiveMembership !== EffectiveMembership.Join) {
+ const membershipEvent = r.currentState.getStateEvents("m.room.member", myUserId);
+ if (membershipEvent && !Array.isArray(membershipEvent)) {
+ return membershipEvent.getTs();
+ }
+ }
+
+ for (let i = r.timeline.length - 1; i >= 0; --i) {
+ const ev = r.timeline[i];
+ if (!ev.getTs()) continue; // skip events that don't have timestamps (tests only?)
+
+ if (ev.getSender() === myUserId || Unread.eventTriggersUnreadCount(ev)) {
+ return ev.getTs();
+ }
+ }
+
+ // we might only have events that don't trigger the unread indicator,
+ // in which case use the oldest event even if normally it wouldn't count.
+ // This is better than just assuming the last event was forever ago.
+ if (r.timeline.length && r.timeline[0].getTs()) {
+ return r.timeline[0].getTs();
+ } else {
+ return Number.MAX_SAFE_INTEGER;
+ }
+ })();
+
+ tsCache[r.roomId] = ts;
+ return ts;
+ };
+
+ return rooms.sort((a, b) => {
+ return getLastTs(b) - getLastTs(a);
+ });
+};
+
/**
* Sorts rooms according to the last event's timestamp in each room that seems
* useful to the user.
*/
export class RecentAlgorithm implements IAlgorithm {
public async sortRooms(rooms: Room[], tagId: TagID): Promise {
- // We cache the timestamp lookup to avoid iterating forever on the timeline
- // of events. This cache only survives a single sort though.
- // We wouldn't need this if `.sort()` didn't constantly try and compare all
- // of the rooms to each other.
-
- // TODO: We could probably improve the sorting algorithm here by finding changes.
- // See https://github.com/vector-im/element-web/issues/14459
- // For example, if we spent a little bit of time to determine which elements have
- // actually changed (probably needs to be done higher up?) then we could do an
- // insertion sort or similar on the limited set of changes.
-
- // TODO: Don't assume we're using the same client as the peg
- // See https://github.com/vector-im/element-web/issues/14458
- let myUserId = '';
- if (MatrixClientPeg.get()) {
- myUserId = MatrixClientPeg.get().getUserId();
- }
-
- const tsCache: { [roomId: string]: number } = {};
- const getLastTs = (r: Room) => {
- if (tsCache[r.roomId]) {
- return tsCache[r.roomId];
- }
-
- const ts = (() => {
- // Apparently we can have rooms without timelines, at least under testing
- // environments. Just return MAX_INT when this happens.
- if (!r || !r.timeline) {
- return Number.MAX_SAFE_INTEGER;
- }
-
- // If the room hasn't been joined yet, it probably won't have a timeline to
- // parse. We'll still fall back to the timeline if this fails, but chances
- // are we'll at least have our own membership event to go off of.
- const effectiveMembership = getEffectiveMembership(r.getMyMembership());
- if (effectiveMembership !== EffectiveMembership.Join) {
- const membershipEvent = r.currentState.getStateEvents("m.room.member", myUserId);
- if (membershipEvent && !Array.isArray(membershipEvent)) {
- return membershipEvent.getTs();
- }
- }
-
- for (let i = r.timeline.length - 1; i >= 0; --i) {
- const ev = r.timeline[i];
- if (!ev.getTs()) continue; // skip events that don't have timestamps (tests only?)
-
- if (ev.getSender() === myUserId || Unread.eventTriggersUnreadCount(ev)) {
- return ev.getTs();
- }
- }
-
- // we might only have events that don't trigger the unread indicator,
- // in which case use the oldest event even if normally it wouldn't count.
- // This is better than just assuming the last event was forever ago.
- if (r.timeline.length && r.timeline[0].getTs()) {
- return r.timeline[0].getTs();
- } else {
- return Number.MAX_SAFE_INTEGER;
- }
- })();
-
- tsCache[r.roomId] = ts;
- return ts;
- };
-
- return rooms.sort((a, b) => {
- return getLastTs(b) - getLastTs(a);
- });
+ return sortRooms(rooms);
}
}
diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts
index 43bdcb3879..6a06bee0d8 100644
--- a/src/stores/room-list/filters/SpaceFilterCondition.ts
+++ b/src/stores/room-list/filters/SpaceFilterCondition.ts
@@ -19,7 +19,7 @@ import { Room } from "matrix-js-sdk/src/models/room";
import { FILTER_CHANGED, FilterKind, IFilterCondition } from "./IFilterCondition";
import { IDestroyable } from "../../../utils/IDestroyable";
-import SpaceStore, {HOME_SPACE} from "../../SpaceStore";
+import SpaceStore from "../../SpaceStore";
import { setHasDiff } from "../../../utils/sets";
/**
@@ -55,10 +55,12 @@ export class SpaceFilterCondition extends EventEmitter implements IFilterConditi
}
};
- private getSpaceEventKey = (space: Room | null) => space ? space.roomId : HOME_SPACE;
+ private getSpaceEventKey = (space: Room) => space.roomId;
public updateSpace(space: Room) {
- SpaceStore.instance.off(this.getSpaceEventKey(this.space), this.onStoreUpdate);
+ if (this.space) {
+ SpaceStore.instance.off(this.getSpaceEventKey(this.space), this.onStoreUpdate);
+ }
SpaceStore.instance.on(this.getSpaceEventKey(this.space = space), this.onStoreUpdate);
this.onStoreUpdate(); // initial update from the change to the space
}
diff --git a/src/stores/room-list/filters/VisibilityProvider.ts b/src/stores/room-list/filters/VisibilityProvider.ts
index f212b1f9d9..c07c2b0b26 100644
--- a/src/stores/room-list/filters/VisibilityProvider.ts
+++ b/src/stores/room-list/filters/VisibilityProvider.ts
@@ -50,7 +50,7 @@ export class VisibilityProvider {
}
// hide space rooms as they'll be shown in the SpacePanel
- if (room.isSpaceRoom() && SettingsStore.getValue("feature_spaces")) {
+ if (SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()) {
return false;
}
diff --git a/src/utils/DecryptFile.ts b/src/utils/DecryptFile.ts
index 93cedbc707..d073393170 100644
--- a/src/utils/DecryptFile.ts
+++ b/src/utils/DecryptFile.ts
@@ -17,63 +17,8 @@ limitations under the License.
// Pull in the encryption lib so that we can decrypt attachments.
import encrypt from 'browser-encrypt-attachment';
import {mediaFromContent} from "../customisations/Media";
-import {IEncryptedFile} from "../customisations/models/IMediaEventContent";
-
-// WARNING: We have to be very careful about what mime-types we allow into blobs,
-// as for performance reasons these are now rendered via URL.createObjectURL()
-// rather than by converting into data: URIs.
-//
-// This means that the content is rendered using the origin of the script which
-// called createObjectURL(), and so if the content contains any scripting then it
-// will pose a XSS vulnerability when the browser renders it. This is particularly
-// bad if the user right-clicks the URI and pastes it into a new window or tab,
-// as the blob will then execute with access to Element's full JS environment(!)
-//
-// See https://github.com/matrix-org/matrix-react-sdk/pull/1820#issuecomment-385210647
-// for details.
-//
-// We mitigate this by only allowing mime-types into blobs which we know don't
-// contain any scripting, and instantiate all others as application/octet-stream
-// regardless of what mime-type the event claimed. Even if the payload itself
-// is some malicious HTML, the fact we instantiate it with a media mimetype or
-// application/octet-stream means the browser doesn't try to render it as such.
-//
-// One interesting edge case is image/svg+xml, which empirically *is* rendered
-// correctly if the blob is set to the src attribute of an img tag (for thumbnails)
-// *even if the mimetype is application/octet-stream*. However, empirically JS
-// in the SVG isn't executed in this scenario, so we seem to be okay.
-//
-// Tested on Chrome 65 and Firefox 60
-//
-// The list below is taken mainly from
-// https://developer.mozilla.org/en-US/docs/Web/HTML/Supported_media_formats
-// N.B. Matrix doesn't currently specify which mimetypes are valid in given
-// events, so we pick the ones which HTML5 browsers should be able to display
-//
-// For the record, mime-types which must NEVER enter this list below include:
-// text/html, text/xhtml, image/svg, image/svg+xml, image/pdf, and similar.
-
-const ALLOWED_BLOB_MIMETYPES = [
- 'image/jpeg',
- 'image/gif',
- 'image/png',
-
- 'video/mp4',
- 'video/webm',
- 'video/ogg',
-
- 'audio/mp4',
- 'audio/webm',
- 'audio/aac',
- 'audio/mpeg',
- 'audio/ogg',
- 'audio/wave',
- 'audio/wav',
- 'audio/x-wav',
- 'audio/x-pn-wav',
- 'audio/flac',
- 'audio/x-flac',
-];
+import { IEncryptedFile } from "../customisations/models/IMediaEventContent";
+import { getBlobSafeMimeType } from "./blobs";
/**
* Decrypt a file attached to a matrix event.
@@ -100,9 +45,7 @@ export function decryptFile(file: IEncryptedFile): Promise {
// browser (e.g. by copying the URI into a new tab or window.)
// See warning at top of file.
let mimetype = file.mimetype ? file.mimetype.split(";")[0].trim() : '';
- if (!ALLOWED_BLOB_MIMETYPES.includes(mimetype)) {
- mimetype = 'application/octet-stream';
- }
+ mimetype = getBlobSafeMimeType(mimetype);
return new Blob([dataArray], {type: mimetype});
});
diff --git a/src/utils/arrays.ts b/src/utils/arrays.ts
index f7e693452b..1e130bd605 100644
--- a/src/utils/arrays.ts
+++ b/src/utils/arrays.ts
@@ -36,14 +36,12 @@ export function arrayFastResample(input: number[], points: number): number[] {
}
} else {
// Smaller inputs mean we have to spread the values over the desired length. We
- // end up overshooting the target length in doing this, so we'll resample down
- // before returning. This recursion is risky, but mathematically should not go
- // further than 1 level deep.
+ // end up overshooting the target length in doing this, but we're not looking to
+ // be super accurate so we'll let the sanity trims do their job.
const spreadFactor = Math.ceil(points / input.length);
for (const val of input) {
samples.push(...arraySeed(val, spreadFactor));
}
- samples = arrayFastResample(samples, points);
}
// Sanity fill, just in case
diff --git a/src/utils/blobs.ts b/src/utils/blobs.ts
new file mode 100644
index 0000000000..4e073a3936
--- /dev/null
+++ b/src/utils/blobs.ts
@@ -0,0 +1,78 @@
+/*
+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.
+*/
+
+// WARNING: We have to be very careful about what mime-types we allow into blobs,
+// as for performance reasons these are now rendered via URL.createObjectURL()
+// rather than by converting into data: URIs.
+//
+// This means that the content is rendered using the origin of the script which
+// called createObjectURL(), and so if the content contains any scripting then it
+// will pose a XSS vulnerability when the browser renders it. This is particularly
+// bad if the user right-clicks the URI and pastes it into a new window or tab,
+// as the blob will then execute with access to Element's full JS environment(!)
+//
+// See https://github.com/matrix-org/matrix-react-sdk/pull/1820#issuecomment-385210647
+// for details.
+//
+// We mitigate this by only allowing mime-types into blobs which we know don't
+// contain any scripting, and instantiate all others as application/octet-stream
+// regardless of what mime-type the event claimed. Even if the payload itself
+// is some malicious HTML, the fact we instantiate it with a media mimetype or
+// application/octet-stream means the browser doesn't try to render it as such.
+//
+// One interesting edge case is image/svg+xml, which empirically *is* rendered
+// correctly if the blob is set to the src attribute of an img tag (for thumbnails)
+// *even if the mimetype is application/octet-stream*. However, empirically JS
+// in the SVG isn't executed in this scenario, so we seem to be okay.
+//
+// Tested on Chrome 65 and Firefox 60
+//
+// The list below is taken mainly from
+// https://developer.mozilla.org/en-US/docs/Web/HTML/Supported_media_formats
+// N.B. Matrix doesn't currently specify which mimetypes are valid in given
+// events, so we pick the ones which HTML5 browsers should be able to display
+//
+// For the record, mime-types which must NEVER enter this list below include:
+// text/html, text/xhtml, image/svg, image/svg+xml, image/pdf, and similar.
+
+const ALLOWED_BLOB_MIMETYPES = [
+ 'image/jpeg',
+ 'image/gif',
+ 'image/png',
+
+ 'video/mp4',
+ 'video/webm',
+ 'video/ogg',
+
+ 'audio/mp4',
+ 'audio/webm',
+ 'audio/aac',
+ 'audio/mpeg',
+ 'audio/ogg',
+ 'audio/wave',
+ 'audio/wav',
+ 'audio/x-wav',
+ 'audio/x-pn-wav',
+ 'audio/flac',
+ 'audio/x-flac',
+];
+
+export function getBlobSafeMimeType(mimetype: string): string {
+ if (!ALLOWED_BLOB_MIMETYPES.includes(mimetype)) {
+ return 'application/octet-stream';
+ }
+ return mimetype;
+}
diff --git a/src/utils/space.tsx b/src/utils/space.tsx
index 3f2b6f9bb4..c14dc988d2 100644
--- a/src/utils/space.tsx
+++ b/src/utils/space.tsx
@@ -83,6 +83,7 @@ export const showCreateNewRoom = async (cli: MatrixClient, space: Room) => {
if (shouldCreate) {
await createRoom(opts);
}
+ return shouldCreate;
};
export const showSpaceInvite = (space: Room, initialText = "") => {
diff --git a/src/voice/Playback.ts b/src/voice/Playback.ts
index 99b1f62866..caa5241e1a 100644
--- a/src/voice/Playback.ts
+++ b/src/voice/Playback.ts
@@ -20,6 +20,7 @@ import {arrayFastResample, arraySeed} from "../utils/arrays";
import {SimpleObservable} from "matrix-widget-api";
import {IDestroyable} from "../utils/IDestroyable";
import {PlaybackClock} from "./PlaybackClock";
+import {clamp} from "../utils/numbers";
export enum PlaybackState {
Decoding = "decoding",
@@ -28,7 +29,7 @@ export enum PlaybackState {
Playing = "playing", // active progress through timeline
}
-export const PLAYBACK_WAVEFORM_SAMPLES = 35;
+export const PLAYBACK_WAVEFORM_SAMPLES = 39;
const DEFAULT_WAVEFORM = arraySeed(0, PLAYBACK_WAVEFORM_SAMPLES);
export class Playback extends EventEmitter implements IDestroyable {
@@ -49,11 +50,9 @@ export class Playback extends EventEmitter implements IDestroyable {
constructor(private buf: ArrayBuffer, seedWaveform = DEFAULT_WAVEFORM) {
super();
this.context = new AudioContext();
- this.resampledWaveform = arrayFastResample(seedWaveform, PLAYBACK_WAVEFORM_SAMPLES);
+ this.resampledWaveform = arrayFastResample(seedWaveform ?? DEFAULT_WAVEFORM, PLAYBACK_WAVEFORM_SAMPLES);
this.waveformObservable.update(this.resampledWaveform);
this.clock = new PlaybackClock(this.context);
-
- // TODO: @@ TR: Calculate real waveform
}
public get waveform(): number[] {
@@ -93,6 +92,13 @@ export class Playback extends EventEmitter implements IDestroyable {
public async prepare() {
this.audioBuf = await this.context.decodeAudioData(this.buf);
+
+ // Update the waveform to the real waveform once we have channel data to use. We don't
+ // exactly trust the user-provided waveform to be accurate...
+ const waveform = Array.from(this.audioBuf.getChannelData(0)).map(v => clamp(v, 0, 1));
+ this.resampledWaveform = arrayFastResample(waveform, PLAYBACK_WAVEFORM_SAMPLES);
+ this.waveformObservable.update(this.resampledWaveform);
+
this.emit(PlaybackState.Stopped); // signal that we're not decoding anymore
this.clock.durationSeconds = this.audioBuf.duration;
}
diff --git a/src/voice/VoiceRecording.ts b/src/voice/VoiceRecording.ts
index eb705200ca..c4a0a78ce5 100644
--- a/src/voice/VoiceRecording.ts
+++ b/src/voice/VoiceRecording.ts
@@ -33,6 +33,8 @@ const BITRATE = 24000; // 24kbps is pretty high quality for our use case in opus
const TARGET_MAX_LENGTH = 120; // 2 minutes in seconds. Somewhat arbitrary, though longer == larger files.
const TARGET_WARN_TIME_LEFT = 10; // 10 seconds, also somewhat arbitrary.
+export const RECORDING_PLAYBACK_SAMPLES = 44;
+
export interface IRecordingUpdate {
waveform: number[]; // floating points between 0 (low) and 1 (high).
timeSeconds: number; // float
diff --git a/test/CallHandler-test.ts b/test/CallHandler-test.ts
index 754610b223..1e3f92e788 100644
--- a/test/CallHandler-test.ts
+++ b/test/CallHandler-test.ts
@@ -16,7 +16,7 @@ limitations under the License.
import './skinned-sdk';
-import CallHandler, { PlaceCallType } from '../src/CallHandler';
+import CallHandler, { PlaceCallType, CallHandlerEvent } from '../src/CallHandler';
import { stubClient, mkStubRoom } from './test-utils';
import { MatrixClientPeg } from '../src/MatrixClientPeg';
import dis from '../src/dispatcher/dispatcher';
@@ -172,11 +172,9 @@ describe('CallHandler', () => {
let callRoomChangeEventCount = 0;
const roomChangePromise = new Promise(resolve => {
- dispatchHandle = dis.register(payload => {
- if (payload.action === Action.CallChangeRoom) {
- ++callRoomChangeEventCount;
- resolve();
- }
+ callHandler.addListener(CallHandlerEvent.CallChangeRoom, () => {
+ ++callRoomChangeEventCount;
+ resolve();
});
});
@@ -201,7 +199,7 @@ describe('CallHandler', () => {
fakeCall.emit(CallEvent.AssertedIdentityChanged);
await roomChangePromise;
- dis.unregister(dispatchHandle);
+ callHandler.removeAllListeners();
// If everything's gone well, we should have seen only one room change
// event and the call should now be in user 3's room.
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 7347ff2658..dc70e3f7f6 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -77,7 +77,7 @@ describe('MessagePanel', function() {
DMRoomMap.makeShared();
});
- afterEach(function() {
+ afterEach(function () {
clock.uninstall();
});
@@ -88,7 +88,21 @@ describe('MessagePanel', function() {
events.push(test_utils.mkMessage(
{
event: true, room: "!room:id", user: "@user:id",
- ts: ts0 + i*1000,
+ ts: ts0 + i * 1000,
+ }));
+ }
+ return events;
+ }
+
+ // Just to avoid breaking Dateseparator tests that might run at 00hrs
+ function mkOneDayEvents() {
+ const events = [];
+ const ts0 = Date.parse('09 May 2004 00:12:00 GMT');
+ for (let i = 0; i < 10; i++) {
+ events.push(test_utils.mkMessage(
+ {
+ event: true, room: "!room:id", user: "@user:id",
+ ts: ts0 + i * 1000,
}));
}
return events;
@@ -104,7 +118,7 @@ describe('MessagePanel', function() {
let i = 0;
events.push(test_utils.mkMessage({
event: true, room: "!room:id", user: "@user:id",
- ts: ts0 + ++i*1000,
+ ts: ts0 + ++i * 1000,
}));
for (i = 0; i < 10; i++) {
@@ -151,7 +165,7 @@ describe('MessagePanel', function() {
},
getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
},
- ts: ts0 + i*1000,
+ ts: ts0 + i * 1000,
mship: 'join',
prevMship: 'join',
name: 'A user',
@@ -250,7 +264,6 @@ describe('MessagePanel', function() {
}),
];
}
-
function isReadMarkerVisible(rmContainer) {
return rmContainer && rmContainer.children.length > 0;
}
@@ -437,4 +450,17 @@ describe('MessagePanel', function() {
// read marker should be hidden given props and at the last event
expect(isReadMarkerVisible(rm)).toBeFalsy();
});
+
+ it('should render Date separators for the events', function () {
+ const events = mkOneDayEvents();
+ const res = mount(
+ ,
+ );
+ const Dates = res.find(sdk.getComponent('messages.DateSeparator'));
+
+ expect(Dates.length).toEqual(1);
+ });
});
diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.js
index 07b75aaae5..7c7a2f84fb 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.js
@@ -178,7 +178,7 @@ describe('editor/deserialize', function() {
const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
expect(parts.length).toBe(3);
expect(parts[0]).toStrictEqual({type: "plain", text: "Try "});
- expect(parts[1]).toStrictEqual({type: "room-pill", text: "#room:hs.tld"});
+ expect(parts[1]).toStrictEqual({type: "room-pill", text: "#room:hs.tld", resourceId: "#room:hs.tld"});
expect(parts[2]).toStrictEqual({type: "plain", text: "?"});
});
it('@room pill', function() {
diff --git a/test/end-to-end-tests/yarn.lock b/test/end-to-end-tests/yarn.lock
index 7f2cefb92e..97b348fe50 100644
--- a/test/end-to-end-tests/yarn.lock
+++ b/test/end-to-end-tests/yarn.lock
@@ -435,9 +435,9 @@ jsprim@^1.2.2:
verror "1.10.0"
lodash@^4.15.0, lodash@^4.17.11:
- version "4.17.19"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
- integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+ version "4.17.21"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+ integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
mime-db@~1.38.0:
version "1.38.0"
diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts
index aef788647d..20c48c29db 100644
--- a/test/stores/SpaceStore-test.ts
+++ b/test/stores/SpaceStore-test.ts
@@ -101,6 +101,7 @@ const invite1 = "!invite1:server";
const invite2 = "!invite2:server";
const room1 = "!room1:server";
const room2 = "!room2:server";
+const room3 = "!room3:server";
const space1 = "!space1:server";
const space2 = "!space2:server";
const space3 = "!space3:server";
@@ -361,8 +362,8 @@ describe("SpaceStore", () => {
expect(store.getSpaceFilteredRoomIds(null).has(invite2)).toBeTruthy();
});
- it("home space does not contain rooms/low priority from rooms within spaces", () => {
- expect(store.getSpaceFilteredRoomIds(null).has(room1)).toBeFalsy();
+ it("home space does contain rooms/low priority even if they are also shown in a space", () => {
+ expect(store.getSpaceFilteredRoomIds(null).has(room1)).toBeTruthy();
});
it("space contains child rooms", () => {
@@ -614,8 +615,8 @@ describe("SpaceStore", () => {
describe("space auto switching tests", () => {
beforeEach(async () => {
- [room1, room2, orphan1].forEach(mkRoom);
- mkSpace(space1, [room1, room2]);
+ [room1, room2, room3, orphan1].forEach(mkRoom);
+ mkSpace(space1, [room1, room2, room3]);
mkSpace(space2, [room1, room2]);
client.getRoom(room2).currentState.getStateEvents.mockImplementation(mockStateEventImplementation([
@@ -641,15 +642,15 @@ describe("SpaceStore", () => {
it("switch to canonical parent space for room", async () => {
viewRoom(room1);
- await store.setActiveSpace(null, false);
+ await store.setActiveSpace(client.getRoom(space2), false);
viewRoom(room2);
expect(store.activeSpace).toBe(client.getRoom(space2));
});
it("switch to first containing space for room", async () => {
viewRoom(room2);
- await store.setActiveSpace(null, false);
- viewRoom(room1);
+ await store.setActiveSpace(client.getRoom(space2), false);
+ viewRoom(room3);
expect(store.activeSpace).toBe(client.getRoom(space1));
});
@@ -659,6 +660,13 @@ describe("SpaceStore", () => {
viewRoom(orphan1);
expect(store.activeSpace).toBeNull();
});
+
+ it("when switching rooms in the all rooms home space don't switch to related space", async () => {
+ viewRoom(room2);
+ await store.setActiveSpace(null, false);
+ viewRoom(room1);
+ expect(store.activeSpace).toBeNull();
+ });
});
describe("traverseSpace", () => {
diff --git a/yarn.lock b/yarn.lock
index acdca26e55..0d9b2bdd3f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1594,6 +1594,11 @@
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+"@types/parse5@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.0.tgz#38590dc2c3cf5717154064e3ee9b6947ee21b299"
+ integrity sha512-oPwPSj4a1wu9rsXTEGIJz91ISU725t0BmSnUhb57sI+M8XEmvUop84lzuiYdq0Y5M6xLY8DBPg0C2xEQKLyvBA==
+
"@types/prettier@^2.0.0":
version "2.1.6"
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03"
@@ -4221,9 +4226,9 @@ hoist-non-react-statics@^3.3.0:
react-is "^16.7.0"
hosted-git-info@^2.1.4:
- version "2.8.8"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
- integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+ version "2.8.9"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+ integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
hosted-git-info@^3.0.6:
version "3.0.7"
@@ -5580,9 +5585,9 @@ lodash.sortby@^4.7.0:
integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.2.1:
- version "4.17.20"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
- integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+ version "4.17.21"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+ integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
log-symbols@^4.0.0:
version "4.0.0"
@@ -5672,8 +5677,8 @@ mathml-tag-names@^2.1.3:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "10.0.0"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c8f69c0b7937b9064938c134d708c4d064b71315"
+ version "10.1.0"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2d73805ca3d8c5a140fe05e574f826696de1656a"
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@@ -6302,6 +6307,11 @@ parse-json@^5.0.0:
json-parse-even-better-errors "^2.3.0"
lines-and-columns "^1.1.6"
+parse-srcset@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
+ integrity sha1-8r0iH2zJcKk42IVWq8WJyqqiveE=
+
parse5-htmlparser2-tree-adapter@^6.0.0:
version "6.0.1"
resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
@@ -7243,17 +7253,18 @@ sane@^4.0.3:
minimist "^1.1.1"
walker "~1.0.5"
-"sanitize-html@github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db":
- version "2.0.0-rc.3"
- resolved "https://codeload.github.com/apostrophecms/sanitize-html/tar.gz/3c7f93f2058f696f5359e3e58d464161647226db"
+sanitize-html@^2.3.2:
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.3.3.tgz#3db382c9a621cce4c46d90f10c64f1e9da9e8353"
+ integrity sha512-DCFXPt7Di0c6JUnlT90eIgrjs6TsJl/8HYU3KLdmrVclFN4O0heTcVbJiMa23OKVr6aR051XYtsgd8EWwEBwUA==
dependencies:
deepmerge "^4.2.2"
escape-string-regexp "^4.0.0"
- htmlparser2 "^4.1.0"
+ htmlparser2 "^6.0.0"
is-plain-object "^5.0.0"
klona "^2.0.3"
+ parse-srcset "^1.0.2"
postcss "^8.0.2"
- srcset "^3.0.0"
saxes@^5.0.0:
version "5.0.1"
@@ -7510,11 +7521,6 @@ sprintf-js@~1.0.2:
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-srcset@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/srcset/-/srcset-3.0.0.tgz#8afd8b971362dfc129ae9c1a99b3897301ce6441"
- integrity sha512-D59vF08Qzu/C4GAOXVgMTLfgryt5fyWo93FZyhEWANo0PokFz/iWdDe13mX3O5TRf6l8vMTqckAfR4zPiaH0yQ==
-
sshpk@^1.7.0:
version "1.16.1"
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -8070,9 +8076,9 @@ typescript@^4.1.3:
integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
ua-parser-js@^0.7.18:
- version "0.7.23"
- resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.23.tgz#704d67f951e13195fbcd3d78818577f5bc1d547b"
- integrity sha512-m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA==
+ version "0.7.28"
+ resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
+ integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
unhomoglyph@^1.0.6:
version "1.0.6"