From fc202437e85535185056736361d65168e58a604f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 18:31:46 +0200
Subject: [PATCH 1/4] Fix lint issues

---
 vector/src/main/res/values-ar/strings.xml |  1 -
 vector/src/main/res/values-tr/strings.xml | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index bc0738643f..4e74426e9a 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -11,7 +11,6 @@
     <string name="notice_room_unban">رفعَ ⁨%1$s⁩ المنع عن ⁨%2$s⁩</string>
     <string name="notice_room_ban">منعَ ⁨%1$s⁩ ⁨%2$s⁩</string>
     <string name="notice_avatar_url_changed">غيّر ⁨%1$s⁩ صورته الشخصية</string>
-    <string name="notice_display_name_set">ضبطَ ⁨%1$s⁩ اسم العرض على</string>
     <string name="notice_display_name_changed_from">إنَّ %1$s قد غيَّرَ اسمه الظاهر من %2$s إلى %3$s</string>
     <string name="notice_display_name_removed">إنَّ %1$s قد أزالَ اسمه الظاهر (لقد كان %2$s)</string>
     <string name="notice_room_topic_changed">إنَّ %1$s قد غيَّرَ الموضوع إلى: %2$s</string>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index aa234ac78c..4739830ea4 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -1761,8 +1761,6 @@
     <string name="notice_ended_call">%s aramayı sonlandırdı.</string>
     <string name="notice_answered_call_by_you">Aramayı cevapladınız.</string>
     <string name="notice_answered_call">%s aramayı cevapladı.</string>
-    <string name="notice_call_candidates">"
-\n"</string>
     <string name="notice_placed_voice_call_by_you">Bir sesli arama başlattınız.</string>
     <string name="notice_placed_voice_call">%s bir sesli arama başlattı.</string>
     <string name="notice_placed_video_call_by_you">Görüntülü arama başlattınız.</string>
@@ -1784,15 +1782,11 @@
     <string name="room_settings_room_version_title">Oda sürümü</string>
     <string name="event_status_sending_message">Mesaj gönderiliyor…</string>
     <string name="room_displayname_empty_room">Boş oda</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
-    </plurals>
-    <string name="room_displayname_3_members">%1$s, %2$s ve</string>
+    <string name="room_displayname_3_members">%1$s, %2$s ve %3$s</string>
     <string name="power_level_custom_no_value">Özel</string>
     <string name="notice_widget_removed_by_you">%1$s widgetını kaldırdınız</string>
     <string name="notice_widget_added_by_you">%1$s widgetını eklediniz</string>
-    <string name="notice_profile_change_redacted_by_you">Profilinizi güncellediniz</string>
+    <string name="notice_profile_change_redacted_by_you">Profilinizi güncellediniz %1$s</string>
     <string name="room_displayname_room_invite">Oda daveti</string>
     <string name="medium_phone_number">Telefon numarası</string>
     <string name="medium_email">E-posta adresi</string>
@@ -1801,7 +1795,6 @@
     <string name="message_failed_to_upload">Görüntü yüklenemedi</string>
     <string name="unable_to_send_message">Mesaj gönderilemedi</string>
     <string name="power_level_default">Varsayılan</string>
-    <string name="power_level_admin"></string>
     <string name="notice_widget_jitsi_modified_by_you">Video konferansı düzenlediniz</string>
     <string name="notice_widget_jitsi_modified">Video konferans %1$s tarafından düzenlendi</string>
     <string name="notice_widget_jitsi_removed_by_you">Video konferansı sonlandırdınız</string>

From 47aeadef7c0313ec315b19b976f0597083d2b354 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 18:34:54 +0200
Subject: [PATCH 2/4] Add configuration for new Irish language

---
 vector/src/main/res/values-ga/strings_no_weblate.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 vector/src/main/res/values-ga/strings_no_weblate.xml

diff --git a/vector/src/main/res/values-ga/strings_no_weblate.xml b/vector/src/main/res/values-ga/strings_no_weblate.xml
new file mode 100644
index 0000000000..ec03f726fd
--- /dev/null
+++ b/vector/src/main/res/values-ga/strings_no_weblate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="resources_language">ga</string>
+    <string name="resources_country_code">IE</string>
+    <string name="resources_script">Latn</string>
+
+</resources>
\ No newline at end of file

From e7608469ca16269ac45d5dcd8ad2aadd033fe7b5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 18:42:52 +0200
Subject: [PATCH 3/4] Import SAS strings

---
 .../src/main/res/values-fi/strings_sas.xml    |  2 +-
 .../src/main/res/values-ja/strings_sas.xml    | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml b/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml
index b690fee4ed..12edb39070 100644
--- a/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml
+++ b/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml
@@ -35,7 +35,7 @@
     <string name="verification_emoji_robot">Robotti</string>
     <string name="verification_emoji_hat">Hattu</string>
     <string name="verification_emoji_glasses">Silmälasit</string>
