From 93fb40f3235422c244e0c3575893763ab0f97f7e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 2 Jul 2020 11:29:00 +0200 Subject: [PATCH 1/7] (re-)Enable abortOnError for lint And fix a first issue (on unused code) --- vector/build.gradle | 3 +-- .../vector/riotx/features/form/FormEditTextWithButtonItem.kt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/build.gradle b/vector/build.gradle index e497b156ae..92e7239dbf 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -232,8 +232,7 @@ android { lintOptions { lintConfig file("lint.xml") - // TODO Restore true once pb with WorkManager is fixed - abortOnError false + abortOnError true } compileOptions { diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt index 0650c0f55c..799f6abe00 100644 --- a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt @@ -56,6 +56,7 @@ abstract class FormEditTextWithButtonItem : VectorEpoxyModel Date: Thu, 2 Jul 2020 12:17:09 +0200 Subject: [PATCH 2/7] Clean code --- .../java/im/vector/riotx/VectorApplication.kt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/VectorApplication.kt b/vector/src/main/java/im/vector/riotx/VectorApplication.kt index d0a3174227..ab7c3e1bf7 100644 --- a/vector/src/main/java/im/vector/riotx/VectorApplication.kt +++ b/vector/src/main/java/im/vector/riotx/VectorApplication.kt @@ -63,7 +63,13 @@ import java.util.Locale import java.util.concurrent.Executors import javax.inject.Inject -class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration.Provider, androidx.work.Configuration.Provider { +import androidx.work.Configuration as WorkConfiguration + +class VectorApplication : + Application(), + HasVectorInjector, + MatrixConfiguration.Provider, + WorkConfiguration.Provider { lateinit var appContext: Context @Inject lateinit var legacySessionImporter: LegacySessionImporter @@ -85,6 +91,7 @@ class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration. @Inject lateinit var webRtcPeerConnectionManager: WebRtcPeerConnectionManager lateinit var vectorComponent: VectorComponent + // font thread handler private var fontThreadHandler: Handler? = null @@ -157,7 +164,11 @@ class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration. override fun providesMatrixConfiguration() = MatrixConfiguration(BuildConfig.FLAVOR_DESCRIPTION) - override fun getWorkManagerConfiguration() = androidx.work.Configuration.Builder().setExecutor(Executors.newCachedThreadPool()).build() + override fun getWorkManagerConfiguration(): WorkConfiguration { + return WorkConfiguration.Builder() + .setExecutor(Executors.newCachedThreadPool()) + .build() + } override fun injector(): VectorComponent { return vectorComponent From 1de819b0a3ab6dd3d4e878ed831c3416ce45de59 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 2 Jul 2020 12:21:23 +0200 Subject: [PATCH 3/7] Fix lint false-positive about WorkManger (#1012) --- CHANGES.md | 2 +- matrix-sdk-android/src/main/AndroidManifest.xml | 6 ------ vector/src/main/AndroidManifest.xml | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4a7d0d70af..378ea2279a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,7 +17,7 @@ SDK API changes ⚠️: - Build 🧱: - - + - Fix lint false-positive about WorkManger (#1012) Other changes: - diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml index 94b2db2bf1..c02f34f1c9 100644 --- a/matrix-sdk-android/src/main/AndroidManifest.xml +++ b/matrix-sdk-android/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ @@ -8,11 +7,6 @@ - + + + Date: Thu, 2 Jul 2020 12:44:07 +0200 Subject: [PATCH 4/7] Upgrade build-tools from 3.5.3 to 3.6.6 and gradle from 5.4.1 to 5.6.4 --- CHANGES.md | 2 ++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 378ea2279a..3555894bf4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,8 @@ SDK API changes ⚠️: Build 🧱: - Fix lint false-positive about WorkManger (#1012) + - Upgrade build-tools from 3.5.3 to 3.6.6 + - Upgrade gradle from 5.4.1 to 5.6.4 Other changes: - diff --git a/build.gradle b/build.gradle index 74a62f0d17..5f1fa78620 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.google.gms:google-services:4.3.2' classpath "com.airbnb.okreplay:gradle-plugin:1.5.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 51b92600a0..4da2435f42 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 27 10:10:35 CEST 2019 +#Thu Jul 02 12:33:07 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip From d4050a7b9d18a92b56960c192d5662f2b48184ba Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 2 Jul 2020 23:39:42 +0200 Subject: [PATCH 5/7] Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use --- vector/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vector/build.gradle b/vector/build.gradle index 92e7239dbf..f966f441b2 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -106,6 +106,11 @@ def buildNumber = System.env.BUILDKITE_BUILD_NUMBER as Integer ?: 0 android { compileSdkVersion 29 + + // Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use + // Ref: https://issuetracker.google.com/issues/144111441 + ndkVersion "21.3.6528147" + defaultConfig { applicationId "im.vector.app" // Set to API 21: see #405 From e9ba7342d5d3ad5c07136de3bc3160378302b597 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 3 Jul 2020 23:10:44 +0300 Subject: [PATCH 6/7] Fix reply fallback format Signed-off-by: Tulir Asokan --- CHANGES.md | 1 + .../session/room/send/LocalEchoEventFactory.kt | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c5cae43f67..9138eb6ad2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ Improvements 🙌: Bugfix 🐛: - Fix crash when coming from a notification (#1601) - Fix Exception when importing keys (#1576) + - Fix reply fallback leaking sender locale (#429) Translations 🗣: - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt index 08dc4e80d8..370a81e409 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt @@ -177,7 +177,6 @@ internal class LocalEchoEventFactory @Inject constructor( val body = bodyForReply(originalEvent.getLastMessageContent(), originalEvent.root.getClearContent().toModel()) val replyFormatted = REPLY_PATTERN.format( permalink, - stringProvider.getString(R.string.message_reply_to_prefix), userLink, originalEvent.senderInfo.disambiguatedDisplayName, body.takeFormatted(), @@ -372,7 +371,6 @@ internal class LocalEchoEventFactory @Inject constructor( val body = bodyForReply(eventReplied.getLastMessageContent(), eventReplied.root.getClearContent().toModel()) val replyFormatted = REPLY_PATTERN.format( permalink, - stringProvider.getString(R.string.message_reply_to_prefix), userLink, userId, body.takeFormatted(), @@ -434,10 +432,10 @@ internal class LocalEchoEventFactory @Inject constructor( TextContent(content.body, formattedText) } } - MessageType.MSGTYPE_FILE -> return TextContent(stringProvider.getString(R.string.reply_to_a_file)) - MessageType.MSGTYPE_AUDIO -> return TextContent(stringProvider.getString(R.string.reply_to_an_audio_file)) - MessageType.MSGTYPE_IMAGE -> return TextContent(stringProvider.getString(R.string.reply_to_an_image)) - MessageType.MSGTYPE_VIDEO -> return TextContent(stringProvider.getString(R.string.reply_to_a_video)) + MessageType.MSGTYPE_FILE -> return TextContent("sent a file.") + MessageType.MSGTYPE_AUDIO -> return TextContent("sent an audio file.") + MessageType.MSGTYPE_IMAGE -> return TextContent("sent an image.") + MessageType.MSGTYPE_VIDEO -> return TextContent("sent a video.") else -> return TextContent(content?.body ?: "") } } @@ -489,6 +487,6 @@ internal class LocalEchoEventFactory @Inject constructor( // // // No whitespace because currently breaks temporary formatted text to Span - const val REPLY_PATTERN = """
%s%s
%s
%s""" + const val REPLY_PATTERN = """
In reply to %s
%s
%s""" } } From 51e63c5d1de60eabd1c095214ec1b20038667643 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 3 Jul 2020 23:12:38 +0300 Subject: [PATCH 7/7] Remove unused reply fallback translations Signed-off-by: Tulir Asokan --- matrix-sdk-android/src/main/res/values-ar/strings.xml | 6 ------ matrix-sdk-android/src/main/res/values-az/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-bg/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-ca/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-cs/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-de/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-el/strings.xml | 6 ------ matrix-sdk-android/src/main/res/values-eo/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-es-rMX/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-es/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-et/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-eu/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-fa/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-fi/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-fr/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-gl/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-hu/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-is/strings.xml | 1 - matrix-sdk-android/src/main/res/values-it/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-ja/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-ko/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-nl/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-nn/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-pl/strings.xml | 6 ------ matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-ru/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-sk/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-sq/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-uk/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-vls/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml | 7 ------- matrix-sdk-android/src/main/res/values/strings.xml | 7 ------- 33 files changed, 222 deletions(-) diff --git a/matrix-sdk-android/src/main/res/values-ar/strings.xml b/matrix-sdk-android/src/main/res/values-ar/strings.xml index ab48ea9934..e9aba1721a 100644 --- a/matrix-sdk-android/src/main/res/values-ar/strings.xml +++ b/matrix-sdk-android/src/main/res/values-ar/strings.xml @@ -63,12 +63,6 @@ أرسل ⁨%1$s⁩ ملصقا. (تغيّرت الصورة أيضا) - ردا على - - أرسل صورة. - أرسل فديوهًا. - أرسل ملف صوت. - أرسل ملفًا. دعوة من ⁨%s⁩ غرفة فارغة diff --git a/matrix-sdk-android/src/main/res/values-az/strings.xml b/matrix-sdk-android/src/main/res/values-az/strings.xml index c4347619d0..9c60dfafa7 100644 --- a/matrix-sdk-android/src/main/res/values-az/strings.xml +++ b/matrix-sdk-android/src/main/res/values-az/strings.xml @@ -52,8 +52,6 @@ ** Şifrəni aça bilmir: %s ** Göndərənin cihazı bu mesaj üçün açarları bizə göndərməyib. - Cavab olaraq - Redaktə etmək olmur Mesaj göndərmək olmur @@ -69,11 +67,6 @@ Elektron poçt ünvanı Telefon nömrəsi - şəkil göndərdi. - video göndərdi. - səs faylı göndərdi. - fayl göndərdi. - %s-dən dəvət Otağa dəvət diff --git a/matrix-sdk-android/src/main/res/values-bg/strings.xml b/matrix-sdk-android/src/main/res/values-bg/strings.xml index ea53f593fa..07d59852f3 100644 --- a/matrix-sdk-android/src/main/res/values-bg/strings.xml +++ b/matrix-sdk-android/src/main/res/values-bg/strings.xml @@ -63,13 +63,6 @@ %1$s изпрати стикер. - В отговор на - - изпрати снимка. - изпрати видео. - изпрати аудио файл. - изпрати файл. - Покана от %s Покана за стая %1$s и %2$s diff --git a/matrix-sdk-android/src/main/res/values-ca/strings.xml b/matrix-sdk-android/src/main/res/values-ca/strings.xml index c59ee3b23d..2dc2206c8c 100644 --- a/matrix-sdk-android/src/main/res/values-ca/strings.xml +++ b/matrix-sdk-android/src/main/res/values-ca/strings.xml @@ -76,11 +76,4 @@ %1$s ha enviat un adhesiu. - En resposta a - - ha enviat una imatge. - ha enviat un vídeo. - ha enviat un fitxer d\'àudio. - ha enviat un fitxer. - diff --git a/matrix-sdk-android/src/main/res/values-cs/strings.xml b/matrix-sdk-android/src/main/res/values-cs/strings.xml index 7e5081b6e9..44908c38f7 100644 --- a/matrix-sdk-android/src/main/res/values-cs/strings.xml +++ b/matrix-sdk-android/src/main/res/values-cs/strings.xml @@ -46,8 +46,6 @@ ** Nelze dešifrovat: %s ** Odesílatelovo zařízení neposlalo klíče pro tuto zprávu. - V odpovědi na - Nelze vymazat Zprávu nelze odeslat @@ -63,11 +61,6 @@ E-mailová adresa Telefonní číslo - odeslal obrázek. - odeslal video. - odeslal zvukový soubor. - odeslal soubor. - Pozvání od %s Pozvání do místnosti diff --git a/matrix-sdk-android/src/main/res/values-de/strings.xml b/matrix-sdk-android/src/main/res/values-de/strings.xml index d19396d932..94da3369d8 100644 --- a/matrix-sdk-android/src/main/res/values-de/strings.xml +++ b/matrix-sdk-android/src/main/res/values-de/strings.xml @@ -73,13 +73,6 @@ %1$s sandte einen Sticker. - Als Antwort auf - - hat ein Bild gesendet. - hat ein Video gesendet. - hat eine Audio-Datei gesendet. - sandte eine Datei. - Einladung von %s Raumeinladung diff --git a/matrix-sdk-android/src/main/res/values-el/strings.xml b/matrix-sdk-android/src/main/res/values-el/strings.xml index 37eac5351e..9db4e91849 100644 --- a/matrix-sdk-android/src/main/res/values-el/strings.xml +++ b/matrix-sdk-android/src/main/res/values-el/strings.xml @@ -40,8 +40,6 @@ ** Αδυναμία αποκρυπτογράφησης: %s ** Η συσκευή του/της αποστολέα δεν μας έχει στείλει τα κλειδιά για αυτό το μήνυμα. - Προς απάντηση στο - Αποτυχία αποστολής μηνύματος Αποτυχία αναφόρτωσης εικόνας @@ -56,10 +54,6 @@ Η VoIP διάσκεψη έληξε Ο/Η %1$s εισήλθε στο δωμάτιο - έστειλε μία εικόνα. - έστειλε ένα βίντεο. - έστειλε ένα αρχείο ήχου. - έστειλε ένα αρχείο. Πρόσκληση από %s Πρόσκληση στο δωμάτιο diff --git a/matrix-sdk-android/src/main/res/values-eo/strings.xml b/matrix-sdk-android/src/main/res/values-eo/strings.xml index 69600394ac..4a1e2c4c65 100644 --- a/matrix-sdk-android/src/main/res/values-eo/strings.xml +++ b/matrix-sdk-android/src/main/res/values-eo/strings.xml @@ -17,8 +17,6 @@ ** Ne eblas malĉifri: %s ** La aparato de la sendanto ne sendis al ni la ŝlosilojn por tiu mesaĝo. - Responde al - %1$s: %2$s %1$s ŝanĝis sian vidigan nomon al %2$s %1$s ŝanĝis sian vidigan nomon de %2$s al %3$s @@ -62,11 +60,6 @@ Retpoŝtadreso Telefonnumero - sendis bildon. - sendis filmon. - sendis sondosieron. - sendis dosieron. - Invito de %s Ĉambra invito diff --git a/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml b/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml index 56cbe6ace5..35b7bfc829 100644 --- a/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml +++ b/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml @@ -73,13 +73,6 @@ %1$s envió una calcomanía. - En respuesta a - - envió una imagen. - envió un video. - envió un archivo de audio. - envió un archivo. - Invitación de %s Invitación de Sala diff --git a/matrix-sdk-android/src/main/res/values-es/strings.xml b/matrix-sdk-android/src/main/res/values-es/strings.xml index 69f02d2ef4..3c019b3b80 100644 --- a/matrix-sdk-android/src/main/res/values-es/strings.xml +++ b/matrix-sdk-android/src/main/res/values-es/strings.xml @@ -73,13 +73,6 @@ %1$s envió una pegatina. - En respuesta a - - envió una imagen. - envió un vídeo. - envió un archivo de audio. - envió un archivo. - Invitación de %s Invitación a Sala diff --git a/matrix-sdk-android/src/main/res/values-et/strings.xml b/matrix-sdk-android/src/main/res/values-et/strings.xml index 3a5a1ff767..2536500247 100644 --- a/matrix-sdk-android/src/main/res/values-et/strings.xml +++ b/matrix-sdk-android/src/main/res/values-et/strings.xml @@ -50,8 +50,6 @@ ** Ei õnnestu dekrüptida: %s ** Sõnumi saatja seade ei ole selle sõnumi jaoks saatnud dekrüptimisvõtmeid. - Vastuseks kasutajale - Ei saanud muuta sõnumit Sõnumi saatmine ei õnnestunud @@ -67,11 +65,6 @@ E-posti aadress Telefoninumber - saatis pildi. - saatis video. - saatis helifaili. - saatis faili. - Kutse kasutajalt %s Kutse jututuppa diff --git a/matrix-sdk-android/src/main/res/values-eu/strings.xml b/matrix-sdk-android/src/main/res/values-eu/strings.xml index 7938db3cbd..1a5c81fe5e 100644 --- a/matrix-sdk-android/src/main/res/values-eu/strings.xml +++ b/matrix-sdk-android/src/main/res/values-eu/strings.xml @@ -63,13 +63,6 @@ %1$s erabiltzaileak eranskailu bat bidali du. - Honi erantzunez - - irudi bat bidali du. - bideo bat bidali du. - audio fitxategi bat bidali du. - fitxategi bat bidali du. - %s gelarako gonbidapena Gela gonbidapena %1$s eta %2$s diff --git a/matrix-sdk-android/src/main/res/values-fa/strings.xml b/matrix-sdk-android/src/main/res/values-fa/strings.xml index 7addf22ca8..18d8578e54 100644 --- a/matrix-sdk-android/src/main/res/values-fa/strings.xml +++ b/matrix-sdk-android/src/main/res/values-fa/strings.xml @@ -51,8 +51,6 @@ ** ناتوان در رمزگشایی: %s ** دستگاه فرستنده، کلیدهای این پیام را برایمان نفرستاده است. - در پاسخ به - ناتوان در فرستادن پیام شکست در بارگذاری تصویر @@ -67,11 +65,6 @@ نشانی رایانامه شماره تلفن - تصویری فرستاد. - ویدیویی فرستاد. - پرونده‌ای صوتی فرستاد. - پرونده‌ای فرستاد. - دعوت از %s دعوت اتاق diff --git a/matrix-sdk-android/src/main/res/values-fi/strings.xml b/matrix-sdk-android/src/main/res/values-fi/strings.xml index 06820183fd..078769942c 100644 --- a/matrix-sdk-android/src/main/res/values-fi/strings.xml +++ b/matrix-sdk-android/src/main/res/values-fi/strings.xml @@ -70,13 +70,6 @@ %1$s lähetti tarran. - Vastauksena käyttäjälle - - oli lähettänyt kuvan. - lähetti videon. - lähetti äänitiedoston. - lähetti tiedoston. - %1$s ja yksi muu %1$s ja %2$d muuta diff --git a/matrix-sdk-android/src/main/res/values-fr/strings.xml b/matrix-sdk-android/src/main/res/values-fr/strings.xml index a744c35b99..aad3bd1afb 100644 --- a/matrix-sdk-android/src/main/res/values-fr/strings.xml +++ b/matrix-sdk-android/src/main/res/values-fr/strings.xml @@ -63,13 +63,6 @@ %1$s a envoyé un sticker. - En réponse à - - a envoyé une image. - a envoyé une vidéo. - a envoyé un fichier audio. - a envoyé un fichier. - Invitation de %s Invitation au salon Salon vide diff --git a/matrix-sdk-android/src/main/res/values-gl/strings.xml b/matrix-sdk-android/src/main/res/values-gl/strings.xml index 907730f154..77868e7df3 100644 --- a/matrix-sdk-android/src/main/res/values-gl/strings.xml +++ b/matrix-sdk-android/src/main/res/values-gl/strings.xml @@ -50,8 +50,6 @@ ** Imposíbel descifrar: %s ** O dispositivo do que envía non enviou as chaves desta mensaxe. - Respondéndolle a - Non se puido redactar Non foi posíbel enviar a mensaxe @@ -64,11 +62,6 @@ Número de teléfono - Responder a - enviar un vídeo. - enviar un ficheiro de son. - enviar un ficheiro. - %1$s e %2$s diff --git a/matrix-sdk-android/src/main/res/values-hu/strings.xml b/matrix-sdk-android/src/main/res/values-hu/strings.xml index 03d52bef44..35f35eaecd 100644 --- a/matrix-sdk-android/src/main/res/values-hu/strings.xml +++ b/matrix-sdk-android/src/main/res/values-hu/strings.xml @@ -62,13 +62,6 @@ %1$s küldött egy matricát. - Válasz erre: - - képet küldött. - videót küldött. - hangfájlt küldött. - fájlt küldött. - Meghívó tőle: %s Meghívó egy szobába %1$s és %2$s diff --git a/matrix-sdk-android/src/main/res/values-is/strings.xml b/matrix-sdk-android/src/main/res/values-is/strings.xml index 01954ae2b4..ecf19edb8a 100644 --- a/matrix-sdk-android/src/main/res/values-is/strings.xml +++ b/matrix-sdk-android/src/main/res/values-is/strings.xml @@ -24,7 +24,6 @@ (einnig var skipt um auðkennismynd) ** Mistókst að afkóða: %s ** - Sem svar til Gat ekki sent skilaboð diff --git a/matrix-sdk-android/src/main/res/values-it/strings.xml b/matrix-sdk-android/src/main/res/values-it/strings.xml index ec86122313..42328b836f 100644 --- a/matrix-sdk-android/src/main/res/values-it/strings.xml +++ b/matrix-sdk-android/src/main/res/values-it/strings.xml @@ -62,13 +62,6 @@ %1$s ha inviato un adesivo. - In risposta a - - inviata un\'immagine. - inviato un video. - inviato un file audio. - inviato un file. - Invito da %s Invito nella stanza diff --git a/matrix-sdk-android/src/main/res/values-ja/strings.xml b/matrix-sdk-android/src/main/res/values-ja/strings.xml index b72d1a13ca..366c743494 100644 --- a/matrix-sdk-android/src/main/res/values-ja/strings.xml +++ b/matrix-sdk-android/src/main/res/values-ja/strings.xml @@ -56,8 +56,6 @@ ** 解読できません: %s ** 送信者の端末からこのメッセージのキーが送信されていません。 - に返信 - 修正できませんでした メッセージを送信できません @@ -73,9 +71,4 @@ メールアドレス 電話番号 - 画像を送信しました。 - 動画を送りました。 - 音声ファイルを送信しました。 - ファイルを送信しました。 - diff --git a/matrix-sdk-android/src/main/res/values-ko/strings.xml b/matrix-sdk-android/src/main/res/values-ko/strings.xml index 68e94bb641..88c5e7d618 100644 --- a/matrix-sdk-android/src/main/res/values-ko/strings.xml +++ b/matrix-sdk-android/src/main/res/values-ko/strings.xml @@ -52,8 +52,6 @@ ** 암호를 복호화할 수 없음: %s ** 발신인의 기기에서 이 메시지의 키를 보내지 않았습니다. - 관련 대화 - 검열할 수 없습니다 메시지를 보낼 수 없습니다 @@ -69,11 +67,6 @@ 이메일 주소 전화번호 - 사진을 보냈습니다. - 동영상을 보냈습니다. - 오디오 파일을 보냈습니다. - 파일을 보냈습니다. - %s에서 초대함 방 초대 diff --git a/matrix-sdk-android/src/main/res/values-nl/strings.xml b/matrix-sdk-android/src/main/res/values-nl/strings.xml index d08b3c7845..22eb61f109 100644 --- a/matrix-sdk-android/src/main/res/values-nl/strings.xml +++ b/matrix-sdk-android/src/main/res/values-nl/strings.xml @@ -71,13 +71,6 @@ %1$s heeft een sticker gestuurd. - Als antwoord op - - heeft een afbeelding gestuurd. - heeft een video gestuurd. - heeft een audiobestand gestuurd. - heeft een bestand gestuurd. - Uitnodiging van %s Gespreksuitnodiging diff --git a/matrix-sdk-android/src/main/res/values-nn/strings.xml b/matrix-sdk-android/src/main/res/values-nn/strings.xml index edc50a5a0e..601cf4c9df 100644 --- a/matrix-sdk-android/src/main/res/values-nn/strings.xml +++ b/matrix-sdk-android/src/main/res/values-nn/strings.xml @@ -49,8 +49,6 @@ ** Fekk ikkje til å dekryptera: %s ** Avsendareiningi hev ikkje sendt oss nyklane fyr denna meldingi. - Som svar til - Kunde ikkje gjera um Fekk ikkje å senda meldingi @@ -64,11 +62,6 @@ Epostadresse Telefonnummer - sende eit bilæte. - sende ein video. - sende ei ljodfil. - sende ei fil. - Innbjoding frå %s Rominnbjoding %1$s og %2$s diff --git a/matrix-sdk-android/src/main/res/values-pl/strings.xml b/matrix-sdk-android/src/main/res/values-pl/strings.xml index 4e1d256788..dc380516b7 100644 --- a/matrix-sdk-android/src/main/res/values-pl/strings.xml +++ b/matrix-sdk-android/src/main/res/values-pl/strings.xml @@ -42,7 +42,6 @@ %1$s wycofał(a) zaproszenie %2$s %s odebrał(a) połączenie. (awatar też został zmieniony) - W odpowiedzi do Zaproszenie od %s Zaproszenie do pokoju @@ -76,11 +75,6 @@ Nie można zredagować Obecnie nie jest możliwe ponowne dołączenie do pustego pokoju. - wyślij zdjęcie. - wyślij wideo. - wyślij plik audio. - wyślij plik. - Wiadomość usunięta Wiadomość usunięta przez %1$s Wiadomość usunięta [powód: %1$s] diff --git a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml index 17e7ae33a1..a573c659a6 100644 --- a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml +++ b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml @@ -74,13 +74,6 @@ %1$s enviou um sticker. - Em resposta a - - enviou uma imagem. - enviou um vídeo. - enviou um arquivo de áudio. - enviou um arquivo. - Convite de %s Convite para sala diff --git a/matrix-sdk-android/src/main/res/values-ru/strings.xml b/matrix-sdk-android/src/main/res/values-ru/strings.xml index 3e20353b7d..bd0dcef3dd 100644 --- a/matrix-sdk-android/src/main/res/values-ru/strings.xml +++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml @@ -73,13 +73,6 @@ %1$s отправил стикер. - В ответ на - - отправил изображение. - отправил видео. - отправил аудиофайл. - отправил файл. - Приглашение от %s Приглашение в комнату diff --git a/matrix-sdk-android/src/main/res/values-sk/strings.xml b/matrix-sdk-android/src/main/res/values-sk/strings.xml index c6eb6b896b..8aec8fccf9 100644 --- a/matrix-sdk-android/src/main/res/values-sk/strings.xml +++ b/matrix-sdk-android/src/main/res/values-sk/strings.xml @@ -62,13 +62,6 @@ %1$s poslal nálepku. - Odpoveď na - - odoslal obrázok. - odoslal video. - odoslal zvukový súbor. - Odoslal súbor. - Pozvanie od %s Pozvanie do miestnosti %1$s a %2$s diff --git a/matrix-sdk-android/src/main/res/values-sq/strings.xml b/matrix-sdk-android/src/main/res/values-sq/strings.xml index 853d4729af..e63e28288f 100644 --- a/matrix-sdk-android/src/main/res/values-sq/strings.xml +++ b/matrix-sdk-android/src/main/res/values-sq/strings.xml @@ -34,8 +34,6 @@ ** S’arrihet të shfshehtëzohet: %s ** Pajisja e dërguesit nuk na ka dërguar kyçet për këtë mesazh. - Në përgjigje të - S’u redaktua dot S’arrihet të dërgohet mesazh @@ -51,11 +49,6 @@ Adresë email Numër telefoni - dërgoi një figurë. - dërgoi një video. - dërgoi një kartelë audio. - dërgoi një kartelë. - Ftesë nga %s Ftesë Dhome diff --git a/matrix-sdk-android/src/main/res/values-uk/strings.xml b/matrix-sdk-android/src/main/res/values-uk/strings.xml index bf83e39d72..eb5071f190 100644 --- a/matrix-sdk-android/src/main/res/values-uk/strings.xml +++ b/matrix-sdk-android/src/main/res/values-uk/strings.xml @@ -56,8 +56,6 @@ ** Неможливо розшифрувати: %s ** Пристрій відправника не надіслав нам ключ для цього повідомлення. - У відповідь на - Неможливо відредагувати Не вдалося надіслати повідомлення @@ -71,11 +69,6 @@ Адреса електронної пошти Номер телефону - надіслав зображення. - надіслав відео. - надіслав аудіо файл. - надіслав файл. - %1$s та 1 інший %1$s та %2$d інші diff --git a/matrix-sdk-android/src/main/res/values-vls/strings.xml b/matrix-sdk-android/src/main/res/values-vls/strings.xml index dad88788e4..5c9132ed35 100644 --- a/matrix-sdk-android/src/main/res/values-vls/strings.xml +++ b/matrix-sdk-android/src/main/res/values-vls/strings.xml @@ -50,8 +50,6 @@ ** Kun nie ountsleuteln: %s ** ’t Toestel van den afzender èt geen sleutels vo da bericht hier gesteurd. - Als antwoord ip - Kosteg nie verwyderd wordn Kosteg ’t bericht nie verzendn @@ -67,11 +65,6 @@ E-mailadresse Telefongnumero - èt e fotootje gesteurd. - èt e filmtje gesteurd. - èt e geluudsfragment gesteurd. - èt e bestand gesteurd. - Uutnodigienge van %s Gespreksuutnodigienge diff --git a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml index 0c0953c92d..48dbd27a1b 100644 --- a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml +++ b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml @@ -63,13 +63,6 @@ %1$s：%2$s %1$s 发送了一张贴纸。 - 发送了一张图片。 - 发送了一个视频。 - 发送了一段音频。 - 发送了一个文件。 - - 回复 - 空聊天室 来自 %s 的邀请 聊天室邀请 diff --git a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml index ca2fd79aa2..f3da62dccc 100644 --- a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml +++ b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml @@ -62,13 +62,6 @@ %1$s 傳送了一張貼圖。 - 回覆 - - 傳送了圖片。 - 傳送了影片。 - 傳送了音訊檔案。 - 傳送了檔案。 - 來自%s 的邀請 聊天室邀請 %1$s 和 %2$s diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml index 9b7fa01eaf..0dc64c1b4b 100644 --- a/matrix-sdk-android/src/main/res/values/strings.xml +++ b/matrix-sdk-android/src/main/res/values/strings.xml @@ -112,7 +112,6 @@ The sender\'s device has not sent us the keys for this message. - In reply to Could not redact @@ -139,12 +138,6 @@ Email address Phone number - - sent an image. - sent a video. - sent an audio file. - sent a file. - Invite from %s Room Invite