From aaa9c7e7959093192e756dc0c59b3356dcdc2e38 Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 30 Jul 2021 18:48:14 +0200 Subject: [PATCH] fix rebase --- tools/check/forbidden_strings_in_code.txt | 2 +- vector/src/main/res/values/strings.xml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt index 4f1df39897..391140b9f3 100644 --- a/tools/check/forbidden_strings_in_code.txt +++ b/tools/check/forbidden_strings_in_code.txt @@ -162,7 +162,7 @@ Formatter\.formatShortFileSize===1 # android\.text\.TextUtils ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt -enum class===104 +enum class===105 ### Do not import temporary legacy classes import org.matrix.android.sdk.internal.legacy.riot===3 diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 065ca85d36..8e6bf85eae 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -3476,8 +3476,6 @@ Cannot reply or edit while voice message is active Voice Message (%1$s) - Anyone in %s will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime. - Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime. Anyone in %s will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime. Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.