-    <string name="verification_emoji_spanner">Mutteriavain</string>
+    <string name="verification_emoji_spanner">Kiintoavain</string>
     <string name="verification_emoji_santa">Joulupukki</string>
     <string name="verification_emoji_thumbs_up">Peukalo ylös</string>
     <string name="verification_emoji_umbrella">Sateenvarjo</string>
diff --git a/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml b/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml
index 618302eb4f..12f90e316d 100644
--- a/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml
+++ b/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml
@@ -3,18 +3,66 @@
     <!-- Generated file, do not edit -->
     <string name="verification_emoji_dog">犬</string>
     <string name="verification_emoji_cat">猫</string>
+    <string name="verification_emoji_lion">ライオン</string>
     <string name="verification_emoji_horse">馬</string>
+    <string name="verification_emoji_unicorn">ユニコーン</string>
+    <string name="verification_emoji_pig">ブタ</string>
+    <string name="verification_emoji_elephant">ゾウ</string>
+    <string name="verification_emoji_rabbit">うさぎ</string>
+    <string name="verification_emoji_panda">パンダ</string>
+    <string name="verification_emoji_rooster">ニワトリ</string>
+    <string name="verification_emoji_penguin">ペンギン</string>
+    <string name="verification_emoji_turtle">亀</string>
+    <string name="verification_emoji_fish">魚</string>
     <string name="verification_emoji_octopus">たこ</string>
+    <string name="verification_emoji_butterfly">ちょうちょ</string>
     <string name="verification_emoji_flower">花</string>
     <string name="verification_emoji_tree">木</string>
+    <string name="verification_emoji_cactus">サボテン</string>
     <string name="verification_emoji_mushroom">きのこ</string>
+    <string name="verification_emoji_globe">地球</string>
     <string name="verification_emoji_moon">月</string>
+    <string name="verification_emoji_cloud">雲</string>
+    <string name="verification_emoji_fire">炎</string>
+    <string name="verification_emoji_banana">バナナ</string>
     <string name="verification_emoji_apple">リンゴ</string>
+    <string name="verification_emoji_strawberry">いちご</string>
+    <string name="verification_emoji_corn">とうもろこし</string>
+    <string name="verification_emoji_pizza">ピザ</string>
     <string name="verification_emoji_cake">ケーキ</string>
+    <string name="verification_emoji_heart">ハート</string>
+    <string name="verification_emoji_smiley">スマイル</string>
     <string name="verification_emoji_robot">ロボと</string>
+    <string name="verification_emoji_hat">帽子</string>
     <string name="verification_emoji_glasses">めがね</string>
+    <string name="verification_emoji_spanner">スパナ</string>
+    <string name="verification_emoji_santa">サンタ</string>
+    <string name="verification_emoji_thumbs_up">いいね</string>
+    <string name="verification_emoji_umbrella">傘</string>
+    <string name="verification_emoji_hourglass">砂時計</string>
+    <string name="verification_emoji_clock">時計</string>
+    <string name="verification_emoji_gift">ギフト</string>
+    <string name="verification_emoji_light_bulb">電球</string>
     <string name="verification_emoji_book">本</string>
+    <string name="verification_emoji_pencil">鉛筆</string>
+    <string name="verification_emoji_paperclip">クリップ</string>
+    <string name="verification_emoji_scissors">はさみ</string>
+    <string name="verification_emoji_lock">錠前</string>
+    <string name="verification_emoji_key">鍵</string>
+    <string name="verification_emoji_hammer">金槌</string>
     <string name="verification_emoji_telephone">電話機</string>
+    <string name="verification_emoji_flag">旗</string>
     <string name="verification_emoji_train">電車</string>
     <string name="verification_emoji_bicycle">自転車</string>
+    <string name="verification_emoji_aeroplane">飛行機</string>
+    <string name="verification_emoji_rocket">ロケット</string>
+    <string name="verification_emoji_trophy">トロフィー</string>
+    <string name="verification_emoji_ball">ボール</string>
+    <string name="verification_emoji_guitar">ギター</string>
+    <string name="verification_emoji_trumpet">トランペット</string>
+    <string name="verification_emoji_bell">ベル</string>
+    <string name="verification_emoji_anchor">いかり</string>
+    <string name="verification_emoji_headphones">ヘッドホン</string>
+    <string name="verification_emoji_folder">フォルダ</string>
+    <string name="verification_emoji_pin">ピン</string>
 </resources>

From b423d5da4c9f24bc46abe55e810ec496e30bb14b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 19:00:02 +0200
Subject: [PATCH 4/4] typo

---
 tools/import_emojis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/import_emojis.py b/tools/import_emojis.py
index f5638175a9..a626a5a260 100755
--- a/tools/import_emojis.py
+++ b/tools/import_emojis.py
@@ -22,7 +22,7 @@ emoji_picker_datasource_emojis = emoji_picker_datasource["emojis"]
 
 
 # Get official emoji list from unicode.org (Emoji List, v13.1 at time of writing)
-print("Fetching emoji list from Unicode.org...",)
+print("Fetching emoji list from Unicode.org...")
 req = requests.get("https://unicode.org/emoji/charts/emoji-list.html")
 soup = BeautifulSoup(req.content, 'html.parser')