Merge branch 'main' into devon/remove-rustls-pemfile

This commit is contained in:
Devon Hudson
2025-12-09 12:59:51 -07:00
9 changed files with 121 additions and 102 deletions

56
Cargo.lock generated
View File

@@ -3097,7 +3097,7 @@ dependencies = [
[[package]]
name = "mas-axum-utils"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"axum",
@@ -3131,7 +3131,7 @@ dependencies = [
[[package]]
name = "mas-cli"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"axum",
@@ -3204,7 +3204,7 @@ dependencies = [
[[package]]
name = "mas-config"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"camino",
@@ -3235,7 +3235,7 @@ dependencies = [
[[package]]
name = "mas-context"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"console",
"opentelemetry",
@@ -3251,7 +3251,7 @@ dependencies = [
[[package]]
name = "mas-data-model"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"base64ct",
"chrono",
@@ -3274,7 +3274,7 @@ dependencies = [
[[package]]
name = "mas-email"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"async-trait",
"lettre",
@@ -3285,7 +3285,7 @@ dependencies = [
[[package]]
name = "mas-handlers"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"aide",
"anyhow",
@@ -3365,7 +3365,7 @@ dependencies = [
[[package]]
name = "mas-http"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"futures-util",
"headers",
@@ -3386,7 +3386,7 @@ dependencies = [
[[package]]
name = "mas-i18n"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"camino",
"icu_calendar",
@@ -3408,7 +3408,7 @@ dependencies = [
[[package]]
name = "mas-i18n-scan"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"camino",
"clap",
@@ -3422,7 +3422,7 @@ dependencies = [
[[package]]
name = "mas-iana"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"schemars 0.9.0",
"serde",
@@ -3430,7 +3430,7 @@ dependencies = [
[[package]]
name = "mas-iana-codegen"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3447,7 +3447,7 @@ dependencies = [
[[package]]
name = "mas-jose"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"base64ct",
"chrono",
@@ -3477,7 +3477,7 @@ dependencies = [
[[package]]
name = "mas-keystore"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"aead",
"base64ct",
@@ -3505,7 +3505,7 @@ dependencies = [
[[package]]
name = "mas-listener"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"bytes",
@@ -3529,7 +3529,7 @@ dependencies = [
[[package]]
name = "mas-matrix"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3539,7 +3539,7 @@ dependencies = [
[[package]]
name = "mas-matrix-synapse"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3556,7 +3556,7 @@ dependencies = [
[[package]]
name = "mas-oidc-client"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"assert_matches",
"async-trait",
@@ -3592,7 +3592,7 @@ dependencies = [
[[package]]
name = "mas-policy"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"arc-swap",
@@ -3609,7 +3609,7 @@ dependencies = [
[[package]]
name = "mas-router"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"axum",
"serde",
@@ -3620,7 +3620,7 @@ dependencies = [
[[package]]
name = "mas-spa"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"camino",
"serde",
@@ -3629,7 +3629,7 @@ dependencies = [
[[package]]
name = "mas-storage"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"async-trait",
"chrono",
@@ -3651,7 +3651,7 @@ dependencies = [
[[package]]
name = "mas-storage-pg"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"async-trait",
"chrono",
@@ -3679,7 +3679,7 @@ dependencies = [
[[package]]
name = "mas-tasks"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3711,7 +3711,7 @@ dependencies = [
[[package]]
name = "mas-templates"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"arc-swap",
@@ -3743,7 +3743,7 @@ dependencies = [
[[package]]
name = "mas-tower"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"http",
"opentelemetry",
@@ -4013,7 +4013,7 @@ dependencies = [
[[package]]
name = "oauth2-types"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"assert_matches",
"base64ct",
@@ -6075,7 +6075,7 @@ dependencies = [
[[package]]
name = "syn2mas"
version = "1.8.0-rc.0"
version = "1.8.0"
dependencies = [
"anyhow",
"arc-swap",

View File

@@ -9,7 +9,7 @@ members = ["crates/*"]
resolver = "2"
# Updated in the CI with a `sed` command
package.version = "1.8.0-rc.0"
package.version = "1.8.0"
package.license = "AGPL-3.0-only OR LicenseRef-Element-Commercial"
package.authors = ["Element Backend Team"]
package.edition = "2024"
@@ -34,35 +34,35 @@ broken_intra_doc_links = "deny"
[workspace.dependencies]
# Workspace crates
mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.8.0-rc.0" }
mas-cli = { path = "./crates/cli/", version = "=1.8.0-rc.0" }
mas-config = { path = "./crates/config/", version = "=1.8.0-rc.0" }
mas-context = { path = "./crates/context/", version = "=1.8.0-rc.0" }
mas-data-model = { path = "./crates/data-model/", version = "=1.8.0-rc.0" }
mas-email = { path = "./crates/email/", version = "=1.8.0-rc.0" }
mas-graphql = { path = "./crates/graphql/", version = "=1.8.0-rc.0" }
mas-handlers = { path = "./crates/handlers/", version = "=1.8.0-rc.0" }
mas-http = { path = "./crates/http/", version = "=1.8.0-rc.0" }
mas-i18n = { path = "./crates/i18n/", version = "=1.8.0-rc.0" }
mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.8.0-rc.0" }
mas-iana = { path = "./crates/iana/", version = "=1.8.0-rc.0" }
mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.8.0-rc.0" }
mas-jose = { path = "./crates/jose/", version = "=1.8.0-rc.0" }
mas-keystore = { path = "./crates/keystore/", version = "=1.8.0-rc.0" }
mas-listener = { path = "./crates/listener/", version = "=1.8.0-rc.0" }
mas-matrix = { path = "./crates/matrix/", version = "=1.8.0-rc.0" }
mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.8.0-rc.0" }
mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.8.0-rc.0" }
mas-policy = { path = "./crates/policy/", version = "=1.8.0-rc.0" }
mas-router = { path = "./crates/router/", version = "=1.8.0-rc.0" }
mas-spa = { path = "./crates/spa/", version = "=1.8.0-rc.0" }
mas-storage = { path = "./crates/storage/", version = "=1.8.0-rc.0" }
mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.8.0-rc.0" }
mas-tasks = { path = "./crates/tasks/", version = "=1.8.0-rc.0" }
mas-templates = { path = "./crates/templates/", version = "=1.8.0-rc.0" }
mas-tower = { path = "./crates/tower/", version = "=1.8.0-rc.0" }
oauth2-types = { path = "./crates/oauth2-types/", version = "=1.8.0-rc.0" }
syn2mas = { path = "./crates/syn2mas", version = "=1.8.0-rc.0" }
mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.8.0" }
mas-cli = { path = "./crates/cli/", version = "=1.8.0" }
mas-config = { path = "./crates/config/", version = "=1.8.0" }
mas-context = { path = "./crates/context/", version = "=1.8.0" }
mas-data-model = { path = "./crates/data-model/", version = "=1.8.0" }
mas-email = { path = "./crates/email/", version = "=1.8.0" }
mas-graphql = { path = "./crates/graphql/", version = "=1.8.0" }
mas-handlers = { path = "./crates/handlers/", version = "=1.8.0" }
mas-http = { path = "./crates/http/", version = "=1.8.0" }
mas-i18n = { path = "./crates/i18n/", version = "=1.8.0" }
mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.8.0" }
mas-iana = { path = "./crates/iana/", version = "=1.8.0" }
mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.8.0" }
mas-jose = { path = "./crates/jose/", version = "=1.8.0" }
mas-keystore = { path = "./crates/keystore/", version = "=1.8.0" }
mas-listener = { path = "./crates/listener/", version = "=1.8.0" }
mas-matrix = { path = "./crates/matrix/", version = "=1.8.0" }
mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.8.0" }
mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.8.0" }
mas-policy = { path = "./crates/policy/", version = "=1.8.0" }
mas-router = { path = "./crates/router/", version = "=1.8.0" }
mas-spa = { path = "./crates/spa/", version = "=1.8.0" }
mas-storage = { path = "./crates/storage/", version = "=1.8.0" }
mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.8.0" }
mas-tasks = { path = "./crates/tasks/", version = "=1.8.0" }
mas-templates = { path = "./crates/templates/", version = "=1.8.0" }
mas-tower = { path = "./crates/tower/", version = "=1.8.0" }
oauth2-types = { path = "./crates/oauth2-types/", version = "=1.8.0" }
syn2mas = { path = "./crates/syn2mas", version = "=1.8.0" }
# OpenAPI schema generation and validation
[workspace.dependencies.aide]

View File

@@ -19,6 +19,9 @@ ignore = [
# RSA key extraction "Marvin Attack". This is only relevant when using
# PKCS#1 v1.5 encryption, which we don't
"RUSTSEC-2023-0071",
# This is a newly unmaintained package that we can allow temporarily.
# Remove ASAP once https://github.com/element-hq/matrix-authentication-service/issues/5337 is fixed.
"RUSTSEC-2025-0134",
]
[licenses]

View File

@@ -27,7 +27,7 @@ export type LocalazyMetadata = {
};
const localazyMetadata: LocalazyMetadata = {
projectUrl: "https://localazy.com/p/matrix-authentication-service",
projectUrl: "https://localazy.com/p/matrix-authentication-service!v1.8",
baseLocale: "en",
languages: [
{
@@ -181,22 +181,22 @@ const localazyMetadata: LocalazyMetadata = {
file: "frontend.json",
path: "",
cdnFiles: {
"cs": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/cs/frontend.json",
"da": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/da/frontend.json",
"de": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/de/frontend.json",
"en": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/en/frontend.json",
"et": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/et/frontend.json",
"fi": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fi/frontend.json",
"fr": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fr/frontend.json",
"hu": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/hu/frontend.json",
"nb_NO": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nb-NO/frontend.json",
"nl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nl/frontend.json",
"pl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pl/frontend.json",
"pt": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pt/frontend.json",
"ru": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/ru/frontend.json",
"sv": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/sv/frontend.json",
"uk": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/uk/frontend.json",
"zh#Hans": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/zh-Hans/frontend.json"
"cs": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/cs/frontend.json",
"da": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/da/frontend.json",
"de": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/de/frontend.json",
"en": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/en/frontend.json",
"et": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/et/frontend.json",
"fi": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fi/frontend.json",
"fr": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fr/frontend.json",
"hu": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/hu/frontend.json",
"nb_NO": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nb-NO/frontend.json",
"nl": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nl/frontend.json",
"pl": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pl/frontend.json",
"pt": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pt/frontend.json",
"ru": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/ru/frontend.json",
"sv": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/sv/frontend.json",
"uk": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/uk/frontend.json",
"zh#Hans": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/zh-Hans/frontend.json"
}
},
{
@@ -204,22 +204,22 @@ const localazyMetadata: LocalazyMetadata = {
file: "file.json",
path: "",
cdnFiles: {
"cs": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/cs/file.json",
"da": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/da/file.json",
"de": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/de/file.json",
"en": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/en/file.json",
"et": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/et/file.json",
"fi": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fi/file.json",
"fr": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fr/file.json",
"hu": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/hu/file.json",
"nb_NO": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nb-NO/file.json",
"nl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nl/file.json",
"pl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pl/file.json",
"pt": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pt/file.json",
"ru": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/ru/file.json",
"sv": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/sv/file.json",
"uk": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/uk/file.json",
"zh#Hans": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/zh-Hans/file.json"
"cs": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/cs/file.json",
"da": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/da/file.json",
"de": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/de/file.json",
"en": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/en/file.json",
"et": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/et/file.json",
"fi": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fi/file.json",
"fr": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fr/file.json",
"hu": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/hu/file.json",
"nb_NO": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nb-NO/file.json",
"nl": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nl/file.json",
"pl": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pl/file.json",
"pt": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pt/file.json",
"ru": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/ru/file.json",
"sv": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/sv/file.json",
"uk": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/uk/file.json",
"zh#Hans": "https://delivery.localazy.com/_a6714272761432419575f0da7e87/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/zh-Hans/file.json"
}
}
]

View File

@@ -391,9 +391,9 @@
"scope": {
"edit_profile": "Muuta sinu kasutajaprofiili ning kontaktandmeid",
"manage_sessions": "Hallata sinu seadmeid ja sessioone",
"mas_admin": "Hallata iga kasutajat teenuses matrix-authentication-service",
"mas_admin": "Hallata kasutajaid (urn:mas:admin)",
"send_messages": "Saata sõnumeid sinu nimel",
"synapse_admin": "Hallata seda Synapse koduserverit",
"synapse_admin": "Hallata seda Synapse koduserverit (urn:synapse:admin:*)",
"view_messages": "Vaadata sinu sõnumeid ja andmeid",
"view_profile": "Vaadata sinu profiili teavet ja kontaktadmeid"
}

View File

@@ -394,9 +394,9 @@
"scope": {
"edit_profile": "Редагування профілю та контактних даних",
"manage_sessions": "Керування пристроями та сеансами",
"mas_admin": "Адміністрування будь-якого користувача на matrix-authentication-service",
"mas_admin": "Керування користувачами (urn:mas:admin)",
"send_messages": "Надсилати нові повідомлення від вашого імені",
"synapse_admin": "Адміністрування домашнього сервера Synapse",
"synapse_admin": "Адмініструвати сервер (urn:synapse:admin:*)",
"view_messages": "Перегляд наявних повідомлень і даних",
"view_profile": "Перегляд інформації профілю та контактних даних"
}

View File

@@ -74,9 +74,13 @@
},
"consent": {
"client_wants_access": "<span>%(client_name)s</span> aadressil <span>%(redirect_uri)s</span> soovib ligipääsu sinu kasutajakontole.",
"continue_to": "Kas jätkad kliendis <span>%(client_name)s</span>?",
"heading": "Kas lubad ligipääsu sinu kasutajakontole?",
"make_sure_you_trust": "Palun kontrolli, et <span>%(client_name)s</span> on sinu jaoks usaldusväärne teenus.",
"scope_list_preface": "Jätkates lubad sa <span>%(client_name)s</span> kliendil:",
"this_will_allow": "Sellega <span>%(client_name)s</span> saab õigused:",
"this_will_setup": "Sellega seadistad %(client_name)s (<span>%(client_uri)s</span>) kliendi kasutama sinu <span>%(server_name)s</span> kontot.",
"use_another_account": "Kasuta teist kontot",
"you_may_be_sharing": "Sa tõenäoliselt jagad privaatset teavet selle veebisaidi või rakendusega."
},
"device_card": {
@@ -98,7 +102,8 @@
"granted": {
"description": "Sa lubasid seadmele %(client_name)s ligipääsu. Sa võid nüüd selle akna sulgeda.",
"heading": "Ligipääs on lubatud"
}
},
"this_will_setup": "Üks teine seade tahab seadistada %(client_name)s (<span>%(client_uri)s</span>) klienti kasutama sinu <span>%(server_name)s</span> kontot. Palun kontrolli, et see on õige ja sinule vajalik seade."
},
"device_display_name": {
"client_on_device": "%(client_name)s seadmes %(device_name)s",
@@ -145,6 +150,9 @@
"username_too_long": "Kasutajanimi on liiga pikk",
"username_too_short": "Kasutajanimi on liiga lühike"
},
"legacy_consent": {
"this_will_setup": "Sellega seadistad <span>%(client_name)s</span> kliendi kasutama oma <span>%(server_name)s</span> kontot."
},
"login": {
"call_to_register": "Sul veel pole kasutajakontot?",
"continue_with_provider": "Jätka teenusepakkujaga %(provider)s",
@@ -226,9 +234,9 @@
"scope": {
"edit_profile": "Muuta sinu kasutajaprofiili ning kontaktandmeid",
"manage_sessions": "Hallata sinu seadmeid ja sessioone",
"mas_admin": "Hallata iga kasutajat teenuses matrix-authentication-service",
"mas_admin": "Hallata kasutajaid (urn:mas:admin)",
"send_messages": "Saata sõnumeid sinu nimel",
"synapse_admin": "Hallata seda Synapse koduserverit",
"synapse_admin": "Hallata seda Synapse koduserverit (urn:synapse:admin:*)",
"view_messages": "Vaadata sinu sõnumeid ja andmeid",
"view_profile": "Vaadata sinu profiili teavet ja kontaktadmeid"
},

View File

@@ -103,7 +103,7 @@
"description": "Vous avez accordé l'accès à %(client_name)s. Vous pouvez fermer cette fenêtre.",
"heading": "Accès accordé"
},
"this_will_setup": "Un autre appareil souhaite connecter %(client_name)s (<span>%(client_uri)s</span>) avec votre compte %(server_name)s<span></span>. Assurez-vous de reconnaître cet appareil."
"this_will_setup": "Un autre appareil souhaite connecter %(client_name)s (<span>%(client_uri)s</span>) avec votre compte <span>%(server_name)s</span>. Assurez-vous de reconnaître cet appareil."
},
"device_display_name": {
"client_on_device": "%(client_name)s sur %(device_name)s",

View File

@@ -74,9 +74,13 @@
},
"consent": {
"client_wants_access": "<span>%(client_name)s</span> за <span>%(redirect_uri)s</span> хоче отримати доступ до вашого облікового запису.",
"continue_to": "Продовжити в <span>%(client_name)s</span>?",
"heading": "Дозволити доступ до свого облікового запису?",
"make_sure_you_trust": "Переконайтеся, що ви довіряєте <span> %(client_name)s</span>.",
"scope_list_preface": "Продовжуючи, ви дозволяєте <span>%(client_name)s</span>:",
"this_will_allow": "Це дозволить <span>%(client_name)s</span>:",
"this_will_setup": "Це налаштує %(client_name)s (<span>%(client_uri)s</span>) з вашим обліковим записом <span>%(server_name)s</span>.",
"use_another_account": "Використати інший обліковий запис",
"you_may_be_sharing": "Можливо, ви ділитеся конфіденційною інформацією з цим сайтом або застосунком."
},
"device_card": {
@@ -98,7 +102,8 @@
"granted": {
"description": "Ви надали доступ до %(client_name)s. Ви можете закрити це вікно.",
"heading": "Доступ надано"
}
},
"this_will_setup": "Інший пристрій хоче налаштувати %(client_name)s (<span>%(client_uri)s</span>) з вашим обліковим записом <span>%(server_name)s</span>. Переконайтеся, що ви розпізнаєте цей пристрій."
},
"device_display_name": {
"client_on_device": "%(client_name)s на %(device_name)s",
@@ -145,6 +150,9 @@
"username_too_long": "Ім'я користувача задовге",
"username_too_short": "Ім'я користувача закоротке"
},
"legacy_consent": {
"this_will_setup": "Це налаштує <span>%(client_name)s</span> з вашим обліковим записом <span>%(server_name)s</span>."
},
"login": {
"call_to_register": "У вас ще немає облікового запису?",
"continue_with_provider": "Продовжити з %(provider)s",
@@ -226,9 +234,9 @@
"scope": {
"edit_profile": "Редагування профілю та контактних даних",
"manage_sessions": "Керування пристроями та сеансами",
"mas_admin": "Адміністрування будь-якого користувача на matrix-authentication-service",
"mas_admin": "Керування користувачами (urn:mas:admin)",
"send_messages": "Надсилати нові повідомлення від вашого імені",
"synapse_admin": "Адміністрування домашнього сервера Synapse",
"synapse_admin": "Адмініструвати сервер (urn:synapse:admin:*)",
"view_messages": "Перегляд наявних повідомлень і даних",
"view_profile": "Перегляд інформації профілю та контактних даних"
},