diff --git a/Cargo.lock b/Cargo.lock index 29623ffdb..18f6e791a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3104,7 +3104,7 @@ dependencies = [ [[package]] name = "mas-axum-utils" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "axum", @@ -3138,7 +3138,7 @@ dependencies = [ [[package]] name = "mas-cli" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "axum", @@ -3211,7 +3211,7 @@ dependencies = [ [[package]] name = "mas-config" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "camino", @@ -3243,7 +3243,7 @@ dependencies = [ [[package]] name = "mas-context" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "console", "opentelemetry", @@ -3259,7 +3259,7 @@ dependencies = [ [[package]] name = "mas-data-model" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "base64ct", "chrono", @@ -3282,7 +3282,7 @@ dependencies = [ [[package]] name = "mas-email" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "async-trait", "lettre", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "mas-handlers" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "aide", "anyhow", @@ -3373,7 +3373,7 @@ dependencies = [ [[package]] name = "mas-http" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "futures-util", "headers", @@ -3394,7 +3394,7 @@ dependencies = [ [[package]] name = "mas-i18n" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "camino", "icu_calendar", @@ -3416,7 +3416,7 @@ dependencies = [ [[package]] name = "mas-i18n-scan" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "camino", "clap", @@ -3430,7 +3430,7 @@ dependencies = [ [[package]] name = "mas-iana" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "schemars 0.8.22", "serde", @@ -3438,7 +3438,7 @@ dependencies = [ [[package]] name = "mas-iana-codegen" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "async-trait", @@ -3454,7 +3454,7 @@ dependencies = [ [[package]] name = "mas-jose" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "base64ct", "chrono", @@ -3484,7 +3484,7 @@ dependencies = [ [[package]] name = "mas-keystore" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "aead", "base64ct", @@ -3512,7 +3512,7 @@ dependencies = [ [[package]] name = "mas-listener" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "bytes", @@ -3537,7 +3537,7 @@ dependencies = [ [[package]] name = "mas-matrix" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "async-trait", @@ -3547,7 +3547,7 @@ dependencies = [ [[package]] name = "mas-matrix-synapse" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "async-trait", @@ -3564,7 +3564,7 @@ dependencies = [ [[package]] name = "mas-oidc-client" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "assert_matches", "async-trait", @@ -3600,7 +3600,7 @@ dependencies = [ [[package]] name = "mas-policy" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "arc-swap", @@ -3617,7 +3617,7 @@ dependencies = [ [[package]] name = "mas-router" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "axum", "serde", @@ -3628,7 +3628,7 @@ dependencies = [ [[package]] name = "mas-spa" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "camino", "serde", @@ -3637,7 +3637,7 @@ dependencies = [ [[package]] name = "mas-storage" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "async-trait", "chrono", @@ -3659,7 +3659,7 @@ dependencies = [ [[package]] name = "mas-storage-pg" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "async-trait", "chrono", @@ -3686,7 +3686,7 @@ dependencies = [ [[package]] name = "mas-tasks" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "async-trait", @@ -3718,7 +3718,7 @@ dependencies = [ [[package]] name = "mas-templates" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "arc-swap", @@ -3748,7 +3748,7 @@ dependencies = [ [[package]] name = "mas-tower" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "http", "opentelemetry", @@ -4018,7 +4018,7 @@ dependencies = [ [[package]] name = "oauth2-types" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "assert_matches", "base64ct", @@ -6100,7 +6100,7 @@ dependencies = [ [[package]] name = "syn2mas" -version = "1.4.0-rc.1" +version = "1.4.0" dependencies = [ "anyhow", "arc-swap", diff --git a/Cargo.toml b/Cargo.toml index 92b80de2d..dbfc35c4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = ["crates/*"] resolver = "2" # Updated in the CI with a `sed` command -package.version = "1.4.0-rc.1" +package.version = "1.4.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.4.0-rc.1" } -mas-cli = { path = "./crates/cli/", version = "=1.4.0-rc.1" } -mas-config = { path = "./crates/config/", version = "=1.4.0-rc.1" } -mas-context = { path = "./crates/context/", version = "=1.4.0-rc.1" } -mas-data-model = { path = "./crates/data-model/", version = "=1.4.0-rc.1" } -mas-email = { path = "./crates/email/", version = "=1.4.0-rc.1" } -mas-graphql = { path = "./crates/graphql/", version = "=1.4.0-rc.1" } -mas-handlers = { path = "./crates/handlers/", version = "=1.4.0-rc.1" } -mas-http = { path = "./crates/http/", version = "=1.4.0-rc.1" } -mas-i18n = { path = "./crates/i18n/", version = "=1.4.0-rc.1" } -mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.4.0-rc.1" } -mas-iana = { path = "./crates/iana/", version = "=1.4.0-rc.1" } -mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.4.0-rc.1" } -mas-jose = { path = "./crates/jose/", version = "=1.4.0-rc.1" } -mas-keystore = { path = "./crates/keystore/", version = "=1.4.0-rc.1" } -mas-listener = { path = "./crates/listener/", version = "=1.4.0-rc.1" } -mas-matrix = { path = "./crates/matrix/", version = "=1.4.0-rc.1" } -mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.4.0-rc.1" } -mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.4.0-rc.1" } -mas-policy = { path = "./crates/policy/", version = "=1.4.0-rc.1" } -mas-router = { path = "./crates/router/", version = "=1.4.0-rc.1" } -mas-spa = { path = "./crates/spa/", version = "=1.4.0-rc.1" } -mas-storage = { path = "./crates/storage/", version = "=1.4.0-rc.1" } -mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.4.0-rc.1" } -mas-tasks = { path = "./crates/tasks/", version = "=1.4.0-rc.1" } -mas-templates = { path = "./crates/templates/", version = "=1.4.0-rc.1" } -mas-tower = { path = "./crates/tower/", version = "=1.4.0-rc.1" } -oauth2-types = { path = "./crates/oauth2-types/", version = "=1.4.0-rc.1" } -syn2mas = { path = "./crates/syn2mas", version = "=1.4.0-rc.1" } +mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.4.0" } +mas-cli = { path = "./crates/cli/", version = "=1.4.0" } +mas-config = { path = "./crates/config/", version = "=1.4.0" } +mas-context = { path = "./crates/context/", version = "=1.4.0" } +mas-data-model = { path = "./crates/data-model/", version = "=1.4.0" } +mas-email = { path = "./crates/email/", version = "=1.4.0" } +mas-graphql = { path = "./crates/graphql/", version = "=1.4.0" } +mas-handlers = { path = "./crates/handlers/", version = "=1.4.0" } +mas-http = { path = "./crates/http/", version = "=1.4.0" } +mas-i18n = { path = "./crates/i18n/", version = "=1.4.0" } +mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.4.0" } +mas-iana = { path = "./crates/iana/", version = "=1.4.0" } +mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.4.0" } +mas-jose = { path = "./crates/jose/", version = "=1.4.0" } +mas-keystore = { path = "./crates/keystore/", version = "=1.4.0" } +mas-listener = { path = "./crates/listener/", version = "=1.4.0" } +mas-matrix = { path = "./crates/matrix/", version = "=1.4.0" } +mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.4.0" } +mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.4.0" } +mas-policy = { path = "./crates/policy/", version = "=1.4.0" } +mas-router = { path = "./crates/router/", version = "=1.4.0" } +mas-spa = { path = "./crates/spa/", version = "=1.4.0" } +mas-storage = { path = "./crates/storage/", version = "=1.4.0" } +mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.4.0" } +mas-tasks = { path = "./crates/tasks/", version = "=1.4.0" } +mas-templates = { path = "./crates/templates/", version = "=1.4.0" } +mas-tower = { path = "./crates/tower/", version = "=1.4.0" } +oauth2-types = { path = "./crates/oauth2-types/", version = "=1.4.0" } +syn2mas = { path = "./crates/syn2mas", version = "=1.4.0" } # OpenAPI schema generation and validation [workspace.dependencies.aide] diff --git a/frontend/locales/de.json b/frontend/locales/de.json index e1e6b7dc8..75c8493ed 100644 --- a/frontend/locales/de.json +++ b/frontend/locales/de.json @@ -146,7 +146,7 @@ }, "nav": { "devices": "Geräte", - "plan": "Plan", + "plan": "Abo", "profile": "Profil", "sessions": "Sitzungen", "settings": "Einstellungen" diff --git a/frontend/locales/zh-Hans.json b/frontend/locales/zh-Hans.json index 57e1b4cb3..ec5b8534f 100644 --- a/frontend/locales/zh-Hans.json +++ b/frontend/locales/zh-Hans.json @@ -273,7 +273,7 @@ "title": "无法允许加密身份" }, "finish_reset": "完成重置", - "heading": "重置加密身份", + "heading": "如果你无法通过其它方式确认请重置身份", "start_reset": "开始重置", "success": { "description": "身份重置已获批准,有效时间为 {{minutes}} 分钟。您可以关闭此窗口并返回应用继续操作。", diff --git a/translations/et.json b/translations/et.json index d24fe376e..50f3550e7 100644 --- a/translations/et.json +++ b/translations/et.json @@ -210,6 +210,7 @@ "register": { "call_to_login": "Sul on kasutajakonto juba olemas?", "continue_with_email": "Jätka e-posti aadressiga", + "continue_with_password": "Jätka salasõnaga", "create_account": { "description": "Jätkamiseks vali kasutajanimi.", "heading": "Loo kasutajakonto" diff --git a/translations/fi.json b/translations/fi.json index 668856735..5f7eb2a36 100644 --- a/translations/fi.json +++ b/translations/fi.json @@ -210,6 +210,7 @@ "register": { "call_to_login": "Onko sinulla jo tili?", "continue_with_email": "Jatka sähköpostiosoitteella", + "continue_with_password": "Jatka salasanalla", "create_account": { "description": "Valitse käyttäjänimi jatkaaksesi.", "heading": "Luo tili"