From 9c5c65a243b009924042b78eb251877140b35192 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 12 Nov 2019 10:13:12 +0100
Subject: [PATCH] Cleanup

---
 .../im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt | 1 -
 .../java/im/vector/riotx/features/debug/sas/ItemSasEmoji.kt     | 1 -
 vector/src/main/res/values-de/strings.xml                       | 2 +-
 vector/src/main/res/values-zh-rTW/strings.xml                   | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt
index 49756d0c1a..ba1c47c08c 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt
+++ b/vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt
@@ -24,7 +24,6 @@ import kotlinx.android.synthetic.main.fragment_generic_recycler_epoxy.*
 
 class DebugSasEmojiActivity : AppCompatActivity() {
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.fragment_generic_recycler_epoxy)
diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/sas/ItemSasEmoji.kt b/vector/src/debug/java/im/vector/riotx/features/debug/sas/ItemSasEmoji.kt
index e7f152673c..92d9bc0b11 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/sas/ItemSasEmoji.kt
+++ b/vector/src/debug/java/im/vector/riotx/features/debug/sas/ItemSasEmoji.kt
@@ -24,7 +24,6 @@ import im.vector.matrix.android.api.session.crypto.sas.EmojiRepresentation
 import im.vector.riotx.core.epoxy.VectorEpoxyHolder
 import im.vector.riotx.core.epoxy.VectorEpoxyModel
 
-
 @EpoxyModelClass(layout = im.vector.riotx.R.layout.item_sas_emoji)
 abstract class ItemSasEmoji : VectorEpoxyModel<ItemSasEmoji.Holder>() {
 
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 356e3fdaaa..251c42c00c 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1662,7 +1662,7 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
     <string name="people_no_identity_server">Kein Integrationsserver konfiguriert.</string>
 
     <string name="call_failed_no_ice_title">Anruf aufgrund eines falsch konfigurierten Servers fehlgeschlagen</string>
-    <string name="call_failed_no_ice_use_alt">Versuchen Sie es mit %@</string>
+    <string name="call_failed_no_ice_use_alt">Versuchen Sie es mit %s</string>
     <string name="call_failed_dont_ask_again">Nicht erneut fragen</string>
 
     <string name="auth_add_email_message_2">Richten Sie eine E-Mail für die Kontowiederherstellung ein, die später von Personen, die Sie kennen, optional gefunden werden kann.</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 837e75583a..a1d6ceb32b 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1675,7 +1675,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="a11y_jump_to_bottom">跳到底部</string>
 
     <string name="two_and_some_others_read">%1$s、%2$s 與 %3$d 個其他人已閱讀</string>
-    <string name="three_users_read">%1$s、%2$s 與 %3$d 已閱讀</string>
+    <string name="three_users_read">%1$s、%2$s 與 %3$s 已閱讀</string>
     <string name="two_users_read">%1$s 與 %2$s 已閱讀</string>
     <string name="one_user_read">%s 已閱讀</string>
     <plurals name="fallback_users_read">