{_t( - "Secret Storage will be set up using your existing key backup details." + + "Secret Storage will be set up using your existing key backup details. " + "Your secret storage passphrase and recovery key will be the same as " + " they were for your key backup", )}
@@ -527,6 +561,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent { _titleForPhase(phase) { switch (phase) { + case PHASE_RESTORE_KEY_BACKUP: + return _t('Restore your Key Backup'); case PHASE_MIGRATE: return _t('Migrate from Key Backup'); case PHASE_PASSPHRASE: @@ -569,6 +605,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent { case PHASE_LOADING: content = this._renderBusyPhase(); break; + case PHASE_RESTORE_KEY_BACKUP: + content = this._renderPhaseRestoreKeyBackup(); + break; case PHASE_MIGRATE: content = this._renderPhaseMigrate(); break; diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index af3f4d2598..2515035996 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1505,6 +1505,15 @@ export default createReactClass({ "blacklistUnverifiedDevices", ); cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled); + + // With cross-signing enabled, we send to unknown devices + // without prompting. Any bad-device status the user should + // be aware of will be signalled through the room shield + // changing colour. More advanced behaviour will come once + // we implement more settings. + cli.setGlobalErrorOnUnknownDevices( + !SettingsStore.isFeatureEnabled("feature_cross_signing"), + ); } }, diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index c552e2f8f5..a717f485f0 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -485,6 +485,7 @@ module.exports = createReactClass({ MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline); MatrixClientPeg.get().removeListener("Room.name", this.onRoomName); MatrixClientPeg.get().removeListener("Room.accountData", this.onRoomAccountData); + MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents); MatrixClientPeg.get().removeListener("Room.myMembership", this.onMyMembership); MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember); MatrixClientPeg.get().removeListener("accountData", this.onAccountData); diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js index 383bab5e79..8b6d41eb9f 100644 --- a/src/components/views/avatars/MemberAvatar.js +++ b/src/components/views/avatars/MemberAvatar.js @@ -55,7 +55,7 @@ module.exports = createReactClass({ }, _getState: function(props) { - if (props.member) { + if (props.member && props.member.name) { return { name: props.member.name, title: props.title || props.member.userId, diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js index c5e9c92131..371768eb4e 100644 --- a/src/components/views/dialogs/DMInviteDialog.js +++ b/src/components/views/dialogs/DMInviteDialog.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React from 'react'; +import React, {createRef} from 'react'; import PropTypes from 'prop-types'; import {_t} from "../../../languageHandler"; import sdk from "../../../index"; @@ -25,24 +25,56 @@ import {RoomMember} from "matrix-js-sdk/lib/matrix"; import * as humanize from "humanize"; import SdkConfig from "../../../SdkConfig"; import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo"; +import * as Email from "../../../email"; +import {getDefaultIdentityServerUrl, useDefaultIdentityServer} from "../../../utils/IdentityServerUtils"; +import {abbreviateUrl} from "../../../utils/UrlUtils"; +import dis from "../../../dispatcher"; +import IdentityAuthClient from "../../../IdentityAuthClient"; +import Modal from "../../../Modal"; // TODO: [TravisR] Make this generic for all kinds of invites const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked -class DirectoryMember { +// This is the interface that is expected by various components in this file. It is a bit +// awkward because it also matches the RoomMember class from the js-sdk with some extra support +// for 3PIDs/email addresses. +// +// XXX: We should use TypeScript interfaces instead of this weird "abstract" class. +class Member { + /** + * The display name of this Member. For users this should be their profile's display + * name or user ID if none set. For 3PIDs this should be the 3PID address (email). + */ + get name(): string { throw new Error("Member class not implemented"); } + + /** + * The ID of this Member. For users this should be their user ID. For 3PIDs this should + * be the 3PID address (email). + */ + get userId(): string { throw new Error("Member class not implemented"); } + + /** + * Gets the MXC URL of this Member's avatar. For users this should be their profile's + * avatar MXC URL or null if none set. For 3PIDs this should always be null. + */ + getMxcAvatarUrl(): string { throw new Error("Member class not implemented"); } +} + +class DirectoryMember extends Member { _userId: string; _displayName: string; _avatarUrl: string; constructor(userDirResult: {user_id: string, display_name: string, avatar_url: string}) { + super(); this._userId = userDirResult.user_id; this._displayName = userDirResult.display_name; this._avatarUrl = userDirResult.avatar_url; } - // These next members are to implement the contract expected by DMRoomTile + // These next class members are for the Member interface get name(): string { return this._displayName || this._userId; } @@ -56,13 +88,93 @@ class DirectoryMember { } } +class ThreepidMember extends Member { + _id: string; + + constructor(id: string) { + super(); + this._id = id; + } + + // This is a getter that would be falsey on all other implementations. Until we have + // better type support in the react-sdk we can use this trick to determine the kind + // of 3PID we're dealing with, if any. + get isEmail(): boolean { + return this._id.includes('@'); + } + + // These next class members are for the Member interface + get name(): string { + return this._id; + } + + get userId(): string { + return this._id; + } + + getMxcAvatarUrl(): string { + return null; + } +} + +class DMUserTile extends React.PureComponent { + static propTypes = { + member: PropTypes.object.isRequired, // Should be a Member (see interface above) + onRemove: PropTypes.func.isRequired, // takes 1 argument, the member being removed + }; + + _onRemove = (e) => { + // Stop the browser from highlighting text + e.preventDefault(); + e.stopPropagation(); + + this.props.onRemove(this.props.member); + }; + + render() { + const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar"); + const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); + + const avatarSize = 20; + const avatar = this.props.member.isEmail + ?![]({require("../../../../res/img/icon-email-pill-avatar.svg")}){kind=icon}
+ : ![{_t('Remove')}]({require("../../../../res/img/icon-pill-remove.svg")}){kind=icon}
+
+ :
-
{sectionName}
@@ -335,6 +635,10 @@ export default class DMInviteDialog extends React.PureComponent { } } + // Now we mix in the additional members. Again, we presume these have already been filtered. We + // also assume they are more relevant than our suggestions and prepend them to the list. + sourceMembers = [...additionalMembers, ...sourceMembers]; + // If we're going to hide one member behind 'show more', just use up the space of the button // with the member's tile instead. if (showNum === sourceMembers.length - 1) showNum++; @@ -360,6 +664,7 @@ export default class DMInviteDialog extends React.PureComponent { key={r.userId} onToggle={this._toggleMember} highlightWord={this.state.filterText} + isSelected={this.state.targets.some(t => t.userId === r.userId)} /> )); return ( @@ -371,23 +676,65 @@ export default class DMInviteDialog extends React.PureComponent { ); } - render() { - const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); - const Field = sdk.getComponent("elements.Field"); - const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); - - // Dev note: The use of Field is temporary/incomplete pending https://github.com/vector-im/riot-web/issues/11197 - // For now, we just list who the targets are. - const editor = ( -
-
+ {targets}
+ {input}
);
- const targets = this.state.targets.map(t => {t}
);
+ }
+
+ _renderIdentityServerWarning() {
+ if (!this.state.tryingIdentityServer || this.state.canUseIdentityServer) {
+ return null;
+ }
+
+ const defaultIdentityServerUrl = getDefaultIdentityServerUrl();
+ if (defaultIdentityServerUrl) {
+ return (
+ {_t(
+ "Use an identity server to invite by email. " +
+ "Use the default (%(defaultIdentityServerName)s) " +
+ "or manage in Settings .",
+ {
+ defaultIdentityServerName: abbreviateUrl(defaultIdentityServerUrl),
+ },
+ {
+ default: sub => {sub},
+ settings: sub => {sub},
+ },
+ )}
+ );
+ } else {
+ return (
+ {_t(
+ "Use an identity server to invite by email. " +
+ "Manage in Settings .",
+ {}, {
+ settings: sub => {sub},
+ },
+ )}
+ );
+ }
+ }
+
+ render() {
+ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+ const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
const userId = MatrixClientPeg.get().getUserId();
return (
@@ -406,9 +753,9 @@ export default class DMInviteDialog extends React.PureComponent {
{a: (sub) => {sub}},
)}
- {targets}
- {editor}
+ {this._renderEditor()}
+ {this._renderIdentityServerWarning()}
+ { privateIcon }
{ roomAvatar }
{ e2eIcon }
+ { privateIcon }
{ name }
{ topicElement }
{ cancelButton }
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 241713c97d..4dbcc7ca03 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -56,7 +56,11 @@ module.exports = createReactClass({
},
getInitialState: function() {
+ const joinRules = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
+ const joinRule = joinRules && joinRules.getContent().join_rule;
+
return ({
+ joinRule,
hover: false,
badgeHover: false,
contextMenuPosition: null, // DOM bounding box, null if non-shown
@@ -104,6 +108,12 @@ module.exports = createReactClass({
});
},
+ onJoinRule: function(ev) {
+ if (ev.getType() !== "m.room.join_rules") return;
+ if (ev.getRoomId() !== this.props.room.roomId) return;
+ this.setState({ joinRule: ev.getContent().join_rule });
+ },
+
onAccountData: function(accountDataEvent) {
if (accountDataEvent.getType() === 'm.push_rules') {
this.setState({
@@ -143,6 +153,7 @@ module.exports = createReactClass({
const cli = MatrixClientPeg.get();
cli.on("accountData", this.onAccountData);
cli.on("Room.name", this.onRoomName);
+ cli.on("RoomState.events", this.onJoinRule);
ActiveRoomObserver.addListener(this.props.room.roomId, this._onActiveRoomChange);
this.dispatcherRef = dis.register(this.onAction);
@@ -159,6 +170,7 @@ module.exports = createReactClass({
if (cli) {
MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
+ cli.removeListener("RoomState.events", this.onJoinRule);
}
ActiveRoomObserver.removeListener(this.props.room.roomId, this._onActiveRoomChange);
dis.unregister(this.dispatcherRef);
@@ -292,6 +304,8 @@ module.exports = createReactClass({
const isMenuDisplayed = Boolean(this.state.contextMenuPosition);
+ const dmUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
+
const classes = classNames({
'mx_RoomTile': true,
'mx_RoomTile_selected': this.state.selected,
@@ -303,6 +317,7 @@ module.exports = createReactClass({
'mx_RoomTile_noBadges': !badges,
'mx_RoomTile_transparent': this.props.transparent,
'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
+ 'mx_RoomTile_isPrivate': this.state.joinRule == "invite" && !dmUserId,
});
const avatarClasses = classNames({
@@ -366,8 +381,6 @@ module.exports = createReactClass({
let ariaLabel = name;
- const dmUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
-
let dmIndicator;
let dmOnline;
if (dmUserId) {
@@ -381,7 +394,10 @@ module.exports = createReactClass({
const { room } = this.props;
const member = room.getMember(dmUserId);
- if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) {
+ if (
+ member && member.membership === "join" && room.getJoinedMemberCount() === 2 &&
+ SettingsStore.isFeatureEnabled("feature_presence_in_room_list")
+ ) {
const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
dmOnline =
{ label }
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index e7846a0199..ca2eab3e17 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -140,7 +140,7 @@ _td("Book");
_td("Pencil");
_td("Paperclip");
_td("Scissors");
-_td("Padlock");
+_td("Lock");
_td("Key");
_td("Hammer");
_td("Telephone");
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index e179c9d61b..108eb8ffb7 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2015,5 +2015,22 @@
"Migrate from Key Backup": "Мигрирай от резервно копие на ключове",
"Secure your encrypted messages with a passphrase": "Защитете шифрованите съобщения с парола",
"Storing secrets...": "Складиране на тайни...",
- "Unable to set up secret storage": "Неуспешна настройка на секретно складиране"
+ "Unable to set up secret storage": "Неуспешна настройка на секретно складиране",
+ "New DM invite dialog (under development)": "Нов процес за канене чрез директни съобщения (все още се разработва)",
+ "Show info about bridges in room settings": "Показвай информация за връзки с други мрежи в настройките на стаята",
+ "This bridge was provisioned by unknown device with ID %(deviceId)s.": "Резервная копия подписана неизвестным устройством с ID %(deviceId)s.",
"Backup has a valid signature from this device": "Резервная копия заверена действительной подписью от этого устройства",
"Backup has a valid signature from verified device действительной подписью от подтверждённого устройства submit a bug report .": "%(errcode)s был возвращен при попытке доступа в комнату. Если вы считаете, что видите это сообщение по ошибке, пожалуйста, отправьте отчет об ошибке .",
@@ -1440,7 +1440,7 @@
"You've previously used Riot on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, Riot needs to resync your account.": "Ранее вы использовали Riot на %(host)s с отложенной загрузкой участников. В этой версии отложенная загрузка отключена. Поскольку локальный кеш не совместим между этими двумя настройками, Riot необходимо повторно синхронизировать вашу учётную запись.",
"If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Если другая версия Riot все еще открыта на другой вкладке, закройте ее, так как использование Riot на том же хосте с включенной и отключенной ленивой загрузкой одновременно вызовет проблемы.",
"Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot теперь использует в 3-5 раз меньше памяти, загружая информацию только о других пользователях, когда это необходимо. Пожалуйста, подождите, пока мы ресинхронизируемся с сервером!",
- "I don't want my encrypted messages": "Я не хочу, мои зашифрованные сообщения",
+ "I don't want my encrypted messages": "Мне не нужны мои зашифрованные сообщения",
"Manually export keys": "Ручной экспорт ключей",
"If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Если вы столкнулись с какими-либо ошибками или хотите оставить отзыв, которым хотите поделиться, сообщите нам об этом на GitHub.",
"To help avoid duplicate issues, please view existing issues first (and add a +1) or create a new issue if you can't find it.": "Чтобы избежать повторяющихся проблем, сначала просмотрите существующие проблемы (и добавьте +1), либо создайте новую проблему , если вы не можете ее найти.",
@@ -1550,7 +1550,7 @@
"Unable to query for supported registration methods.": "Невозможно запросить поддерживаемые методы регистрации.",
"Great! This passphrase looks strong enough.": "Отлично! Этот пароль выглядит достаточно сильной.",
"We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Мы будем хранить зашифрованную копию ваших ключей на нашем сервере. Защитите свою резервную копию паролем, чтобы сохранить ее в безопасности.",
- "For maximum security, this should be different from your account password.": "Для максимальной безопасности это должно отличаться от пароля вашей учётной записи.",
+ "For maximum security, this should be different from your account password.": "Для максимальной безопасности он должен отличаться от пароля вашей учётной записи.",
"Enter a passphrase...": "Введите пароль....",
"Set up with a Recovery Key": "Настройка с ключом восстановления",
"That matches!": "Это совпадает!",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 1cd7b42a42..90c03b84f3 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -149,7 +149,7 @@
"Incorrect verification code": "Fel verifieringskod",
"Invalid alias format": "Fel alias-format",
"Invalid Email Address": "Ogiltig epostadress",
- "Invalid file%(extra)s": "Fel fil%(extra)s",
+ "Invalid file%(extra)s": "Felaktig fil%(extra)s",
"%(senderName)s invited %(targetName)s.": "%(senderName)s bjöd in %(targetName)s.",
"Invite new room members": "Bjud in nya rumsmedlemmar",
"Invited": "Inbjuden",
@@ -1519,5 +1519,130 @@
"%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
"Try out new ways to ignore people (experimental)": "Testa nya sätt att ignorera personer (experimentalt)",
"Use the new, faster, composer for writing messages": "Använd den nya, snabbare kompositören för att skriva meddelanden",
- "Show previews/thumbnails for images": "Visa förhandsvisning/tumnagel för bilder"
+ "Show previews/thumbnails for images": "Visa förhandsvisning/tumnagel för bilder",
+ "Send cross-signing keys to homeserver": "Skicka korssigneringsnycklar till hemserver",
+ "Custom (%(level)s)": "Anpassad (%(level)s)",
+ "Error upgrading room": "Fel vid uppgradering av rum",
+ "Double check that your server supports the room version chosen and try again.": "Dubbelkolla att din server stöder den valda rumsversionen och försök igen.",
+ "%(senderName)s placed a voice call.": "%(senderName)s ringde ett röstsamtal.",
+ "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s ringde ett röstsamtal. (stöds inte av denna webbläsare)",
+ "%(senderName)s placed a video call.": "%(senderName)s ringde ett videosamtal.",
+ "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s ringde ett videosamtal. (stöds inte av denna webbläsare)",
+ "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s tog bort regeln som bannar användare som matchar %(glob)s",
+ "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s tog bort regeln som bannar rum som matchar %(glob)s",
+ "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s tog bort regeln som bannar servrar som matchar %(glob)s",
+ "Match system theme": "Matcha systemtema",
+ "Decline (%(counter)s)": "Avvisa (%(counter)s)",
+ "on device": "på enhet",
+ "not found": "hittades inte",
+ "Connecting to integration manager...": "Ansluter till integrationshanterare...",
+ "Cannot connect to integration manager": "Det går inte att ansluta till integrationshanterare",
+ "The integration manager is offline or it cannot reach your homeserver.": "Integrationshanteraren är offline eller kan inte nå din hemserver.",
+ "Use an Integration Manager (%(serverName)s) to manage bots, widgets, and sticker packs.": "Använd en Integrationshanterare (%(serverName)s) för att hantera bots, widgets och klistermärkespaket.",
+ "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Använd en Integrationshanterare för att hantera bots, widgets och klistermärkespaket.",
+ "Manage integrations": "Hantera integrationer",
+ "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationshanterare får konfigurationsdata och kan ändra widgetar, skicka ruminbjudningar och ställa in behörighetsnivåer via ditt konto.",
+ "Close preview": "Stäng förhandsvisning",
+ "Room %(name)s": "Rum %(name)s",
+ "Recent rooms": "Senaste rummen",
+ "Loading room preview": "Laddar förhandsvisning av rummet",
+ "Re-join": "Gå med igen",
+ "Try to join anyway": "Försök att gå med ändå",
+ "Join the discussion": "Gå med i diskussionen",
+ "Do you want to chat with %(user)s?": "Vill du chatta med %(user)s?",
+ "submit a bug report .": "%(errcode)s returnerades när du försökte komma åt rummet. Om du tror att du ser det här meddelandet felaktigt, vänligen skicka in en felrapport .",
+ "Failed to connect to integration manager": "Det gick inte att ansluta till integrationshanterare",
+ "React": "Reagera",
+ "Message Actions": "Meddelandeåtgärder",
+ "Show image": "Visa bild",
+ "You have ignored this user, so their message is hidden. Show anyways.": "Du har ignorerat denna användare, så deras meddelande är dolt. Visa ändå.",
+ "You verified %(name)s": "Du verifierade %(name)s",
+ "You cancelled verifying %(name)s": "Du avbröt verifiering av %(name)s",
+ "%(name)s cancelled verifying": "%(name)s avbröt verifiering",
+ "You accepted": "Du accepterade",
+ "%(name)s accepted": "%(name)s accepterade",
+ "You cancelled": "Du avbröt",
+ "%(name)s cancelled": "%(name)s avbröt",
+ "%(name)s wants to verify": "%(name)s vill verifiera",
+ "You sent a verification request": "Du skickade en verifieringsbegäran",
+ "Reactions": "Reaktioner",
+ " reacted with %(content)s ": " reagerade med %(content)s ",
+ "Frequently Used": "Ofta använd",
+ "Smileys & People": "Smileys & Människor",
+ "Animals & Nature": "Djur & Natur",
+ "Food & Drink": "Mat & Dryck",
+ "Activities": "Aktiviteter",
+ "Travel & Places": "Resor & Platser",
+ "Objects": "Objekt",
+ "Symbols": "Symboler",
+ "Flags": "Flaggor",
+ "Quick Reactions": "Snabbreaktioner",
+ "Cancel search": "Avbryt sökningen",
+ "Any of the following data may be shared:": "Någon av följande data kan delas:",
+ "Your display name": "Ditt visningsnamn",
+ "Your avatar URL": "Din avatar-URL",
+ "Your user ID": "Ditt användar-ID",
+ "Your theme": "Ditt tema",
+ "Riot URL": "Riot-URL",
+ "Room ID": "Rums-ID",
+ "Widget ID": "Widget-ID",
+ "Using this widget may share data create a new issue on GitHub so that we can investigate this bug.": "Vänligen skapa ett nytt ärende på GitHub så att vi kan undersöka detta fel.",
+ "Rotate Left": "Rotera vänster",
+ "Rotate Right": "Rotera höger",
+ "Language Dropdown": "Språkmeny",
+ "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sgjorde inga ändringar %(count)s gånger",
+ "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sgjorde inga ändringar",
+ "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sgjorde inga ändringar %(count)s gånger",
+ "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sgjorde inga ändringar",
+ "Room alias": "Rumsalias",
+ "e.g. my-room": "t.ex. mitt rum",
+ "Some characters not allowed": "Vissa tecken är inte tillåtna",
+ "Please provide a room alias": "Vänligen ange ett rumsalias",
+ "This alias is available to use": "Detta alias är tillgängligt att använda",
+ "This alias is already in use": "Detta alias används redan",
+ "Use an identity server to invite by email. Use the default (%(defaultIdentityServerName)s) or manage in Settings .": "Använd en identitetsserver för att bjuda in via epost. Använd standard (%(defaultIdentityServerName)s) eller hantera i Inställningar .",
+ "Use an identity server to invite by email. Manage in Settings .": "Använd en identitetsserver för att bjuda in via epost. Hantera i Inställningar .",
+ "Close dialog": "Stäng dialogrutan",
+ "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Berätta vad som gick fel eller, bättre, skapa ett GitHub-ärende som beskriver problemet.",
+ "View Servers in Room": "Visa servrar i rum",
+ "Recent Conversations": "Senaste konversationerna",
+ "Suggestions": "Förslag",
+ "Show more": "Visa mer",
+ "Direct Messages": "Direktmeddelanden",
+ "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "Om det är någon du inte kan hitta, be dem om sitt användarnamn eller dela ditt användarnamn (%(userId)s) eller profillänk.",
+ "Go": "Gå",
+ "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifiering av den här användaren kommer att markera deras enhet som betrodd, men även markera din enhet som den är betrodd för dem.",
+ "Waiting for partner to confirm...": "Väntar på att kompanjon ska bekräfta...",
+ "Incoming Verification Request": "Inkommande verifieringsbegäran",
+ "Integrations are disabled": "Integrationer är inaktiverade",
+ "Enable 'Manage Integrations' in Settings to do this.": "Aktivera \"Hantera integrationer\" i Inställningar för att göra detta.",
+ "Integrations not allowed": "Integrationer inte tillåtna",
+ "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Ditt Riot tillåter dig inte att använda en Integrationshanterare för att göra detta. Vänligen kontakta en administratör.",
+ "Your homeserver doesn't seem to support this feature.": "Din hemserver verkar inte stödja den här funktionen.",
+ "Message edits": "Meddelandedigeringar",
+ "Preview": "Förhandsvisa",
+ "The message you are trying to send is too large.": "Meddelandet du försöker skicka är för stort.",
+ "New DM invite dialog (under development)": "Ny inbjudningsdialog för direktmeddelanden (under utveckling)",
+ "Enable cross-signing to verify per-user instead of per-device (in development)": "Aktivera korssignering för att verifiera per användare istället för per enhet (under utveckling)",
+ "Find others by phone or email": "Hitta andra via telefon eller epost",
+ "Be found by phone or email": "Bli hittad via telefon eller e-post",
+ "Terms of Service": "Användarvillkor",
+ "To continue you need to accept the terms of this service.": "För att fortsätta måste du acceptera villkoren för denna tjänst.",
+ "Service": "Tjänst",
+ "Summary": "Sammanfattning",
+ "Document": "Dokument"
}
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 159cb61965..659c973d35 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1071,5 +1071,231 @@
"Pizza": "Pizza",
"Cake": "Kek",
"Heart": "Kalp",
- "Trophy": "Ödül"
+ "Trophy": "Ödül",
+ "wait and try again later": "bekle ve tekrar dene",
+ "Disconnect anyway": "Yinede bağlantıyı kes",
+ "Go back": "Geri dön",
+ "Identity Server (%(server)s)": "(%(server)s) Kimlik Sunucusu",
+ "Identity Server": "Kimlik Sunucusu",
+ "Do not use an identity server": "Bir kimlik sunucu kullanma",
+ "Enter a new identity server": "Yeni bir kimlik sunucu gir",
+ "Change": "Değiştir",
+ "Manage integrations": "Entegrasyonları yönet",
+ "Email addresses": "E-posta adresleri",
+ "Phone numbers": "Telefon numaraları",
+ "Language and region": "Dil ve bölge",
+ "Theme": "Tema",
+ "Account management": "Hesap yönetimi",
+ "Warning": "Uyarı",
+ "General": "Genel",
+ "Discovery": "Keşfet",
+ "Legal": "Yasal",
+ "Check for update": "Güncelleme kontrolü",
+ "Help & About": "Yardım & Hakkında",
+ "Bug reporting": "Hata raporlama",
+ "FAQ": "FAQ",
+ "Versions": "Sürümler",
+ "Server rules": "Sunucu kuralları",
+ "User rules": "Kullanıcı kuralları",
+ "View rules": "Kuralları görüntüle",
+ "Room list": "Oda listesi",
+ "Autocomplete delay (ms)": "Oto tamamlama gecikmesi (ms)",
+ "Key backup": "Anahtar yedek",
+ "Cross-signing": "Çapraz-imzalama",
+ "Security & Privacy": "Güvenlik & Gizlilik",
+ "Learn more about how we use analytics.": "Analizleri nasıl kullandığımız hakkında daha fazla öğrenin.",
+ "No Audio Outputs detected": "Ses çıkışları tespit edilemedi",
+ "Audio Output": "Ses Çıkışı",
+ "Voice & Video": "Ses & Video",
+ "this room": "bu oda",
+ "Room information": "Oda bilgisi",
+ "Room version": "Oda sürümü",
+ "Room version:": "Oda versiyonu:",
+ "Developer options": "Geliştirici ayarları",
+ "Open Devtools": "Geliştirici araçlarını aç",
+ "Room Addresses": "Oda Adresleri",
+ "Uploaded sound": "Yüklenen ses",
+ "Sounds": "Sesler",
+ "Notification sound": "Bildirim sesi",
+ "Reset": "Sıfırla",
+ "Browse": "Gözat",
+ "Change room name": "Oda adını değiştir",
+ "Change history visibility": "Geçmiş görünürlüğünü değiştir",
+ "Change permissions": "İzinleri değiştir",
+ "Upgrade the room": "Odayı güncelle",
+ "Enable room encryption": "Oda şifrelemeyi aç",
+ "Modify widgets": "Görsel bileşenleri düzenle",
+ "Banned by %(displayName)s": "%(displayName)s tarafından yasaklandı",
+ "Default role": "Varsayılan rol",
+ "Send messages": "Mesajları gönder",
+ "Invite users": "Kullanıcıları davet et",
+ "Change settings": "Ayarları değiştir",
+ "Kick users": "Kullanıcıları at",
+ "Ban users": "Kullanıcıları yasakla",
+ "Remove messages": "Mesajları sil",
+ "Notify everyone": "Herkesi bilgilendir",
+ "Muted Users": "Sessizdeki Kullanıcılar",
+ "Roles & Permissions": "Roller & İzinler",
+ "Enable encryption?": "Şifrelemeyi aç?",
+ "Members only (since they were invited)": "Sadece üyeler (davet edildiklerinden beri)",
+ "Members only (since they joined)": "Sadece üyeler (katıldıklarından beri)",
+ "Encryption": "Şifreleme",
+ "Once enabled, encryption cannot be disabled.": "Açıldıktan donra şifreleme kapatılamaz.",
+ "Encrypted": "Şifrelenmiş",
+ "Unable to share email address": "E-posta adresi paylaşılamıyor",
+ "Your email address hasn't been verified yet": "E-posta adresiniz henüz doğrulanmadı",
+ "Verify the link in your inbox": "Gelen kutunuzdaki linki doğrulayın",
+ "Share": "Paylaş",
+ "Unable to share phone number": "Telefon numarası paylaşılamıyor",
+ "Unable to verify phone number.": "Telefon numarası doğrulanamıyor.",
+ "Please enter verification code sent via text.": "Lütfen mesajla gönderilen doğrulama kodunu girin.",
+ "Verification code": "Doğrulama kodu",
+ "Remove %(email)s?": "%(email)s sil?",
+ "Email Address": "E-posta Adresi",
+ "Remove %(phone)s?": "%(phone)s sil?",
+ "Phone Number": "Telefon Numarası",
+ "Cannot add any more widgets": "Daha fazla görsel bileşen eklenemiyor",
+ "The maximum permitted number of widgets have already been added to this room.": "İzin verilen maksimum sayıda görsel bileşen bu odaya zaten eklenmiş.",
+ "Add a widget": "Bir görsel bileşen ekle",
+ "Some devices for this user are not trusted": "Bu kullanıcının bazı cihazları güvenilir değil",
+ "All devices for this user are trusted": "Bu kullanıcının tüm cihazları güvenilir",
+ "Some devices in this encrypted room are not trusted": "Bu şifrelenmiş odada bazı cihazlar şifrelenmemiş",
+ "All devices in this encrypted room are trusted": "Bu şifrelenmiş odadaki tüm cihazlar güvenilir",
+ "Edit message": "Mesajı düzenle",
+ "%(senderName)s sent an image": "%(senderName)s bir resim gönderdi",
+ "%(senderName)s sent a video": "%(senderName)s bir video gönderdi",
+ "%(senderName)s uploaded a file": "%(senderName)s bir dosya yükledi",
+ "Key request sent.": "Anahtar isteği gönderildi.",
+ "This message cannot be decrypted": "Bu mesajın şifresi çözülemedi",
+ "Unencrypted": "Şifrelenmemiş",
+ "Close preview": "Önizlemeyi kapat",
+ "Disinvite this user?": "Bu kullanıcı davetini geri çek?",
+ "Kick this user?": "Bu kullanıcıyı kov?",
+ "Unban this user?": "Bu kullanıcının yasağını kaldır?",
+ "Ban this user?": "Bu kullanıcıyı yasakla?",
+ "Remove %(count)s messages|other": "%(count)s mesajı sil",
+ "Remove %(count)s messages|one": "1 mesajı sil",
+ "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Bu odada bilinmeyen cihazlar var: bunları doğrulamadan devam ederseniz birilerinin çağrılarınıza göz atma ihtimali var.",
+ "A conference call could not be started because the integrations server is not available": "Entegrasyon sunucusu mevcut olmadığından konferans çağrısı başlatılamadı",
+ "Send cross-signing keys to homeserver": "Çapraz-imzalama anahtarlarını anasunucuya gönder",
+ "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Uyarı: Topluluğa eklediğiniz her bir kişi topluluk IDsini bilen herhangi biri tarafından açıkça görünür olacaktır",
+ "Room name or alias": "Oda adı ve lakabı",
+ "Failed to invite users to %(groupId)s": "%(groupId)s grubuna kullanıcı daveti başarısız",
+ "Failed to add the following rooms to %(groupId)s:": "%(groupId)s odalarına ekleme başarısız:",
+ "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Düz-metin mesajına ¯\\_(ツ)_/¯ ifadesi ekler",
+ "Rooster": "Horoz",
+ "Cross-signing public keys:": "Çarpraz-imzalama açık anahtarları:",
+ "Cross-signing private keys:": "Çarpraz-imzalama gizli anahtarları:",
+ "Backup has a valid signature from this user": "Yedek bu kullanıcıdan geçerli anahtara sahip",
+ "Backup has a invalid signature from this user": "Yedek bu kullanıcıdan geçersiz bir anahtara sahip",
+ "Add an email address to configure email notifications": "E-posta bildirimlerini yapılandırmak için bir e-posta adresi ekleyin",
+ "Identity Server URL must be HTTPS": "Kimlik Sunucu URL adresi HTTPS olmak zorunda",
+ "Not a valid Identity Server (status code %(code)s)": "Geçerli bir Kimlik Sunucu değil ( durum kodu %(code)s )",
+ "Terms of service not accepted or the identity server is invalid.": "Hizmet şartları kabuk edilmedi yada kimlik sunucu geçersiz.",
+ "The identity server you have chosen does not have any terms of service.": "Seçtiğiniz kimlik sunucu herhangi bir hizmet şartları sözleşmesine sahip değil.",
+ "Disconnect identity server": "Kimlik sunucu bağlantısını kes",
+ "Disconnect from the identity server