From 759b44c224043966a13ad4dc9d68b14349602446 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 25 Mar 2023 03:16:02 +0100
Subject: [PATCH 001/124] New translations strings.xml (Indonesian)

---
 .../src/main/res/values-in-rID/strings.xml    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-in-rID/strings.xml b/mastodon/src/main/res/values-in-rID/strings.xml
index c951d8afa..bd3f61a0b 100644
--- a/mastodon/src/main/res/values-in-rID/strings.xml
+++ b/mastodon/src/main/res/values-in-rID/strings.xml
@@ -8,8 +8,8 @@
 	<string name="error">Kesalahan</string>
 	<string name="not_a_mastodon_instance">%s sepertinya bukan server Mastodon.</string>
 	<string name="ok">Oke</string>
-	<string name="preparing_auth">Menyiapkan untuk otentikasi…</string>
-	<string name="finishing_auth">Menyelesaikan otentikasi…</string>
+	<string name="preparing_auth">Menyiapkan untuk autentikasi…</string>
+	<string name="finishing_auth">Menyelesaikan autentikasi…</string>
 	<string name="user_boosted">%s membagikan</string>
 	<string name="in_reply_to">Membalas ke %s</string>
 	<string name="notifications">Notifikasi</string>
@@ -159,7 +159,16 @@
 	<string name="back">Kembali</string>
 	<string name="instance_catalog_title">Mastodon dibuat oleh pengguna di server yang berbeda-beda.</string>
 	<string name="instance_catalog_subtitle">Pilih sebuah server berdasarkan minat atau wilayah Anda, atau yang umum. Anda masih dapat berkomunikasi dengan semua orang, tanpa memedulikan server yang Anda berada.</string>
+	<string name="search_communities">Nama server atau URL</string>
+	<string name="instance_rules_title">Aturan Server</string>
+	<string name="instance_rules_subtitle">Dengan melanjutkan, Anda setuju mengikuti peraturan berikut yang ditetapkan oleh moderator %s.</string>
+	<string name="signup_title">Buat Akun</string>
 	<string name="edit_photo">sunting</string>
+	<string name="display_name">Nama</string>
+	<string name="username">Nama pengguna</string>
+	<string name="email">Surel</string>
+	<string name="password">Kata sandi</string>
+	<string name="confirm_password">Konfirmasi kata sandi</string>
 	<string name="password_note">Tambahkan huruf besar, karakter spesial, dan nomor untuk meningkatkan kekuatan kata sandi Anda.</string>
 	<string name="category_academia">Akademisi</string>
 	<string name="category_activism">Aktivisme</string>
@@ -174,7 +183,10 @@
 	<string name="category_music">Musik</string>
 	<string name="category_regional">Regional</string>
 	<string name="category_tech">Teknologi</string>
+	<string name="confirm_email_title">Periksa Kotak Masuk Anda</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Ketuk tautan yang kami kirim kepada Anda untuk memverifikasi %s. Kami akan tunggu di sini.</string>
+	<string name="confirm_email_didnt_get">Tidak mendapatkan tautan?</string>
 	<string name="resend">Kirim ulang</string>
 	<string name="open_email_app">Buka aplikasi surel</string>
 	<string name="resent_email">Surel konfirmasi terkirim</string>
@@ -258,9 +270,11 @@
 	<string name="follow_user">Ikuti %s</string>
 	<string name="unfollowed_user">Berhenti mengikuti %s</string>
 	<string name="followed_user">Anda sekarang mengikuti %s</string>
+	<string name="following_user_requested">Diminta untuk mengikuti %s</string>
 	<string name="open_in_browser">Buka di peramban</string>
 	<string name="hide_boosts_from_user">Sembunyikan pembagian dari %s</string>
 	<string name="show_boosts_from_user">Tampilkan pembagian dari %s</string>
+	<string name="signup_reason">Mengapa Anda ingin bergabung?</string>
 	<string name="signup_reason_note">Ini akan membantu kami meninjau aplikasi Anda.</string>
 	<string name="clear">Hapus</string>
 	<string name="profile_header">Gambar tajuk</string>
@@ -347,6 +361,7 @@
 	<!-- %s is file size -->
 	<string name="download_update">Unduh (%s)</string>
 	<string name="install_update">Pasang</string>
+	<string name="privacy_policy_title">Privasi Anda</string>
 	<string name="i_agree">Saya Setuju</string>
 	<string name="empty_list">Daftar ini kosong</string>
 	<string name="instance_signup_closed">Server ini tidak menerima pendaftaran baru.</string>

From dd0f0a7d5ab1ab3dc9850ce4af6a577574230f5b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 25 Mar 2023 04:22:02 +0100
Subject: [PATCH 002/124] New translations strings.xml (Indonesian)

---
 .../src/main/res/values-in-rID/strings.xml    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/mastodon/src/main/res/values-in-rID/strings.xml b/mastodon/src/main/res/values-in-rID/strings.xml
index bd3f61a0b..65df36648 100644
--- a/mastodon/src/main/res/values-in-rID/strings.xml
+++ b/mastodon/src/main/res/values-in-rID/strings.xml
@@ -362,6 +362,7 @@
 	<string name="download_update">Unduh (%s)</string>
 	<string name="install_update">Pasang</string>
 	<string name="privacy_policy_title">Privasi Anda</string>
+	<string name="privacy_policy_subtitle">Walaupun aplikasi Mastodon tidak mengumpulkan data apa pun, server yang Anda daftarkan di sana dapat memiliki kebijakan yang berbeda.\n\nJika Anda tidak setuju dengan kebijakan %s, Anda dapat kembali dan pilih server yang lain.</string>
 	<string name="i_agree">Saya Setuju</string>
 	<string name="empty_list">Daftar ini kosong</string>
 	<string name="instance_signup_closed">Server ini tidak menerima pendaftaran baru.</string>
@@ -373,12 +374,41 @@
 	<string name="login_title">Selamat Datang Kembali</string>
 	<string name="login_subtitle">Masuk dengan server di mana Anda buat akun Anda.</string>
 	<string name="server_url">URL Server</string>
+	<string name="welcome_page1_title">Apa itu Mastodon?</string>
 	<string name="welcome_page1_text">Bayangkan Anda memikiki alamat surel yang berakhiran @contoh.com.\n\nAnda masih bisa mengirim dan menerima surel dari siapa pun, bahkan jika alamat surel mereka berakhiran @gmail.com atau @icloud.com atau @contoh.com.</string>
 	<string name="welcome_page2_title">Mastodon seperti itu.</string>
 	<string name="welcome_page2_text">Alamat akun Anda bisa seperti @gadisgothic654@contoh.social, tetapi Anda masih dapat mengikuti, membagikan, dan mengobrol dengan @fallout5selamanya@contoh.online.</string>
 	<string name="welcome_page3_title">Bagaimana saya memilih server?</string>
 	<string name="welcome_page3_text">Kebanyakan orang memilih server berbeda karena berbagai alasan. seni.contoh adalah tempat yang cocok bagi artis, sedangkan glasgow.example mungkin pilihan yang baik untuk para Scots.\n\nAnda tidak bisa salah dengan server yang kami rekomendasikan, jadi server apa yang Anda pilih (atau jika Anda memasukkan Anda sendiri di bilah pencarian server), Anda tidak akan melewatkan apa pun di mana pun.</string>
+	<string name="signup_random_server_explain">Kami akan memilih sebuah server berdasarkan bahasa Anda jika Anda melanjutkan tanpa memilih.</string>
+	<string name="server_filter_any_language">Bahasa Apa Pun</string>
+	<string name="server_filter_instant_signup">Pendaftaran Instan</string>
+	<string name="server_filter_manual_review">Pemeriksaan Manual</string>
+	<string name="server_filter_any_signup_speed">Kecepatan Pendaftaran Apa Pun</string>
+	<string name="server_filter_region_europe">Eropa</string>
+	<string name="server_filter_region_north_america">Amerika Utara</string>
+	<string name="server_filter_region_south_america">Amerika Selatan</string>
+	<string name="server_filter_region_africa">Afrika</string>
+	<string name="server_filter_region_asia">Asia</string>
+	<string name="server_filter_region_oceania">Oseania</string>
+	<string name="not_accepting_new_members">Tidak menerima anggota baru</string>
+	<string name="category_special_interests">Minat Khusus</string>
+	<string name="signup_passwords_dont_match">Kata sandi tidak cocok</string>
+	<string name="pick_server_for_me">Pilih untuk saya</string>
+	<string name="profile_add_row">Tambahkan baris</string>
+	<string name="profile_setup">Pengaturan profil</string>
+	<string name="profile_setup_subtitle">Anda dapat selalu menyelesaikan ini nanti di tab Profil.</string>
+	<string name="profile_setup_explanation">Anda dapat menambahkan hingga empat kolom baris untuk apa saja yang Anda inginkan. Lokasi, tautan, kata ganti — langit adalah batasnya.</string>
+	<string name="popular_on_mastodon">Populer di Mastodon</string>
+	<string name="follow_all">Ikuti semua</string>
+	<string name="server_rules_disagree">Tolak</string>
+	<string name="privacy_policy_explanation">Kesimpulan: Kami tidak mengumpulkan atau memproses apa pun.</string>
 	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Tidak setuju dengan %s</string>
+	<string name="profile_bio">Deskripsi</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Mengikuti pengguna…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s tidak memperbolehkan pendaftaran dari %2$s. Coba yang lain atau &lt;a&gt;pilih server lain&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Nama pengguna ini sudah diambil.</string>
 </resources>

From 4be575c534778a34208f35f9f979037c70d5daab Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 25 Mar 2023 19:25:16 +0100
Subject: [PATCH 003/124] New translations strings.xml (Ukrainian)

---
 mastodon/src/main/res/values-uk-rUA/strings.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings.xml b/mastodon/src/main/res/values-uk-rUA/strings.xml
index f191a9982..30ff45fec 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings.xml
@@ -240,7 +240,7 @@
 	<string name="add_alt_text">Додати альтернативний текст</string>
 	<string name="alt_text_subtitle">Альтернативний текст описує ваші фотографії для людей з низьким або відсутністю зору. Спробуйте включити лише достатньо деталей, щоб зрозуміти контекст.</string>
 	<string name="alt_text_hint">наприклад, Собака дивиться навколо підозріло вузькими очима на камеру.</string>
-	<string name="visibility_public">Загальнодоступнo</string>
+	<string name="visibility_public">Загальнодоступно</string>
 	<string name="visibility_followers_only">Тільки для підписників</string>
 	<string name="visibility_private">Тільки людям, яких я згадав</string>
 	<string name="search_all">Все</string>
@@ -441,6 +441,16 @@
 	<string name="welcome_page3_title">Як обрати сервер?</string>
 	<string name="welcome_page3_text">Різні люди обирають різні сервери з будь-якої кількості причин. art.example - це чудове місце для художників, в той час як glasgow.example може бути гарним вибором для шотландці.\n\nВи не можете піти не так з жодними з наших рекомендованих серверів, так чи інакше, незалежно від того, який вибір ви обираєте (або введете власний в панель пошуку сервера), ви ніколи ніде не помилитися в жодному місці.</string>
 	<string name="server_filter_any_language">Будь-яка мова</string>
+	<string name="server_filter_region_europe">Європа</string>
+	<string name="server_filter_region_north_america">Північна Америка</string>
+	<string name="server_filter_region_south_america">Південна Америка</string>
+	<string name="server_filter_region_africa">Африка</string>
+	<string name="server_filter_region_asia">Азія</string>
+	<string name="server_filter_region_oceania">Океанія</string>
+	<string name="not_accepting_new_members">Не приймає нових користувачів</string>
+	<string name="category_special_interests">Особливі Інтереси</string>
+	<string name="signup_passwords_dont_match">Паролі не збігаються</string>
+	<string name="pick_server_for_me">Підібрати для мене</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

From 7674ceefe9a29400b3db733f7ea465a470f8c87b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 25 Mar 2023 20:42:18 +0100
Subject: [PATCH 004/124] New translations strings.xml (Ukrainian)

---
 .../src/main/res/values-uk-rUA/strings.xml    | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings.xml b/mastodon/src/main/res/values-uk-rUA/strings.xml
index 30ff45fec..75168ee6f 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings.xml
@@ -13,7 +13,7 @@
 	<string name="user_boosted">%s Зробив репост</string>
 	<string name="in_reply_to">Відповісти %s</string>
 	<string name="notifications">Сповіщення</string>
-	<string name="user_followed_you">підписаний(-а) на вас</string>
+	<string name="user_followed_you">підписався(-лася) на вас</string>
 	<string name="user_sent_follow_request">відправив запит на підписку</string>
 	<string name="user_favorited">Вподобав(-ла) ваш допис</string>
 	<string name="notification_boosted">Поширив(-ла) ваш допис</string>
@@ -50,7 +50,7 @@
 	<string name="posts_and_replies">Дописи й відповіді</string>
 	<string name="media">Медіа</string>
 	<string name="profile_about">Інформація</string>
-	<string name="button_follow">Підписатися</string>
+	<string name="button_follow">Стежити</string>
 	<string name="button_following">Ви підписані</string>
 	<string name="edit_profile">Редагувати профіль</string>
 	<string name="mention_user">Згадано %s</string>
@@ -227,6 +227,7 @@
 	<string name="category_tech">Технології</string>
 	<string name="confirm_email_title">Перевірити вхідні листи</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Натисніть на посилання, яке ми відправили для підтвердження %s. Ми будемо чекати тут.</string>
 	<string name="confirm_email_didnt_get">Не отримали посилання?</string>
 	<string name="resend">Надіслати повторно</string>
 	<string name="open_email_app">Відкрити Електрону пошту</string>
@@ -314,6 +315,7 @@
 	<string name="follow_user">Підписатися на %s</string>
 	<string name="unfollowed_user">Відписалися від %s</string>
 	<string name="followed_user">Тепер ви підписані на %s</string>
+	<string name="following_user_requested">Запитано на підписку на %s</string>
 	<string name="open_in_browser">Відкрити у браузері</string>
 	<string name="hide_boosts_from_user">Сховати репости від %s</string>
 	<string name="show_boosts_from_user">Показати репости від %s</string>
@@ -423,6 +425,7 @@
 	<string name="download_update">Завантажити (%s)</string>
 	<string name="install_update">Встановити</string>
 	<string name="privacy_policy_title">Ваша конфіденційність</string>
+	<string name="privacy_policy_subtitle">Хоча додаток Mastodon не збирає дані, сервер на якому ви зареєструєтеся може мати іншу політику.\n\nЯкщо ви відмовитеся з політикою %s, ви зможете повернутися й вибрати інший сервер.</string>
 	<string name="i_agree">Я погоджуюся</string>
 	<string name="empty_list">Цей список порожній</string>
 	<string name="instance_signup_closed">Цей сервер не приймає нові реєстрації.</string>
@@ -440,7 +443,11 @@
 	<string name="welcome_page2_text">Ваш індифікатор може бути @gothgirl654@example.social, але ви все ще можете підписуватися, репостити й спілкуватися з @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Як обрати сервер?</string>
 	<string name="welcome_page3_text">Різні люди обирають різні сервери з будь-якої кількості причин. art.example - це чудове місце для художників, в той час як glasgow.example може бути гарним вибором для шотландці.\n\nВи не можете піти не так з жодними з наших рекомендованих серверів, так чи інакше, незалежно від того, який вибір ви обираєте (або введете власний в панель пошуку сервера), ви ніколи ніде не помилитися в жодному місці.</string>
+	<string name="signup_random_server_explain">Ми підберемо сервер основі вашої мовою, якщо ви продовжите без вибору.</string>
 	<string name="server_filter_any_language">Будь-яка мова</string>
+	<string name="server_filter_instant_signup">Миттєва Реєстрація</string>
+	<string name="server_filter_manual_review">Ручна перевірка</string>
+	<string name="server_filter_any_signup_speed">Будь-яка Швидкість Реєстрації</string>
 	<string name="server_filter_region_europe">Європа</string>
 	<string name="server_filter_region_north_america">Північна Америка</string>
 	<string name="server_filter_region_south_america">Південна Америка</string>
@@ -451,7 +458,20 @@
 	<string name="category_special_interests">Особливі Інтереси</string>
 	<string name="signup_passwords_dont_match">Паролі не збігаються</string>
 	<string name="pick_server_for_me">Підібрати для мене</string>
+	<string name="profile_add_row">Додати рядок</string>
+	<string name="profile_setup">Налаштування профілю</string>
+	<string name="profile_setup_subtitle">Ви можете завершити це пізніше у вкладці з Профілем.</string>
+	<string name="profile_setup_explanation">Ви можете додати до чотирьох міток в профілі для будь-чого. Місця, посилання, займенники — небо є межею.</string>
+	<string name="popular_on_mastodon">Популярне в Mastodon</string>
+	<string name="follow_all">Стежити за всіма</string>
+	<string name="server_rules_disagree">Не приймаю</string>
+	<string name="privacy_policy_explanation">Ми нічого не збираємо або обробляємо.</string>
 	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Не згоден з %s</string>
+	<string name="profile_bio">Про мене</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Підписуємося…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s не приймає реєстрацію з %2$s. Спробуйте інший &lt;a&gt;виберіть інший сервер&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Ім\'я користувача вже зайняте.</string>
 </resources>

From f7df4abdae223a42e6b00623ffee10f651ef6951 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 26 Mar 2023 17:05:29 +0200
Subject: [PATCH 005/124] New translations strings.xml (Spanish)

---
 mastodon/src/main/res/values-es-rES/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-es-rES/strings.xml b/mastodon/src/main/res/values-es-rES/strings.xml
index cff6195bf..7c3cdd369 100644
--- a/mastodon/src/main/res/values-es-rES/strings.xml
+++ b/mastodon/src/main/res/values-es-rES/strings.xml
@@ -285,6 +285,7 @@
 	<string name="follow_user">Seguir a %s</string>
 	<string name="unfollowed_user">No sigues a %s</string>
 	<string name="followed_user">Ahora estás siguiendo a %s</string>
+	<string name="following_user_requested">%s solicitó seguirte</string>
 	<string name="open_in_browser">Abrir en el navegador</string>
 	<string name="hide_boosts_from_user">Ocultar reblogueos de %s</string>
 	<string name="show_boosts_from_user">Mostrar reblogueos de %s</string>

From 21e7e44c014e96e2a4f73e3db000d1b5c62b6958 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 28 Mar 2023 15:36:30 +0200
Subject: [PATCH 006/124] New translations strings.xml (Czech)

---
 mastodon/src/main/res/values-cs-rCZ/strings.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/mastodon/src/main/res/values-cs-rCZ/strings.xml b/mastodon/src/main/res/values-cs-rCZ/strings.xml
index 8578173a4..355f7c292 100644
--- a/mastodon/src/main/res/values-cs-rCZ/strings.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings.xml
@@ -201,7 +201,16 @@
 	<string name="back">Zpět</string>
 	<string name="instance_catalog_title">Mastodon tvoří uživatelé z různých serverů.</string>
 	<string name="instance_catalog_subtitle">Vyberte si server podle na svých zájmů, regionu nebo obecného účelu. Stále se můžete spojit se všemi bez ohledu na server.</string>
+	<string name="search_communities">Název nebo URL serveru</string>
+	<string name="instance_rules_title">Pravidla serveru</string>
+	<string name="instance_rules_subtitle">Pokračováním souhlasíte s následujícími pravidly, která jsou nastavena a prosazována moderátory %s.</string>
+	<string name="signup_title">Vytvořit účet</string>
 	<string name="edit_photo">upravit</string>
+	<string name="display_name">Jméno</string>
+	<string name="username">Uživatelské jméno</string>
+	<string name="email">E-mail</string>
+	<string name="password">Heslo</string>
+	<string name="confirm_password">Potvrdit heslo</string>
 	<string name="password_note">Použijte velká písmena, speciální znaky a čísla, abyste zvýšili sílu hesla.</string>
 	<string name="category_academia">Akademická sféra</string>
 	<string name="category_activism">Aktivismus</string>
@@ -216,7 +225,10 @@
 	<string name="category_music">Hudba</string>
 	<string name="category_regional">Regionální</string>
 	<string name="category_tech">Technologie</string>
+	<string name="confirm_email_title">Zkontrolujte si příchozí poštu</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Klepněte na odkaz, který jsme vám poslali, abyste ověřili %s. Budeme tu na vás čekat.</string>
+	<string name="confirm_email_didnt_get">Nedostali jste odkaz?</string>
 	<string name="resend">Poslat znovu</string>
 	<string name="open_email_app">Otevřít e-mailovou aplikaci</string>
 	<string name="resent_email">Potvrzující e-mail byl odeslán</string>
@@ -303,9 +315,11 @@
 	<string name="follow_user">Sledovat %s</string>
 	<string name="unfollowed_user">Sledování %s bylo zrušeno</string>
 	<string name="followed_user">Nyní sledujete %s</string>
+	<string name="following_user_requested">Požádáno o sledování %s</string>
 	<string name="open_in_browser">Otevřít v prohlížeči</string>
 	<string name="hide_boosts_from_user">Skrýt boosty od %s</string>
 	<string name="show_boosts_from_user">Zobrazit boosty od %s</string>
+	<string name="signup_reason">Proč se chcete připojit?</string>
 	<string name="signup_reason_note">Toto nám pomůže posoudit vaši žádost.</string>
 	<string name="clear">Vyčistit</string>
 	<string name="profile_header">Obrázek v záhlaví</string>
@@ -410,6 +424,8 @@
 	<!-- %s is file size -->
 	<string name="download_update">Stáhnout (%s)</string>
 	<string name="install_update">Instalovat</string>
+	<string name="privacy_policy_title">Vaše soukromí</string>
+	<string name="privacy_policy_subtitle">Přestože aplikace Mastodon neshromažďuje žádná data, server, který se přihlásíte, může mít jiné zásady.\n\nPokud nesouhlasíte se zásadami pro %s, můžete se vrátit a vybrat jiný server.</string>
 	<string name="i_agree">Souhlasím</string>
 	<string name="empty_list">Tento seznam je prázdný</string>
 	<string name="instance_signup_closed">Tento server nepřijímá nové registrace.</string>
@@ -421,6 +437,7 @@
 	<string name="login_title">Vítejte zpět</string>
 	<string name="login_subtitle">Přihlaste se pomocí serveru, kde jste vytvořili svůj účet.</string>
 	<string name="server_url">URL serveru</string>
+	<string name="welcome_page1_title">Co je Mastodon?</string>
 	<string name="welcome_page1_text">Představte si, že máte e-mailovou adresu, která končí @example.com.\n\nStále můžete od kohokoliv odesílat a přijímat e-maily, i když jejich e-mail končí na @gmail.com nebo @icloud.com nebo @example.com.</string>
 	<string name="welcome_page2_title">Takový je Mastodon.</string>
 	<string name="welcome_page2_text">Vaše uživatelské jméno může být @gothgirl654@example.social, ale stále můžete sledovat, boostovat a chatovat s @fallout5ever@example.online.</string>

From b0e6805a2085a4d1f2b5a9ea27ac38c9d4bc1a80 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 28 Mar 2023 16:34:35 +0200
Subject: [PATCH 007/124] New translations strings.xml (Czech)

---
 .../src/main/res/values-cs-rCZ/strings.xml    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/mastodon/src/main/res/values-cs-rCZ/strings.xml b/mastodon/src/main/res/values-cs-rCZ/strings.xml
index 355f7c292..ad4ef0267 100644
--- a/mastodon/src/main/res/values-cs-rCZ/strings.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings.xml
@@ -443,7 +443,35 @@
 	<string name="welcome_page2_text">Vaše uživatelské jméno může být @gothgirl654@example.social, ale stále můžete sledovat, boostovat a chatovat s @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Jak si vybrat server?</string>
 	<string name="welcome_page3_text">Různí lidé si vybírají různé servery z různých důvodů. Art.example je skvělým místem pro umělce, zatímco glasgow.example může být dobrou volbou pro Skoty.\n\nS žádným z našich doporučených serverů nemůžete udělat chybu, takže bez ohledu na to, který z nich si vyberete (nebo pokud zadáte svůj vlastní do vyhledávacího řádku serveru), nikde neprohloupíte.</string>
+	<string name="signup_random_server_explain">Pokud budete pokračovat bez výběru, vybereme server založený na vašem jazyce.</string>
+	<string name="server_filter_any_language">Libovolný jazyk</string>
+	<string name="server_filter_instant_signup">Okamžitá registrace</string>
+	<string name="server_filter_manual_review">Ruční kontrola</string>
+	<string name="server_filter_any_signup_speed">Jakákoliv rychlost registrace</string>
+	<string name="server_filter_region_europe">Evropa</string>
+	<string name="server_filter_region_north_america">Severní Amerika</string>
+	<string name="server_filter_region_south_america">Jižní Amerika</string>
+	<string name="server_filter_region_africa">Afrika</string>
+	<string name="server_filter_region_asia">Asie</string>
+	<string name="server_filter_region_oceania">Oceánie</string>
+	<string name="not_accepting_new_members">Nepřijímá nové členy</string>
+	<string name="category_special_interests">Speciální zájmy</string>
+	<string name="signup_passwords_dont_match">Hesla se neshodují</string>
+	<string name="pick_server_for_me">Vybrat pro mě</string>
+	<string name="profile_add_row">Přidat řádek</string>
+	<string name="profile_setup">Nastavení profilu</string>
+	<string name="profile_setup_subtitle">Toto můžete vždy dokončit později v záložce Profil.</string>
+	<string name="profile_setup_explanation">Můžete přidat až čtyři pole profilu pro cokoliv, co chcete. Umístění, odkazy, oslovení — limitem je obloha.</string>
+	<string name="popular_on_mastodon">Populární na Mastodonu</string>
+	<string name="follow_all">Sledovat všechny</string>
+	<string name="server_rules_disagree">Nesouhlasit</string>
+	<string name="privacy_policy_explanation">Zkráceně: nic nesbíráme a nezpracováváme.</string>
 	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Nesouhlasit s %s</string>
+	<string name="profile_bio">O vás</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Sledování uživatelů…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s neumožňuje registraci od %2$s. Zkuste jiný nebo &lt;a&gt;vyberte jiný server&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Toto uživatelské jméno je obsazené.</string>
 </resources>

From 5a914f9c0e5541f75d6a709ed6c63e1965ecc207 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 28 Mar 2023 21:06:33 +0200
Subject: [PATCH 008/124] New translations strings.xml (Thai)

---
 mastodon/src/main/res/values-th-rTH/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-th-rTH/strings.xml b/mastodon/src/main/res/values-th-rTH/strings.xml
index e9dcc486e..e2c333b3c 100644
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -365,7 +365,7 @@
 	<string name="privacy_policy_subtitle">แม้ว่าแอป Mastodon ไม่เก็บรวบรวมข้อมูลใด ๆ เซิร์ฟเวอร์ที่คุณลงทะเบียนผ่านอาจมีนโยบายที่แตกต่างกัน\n\nหากคุณไม่เห็นด้วยกับนโยบายสำหรับ %s คุณสามารถย้อนกลับและเลือกเซิร์ฟเวอร์อื่น</string>
 	<string name="i_agree">ฉันเห็นด้วย</string>
 	<string name="empty_list">รายการนี้ว่างเปล่า</string>
-	<string name="instance_signup_closed">เซิร์ฟเวอร์นี้ไม่ได้เปิดรับการลงทะเบียนใหม่</string>
+	<string name="instance_signup_closed">เซิร์ฟเวอร์นี้ไม่เปิดรับการลงทะเบียนใหม่</string>
 	<string name="text_copied">คัดลอกไปยังคลิปบอร์ดแล้ว</string>
 	<string name="add_bookmark">เพิ่มที่คั่นหน้า</string>
 	<string name="remove_bookmark">เอาที่คั่นหน้าออก</string>

From 68cba2de637fd53891da7cf25cf3c25a55d3081e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 29 Mar 2023 00:29:42 +0200
Subject: [PATCH 009/124] New translations strings.xml (Icelandic)

---
 mastodon/src/main/res/values-is-rIS/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-is-rIS/strings.xml b/mastodon/src/main/res/values-is-rIS/strings.xml
index e31e895b0..2354b10cd 100644
--- a/mastodon/src/main/res/values-is-rIS/strings.xml
+++ b/mastodon/src/main/res/values-is-rIS/strings.xml
@@ -286,6 +286,7 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="follow_user">Fylgjast með %s</string>
 	<string name="unfollowed_user">Hætti að fylgjast með %s</string>
 	<string name="followed_user">Þú fylgist núna með %s</string>
+	<string name="following_user_requested">Bað um að fylgjast með %s</string>
 	<string name="open_in_browser">Opna í vafra</string>
 	<string name="hide_boosts_from_user">Fela endurbirtingar frá %s</string>
 	<string name="show_boosts_from_user">Sýna endurbirtingar frá %s</string>

From 8d7aaee5b9f4219b62acf5134a067eddc2673389 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 1 Apr 2023 15:16:39 +0200
Subject: [PATCH 010/124] New translations strings.xml (Dutch)

---
 mastodon/src/main/res/values-nl-rNL/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-nl-rNL/strings.xml b/mastodon/src/main/res/values-nl-rNL/strings.xml
index 58563a36d..10da07992 100644
--- a/mastodon/src/main/res/values-nl-rNL/strings.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings.xml
@@ -215,7 +215,7 @@
 	<string name="alt_text_hint">bijv.: ‘een hond die met versmalde ogen verdacht rondkijkt naar de camera’.</string>
 	<string name="visibility_public">Openbaar</string>
 	<string name="visibility_followers_only">Alleen volgers</string>
-	<string name="visibility_private">Direct bericht</string>
+	<string name="visibility_private">Privébericht</string>
 	<string name="search_all">Alles</string>
 	<string name="search_people">Mensen</string>
 	<string name="recent_searches">Recente zoekopdrachten</string>

From ba0c064f3680f338402d223d62fcf17a8fc8ded6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 3 Apr 2023 16:47:01 +0200
Subject: [PATCH 011/124] New translations full_description.txt (Chinese
 Traditional)

---
 fastlane/metadata/android/zh-TW/full_description.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/zh-TW/full_description.txt b/fastlane/metadata/android/zh-TW/full_description.txt
index e3c329055..62315058a 100644
--- a/fastlane/metadata/android/zh-TW/full_description.txt
+++ b/fastlane/metadata/android/zh-TW/full_description.txt
@@ -1,4 +1,4 @@
-Mastodon 是網際網路上最大的去中心化社交網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能在 Mastodon 上遇到充滿熱情的人們討論該話題。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 Mastodon 以隱私與安全為要。 決定您的嘟文要與您的跟隨者分享、只與您提及的人們分享，又或是與全世界分享。 內容警告可讓您隱藏包含敏感或可能觸發強烈情緒反應的嘟文，直到您準備好與它們進行互動。 每個社群都有它們自己的指導方針與管理原來確保其成員安全，強大的封鎖與回報工具有助於防止濫用。
+Mastodon 是網際網路上最大的去中心化社群網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能在 Mastodon 上遇到充滿熱情的人們討論該話題。
 
 加入社群並建立您的個人檔案。 尋找並跟隨迷人的朋友們，並在無廣告、按時間順序排列的時間軸上閱讀他們的嘟文。 在 500 個字元的嘟文中使用自訂表情符號、GIF、視訊與音訊來表達您自己。 回覆任何人的話題與轉發貼文以分享精彩內容。 尋找要跟隨的新帳號與熱門主題標籤來拓展您的網路。
 

From f330ad71acf84ac99c95ad3432d26cf458f5a33e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 4 Apr 2023 16:06:32 +0200
Subject: [PATCH 012/124] New translations full_description.txt (Greek)

---
 fastlane/metadata/android/el-GR/full_description.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/el-GR/full_description.txt b/fastlane/metadata/android/el-GR/full_description.txt
index 11d74abb1..07ec59481 100644
--- a/fastlane/metadata/android/el-GR/full_description.txt
+++ b/fastlane/metadata/android/el-GR/full_description.txt
@@ -1,4 +1,4 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Το Mastodon είναι το μεγαλύτερο αποκεντρωμένο κοινωνικό δίκτυο στο διαδίκτυο. Αντί για μία ενιαία ιστοσελίδα, είναι ένα δίκτυο εκατομμυρίων χρηστών σε ανεξάρτητες κοινότητες που μπορούν όλοι να αλληλεπιδράσουν μεταξύ τους, απρόσκοπτα. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
 
 Join a community and create your profile. Find and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
 

From 182325470b9f4fcb86419fc8434fbebb0690e5bd Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 4 Apr 2023 17:46:59 +0200
Subject: [PATCH 013/124] New translations full_description.txt (Greek)

---
 .../android/el-GR/full_description.txt        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/fastlane/metadata/android/el-GR/full_description.txt b/fastlane/metadata/android/el-GR/full_description.txt
index 07ec59481..6f999f707 100644
--- a/fastlane/metadata/android/el-GR/full_description.txt
+++ b/fastlane/metadata/android/el-GR/full_description.txt
@@ -1,16 +1,16 @@
-Το Mastodon είναι το μεγαλύτερο αποκεντρωμένο κοινωνικό δίκτυο στο διαδίκτυο. Αντί για μία ενιαία ιστοσελίδα, είναι ένα δίκτυο εκατομμυρίων χρηστών σε ανεξάρτητες κοινότητες που μπορούν όλοι να αλληλεπιδράσουν μεταξύ τους, απρόσκοπτα. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Το Mastodon είναι το μεγαλύτερο αποκεντρωμένο κοινωνικό δίκτυο στο διαδίκτυο. Αντί για μία ενιαία ιστοσελίδα, είναι ένα δίκτυο εκατομμυρίων χρηστών σε ανεξάρτητες κοινότητες που μπορούν όλοι να αλληλεπιδράσουν μεταξύ τους, απρόσκοπτα. Δεν έχει σημασία τί σας αρέσει, μπορείτε να συναντήσετε παθιασμένους ανθρώπους να μιλάνε γι' αυτό στο Mastodon!
 
-Join a community and create your profile. Find and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+Εγγραφείτε σε μια κοινότητα και δημιουργήστε το προφίλ σας. Βρείτε και ακολουθήστε συναρπαστικούς ανθρώπους και διαβάσετε τις αναρτήσεις τους σε μία χωρίς διαφημίσεις, χρονολογική ροή. Εκφραστείτε με προσαρμοσμένα emoji, εικόνες, GIF, βίντεο και ήχο σε αναρτήσεις 500 χαρακτήρων. Απαντήστε σε νήματα και παραθέστε αναρτήσεις από οποιονδήποτε για να μοιραστείτε μεγάλα πράγματα. Βρείτε νέους λογαριασμούς για να ακολουθήσετε και δημοφιλείς ετικέτες για να επεκτείνετε το δίκτυό σας.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Το Mastodon είναι κατασκευασμένο με έμφαση στην ιδιωτικότητα και την ασφάλεια. Αποφασίστε αν οι αναρτήσεις σας μοιράζονται με τους ακόλουθούς σας, μόνο τα άτομα που αναφέρετε ή ολόκληρο τον κόσμο. Προειδοποιήσεις περιεχομένου σας επιτρέπουν να κρύψετε αναρτήσεις που περιέχουν ευαίσθητο ή ανησυχητικό υλικό μέχρι να είστε έτοιμοι να συμμετάσχετε μαζί τους. Κάθε κοινότητα έχει τις δικές της οδηγίες και συντονιστές για να κρατήσει τα μέλη της ασφαλή και ισχυρά εργαλεία αποκλεισμού και αναφοράς βοηθούν στην πρόληψη της κατάχρησης.
 
-More features:
+Περισσότερα χαρακτηριστικά:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Σκοτεινή λειτουργία: Διαβάστε αναρτήσεις σε φωτεινή, σκοτεινή ή την απόλυτα μαύρη λειτουργία
+• Δημοσκοπήσεις: Ρωτήστε τους ακόλουθους για τη γνώμη τους και συγκεντρώστε ψήφους
+• Εξερεύνηση: Δημοφιλείς ετικέτες και λογαριασμοί είναι ένα άγγιγμα μακριά
+• Ειδοποιήσεις: Ενημερωθείτε για νέους ακόλουθους, απαντήσεις και παραθέσεις
+• Κοινοποίηση: Αναρτήστε απευθείας στο Mastodon από οποιαδήποτε καρτέλα κοινής χρήσης σε οποιαδήποτε εφαρμογή
+• Χάρη: Η μασκότ μας είναι ένας αξιολάτρευτος ελέφαντας και θα τον δείτε να εμφανίζεται πού και πού
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Το Mastodon είναι μη κερδοσκοπική και η ανάπτυξη υποστηρίζεται άμεσα από τις δωρεές σας. Δεν υπάρχουν διαφημίσεις, δεν γίνεται δημιουργία εσόδων και χωρίς επιχειρηματικά κεφάλαια και σκοπεύουμε να το διατηρήσουμε έτσι.

From c328467a41149f8b1ea660d7af27ca6f985e8ab1 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 4 Apr 2023 17:47:00 +0200
Subject: [PATCH 014/124] New translations strings.xml (Greek)

---
 mastodon/src/main/res/values-el-rGR/strings.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 0091cc2f8..fe5fc1df4 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="get_started">Δημιουργία λογαριασμού</string>
+	<string name="already_have_account">Έχω ήδη λογαριασμό</string>
+	<string name="log_in">Σύνδεση</string>
+	<string name="next">Επόμενο</string>
+	<string name="loading_instance">Ανάκτηση πληροφοριών διακομιστή…</string>
+	<string name="error">Σφάλμα</string>
+	<string name="not_a_mastodon_instance">%s δεν φαίνεται να είναι διακομιστής Mastodon.</string>
+	<string name="ok">ΟΚ</string>
+	<string name="preparing_auth">Προετοιμασία για έλεγχο ταυτότητας…</string>
+	<string name="finishing_auth">Ολοκλήρωση ταυτοποίησης…</string>
 	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->

From 6b893fadef3ef50e2e496203a331e4878a02e4a2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 4 Apr 2023 17:47:01 +0200
Subject: [PATCH 015/124] New translations short_description.txt (Greek)

---
 fastlane/metadata/android/el-GR/short_description.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/el-GR/short_description.txt b/fastlane/metadata/android/el-GR/short_description.txt
index 8f5a9b847..f67c145d0 100644
--- a/fastlane/metadata/android/el-GR/short_description.txt
+++ b/fastlane/metadata/android/el-GR/short_description.txt
@@ -1 +1 @@
-Decentralized social network
\ No newline at end of file
+Αποκεντρωμένο κοινωνικό δίκτυο
\ No newline at end of file

From faecb3bc4b1e428e7c8fefd95957eaa3adb3c8a1 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 4 Apr 2023 20:21:01 +0200
Subject: [PATCH 016/124] New translations strings.xml (Greek)

---
 .../src/main/res/values-el-rGR/strings.xml    | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index fe5fc1df4..0f4de98d4 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -10,6 +10,89 @@
 	<string name="ok">ΟΚ</string>
 	<string name="preparing_auth">Προετοιμασία για έλεγχο ταυτότητας…</string>
 	<string name="finishing_auth">Ολοκλήρωση ταυτοποίησης…</string>
+	<string name="user_boosted">%s αναδημοσίευσε</string>
+	<string name="in_reply_to">Σε απάντηση στο %s</string>
+	<string name="notifications">Ειδοποιήσεις</string>
+	<string name="user_followed_you">σε ακολουθεί</string>
+	<string name="user_sent_follow_request">σου έστειλε ένα αίτημα ακολούθησης</string>
+	<string name="user_favorited">σημείωσε ως αγαπημένη την ανάρτησή σου</string>
+	<string name="notification_boosted">αναδημοσίευσε την ανάρτηση σου</string>
+	<string name="poll_ended">η δημοσκόπηση έληξε</string>
+	<string name="time_seconds">%dδλ</string>
+	<string name="time_minutes">%dλ</string>
+	<string name="time_hours">%dω</string>
+	<string name="time_days">%dημ</string>
+	<string name="share_toot_title">Κοινοποίηση</string>
+	<string name="settings">Ρυθμίσεις</string>
+	<string name="publish">Δημοσίευση</string>
+	<string name="discard_draft">Απόρριψη προχείρου;</string>
+	<string name="discard">Απόρριψη</string>
+	<string name="cancel">Άκυρο</string>
+	<plurals name="followers">
+		<item quantity="one">ακόλουθος</item>
+		<item quantity="other">ακόλουθοι</item>
+	</plurals>
+	<plurals name="posts">
+		<item quantity="one">ανάρτηση</item>
+		<item quantity="other">αναρτήσεις</item>
+	</plurals>
+	<string name="posts">Αναρτήσεις</string>
+	<string name="posts_and_replies">Αναρτήσεις και Απαντήσεις</string>
+	<string name="media">Πολυμέσα</string>
+	<string name="profile_about">Σχετικά</string>
+	<string name="button_follow">Ακολούθησε</string>
+	<string name="button_following">Ακολουθείς</string>
+	<string name="edit_profile">Επεξεργασία Προφίλ</string>
+	<string name="mention_user">Ανάφερε τον @%s</string>
+	<string name="share_user">Κοινοποίηση %s</string>
+	<string name="mute_user">Σίγαση %s</string>
+	<string name="unmute_user">Κατάργηση σίγασης %s</string>
+	<string name="block_user">Αποκλεισμός %s</string>
+	<string name="unblock_user">Άρση αποκλεισμού %s</string>
+	<string name="report_user">Αναφορά %s</string>
+	<string name="block_domain">Αποκλεισμός %s</string>
+	<string name="unblock_domain">Άρση αποκλεισμού %s</string>
+	<plurals name="x_posts">
+		<item quantity="one">%,d ανάρτηση</item>
+		<item quantity="other">%,d αναρτήσεις</item>
+	</plurals>
+	<string name="profile_joined">Έγινε μέλος</string>
+	<string name="done">Εγινε</string>
+	<string name="loading">Φόρτωση…</string>
+	<string name="field_label">Περιγραφή</string>
+	<string name="field_content">Περιεχόμενο</string>
+	<string name="saving">Αποθήκευση…</string>
+	<string name="post_from_user">Ανάρτηση από %s</string>
+	<string name="poll_option_hint">Επιλογή %d</string>
+	<plurals name="x_minutes">
+		<item quantity="one">%d λεπτό</item>
+		<item quantity="other">%d λεπτά</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="one">%d ώρα</item>
+		<item quantity="other">%d ώρες</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="one">%d ημέρα</item>
+		<item quantity="other">%d ημέρες</item>
+	</plurals>
+	<string name="compose_poll_duration">Διάρκεια: %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="one">Απομένει %d δευτερόλεπτο</item>
+		<item quantity="other">Απομένουν %d δευτερόλεπτα</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="one">Απομένει %d λεπτό</item>
+		<item quantity="other">Απομένουν %d λεπτά</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="one">απομένει %d ώρα</item>
+		<item quantity="other">απομένουν %d ώρες</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="one">Απομένει %d ημέρα</item>
+		<item quantity="other">απομένουν %d ημέρες</item>
+	</plurals>
 	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->

From ff374f8899017e7f8588d3dd2b02baa067e8af44 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2023 00:46:17 +0200
Subject: [PATCH 017/124] New translations strings.xml (Greek)

---
 .../src/main/res/values-el-rGR/strings.xml    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 0f4de98d4..66e8d4e32 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -93,6 +93,43 @@
 		<item quantity="one">Απομένει %d ημέρα</item>
 		<item quantity="other">απομένουν %d ημέρες</item>
 	</plurals>
+	<plurals name="x_voters">
+		<item quantity="one">%,d ψηφοφόρος</item>
+		<item quantity="other">%,d ψηφοφόροι</item>
+	</plurals>
+	<string name="poll_closed">Κλειστό</string>
+	<string name="confirm_mute_title">Σίγαση Λογαριασμού</string>
+	<string name="confirm_mute">Επιβεβαίωσε για σίγαση %s</string>
+	<string name="do_mute">Σίγαση</string>
+	<string name="confirm_unmute_title">Κατάργηση Σίγασης Λογαριασμού</string>
+	<string name="confirm_unmute">Επιβεβαίωσε για κατάργηση σίγασης %s</string>
+	<string name="do_unmute">Κατάργηση σίγασης</string>
+	<string name="confirm_block_title">Αποκλεισμός Λογαριασμού</string>
+	<string name="confirm_block_domain_title">Αποκλεισμός Τομέα</string>
+	<string name="confirm_block">Επιβεβαίωση αποκλεισμού %s</string>
+	<string name="do_block">Αποκλεισμός</string>
+	<string name="confirm_unblock_title">Άρση Αποκλεισμού Λογαριασμού</string>
+	<string name="confirm_unblock_domain_title">Άρση αποκλεισμού Τομέα</string>
+	<string name="confirm_unblock">Επιβεβαίωση άρσης αποκλεισμού %s</string>
+	<string name="do_unblock">Άρση αποκλεισμού</string>
+	<string name="button_muted">Σε Σίγαση</string>
+	<string name="button_blocked">Αποκλείστηκε</string>
+	<string name="action_vote">Ψήφισε</string>
+	<string name="tap_to_reveal">Πάτα για εμφάνιση</string>
+	<string name="delete">Διαγραφή</string>
+	<string name="confirm_delete_title">Διαγραφή ανάρτησης</string>
+	<string name="confirm_delete">Είσαι βέβαιοος ότι θες να διαγράψεις την ανάρτηση;</string>
+	<string name="deleting">Διαγραφή…</string>
+	<string name="notification_channel_audio_player">Αναπαραγωγή ήχου</string>
+	<string name="play">Αναπαραγωγή</string>
+	<string name="pause">Παύση</string>
+	<string name="log_out">Αποσύνδεση</string>
+	<string name="add_account">Προσθήκη λογαριασμού</string>
+	<string name="search_hint">Αναζήτηση</string>
+	<string name="hashtags">Ετικέτες</string>
+	<string name="news">Ειδήσεις</string>
+	<string name="for_you">Για σένα</string>
+	<string name="all_notifications">Όλα</string>
 	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->

From 45af198f327567424dee06dbdcb80b189c53d83d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2023 02:04:08 +0200
Subject: [PATCH 018/124] New translations strings.xml (Greek)

---
 .../src/main/res/values-el-rGR/strings.xml    | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 66e8d4e32..0de255c4a 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -130,11 +130,154 @@
 	<string name="news">Ειδήσεις</string>
 	<string name="for_you">Για σένα</string>
 	<string name="all_notifications">Όλα</string>
+	<string name="mentions">Επισημάνσεις</string>
+	<plurals name="x_people_talking">
+		<item quantity="one">%d άτομο μιλάει</item>
+		<item quantity="other">%d άτομα μιλάνε</item>
+	</plurals>
+	<plurals name="discussed_x_times">
+		<item quantity="one">Συζητήθηκε %d φορά</item>
+		<item quantity="other">Συζητήθηκε %d φορές</item>
+	</plurals>
+	<string name="report_title">Αναφορά %s</string>
+	<string name="report_choose_reason">Τι πάει λάθος με αυτή την ανάρτηση;</string>
+	<string name="report_choose_reason_account">Τι πάει λάθος με τον/την %s;</string>
+	<string name="report_choose_reason_subtitle">Διάλεξε τη καλύτερη αντιστοίχηση</string>
+	<string name="report_reason_personal">Δεν μου αρέσει</string>
+	<string name="report_reason_personal_subtitle">Δεν είναι κάτι που θα ηθέλες να δεις</string>
+	<string name="report_reason_spam">Είναι σπαμ</string>
+	<string name="report_reason_spam_subtitle">Κακόβουλοι σύνδεσμοι, πλαστή αλληλεπίδραση ή επαναλαμβανόμενες απαντήσεις</string>
+	<string name="report_reason_violation">Παραβαίνει τους κανόνες του διακομιστή</string>
+	<string name="report_reason_violation_subtitle">Γνωρίζεις ότι παραβιάζει συγκεκριμένους κανόνες</string>
+	<string name="report_reason_other">Είναι κάτι άλλο</string>
+	<string name="report_reason_other_subtitle">Το ζήτημα δεν ταιριάζει σε άλλες κατηγορίες</string>
+	<string name="report_choose_rule">Ποιοι κανόνες παραβιάζονται;</string>
 	<!-- %s is the email address -->
+	<string name="retry_upload">Επανάληψη μεταμόρφωσης</string>
+	<string name="edit_image">Επεξεργασία εικόνας</string>
+	<string name="save">Αποθήκευση</string>
+	<string name="add_alt_text">Προσθήκη εναλλακτικού κειμένου</string>
+	<string name="alt_text_subtitle">Το εναλλακτικό κείμενο περιγράφει τις φωτογραφίες σου για άτομα με χαμηλή ή καθόλου όραση. Προσπάθησε να συμπεριλάβεις μόνο όσες λεπτομέρειες χρειάζεται για να γίνει κατανοητό το περιεχόμενο.</string>
+	<string name="alt_text_hint">π.χ. Ένας σκύλος που κοιτάζει γύρω του ύποπτα με μισόκλειστα μάτια στην κάμερα.</string>
+	<string name="visibility_public">Δημόσιο</string>
+	<string name="visibility_followers_only">Μόνο ακόλουθοι</string>
+	<string name="visibility_private">Μόνο άτομα που επισημαίνω</string>
+	<string name="search_all">Όλα</string>
+	<string name="search_people">Άτομα</string>
+	<string name="recent_searches">Πρόσφατες αναζητήσεις</string>
+	<string name="step_x_of_n">Βήμα %1$d από %2$d</string>
+	<string name="skip">Παράλειψη</string>
+	<string name="notification_type_follow">Νέοι ακόλουθοι</string>
+	<string name="notification_type_favorite">Αγαπημένα</string>
+	<string name="notification_type_reblog">Αναδημοσιεύσεις</string>
+	<string name="notification_type_mention">Επισημάνσεις</string>
+	<string name="notification_type_poll">Δημοσκοπήσεις</string>
+	<string name="choose_account">Επιλογή λογαριασμού</string>
+	<string name="err_not_logged_in">Παρακαλώ συνδέσου πρώτα στο Mastodon</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Δεν μπορείς να προσθέσεις περισσότερα από %d συνημμένο πολυμέσων</item>
+		<item quantity="other">Δεν μπορείς να προσθέσεις περισσότερα από %d συνημμένα πολυμέσων</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Το αρχείο %s είναι μη υποστηριζόμενου τύπου</string>
+	<string name="media_attachment_too_big">Το αρχείο %1$s υπερβαίνει το όριο μεγέθους των %2$s MB</string>
+	<string name="settings_theme">Οπτική εμφάνιση</string>
+	<string name="theme_auto">Αυτόματο</string>
+	<string name="theme_light">Φωτεινό</string>
+	<string name="theme_dark">Σκοτεινό</string>
+	<string name="theme_true_black">Λειτουργία απόλυτου μαύρου</string>
+	<string name="settings_behavior">Συμπεριφορά</string>
+	<string name="settings_gif">Αναπαραγωγή κινούμενων άβαταρ και εμότζι</string>
+	<string name="settings_custom_tabs">Χρήση περιηγητή εντός εφαρμογής</string>
+	<string name="settings_notifications">Ειδοποιήσεις</string>
+	<string name="notify_me_when">Να ειδοποιούμαι όταν</string>
+	<string name="notify_anyone">οποιοσδήποτε</string>
+	<string name="notify_follower">ακόλουθος</string>
+	<string name="notify_followed">κάποιος που ακολουθώ</string>
+	<string name="notify_none">κανείς</string>
+	<string name="notify_favorites">Προσθέτει στα αγαπημένα την ανάρτησή μου</string>
+	<string name="notify_follow">Με ακολουθεί</string>
+	<string name="notify_reblog">Αναδημοσιεύει την ανάρτησή μου</string>
+	<string name="notify_mention">Με επισημαίνει</string>
+	<string name="settings_boring">Η βαρετή ζώνη</string>
+	<string name="settings_account">Ρυθμίσεις λογαριασμού</string>
+	<string name="settings_contribute">Συνείσφερε στο Mastodon</string>
+	<string name="settings_tos">Όροι χρήσης</string>
+	<string name="settings_privacy_policy">Πολιτική απορρήτου</string>
+	<string name="settings_spicy">Η πικάντικη ζώνη</string>
+	<string name="settings_clear_cache">Εκκαθάριση προσωρινής μνήμης πολυμέσων</string>
+	<string name="settings_app_version">Mastodon για Android έκδοση %1$s (%2$d)</string>
+	<string name="load_missing_posts">Φόρτωση αναρτήσεων που λείπουν</string>
+	<string name="follow_back">Ακολούθησε Και Συ</string>
+	<string name="button_follow_pending">Εκκρεμεί</string>
+	<string name="follows_you">Σε ακολουθεί</string>
+	<string name="manually_approves_followers">Χειροκίνητη έγκριση ακολούθων</string>
+	<string name="current_account">Τρέχων λογαριασμός</string>
+	<string name="log_out_account">Αποσύνδεση %s</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="one">%,d ακόλουθος</item>
+		<item quantity="other">%,d ακόλουθοι</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%,d ακολουθεί</item>
+		<item quantity="other">%,d ακολουθούν</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d αγαπημένο</item>
+		<item quantity="other">%,d αγαπημένα</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d αναδημοσίευση</item>
+		<item quantity="other">%,d αναδημοσιεύσεις</item>
+	</plurals>
+	<string name="timestamp_via_app">%1$s μέσω %2$s</string>
+	<string name="time_now">τώρα</string>
+	<string name="post_info_reblogs">Αναδημοσιεύσεις</string>
+	<string name="post_info_favorites">Αγαπημένα</string>
+	<string name="edit_history">Επεξεργασία ιστορικού</string>
+	<string name="last_edit_at_x">Τελευταία επεξεργασία %s</string>
+	<string name="time_just_now">μόλις τώρα</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="one">%d δευτερόλεπτο πριν</item>
+		<item quantity="other">%d δευτερόλεπτα πριν</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="one">%d λεπτό πριν</item>
+		<item quantity="other">%d λεπτά πριν</item>
+	</plurals>
+	<string name="edited_timestamp">επεξεργάστηκε στις %s</string>
+	<string name="edit_original_post">Αρχική ανάρτηση</string>
+	<string name="edit_text_edited">Το κείμενο επεξεργάστηκε</string>
+	<string name="edit_spoiler_added">Προστέθηκε προειδοποίηση περιεχομένου</string>
+	<string name="edit_spoiler_edited">Επεξεργάστηκε η προειδοποίηση περιεχομένου</string>
+	<string name="edit_spoiler_removed">Η προειδοποίηση περιεχομένου αφαιρέθηκε</string>
+	<string name="edit_poll_added">Προστέθηκε δημοσκόπηση</string>
+	<string name="edit_poll_edited">Η δημοσκόπηση επεξεργάστηκε</string>
+	<string name="edit_poll_removed">Η δημοσκόπηση αφαιρέθηκε</string>
+	<string name="edit_media_added">Προστέθηκε πολυμέσο</string>
+	<string name="edit_media_removed">Το πολυμέσο αφαιρέθηκε</string>
+	<string name="edit_media_reordered">Τα πολυμέσο ανακατατάχθηκε</string>
+	<string name="edit_marked_sensitive">Επισημάνθηκε ως ευαίσθητο</string>
+	<string name="edit_marked_not_sensitive">Επισημάνθηκε ως μη ευαίσθητο</string>
+	<string name="edit_multiple_changed">Η ανάρτηση επεξεργάστηκε</string>
+	<string name="edit">Επεξεργασία</string>
+	<string name="discard_changes">Απόρριψη αλλαγών;</string>
+	<string name="upload_failed">Αποτυχία μεταμόρφωσης</string>
+	<string name="file_size_bytes">%d bytes</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="file_upload_progress">%1$s από %2$s</string>
+	<string name="file_upload_time_remaining">%s απομένουν</string>
+	<string name="upload_error_connection_lost">Η συσκευή σου έχασε τη σύνδεση με το διαδίκτυο</string>
+	<string name="upload_processing">Επεξεργασία…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Το Mastodon για Android %s είναι έτοιμο για λήψη.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Το Mastodon για Android %s ελήφθη και είναι έτοιμο για εγκατάσταση.</string>
 	<!-- %s is file size -->
+	<string name="download_update">Λήψη (%s)</string>
+	<string name="install_update">Εγκατάσταση</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

From b454ff5ec7cf8f1ad317017bf838cc3c97c58327 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2023 11:07:06 +0200
Subject: [PATCH 019/124] New translations strings.xml (Belarusian)

---
 mastodon/src/main/res/values-be-rBY/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-be-rBY/strings.xml b/mastodon/src/main/res/values-be-rBY/strings.xml
index 36070ccd5..b02abb706 100644
--- a/mastodon/src/main/res/values-be-rBY/strings.xml
+++ b/mastodon/src/main/res/values-be-rBY/strings.xml
@@ -203,6 +203,7 @@
 	<string name="instance_catalog_subtitle">Выбірайце сервер у залежнасці ад вашых інтарэсаў, рэгіёна або выберыце сервер агульнага прызначэння. Вы па-ранейшаму можаце ўзаемадзейнічаць з усімі, незалежна ад сервера.</string>
 	<string name="search_communities">Назва сервера або URL</string>
 	<string name="instance_rules_title">Правілы сервера</string>
+	<string name="instance_rules_subtitle">Працягваючы, вы згаджаецеся выконваць правілы, устаноўленыя мадэратарам %s.</string>
 	<string name="signup_title">Стварыць уліковы запіс</string>
 	<string name="edit_photo">рэдагаваць</string>
 	<string name="display_name">Імя</string>
@@ -226,6 +227,8 @@
 	<string name="category_tech">Тэхналогіі</string>
 	<string name="confirm_email_title">Праверце паштовую скрыню</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Націсніце на спасылку, якую мы адправілі, каб спраўдзіць %s. Мы вас пачакаем тут.</string>
+	<string name="confirm_email_didnt_get">Не атрымалі спасылку?</string>
 	<string name="resend">Адправіць паўторна</string>
 	<string name="open_email_app">Адкрыць праграму для пошты</string>
 	<string name="resent_email">Электронны ліст з пацвярджэннем адпраўлены</string>
@@ -442,8 +445,14 @@
 	<string name="server_filter_region_africa">Афрыка</string>
 	<string name="server_filter_region_asia">Азія</string>
 	<string name="server_filter_region_oceania">Акіянія</string>
+	<string name="server_rules_disagree">Не згодны</string>
+	<string name="privacy_policy_explanation">Мы нічога не збіраем і не апрацоўваем.</string>
 	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Не згодны з %s</string>
+	<string name="profile_bio">Пра мяне</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Падпісваемся…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s не прымае рэгістрацыю ад %2$s. Паспрабуйце іншы &lt;a&gt;выберыце іншы сервер&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Гэта імя карыстальніка занята.</string>
 </resources>

From ced0accde51c27fc907cf25bcbd7417ba196097a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2023 12:06:47 +0200
Subject: [PATCH 020/124] New translations strings.xml (Belarusian)

---
 .../src/main/res/values-be-rBY/strings.xml    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/mastodon/src/main/res/values-be-rBY/strings.xml b/mastodon/src/main/res/values-be-rBY/strings.xml
index b02abb706..6112ee790 100644
--- a/mastodon/src/main/res/values-be-rBY/strings.xml
+++ b/mastodon/src/main/res/values-be-rBY/strings.xml
@@ -315,9 +315,11 @@
 	<string name="follow_user">Падпісацца на %s</string>
 	<string name="unfollowed_user">Адпісацца ад %s</string>
 	<string name="followed_user">Цяпер вы падпісаны на %s</string>
+	<string name="following_user_requested">Запытана падпісацца на %s</string>
 	<string name="open_in_browser">Адкрыць у браўзеры</string>
 	<string name="hide_boosts_from_user">Схаваць пашырэнні ад %s</string>
 	<string name="show_boosts_from_user">Паказаць пашырэнні ад %s</string>
+	<string name="signup_reason">Чаму вы хочаце далучыцца?</string>
 	<string name="signup_reason_note">Гэта дапаможа нам разгледзець вашу заяўку.</string>
 	<string name="clear">Ачысціць</string>
 	<string name="profile_header">Відарыс шапкі</string>
@@ -422,6 +424,8 @@
 	<!-- %s is file size -->
 	<string name="download_update">Спампаваць (%s)</string>
 	<string name="install_update">Усталяваць</string>
+	<string name="privacy_policy_title">Ваша прыватнасць</string>
+	<string name="privacy_policy_subtitle">Нягледзячы на ​​тое, што праграма Mastodon не збірае даных, сервер, на якім вы рэгіструецеся, можа мець іншую палітыку.\n\nКалі вы адмовіцеся ад палітыкі %s, вы можаце вярнуцца і выбраць іншы сервер.</string>
 	<string name="i_agree">Я згодны</string>
 	<string name="empty_list">Гэты ліст пусты</string>
 	<string name="instance_signup_closed">Гэты сервер не прымае новыя рэгістрацыі.</string>
@@ -433,18 +437,33 @@
 	<string name="login_title">З вяртаннем</string>
 	<string name="login_subtitle">Увайдзіце з дапамогай сервера, на якім вы стварылі свой уліковы запіс.</string>
 	<string name="server_url">URL-адрас сервера</string>
+	<string name="welcome_page1_title">Што такое Mastodon?</string>
 	<string name="welcome_page1_text">Уявіце, што ў вас ёсць адрас электроннай пошты, які заканчваецца на @example.com.\n\nВы па-ранейшаму можаце адпраўляць і атрымліваць электронныя лісты ад каго захочаце, нават калі іх электронная пошта заканчваецца на @gmail.com, @icloud.com або @example.com.</string>
 	<string name="welcome_page2_title">Mastodon такі.</string>
 	<string name="welcome_page2_text">Ваш ідэнтыфікатар можа быць @gothgirl654@example.social, але вы ўсё яшчэ можаце падпісвацца, пашыраць і перапісвацца з @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Як выбраць сервер?</string>
 	<string name="welcome_page3_text">Розныя людзі выбіраюць розныя серверы па розных прычынах. art.example з\'яўляецца выдатным месцам для мастакоў, у той час як glasgow.example можа быць добрым выбарам для шатландцаў.\n\nВы не памыліцеся ні з адным з нашых рэкамендаваных сервераў, так што незалежна ад таго, які вы выбераце (або калі ўведзяце ваш уласны ў радку пошуку сервера), вы нідзе нічога не прапусціце.</string>
+	<string name="signup_random_server_explain">Мы абярэм сервер на аснове вашай мовы, калі вы працягнеце без выбару.</string>
 	<string name="server_filter_any_language">Любая мова</string>
+	<string name="server_filter_instant_signup">Імгненная рэгістрацыя</string>
+	<string name="server_filter_manual_review">Ручная праверка</string>
+	<string name="server_filter_any_signup_speed">Любая хуткасць рэгістрацыі</string>
 	<string name="server_filter_region_europe">Еўропа</string>
 	<string name="server_filter_region_north_america">Паўночная Амерыка</string>
 	<string name="server_filter_region_south_america">Паўднёвая Амерыка</string>
 	<string name="server_filter_region_africa">Афрыка</string>
 	<string name="server_filter_region_asia">Азія</string>
 	<string name="server_filter_region_oceania">Акіянія</string>
+	<string name="not_accepting_new_members">Не прымае новых удзельнікаў</string>
+	<string name="category_special_interests">Асаблівыя інтарэсы</string>
+	<string name="signup_passwords_dont_match">Паролі не супадаюць</string>
+	<string name="pick_server_for_me">Падбяры для мяне</string>
+	<string name="profile_add_row">Дадаць радок</string>
+	<string name="profile_setup">Налады профілю</string>
+	<string name="profile_setup_subtitle">Вы можаце завяршыць гэта пазней на ўкладцы Профіль.</string>
+	<string name="profile_setup_explanation">Вы можаце дадаць да чатырох палёў профіля для ўсяго, што хочаце. Месцазнаходжанне, спасылкі, займеннікі - няма мяжы магчымасцям.</string>
+	<string name="popular_on_mastodon">Папулярна на Mastodon</string>
+	<string name="follow_all">Падпісацца на ўсіх</string>
 	<string name="server_rules_disagree">Не згодны</string>
 	<string name="privacy_policy_explanation">Мы нічога не збіраем і не апрацоўваем.</string>
 	<!-- %s is server domain -->

From 3f80be8377e4d9bb2b27a3923146d59db23ea6a4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2023 16:29:26 +0200
Subject: [PATCH 021/124] New translations strings.xml (Greek)

---
 mastodon/src/main/res/values-el-rGR/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 0de255c4a..04bbab90e 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -152,6 +152,17 @@
 	<string name="report_reason_other">Είναι κάτι άλλο</string>
 	<string name="report_reason_other_subtitle">Το ζήτημα δεν ταιριάζει σε άλλες κατηγορίες</string>
 	<string name="report_choose_rule">Ποιοι κανόνες παραβιάζονται;</string>
+	<string name="report_choose_rule_subtitle">Επίλεξε όλα όσα ισχύουν</string>
+	<string name="report_choose_posts">Υπάρχουν αναρτήσεις που τεκμηριώνουν αυτή την αναφορά;</string>
+	<string name="report_choose_posts_subtitle">Επίλεξε όλα όσα ισχύουν</string>
+	<string name="report_comment_title">Υπάρχει κάτι άλλο που πρέπει να γνωρίζουμε;</string>
+	<string name="report_comment_hint">Επιπλέον σχόλια</string>
+	<string name="sending_report">Αποστολή αναφοράς…</string>
+	<string name="report_sent_title">Σε ευχαριστούμε για την αναφορά, θα το διερευνήσουμε.</string>
+	<string name="report_sent_subtitle">Ενώ το εξετάζουμε αυτό, μπορείς να δράσεις εναντίον του %s.</string>
+	<string name="unfollow_user">Κατάργηση ακολούθησης του %s</string>
+	<string name="unfollow">Άρση ακολούθησης</string>
+	<string name="mute_user_explain">Δεν θα βλέπεις τις αναρτήσεις ή τις αναδημοσιεύσεις τους στην αρχική σελίδα σου. Δεν θα ξέρουν ότι βρίσκονται σε σίγαση.</string>
 	<!-- %s is the email address -->
 	<string name="retry_upload">Επανάληψη μεταμόρφωσης</string>
 	<string name="edit_image">Επεξεργασία εικόνας</string>

From b958299446b12f3197cc03fd26f750654333b676 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 6 Apr 2023 17:45:19 +0200
Subject: [PATCH 022/124] New translations strings.xml (Greek)

---
 mastodon/src/main/res/values-el-rGR/strings.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 04bbab90e..e1a1a6cf8 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -163,6 +163,22 @@
 	<string name="unfollow_user">Κατάργηση ακολούθησης του %s</string>
 	<string name="unfollow">Άρση ακολούθησης</string>
 	<string name="mute_user_explain">Δεν θα βλέπεις τις αναρτήσεις ή τις αναδημοσιεύσεις τους στην αρχική σελίδα σου. Δεν θα ξέρουν ότι βρίσκονται σε σίγαση.</string>
+	<string name="block_user_explain">Δεν θα μπορούν πλέον να σε ακολουθούν ή να βλέπουν τις αναρτήσεις σου, αλλά μπορούν να δουν αν έχουν αποκλειστεί.</string>
+	<string name="report_personal_title">Δε θες να το βλέπεις αυτό;</string>
+	<string name="report_personal_subtitle">Όταν βλέπεις κάτι που δεν σου αρέσει στο Mastodon, μπορείς να αφαιρέσεις το άτομο από την εμπειρία σου.</string>
+	<string name="back">Πίσω</string>
+	<string name="instance_catalog_title">Το Mastodon αποτελείται από χρήστες σε διαφορετικούς διακομιστές.</string>
+	<string name="instance_catalog_subtitle">Διάλεξε ένα διακομιστή με βάση τα ενδιαφέροντά σου, την περιοχή ή έναν γενικού σκοπού. Μπορείς ακόμα να συνδεθείς με όλους, ανεξάρτητα από το διακομιστή.</string>
+	<string name="search_communities">Όνομα διακομιστή ή διεύθυνση URL</string>
+	<string name="instance_rules_title">Κανόνες Διακομιστή</string>
+	<string name="instance_rules_subtitle">Συνεχίζοντας, συμφωνείτε να ακολουθήσετε υπό τους ακόλουθους κανόνες που έχουν οριστεί και επιβάλλονται από τους %s συντονιστές.</string>
+	<string name="signup_title">Δημιουργία Λογαριασμού</string>
+	<string name="edit_photo">επεξεργασία</string>
+	<string name="display_name">Όνομα</string>
+	<string name="username">Όνομα χρήστη</string>
+	<string name="email">Email</string>
+	<string name="password">Συνθηματικό</string>
+	<string name="confirm_password">Επιβεβαίωση συνθηματικού</string>
 	<!-- %s is the email address -->
 	<string name="retry_upload">Επανάληψη μεταμόρφωσης</string>
 	<string name="edit_image">Επεξεργασία εικόνας</string>

From a683fdce62aaa76668688faace25dc60908945d4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 6 Apr 2023 18:46:34 +0200
Subject: [PATCH 023/124] New translations strings.xml (Greek)

---
 .../src/main/res/values-el-rGR/strings.xml    | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index e1a1a6cf8..3e738e5e5 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -177,9 +177,31 @@
 	<string name="display_name">Όνομα</string>
 	<string name="username">Όνομα χρήστη</string>
 	<string name="email">Email</string>
-	<string name="password">Συνθηματικό</string>
-	<string name="confirm_password">Επιβεβαίωση συνθηματικού</string>
+	<string name="password">Κωδικός πρόσβασης</string>
+	<string name="confirm_password">Επιβεβαίωση κωδικού πρόσβασης</string>
+	<string name="password_note">Να συμπεριλάβεις κεφαλαία γράμματα, ειδικούς χαρακτήρες και αριθμούς για να αυξήσεις την ισχύ του κωδικού πρόσβασης.</string>
+	<string name="category_academia">Ακαδημία</string>
+	<string name="category_activism">Ακτιβισμός</string>
+	<string name="category_all">Όλα</string>
+	<string name="category_art">Τέχνη</string>
+	<string name="category_food">Φαγητό</string>
+	<string name="category_games">Παιχνίδια</string>
+	<string name="category_general">Γενικά</string>
+	<string name="category_journalism">Δημοσιογραφία</string>
+	<string name="category_lgbt">LGBT</string>
+	<string name="category_music">Μουσική</string>
+	<string name="category_regional">Τοπικό</string>
+	<string name="category_tech">Τεχνολογία</string>
+	<string name="confirm_email_title">Έλεγξε Τα Εισερχόμενα Σου</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Πάτησε το σύνδεσμο που σου στείλαμε για να επαληθεύσεις το %s. Θα σε περιμένουμε εδώ.</string>
+	<string name="confirm_email_didnt_get">Έλαβες τον σύνδεσμο;</string>
+	<string name="resend">Επαναποστολή</string>
+	<string name="open_email_app">Άνοιγμα εφαρμογής email</string>
+	<string name="resent_email">Το email επιβεβαίωσης εστάλη</string>
+	<string name="compose_hint">Πληκτρολόγησε ή επικολλησε τι υπάρχει στο μυαλό σου</string>
+	<string name="content_warning">Προειδοποίηση περιεχομένου</string>
+	<string name="add_image_description">Προσθήκη περιγραφής εικόνας…</string>
 	<string name="retry_upload">Επανάληψη μεταμόρφωσης</string>
 	<string name="edit_image">Επεξεργασία εικόνας</string>
 	<string name="save">Αποθήκευση</string>
@@ -233,6 +255,17 @@
 	<string name="settings_spicy">Η πικάντικη ζώνη</string>
 	<string name="settings_clear_cache">Εκκαθάριση προσωρινής μνήμης πολυμέσων</string>
 	<string name="settings_app_version">Mastodon για Android έκδοση %1$s (%2$d)</string>
+	<string name="media_cache_cleared">Η προσωρινή μνήμη πολυμέσων καθαρίστηκε</string>
+	<string name="confirm_log_out">Είσαι βέβαιος ότι θες να αποσυνδεθείς;</string>
+	<string name="sensitive_content">Ευαίσθητο περιεχόμενο</string>
+	<string name="sensitive_content_explain">Ο συντάκτης σηματοδότησε αυτό το αρχείο πολυμέσων ως ευαίσθητο. Πάτησε για να το αποκαλύψεις.</string>
+	<string name="media_hidden">Πάτα για εμφάνιση</string>
+	<string name="avatar_description">Μετάβαση στο προφίλ του %s</string>
+	<string name="more_options">Περισσότερες επιλογές</string>
+	<string name="reveal_content">Αποκάλυψη περιεχομένου</string>
+	<string name="hide_content">Απόκρυψη περιεχομένου</string>
+	<string name="new_post">Νέα ανάρτηση</string>
+	<string name="button_reply">Απάντηση</string>
 	<string name="load_missing_posts">Φόρτωση αναρτήσεων που λείπουν</string>
 	<string name="follow_back">Ακολούθησε Και Συ</string>
 	<string name="button_follow_pending">Εκκρεμεί</string>
@@ -305,6 +338,12 @@
 	<!-- %s is file size -->
 	<string name="download_update">Λήψη (%s)</string>
 	<string name="install_update">Εγκατάσταση</string>
+	<string name="login_title">Καλώς Ήρθες Ξανά</string>
+	<string name="login_subtitle">Συνδέσου με τον διακομιστή όπου δημιούργησες τον λογαριασμό σου.</string>
+	<string name="server_url">URL διακομιστή</string>
+	<string name="welcome_page1_title">Τι είναι το Mastodon;</string>
+	<string name="welcome_page1_text">Φαντάσου ότι έχεις μια διεύθυνση email που τελειώνει με @example.com.\n\nΜπορείς ακόμα να στείλεις και να λάβεις μηνύματα από οποιονδήποτε, ακόμη και αν το email τους τελειώνει σε @gmail.com ή @icloud.com ή @example.com.</string>
+	<string name="welcome_page2_title">Έτσι είναι και το Mastodon.</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

From 0925c8c58208a5a70b581d7f4927b411c3bd572f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 6 Apr 2023 21:52:50 +0200
Subject: [PATCH 024/124] New translations strings.xml (Spanish)

---
 mastodon/src/main/res/values-es-rES/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-es-rES/strings.xml b/mastodon/src/main/res/values-es-rES/strings.xml
index 7c3cdd369..67272f5b4 100644
--- a/mastodon/src/main/res/values-es-rES/strings.xml
+++ b/mastodon/src/main/res/values-es-rES/strings.xml
@@ -16,7 +16,7 @@
 	<string name="user_followed_you">ha empezado a seguirte</string>
 	<string name="user_sent_follow_request">te envió una solicitud de seguimiento</string>
 	<string name="user_favorited">marcó como favorita</string>
-	<string name="notification_boosted">reblogueó</string>
+	<string name="notification_boosted">reblogueó tu publicación</string>
 	<string name="poll_ended">encuesta finalizada</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -171,7 +171,7 @@
 	<string name="report_personal_title">¿No quieres ver esto?</string>
 	<string name="report_personal_subtitle">Cuando vea en Mastodon algo que no le agrada, puede sacar a la persona de su experiencia.</string>
 	<string name="back">Atrás</string>
-	<string name="instance_catalog_title">Mastodon está hecho por usuarios den diferentes servidores.</string>
+	<string name="instance_catalog_title">Mastodon está hecho por usuarios de diferentes servidores.</string>
 	<string name="instance_catalog_subtitle">Selecciona un servidor basado en tus intereses, región o un propósito general. Aun así puedes conectarte con todo el mundo, sin importar el servidor.</string>
 	<string name="search_communities">Nombre del servidor o URL</string>
 	<string name="instance_rules_title">Reglas del servidor</string>

From 6ebe4c86afa3cd7b1578b2a9b7ce5d3314ec3e65 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 15:16:19 +0200
Subject: [PATCH 025/124] New translations strings.xml (Greek)

---
 mastodon/src/main/res/values-el-rGR/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 3e738e5e5..ed8082a23 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -185,6 +185,7 @@
 	<string name="category_all">Όλα</string>
 	<string name="category_art">Τέχνη</string>
 	<string name="category_food">Φαγητό</string>
+	<string name="category_furry">Γούνινη</string>
 	<string name="category_games">Παιχνίδια</string>
 	<string name="category_general">Γενικά</string>
 	<string name="category_journalism">Δημοσιογραφία</string>
@@ -266,6 +267,9 @@
 	<string name="hide_content">Απόκρυψη περιεχομένου</string>
 	<string name="new_post">Νέα ανάρτηση</string>
 	<string name="button_reply">Απάντηση</string>
+	<string name="button_reblog">Αναδημοσίευση</string>
+	<string name="button_favorite">Αγαπημένο</string>
+	<string name="button_share">Κοινοποίηση</string>
 	<string name="load_missing_posts">Φόρτωση αναρτήσεων που λείπουν</string>
 	<string name="follow_back">Ακολούθησε Και Συ</string>
 	<string name="button_follow_pending">Εκκρεμεί</string>

From 075aab8074b09d923cd0307b7b77977717b12e9c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 16:16:35 +0200
Subject: [PATCH 026/124] New translations strings.xml (Greek)

---
 .../src/main/res/values-el-rGR/strings.xml    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index ed8082a23..539be0a64 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -270,6 +270,39 @@
 	<string name="button_reblog">Αναδημοσίευση</string>
 	<string name="button_favorite">Αγαπημένο</string>
 	<string name="button_share">Κοινοποίηση</string>
+	<string name="media_no_description">Πολυμέσα χωρίς περιγραφή</string>
+	<string name="add_media">Προσθήκη πολυμέσων</string>
+	<string name="add_poll">Προσθήκη δημοσκόπησης</string>
+	<string name="emoji">Emoji</string>
+	<string name="post_visibility">Ορατότητα ανάρτησης</string>
+	<string name="home_timeline">Αρχική</string>
+	<string name="my_profile">Το προφίλ μου</string>
+	<string name="media_viewer">Αναπαραγωγέας πολυμέσων</string>
+	<string name="follow_user">Ακολούθησε %s</string>
+	<string name="unfollowed_user">Κατάργηση ακολούθησης του %s</string>
+	<string name="followed_user">Ακολουθείς τον/την %s</string>
+	<string name="following_user_requested">Έγινε αίτημα ακολούθησης το %s</string>
+	<string name="open_in_browser">Άνοιξε στον περιηγητή</string>
+	<string name="hide_boosts_from_user">Απόκρυψη αναδημοσιεύσεων από %s</string>
+	<string name="show_boosts_from_user">Εμφάνιση αναδημοσιεύσεων από %s</string>
+	<string name="signup_reason">Γιατί θέλεις να συμμετάσχεις;</string>
+	<string name="signup_reason_note">Αυτό θα μας βοηθήσει να εξετάσουμε την αίτησή σου.</string>
+	<string name="clear">Εκκαθάριση</string>
+	<string name="profile_header">Εικόνα κεφαλίδας</string>
+	<string name="profile_picture">Εικόνα προφίλ</string>
+	<string name="reorder">Αναδιάταξη</string>
+	<string name="download">Λήψη</string>
+	<string name="permission_required">Απαιτούνται δικαιώματα</string>
+	<string name="storage_permission_to_download">Η εφαρμογή χρειάζεται πρόσβαση στον αποθηκευτικό σου χώρο για να αποθηκεύσεις αυτό το αρχείο.</string>
+	<string name="open_settings">Άνοιγμα ρυθμίσεων</string>
+	<string name="error_saving_file">Σφάλμα αποθήκευσης αρχείου</string>
+	<string name="file_saved">Το αρχείο αποθηκεύτηκε</string>
+	<string name="downloading">Λήψη…</string>
+	<string name="no_app_to_handle_action">Δεν υπάρχει εφαρμογή για να χειριστεί αυτήν την ενέργεια</string>
+	<string name="local_timeline">Κοινότητα</string>
+	<string name="trending_posts_info_banner">Αυτές είναι οι αναρτήσεις που κερδίζουν την προσοχή στη δική σου γωνιά του Mastodon.</string>
+	<string name="trending_hashtags_info_banner">Αυτές είναι οι ετικέτες που κερδίζουν την προσοχή στη δική σου γωνιά του Mastodon.</string>
+	<string name="trending_links_info_banner">Αυτές είναι οι ειδήσεις που μοιράζονται περισσότερο στη δική σου γωνιά στο Mastodon.</string>
 	<string name="load_missing_posts">Φόρτωση αναρτήσεων που λείπουν</string>
 	<string name="follow_back">Ακολούθησε Και Συ</string>
 	<string name="button_follow_pending">Εκκρεμεί</string>

From 915b0603d071ed88afe9542676685985c027337c Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Thu, 30 Mar 2023 19:14:12 +0300
Subject: [PATCH 027/124] Reblog -> boost

---
 mastodon/build.gradle                    |  4 ++--
 mastodon/src/main/res/values/strings.xml | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 8ddbe867b..cd340876a 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 50
-		versionName "1.2.0"
+		versionCode 51
+		versionName "1.3.0"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index b42489896..051cdaabf 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -12,14 +12,14 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparing for authentication…</string>
 	<string name="finishing_auth">Finishing authentication…</string>
-	<string name="user_boosted">%s reblogged</string>
+	<string name="user_boosted">%s boosted</string>
 	<string name="in_reply_to">In reply to %s</string>
 	<string name="notifications">Notifications</string>
 
 	<string name="user_followed_you">followed you</string>
 	<string name="user_sent_follow_request">sent you a follow request</string>
 	<string name="user_favorited">favorited your post</string>
-	<string name="notification_boosted">reblogged your post</string>
+	<string name="notification_boosted">boosted your post</string>
 	<string name="poll_ended">poll ended</string>
 
 	<string name="time_seconds">%ds</string>
@@ -172,7 +172,7 @@
 	<string name="report_sent_subtitle">While we review this, you can take action against %s.</string>
 	<string name="unfollow_user">Unfollow %s</string>
 	<string name="unfollow">Unfollow</string>
-	<string name="mute_user_explain">You won\'t see their posts or reblogs in your home feed. They won\'t know they\'ve been muted.</string>
+	<string name="mute_user_explain">You won\'t see their posts or boosts in your home feed. They won\'t know they\'ve been muted.</string>
 	<string name="block_user_explain">They will no longer be able to follow or see your posts, but they can see if they\'ve been blocked.</string>
 	<string name="report_personal_title">Don\'t want to see this?</string>
 	<string name="report_personal_subtitle">When you see something you don\'t like on Mastodon, you can remove the person from your experience.</string>
@@ -229,7 +229,7 @@
 	<string name="skip">Skip</string>
 	<string name="notification_type_follow">New followers</string>
 	<string name="notification_type_favorite">Favorites</string>
-	<string name="notification_type_reblog">Reblogs</string>
+	<string name="notification_type_reblog">Boosts</string>
 	<string name="notification_type_mention">Mentions</string>
 	<string name="notification_type_poll">Polls</string>
 	<string name="choose_account">Choose account</string>
@@ -256,7 +256,7 @@
 	<string name="notify_none">no one</string>
 	<string name="notify_favorites">Favorites my post</string>
 	<string name="notify_follow">Follows me</string>
-	<string name="notify_reblog">Reblogs my post</string>
+	<string name="notify_reblog">Boosts my post</string>
 	<string name="notify_mention">Mentions me</string>
 	<string name="settings_boring">The boring zone</string>
 	<string name="settings_account">Account settings</string>
@@ -277,7 +277,7 @@
 	<string name="hide_content">Hide content</string>
 	<string name="new_post">New post</string>
 	<string name="button_reply">Reply</string>
-	<string name="button_reblog">Reblog</string>
+	<string name="button_reblog">Boost</string>
 	<string name="button_favorite">Favorite</string>
 	<string name="button_share">Share</string>
 	<string name="media_no_description">Media without description</string>
@@ -293,8 +293,8 @@
 	<string name="followed_user">You\'re now following %s</string>
 	<string name="following_user_requested">Requested to follow %s</string>
 	<string name="open_in_browser">Open in browser</string>
-	<string name="hide_boosts_from_user">Hide reblogs from %s</string>
-	<string name="show_boosts_from_user">Show reblogs from %s</string>
+	<string name="hide_boosts_from_user">Hide boosts from %s</string>
+	<string name="show_boosts_from_user">Show boosts from %s</string>
 	<string name="signup_reason">Why do you want to join?</string>
 	<string name="signup_reason_note">This will help us review your application.</string>
 	<string name="clear">Clear</string>
@@ -338,12 +338,12 @@
 		<item quantity="other">%,d favorites</item>
 	</plurals>
 	<plurals name="x_reblogs">
-		<item quantity="one">%,d reblog</item>
-		<item quantity="other">%,d reblogs</item>
+		<item quantity="one">%,d boost</item>
+		<item quantity="other">%,d boosts</item>
 	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">now</string>
-	<string name="post_info_reblogs">Reblogs</string>
+	<string name="post_info_reblogs">Boosts</string>
 	<string name="post_info_favorites">Favorites</string>
 	<string name="edit_history">Edit history</string>
 	<string name="last_edit_at_x">Last edit %s</string>
@@ -405,7 +405,7 @@
 	<string name="welcome_page1_title">What is Mastodon?</string>
 	<string name="welcome_page1_text">Imagine you have an email address that ends with @example.com.\n\nYou can still send and receive emails from anyone, even if their email ends in @gmail.com or @icloud.com or @example.com.</string>
 	<string name="welcome_page2_title">Mastodon is like that.</string>
-	<string name="welcome_page2_text">Your handle might be @gothgirl654@example.social, but you can still follow, reblog, and chat with @fallout5ever@example.online.</string>
+	<string name="welcome_page2_text">Your handle might be @gothgirl654@example.social, but you can still follow, boost, and chat with @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">How do I pick a server?</string>
 	<string name="welcome_page3_text">Different people choose different servers for any number of reasons. art.example is a great place for artists, while glasgow.example might be a good pick for Scots.\n\nYou can’t go wrong with any of our recommend servers, so regardless of which one you pick (or if you enter your own in the server search bar), you’ll never miss a beat anywhere.</string>
 	<string name="signup_random_server_explain">We\'ll pick a server based on your language if you continue without making a selection.</string>

From 4f8d8f0c8d295dd9b35841e8a404c66ba4115929 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Fri, 7 Apr 2023 22:40:00 +0300
Subject: [PATCH 028/124] Welcome fragment redesign again

# Conflicts:
#	mastodon/src/main/res/values/strings.xml
#	mastodon/src/main/res/values/styles.xml
---
 .../android/fragments/SplashFragment.java     | 101 +++++++++----
 .../src/main/res/drawable/bg_bottom_sheet.xml |  10 +-
 .../res/drawable/bg_bottom_sheet_handle.xml   |   6 +-
 .../res/drawable/bg_button_m3_outlined.xml    |  25 +++
 .../src/main/res/drawable/splash_logo.xml     |  27 ++++
 .../src/main/res/layout/fragment_splash.xml   | 142 ++++++++++++------
 .../main/res/layout/intro_bottom_sheet.xml    |  50 ++++++
 mastodon/src/main/res/values/strings.xml      |  19 +++
 mastodon/src/main/res/values/styles.xml       |   7 +
 9 files changed, 303 insertions(+), 84 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/bg_button_m3_outlined.xml
 create mode 100644 mastodon/src/main/res/drawable/splash_logo.xml
 create mode 100644 mastodon/src/main/res/layout/intro_bottom_sheet.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
index b11047400..5359eea81 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -11,33 +12,46 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment;
 import org.joinmastodon.android.fragments.onboarding.InstanceChooserLoginFragment;
+import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.ui.InterpolatingMotionEffect;
+import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
+import org.parceler.Parcels;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.BottomSheet;
 
 public class SplashFragment extends AppKitFragment{
 
+	private static final String DEFAULT_SERVER="mastodon.social";
+
 	private SizeListenerFrameLayout contentView;
 	private View artContainer, blueFill, greenFill;
-	private ViewPager2 pager;
-	private ViewGroup pagerDots;
+	private InterpolatingMotionEffect motionEffect;
 	private View artClouds, artPlaneElephant, artRightHill, artLeftHill, artCenterHill;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
+		motionEffect=new InterpolatingMotionEffect(MastodonApp.context);
 	}
 
 	@Nullable
@@ -46,44 +60,25 @@ public class SplashFragment extends AppKitFragment{
 		contentView=(SizeListenerFrameLayout) inflater.inflate(R.layout.fragment_splash, container, false);
 		contentView.findViewById(R.id.btn_get_started).setOnClickListener(this::onButtonClick);
 		contentView.findViewById(R.id.btn_log_in).setOnClickListener(this::onButtonClick);
+		Button joinDefault=contentView.findViewById(R.id.btn_join_default_server);
+		joinDefault.setText(getString(R.string.join_default_server, DEFAULT_SERVER));
+		joinDefault.setOnClickListener(this::onJoinDefaultServerClick);
+		contentView.findViewById(R.id.btn_learn_more).setOnClickListener(this::onLearnMoreClick);
+
 		artClouds=contentView.findViewById(R.id.art_clouds);
 		artPlaneElephant=contentView.findViewById(R.id.art_plane_elephant);
 		artRightHill=contentView.findViewById(R.id.art_right_hill);
 		artLeftHill=contentView.findViewById(R.id.art_left_hill);
 		artCenterHill=contentView.findViewById(R.id.art_center_hill);
-		pager=contentView.findViewById(R.id.pager);
-		pagerDots=contentView.findViewById(R.id.pager_dots);
-		pager.setAdapter(new PagerAdapter());
-		pager.setOffscreenPageLimit(3);
-		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
-			@Override
-			public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels){
-				for(int i=0;i<pagerDots.getChildCount();i++){
-					float alpha;
-					if(i==position){
-						alpha=0.3f+0.7f*(1f-positionOffset);
-					}else if(i==position+1){
-						alpha=0.3f+0.7f*positionOffset;
-					}else{
-						alpha=0.3f;
-					}
-					pagerDots.getChildAt(i).setAlpha(alpha);
-				}
-
-				float parallaxProgress=(position+positionOffset)/2f;
-				artClouds.setTranslationX(V.dp(-27)*(position>=1 ? 1f : positionOffset));
-				artPlaneElephant.setTranslationX(V.dp(101.55f)*parallaxProgress);
-				artLeftHill.setTranslationX(V.dp(-88)*parallaxProgress);
-				artLeftHill.setTranslationY(V.dp(24)*parallaxProgress);
-				artRightHill.setTranslationX(V.dp(-88)*parallaxProgress);
-				artRightHill.setTranslationY(V.dp(-24)*parallaxProgress);
-				artCenterHill.setTranslationX(V.dp(-40)*parallaxProgress);
-			}
-		});
 
 		artContainer=contentView.findViewById(R.id.art_container);
 		blueFill=contentView.findViewById(R.id.blue_fill);
 		greenFill=contentView.findViewById(R.id.green_fill);
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_clouds), V.dp(-5), V.dp(5), V.dp(-5), V.dp(5)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_right_hill), V.dp(-15), V.dp(25), V.dp(-10), V.dp(10)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_left_hill), V.dp(-25), V.dp(15), V.dp(-15), V.dp(15)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_center_hill), V.dp(-14), V.dp(14), V.dp(-5), V.dp(25)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_plane_elephant), V.dp(-20), V.dp(12), V.dp(-20), V.dp(12)));
 
 		contentView.setSizeListener(new SizeListenerFrameLayout.OnSizeChangedListener(){
 			@Override
@@ -109,6 +104,38 @@ public class SplashFragment extends AppKitFragment{
 		Nav.go(getActivity(), isSignup ? InstanceCatalogSignupFragment.class : InstanceChooserLoginFragment.class, extras);
 	}
 
+	private void onJoinDefaultServerClick(View v){
+		new GetInstance()
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Instance result){
+						if(getActivity()==null)
+							return;
+						Bundle args=new Bundle();
+						args.putParcelable("instance", Parcels.wrap(result));
+						Nav.go(getActivity(), InstanceRulesFragment.class, args);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						if(getActivity()==null)
+							return;
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading_instance, true)
+				.execNoAuth(DEFAULT_SERVER);
+	}
+
+	private void onLearnMoreClick(View v){
+		View sheetView=getActivity().getLayoutInflater().inflate(R.layout.intro_bottom_sheet, null);
+		BottomSheet sheet=new BottomSheet(getActivity());
+		sheet.setContentView(sheetView);
+		sheet.setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Surface),
+				UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
+		sheet.show();
+	}
+
 	private void updateArtSize(int w, int h){
 		float scale=w/(float)V.dp(360);
 		artContainer.setScaleX(scale);
@@ -139,6 +166,18 @@ public class SplashFragment extends AppKitFragment{
 		return true;
 	}
 
+	@Override
+	protected void onShown(){
+		super.onShown();
+		motionEffect.activate();
+	}
+
+	@Override
+	protected void onHidden(){
+		super.onHidden();
+		motionEffect.deactivate();
+	}
+
 	private class PagerAdapter extends RecyclerView.Adapter<PagerViewHolder>{
 
 		@NonNull
diff --git a/mastodon/src/main/res/drawable/bg_bottom_sheet.xml b/mastodon/src/main/res/drawable/bg_bottom_sheet.xml
index e5b3d3ea3..bf1a899ef 100644
--- a/mastodon/src/main/res/drawable/bg_bottom_sheet.xml
+++ b/mastodon/src/main/res/drawable/bg_bottom_sheet.xml
@@ -2,8 +2,14 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 	<item>
 		<shape>
-			<solid android:color="?colorWindowBackground"/>
-			<corners android:topLeftRadius="12dp" android:topRightRadius="12dp"/>
+			<solid android:color="?colorM3Surface"/>
+			<corners android:topLeftRadius="28dp" android:topRightRadius="28dp"/>
+		</shape>
+	</item>
+	<item>
+		<shape android:tint="?colorM3Primary">
+			<solid android:color="#0D000000"/>
+			<corners android:topLeftRadius="28dp" android:topRightRadius="28dp"/>
 		</shape>
 	</item>
 </layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_bottom_sheet_handle.xml b/mastodon/src/main/res/drawable/bg_bottom_sheet_handle.xml
index 199c9cabf..28dc9cb56 100644
--- a/mastodon/src/main/res/drawable/bg_bottom_sheet_handle.xml
+++ b/mastodon/src/main/res/drawable/bg_bottom_sheet_handle.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:gravity="center" android:width="36dp" android:height="4dp">
-		<shape>
-			<solid android:color="?android:textColorSecondary"/>
+	<item android:gravity="center" android:width="32dp" android:height="4dp">
+		<shape android:tint="?colorM3Outline">
+			<solid android:color="#66000000"/>
 			<corners android:radius="2dp"/>
 		</shape>
 	</item>
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_outlined.xml b/mastodon/src/main/res/drawable/bg_button_m3_outlined.xml
new file mode 100644
index 000000000..80709f7e1
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_outlined.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/m3_primary_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<selector>
+			<item android:state_enabled="true">
+				<shape>
+					<stroke android:color="?colorM3Outline" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item>
+				<shape>
+					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask">
+		 <shape>
+			   <solid android:color="#000"/>
+			   <corners android:radius="20dp"/>
+		 </shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/splash_logo.xml b/mastodon/src/main/res/drawable/splash_logo.xml
new file mode 100644
index 000000000..71195de3f
--- /dev/null
+++ b/mastodon/src/main/res/drawable/splash_logo.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="134dp"
+    android:height="34dp"
+    android:viewportWidth="313"
+    android:viewportHeight="81">
+  <path
+      android:pathData="M72.95,18.45C71.82,9.95 64.5,3.24 55.85,1.95C54.38,1.73 48.85,0.93 36.02,0.93H35.92C23.09,0.93 20.34,1.73 18.87,1.95C10.44,3.22 2.76,9.23 0.88,17.84C-0,22.08 -0.1,26.78 0.07,31.09C0.31,37.27 0.36,43.43 0.91,49.6C1.29,53.69 1.95,57.74 2.9,61.73C4.68,69.11 11.86,75.25 18.9,77.75C26.43,80.35 34.53,80.79 42.29,79C43.14,78.79 43.98,78.56 44.82,78.29C46.71,77.68 48.92,77 50.55,75.81C50.57,75.8 50.59,75.77 50.6,75.75C50.61,75.72 50.62,75.7 50.62,75.66V69.7C50.62,69.7 50.62,69.65 50.6,69.62C50.6,69.6 50.57,69.58 50.55,69.56C50.53,69.55 50.5,69.54 50.48,69.53C50.45,69.53 50.43,69.53 50.41,69.53C45.43,70.73 40.33,71.34 35.23,71.33C26.43,71.33 24.06,67.09 23.39,65.34C22.85,63.82 22.5,62.22 22.36,60.61C22.36,60.59 22.36,60.57 22.37,60.54C22.37,60.52 22.39,60.49 22.42,60.48C22.44,60.47 22.46,60.46 22.49,60.44H22.57C27.46,61.64 32.48,62.25 37.51,62.25C38.72,62.25 39.92,62.25 41.14,62.21C46.19,62.06 51.52,61.81 56.51,60.82C56.63,60.8 56.76,60.77 56.87,60.75C64.72,59.21 72.19,54.42 72.95,42.27C72.97,41.79 73.04,37.25 73.04,36.76C73.04,35.07 73.58,24.79 72.96,18.48L72.95,18.45Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="36.62"
+          android:startY="0.93"
+          android:endX="36.62"
+          android:endY="80.07"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF6364FF"/>
+        <item android:offset="1" android:color="#FF563ACC"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M14.81,23.2C14.81,20.72 16.77,18.72 19.2,18.72C21.62,18.72 23.58,20.73 23.58,23.2C23.58,25.67 21.62,27.68 19.2,27.68C16.77,27.68 14.81,25.67 14.81,23.2Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M80.02,27.06V47.66H72.03V27.67C72.03,23.45 70.3,21.32 66.83,21.32C63,21.32 61.07,23.87 61.07,28.87V39.82H53.14V28.87C53.14,23.84 51.24,21.32 47.38,21.32C43.92,21.32 42.18,23.45 42.18,27.67V47.65H34.21V27.06C34.21,22.86 35.25,19.51 37.35,17.03C39.53,14.54 42.37,13.29 45.89,13.29C49.97,13.29 53.07,14.9 55.11,18.11L57.11,21.52L59.1,18.11C61.14,14.91 64.23,13.29 68.32,13.29C71.84,13.29 74.69,14.55 76.86,17.03C78.96,19.51 80.01,22.83 80.01,27.06H80.02ZM107.49,37.3C109.15,35.51 109.93,33.29 109.93,30.59C109.93,27.89 109.14,25.65 107.49,23.94C105.91,22.15 103.89,21.3 101.45,21.3C99.02,21.3 97.01,22.15 95.41,23.94C93.83,25.65 93.04,27.89 93.04,30.59C93.04,33.29 93.83,35.53 95.41,37.3C97,39 99.02,39.87 101.45,39.87C103.89,39.87 105.9,39.02 107.49,37.3ZM109.93,14.12H117.8V47.06H109.93V43.18C107.55,46.41 104.26,48 99.99,48C95.71,48 92.42,46.36 89.5,43C86.64,39.64 85.18,35.48 85.18,30.61C85.18,25.74 86.65,21.65 89.5,18.29C92.43,14.93 95.92,13.23 99.99,13.23C104.06,13.23 107.55,14.81 109.93,18.02V14.14V14.12ZM144.26,29.97C146.58,31.76 147.73,34.25 147.67,37.41C147.67,40.77 146.52,43.41 144.14,45.24C141.76,47.03 138.89,47.94 135.41,47.94C129.13,47.94 124.87,45.3 122.61,40.11L129.43,35.96C130.34,38.78 132.35,40.25 135.41,40.25C138.22,40.25 139.62,39.33 139.62,37.42C139.62,36.03 137.79,34.78 134.07,33.8C132.66,33.41 131.5,33.01 130.6,32.68C129.31,32.16 128.22,31.56 127.31,30.83C125.05,29.04 123.9,26.68 123.9,23.65C123.9,20.42 124.99,17.85 127.19,16C129.45,14.09 132.19,13.18 135.48,13.18C140.73,13.18 144.56,15.48 147.07,20.16L140.37,24.1C139.4,21.86 137.74,20.74 135.48,20.74C133.11,20.74 131.95,21.65 131.95,23.44C131.95,24.83 133.78,26.08 137.5,27.06C140.37,27.72 142.63,28.7 144.26,29.97H144.27H144.26ZM169.26,22.27H162.37V35.98C162.37,37.63 162.98,38.63 164.15,39.08C165,39.4 166.71,39.47 169.27,39.34V47.05C163.98,47.71 160.14,47.17 157.88,45.41C155.62,43.7 154.53,40.53 154.53,36V22.27H149.23V14.1H154.53V7.46L162.39,4.89V14.12H169.29V22.29H169.27L169.26,22.27ZM194.34,37.1C195.92,35.4 196.71,33.22 196.71,30.58C196.71,27.94 195.92,25.78 194.34,24.05C192.74,22.35 190.79,21.48 188.42,21.48C186.04,21.48 184.09,22.33 182.49,24.05C180.97,25.84 180.18,28 180.18,30.58C180.18,33.16 180.97,35.31 182.49,37.1C184.08,38.81 186.04,39.67 188.42,39.67C190.79,39.67 192.74,38.82 194.34,37.1ZM176.96,42.96C173.85,39.6 172.32,35.52 172.32,30.58C172.32,25.63 173.85,21.62 176.96,18.26C180.07,14.9 183.91,13.19 188.42,13.19C192.92,13.19 196.77,14.9 199.87,18.26C202.97,21.62 204.57,25.77 204.57,30.58C204.57,35.39 202.97,39.6 199.87,42.96C196.76,46.32 192.98,47.96 188.42,47.96C183.85,47.96 180.06,46.32 176.96,42.96ZM230.86,37.29C232.45,35.5 233.24,33.28 233.24,30.58C233.24,27.87 232.45,25.63 230.86,23.93C229.28,22.14 227.26,21.29 224.82,21.29C222.39,21.29 220.37,22.14 218.73,23.93C217.14,25.63 216.35,27.87 216.35,30.58C216.35,33.28 217.14,35.52 218.73,37.29C220.38,38.99 222.45,39.86 224.82,39.86C227.2,39.86 229.27,39 230.86,37.29ZM233.24,0.92H241.11V47.05H233.24V43.17C230.93,46.39 227.63,47.99 223.36,47.99C219.09,47.99 215.75,46.35 212.8,42.98C209.93,39.62 208.48,35.47 208.48,30.6C208.48,25.73 209.95,21.64 212.8,18.28C215.72,14.92 219.26,13.22 223.36,13.22C227.45,13.22 230.93,14.8 233.24,18.01V0.93V0.92ZM268.74,37.07C270.32,35.36 271.12,33.18 271.12,30.54C271.12,27.9 270.32,25.74 268.74,24.01C267.15,22.31 265.21,21.45 262.82,21.45C260.43,21.45 258.5,22.3 256.9,24.01C255.37,25.8 254.58,27.96 254.58,30.54C254.58,33.12 255.37,35.28 256.9,37.07C258.48,38.77 260.44,39.64 262.82,39.64C265.2,39.64 267.14,38.78 268.74,37.07ZM251.36,42.92C248.26,39.56 246.73,35.48 246.73,30.54C246.73,25.6 248.25,21.58 251.36,18.22C254.47,14.86 258.32,13.15 262.82,13.15C267.32,13.15 271.18,14.86 274.27,18.22C277.38,21.58 278.97,25.73 278.97,30.54C278.97,35.35 277.38,39.56 274.27,42.92C271.16,46.28 267.38,47.93 262.82,47.93C258.26,47.93 254.46,46.28 251.36,42.92ZM313,26.78V47.01H305.14V27.84C305.14,25.66 304.59,24.01 303.48,22.77C302.45,21.65 300.98,21.07 299.09,21.07C294.65,21.07 292.39,23.77 292.39,29.24V47.03H284.53V14.1H292.39V17.81C294.28,14.71 297.28,13.19 301.47,13.19C304.82,13.19 307.57,14.37 309.71,16.81C311.91,19.24 313,22.54 313,26.82"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/mastodon/src/main/res/layout/fragment_splash.xml b/mastodon/src/main/res/layout/fragment_splash.xml
index 23e7cc657..497ab5f39 100644
--- a/mastodon/src/main/res/layout/fragment_splash.xml
+++ b/mastodon/src/main/res/layout/fragment_splash.xml
@@ -5,7 +5,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:fitsSystemWindows="true"
-	android:clipToPadding="false">
+	android:clipToPadding="false"
+	android:theme="@style/Theme.Mastodon.Dark">
 
 	<View
 		android:id="@+id/blue_fill"
@@ -26,7 +27,8 @@
 			android:id="@+id/art_clouds"
 			android:layout_width="414dp"
 			android:layout_height="541dp"
-			android:layout_marginTop="91dp"
+			android:layout_marginTop="37dp"
+			android:layout_marginLeft="-27dp"
 			android:layout_gravity="top|left"
 			android:alpha="0.3"
 			android:importantForAccessibility="no"
@@ -36,8 +38,8 @@
 			android:id="@+id/art_plane_elephant"
 			android:layout_width="245.64dp"
 			android:layout_height="72.65dp"
-			android:layout_marginLeft="-101.55dp"
-			android:layout_marginTop="238.12dp"
+			android:layout_marginLeft="-50.775dp"
+			android:layout_marginTop="184.12dp"
 			android:layout_gravity="left|top"
 			android:alpha="0.3"
 			android:importantForAccessibility="no"
@@ -48,8 +50,8 @@
 			android:layout_width="150.84dp"
 			android:layout_height="176.44dp"
 			android:layout_gravity="top|left"
-			android:layout_marginLeft="322dp"
-			android:layout_marginTop="310dp"
+			android:layout_marginLeft="278dp"
+			android:layout_marginTop="244dp"
 			android:importantForAccessibility="no"
 			android:src="@drawable/splash_art_layer1"/>
 
@@ -58,7 +60,8 @@
 			android:layout_width="197.2dp"
 			android:layout_height="153.61dp"
 			android:layout_gravity="top|left"
-			android:layout_marginTop="294dp"
+			android:layout_marginTop="252dp"
+			android:layout_marginLeft="-44dp"
 			android:importantForAccessibility="no"
 			android:src="@drawable/splash_art_layer2"/>
 
@@ -67,7 +70,8 @@
 			android:layout_width="400dp"
 			android:layout_height="346dp"
 			android:layout_gravity="top|left"
-			android:layout_marginTop="294dp"
+			android:layout_marginTop="240dp"
+			android:layout_marginLeft="-20dp"
 			android:importantForAccessibility="no"
 			android:src="@drawable/splash_art_layer3"/>
 
@@ -86,60 +90,102 @@
 		android:layout_height="match_parent"
 		android:clipToPadding="false"
 		android:orientation="vertical">
+		
+		<ImageView
+			android:layout_width="300dp"
+			android:layout_height="78dp"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginTop="32dp"
+			android:importantForAccessibility="no"
+			android:src="@drawable/splash_logo"/>
 
-		<androidx.viewpager2.widget.ViewPager2
-			android:id="@+id/pager"
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
+		<Space
+			android:layout_width="1px"
+			android:layout_height="0px"
 			android:layout_weight="1"/>
 
-		<LinearLayout
-			android:id="@+id/pager_dots"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginBottom="16dp"
-			android:orientation="horizontal">
-
-			<View
-				android:layout_width="8dp"
-				android:layout_height="8dp"
-				android:background="@drawable/white_circle"/>
-
-			<View
-				android:layout_width="8dp"
-				android:layout_height="8dp"
-				android:layout_marginLeft="16dp"
-				android:layout_marginRight="16dp"
-				android:alpha="0.3"
-				android:background="@drawable/white_circle"/>
-
-			<View
-				android:layout_width="8dp"
-				android:layout_height="8dp"
-				android:alpha="0.3"
-				android:background="@drawable/white_circle"/>
-
-		</LinearLayout>
-
 		<Button
-			android:id="@+id/btn_log_in"
+			android:id="@+id/btn_join_default_server"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="16dp"
 			android:layout_marginRight="16dp"
-			style="@style/Widget.Mastodon.M3.Button.Text"
-			android:textColor="#fff"
-			android:text="@string/already_have_account"/>
+			style="@style/Widget.Mastodon.M3.Button.Filled"
+			tools:text="@string/join_default_server"/>
+
 		<Button
 			android:id="@+id/btn_get_started"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="16dp"
 			android:layout_marginRight="16dp"
-			android:layout_marginBottom="16dp"
-			style="@style/Widget.Mastodon.M3.Button.Filled"
-			android:text="@string/get_started"/>
+			android:layout_marginTop="8dp"
+			style="@style/Widget.Mastodon.M3.Button.Outlined"
+			android:text="@string/pick_server"/>
+
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="16dp"
+			android:layout_marginRight="16dp"
+			android:layout_marginTop="8dp"
+			android:orientation="horizontal">
+
+			<View
+				android:layout_width="0dp"
+				android:layout_height="1dp"
+				android:layout_weight="1"
+				android:layout_gravity="center_vertical"
+				android:background="?colorM3Secondary"/>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="20dp"
+				android:layout_marginLeft="8dp"
+				android:layout_marginRight="8dp"
+				android:textAllCaps="true"
+				android:textAppearance="@style/m3_label_large"
+				android:textColor="?colorM3Secondary"
+				android:layout_gravity="center_vertical"
+				android:text="@string/signup_or_login"/>
+
+			<View
+				android:layout_width="0dp"
+				android:layout_height="1dp"
+				android:layout_weight="1"
+				android:layout_gravity="center_vertical"
+				android:background="?colorM3Secondary"/>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:layout_marginLeft="8dp"
+			android:layout_marginRight="8dp">
+
+			<Button
+				android:id="@+id/btn_learn_more"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="8dp"
+				android:layout_weight="1"
+				style="@style/Widget.Mastodon.M3.Button.Text"
+				android:text="@string/learn_more"/>
+
+			<Button
+				android:id="@+id/btn_log_in"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="8dp"
+				android:layout_weight="1"
+				style="@style/Widget.Mastodon.M3.Button.Text"
+				android:text="@string/log_in"/>
+
+		</LinearLayout>
+
 	</LinearLayout>
 
 </org.joinmastodon.android.ui.views.SizeListenerFrameLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/intro_bottom_sheet.xml b/mastodon/src/main/res/layout/intro_bottom_sheet.xml
new file mode 100644
index 000000000..b1fea3832
--- /dev/null
+++ b/mastodon/src/main/res/layout/intro_bottom_sheet.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@drawable/bg_bottom_sheet"
+		android:padding="16dp">
+
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="4dp"
+			android:layout_marginBottom="16dp"
+			android:background="@drawable/bg_bottom_sheet_handle"/>
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/m3_headline_medium"
+			android:textColor="?colorM3OnSurface"
+			android:text="@string/welcome_to_mastodon"/>
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:textAppearance="@style/m3_body_large"
+			android:textColor="?colorM3OnSurface"
+			android:text="@string/welcome_paragraph1"/>
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="24dp"
+			android:textAppearance="@style/m3_headline_medium"
+			android:textColor="?colorM3OnSurface"
+			android:text="@string/what_are_servers"/>
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:textAppearance="@style/m3_body_large"
+			android:textColor="?colorM3OnSurface"
+			android:text="@string/welcome_paragraph2"/>
+
+	</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 051cdaabf..0147f48d5 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -439,4 +439,23 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s doesn\'t allow signups from %2$s. Try a different one or &lt;a>pick a different server&lt;/a>.</string>
 	<string name="signup_username_taken">This username is taken.</string>
+	<string name="spoiler_show">Show anyway</string>
+	<string name="spoiler_hide">Re-hide</string>
+	<string name="poll_multiple_choice">Choose one or more</string>
+	<string name="save_changes">Save changes</string>
+	<string name="profile_featured">Featured</string>
+	<string name="profile_timeline">Timeline</string>
+	<string name="view_all">View all</string>
+	<string name="profile_endorsed_accounts">Accounts</string>
+	<string name="verified_link">Verified link</string>
+	<string name="show">Show</string>
+	<string name="hide">Hide</string>
+	<string name="join_default_server">Join %s</string>
+	<string name="pick_server">Pick my own server</string>
+	<string name="signup_or_login">or</string>
+	<string name="learn_more">Learn more</string>
+	<string name="welcome_to_mastodon">Welcome to Mastodon</string>
+	<string name="welcome_paragraph1">Mastodon is a decentralized social network, meaning no single company controls it. It’s made up of many independently-run servers, all connected together.</string>
+	<string name="what_are_servers">What are servers?</string>
+	<string name="welcome_paragraph2"><![CDATA[Every Mastodon account is hosted on a server — each with its own values, rules, & admins. No matter which one you pick, you can follow and interact with people on any server.]]></string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 1231c528f..92098d9f8 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -319,6 +319,13 @@
 		<item name="android:paddingRight">24dp</item>
 	</style>
 
+	<style name="Widget.Mastodon.M3.Button.Outlined">
+		<item name="android:background">@drawable/bg_button_m3_outlined</item>
+		<item name="android:textColor">@color/button_text_m3_text</item>
+		<item name="android:paddingLeft">24dp</item>
+		<item name="android:paddingRight">24dp</item>
+	</style>
+
 	<style name="Widget.Mastodon.M3.EditText" parent="android:Widget.Material.EditText">
 		<item name="android:background">@drawable/bg_m3_outlined_text_field_nopad</item>
 		<item name="android:textAppearance">@style/m3_body_large</item>

From 111b7e25c5362fa6cb09ecbe04c6b908ca8401a6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:21 +0200
Subject: [PATCH 029/124] New translations strings.xml (Spanish)

---
 mastodon/src/main/res/values-es-rES/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-es-rES/strings.xml b/mastodon/src/main/res/values-es-rES/strings.xml
index 67272f5b4..1e9e3f1fb 100644
--- a/mastodon/src/main/res/values-es-rES/strings.xml
+++ b/mastodon/src/main/res/values-es-rES/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">Aceptar</string>
 	<string name="preparing_auth">Preparando para autenticación…</string>
 	<string name="finishing_auth">Finalizando autenticación…</string>
-	<string name="user_boosted">%s reblogueó</string>
 	<string name="in_reply_to">En respuesta a %s</string>
 	<string name="notifications">Notificaciones</string>
 	<string name="user_followed_you">ha empezado a seguirte</string>
 	<string name="user_sent_follow_request">te envió una solicitud de seguimiento</string>
 	<string name="user_favorited">marcó como favorita</string>
-	<string name="notification_boosted">reblogueó tu publicación</string>
 	<string name="poll_ended">encuesta finalizada</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Mientras revisamos esto, puedes tomar medidas contra %s.</string>
 	<string name="unfollow_user">Dejar de seguir a %s</string>
 	<string name="unfollow">Dejar de seguir</string>
-	<string name="mute_user_explain">No verás sus publicaciones o reblogueos en tu línea temporal. No sabrán que han sido silenciados.</string>
 	<string name="block_user_explain">Ya no podrán seguir o ver tus mensajes, pero pueden ver si han sido bloqueados.</string>
 	<string name="report_personal_title">¿No quieres ver esto?</string>
 	<string name="report_personal_subtitle">Cuando vea en Mastodon algo que no le agrada, puede sacar a la persona de su experiencia.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Saltar</string>
 	<string name="notification_type_follow">Nuevos seguidores</string>
 	<string name="notification_type_favorite">Favoritos</string>
-	<string name="notification_type_reblog">Reblogueos</string>
 	<string name="notification_type_mention">Menciones</string>
 	<string name="notification_type_poll">Encuestas</string>
 	<string name="choose_account">Elegir cuenta</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">nadie</string>
 	<string name="notify_favorites">Marca mi post como favorito</string>
 	<string name="notify_follow">Me sigue</string>
-	<string name="notify_reblog">Impulsa mi post</string>
 	<string name="notify_mention">Me menciona</string>
 	<string name="settings_boring">La zona aburrida</string>
 	<string name="settings_account">Ajustes de la cuenta</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Ocultar contenido</string>
 	<string name="new_post">Nuevo post</string>
 	<string name="button_reply">Responder</string>
-	<string name="button_reblog">Impulsar</string>
 	<string name="button_favorite">Favorito</string>
 	<string name="button_share">Compartir</string>
 	<string name="media_no_description">Medios sin descripción</string>
@@ -287,8 +281,6 @@
 	<string name="followed_user">Ahora estás siguiendo a %s</string>
 	<string name="following_user_requested">%s solicitó seguirte</string>
 	<string name="open_in_browser">Abrir en el navegador</string>
-	<string name="hide_boosts_from_user">Ocultar reblogueos de %s</string>
-	<string name="show_boosts_from_user">Mostrar reblogueos de %s</string>
 	<string name="signup_reason">¿Por qué quieres unirte?</string>
 	<string name="signup_reason_note">Esto nos ayudará a revisar su solicitud.</string>
 	<string name="clear">Borrar</string>
@@ -330,13 +322,8 @@
 		<item quantity="one">%,d favorito</item>
 		<item quantity="other">%,d favoritos</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d reblogueo</item>
-		<item quantity="other">%,d reblogueos</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s a través de %2$s</string>
 	<string name="time_now">ahora</string>
-	<string name="post_info_reblogs">Reblogueos</string>
 	<string name="post_info_favorites">Favoritos</string>
 	<string name="edit_history">Editar historial</string>
 	<string name="last_edit_at_x">Última edición: %s</string>
@@ -398,7 +385,6 @@
 	<string name="welcome_page1_title">¿Qué es Mastodon?</string>
 	<string name="welcome_page1_text">Imagina que tienes una dirección de correo electrónico que termina con @ejemplo.com.\n\nPuedes enviar y recibir correos electrónicos de cualquier persona, incluso si su correo electrónico termina en @gmail.com o @icloud.com o @ejemplo.com.</string>
 	<string name="welcome_page2_title">Mastodon es parecido.</string>
-	<string name="welcome_page2_text">Tu cuenta puede ser @gothgirl654@example.social, pero puedes seguir, rebloguear, y chatear con @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">¿Cómo elijo un servidor?</string>
 	<string name="welcome_page3_text">Diferentes personas eligen diferentes servidores por diferentes motivos. Por ejemplo, art.example es un buen lugar para artistas, mientras que madrid.example puede ser una buena elección para los madrileños.\n\nNo te equivocarás con ninguno de nuestros servidores recomendados, por lo que independientemente del que escojas (o si introduces tu propio servidor en la barra de búsqueda), no te perderás ni una en ningún lugar.</string>
 	<string name="signup_random_server_explain">Seleccionaremos un servidor basado en tu idioma si continúas sin hacer una selección.</string>

From cde22a0945a44a889b7b2cf2b0f2a1bf5891cd7e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:22 +0200
Subject: [PATCH 030/124] New translations strings.xml (Czech)

---
 mastodon/src/main/res/values-cs-rCZ/strings.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/mastodon/src/main/res/values-cs-rCZ/strings.xml b/mastodon/src/main/res/values-cs-rCZ/strings.xml
index ad4ef0267..774bdb7e7 100644
--- a/mastodon/src/main/res/values-cs-rCZ/strings.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Příprava na autentizaci…</string>
 	<string name="finishing_auth">Dokončení autentizace…</string>
-	<string name="user_boosted">Uživatel %s boostnul</string>
 	<string name="in_reply_to">V odpovědi na %s</string>
 	<string name="notifications">Upozornění</string>
 	<string name="user_followed_you">vás začal(a) sledovat</string>
 	<string name="user_sent_follow_request">vám poslal(a) žádost o sledování</string>
 	<string name="user_favorited">si oblíbil(a) váš příspěvek</string>
-	<string name="notification_boosted">boostnul(a) váš příspěvek</string>
 	<string name="poll_ended">anketa skončila</string>
 	<string name="time_seconds">%d s</string>
 	<string name="time_minutes">%d m</string>
@@ -194,7 +192,6 @@
 	<string name="report_sent_subtitle">Zatímco to posuzujeme, můžete podniknout akce proti %s.</string>
 	<string name="unfollow_user">Přestat sledovat %s</string>
 	<string name="unfollow">Přestat sledovat</string>
-	<string name="mute_user_explain">Neuvidíte příspěvky nebo boosty tohoto uživatele ve svém domovském kanálu. Nebude vědět, že je skryt.</string>
 	<string name="block_user_explain">Tento uživatel vás již nebude moci sledovat ani vidět vaše příspěvky, ale může zjistit, že je blokován.</string>
 	<string name="report_personal_title">Nechcete tohle vidět?</string>
 	<string name="report_personal_subtitle">Když uvidíte něco, co se vám nelíbí na Mastodonu, můžete odstranit tuto osobu ze svého zážitku.</string>
@@ -251,7 +248,6 @@
 	<string name="skip">Přeskočit</string>
 	<string name="notification_type_follow">Noví sledující</string>
 	<string name="notification_type_favorite">Oblíbené</string>
-	<string name="notification_type_reblog">Boosty</string>
 	<string name="notification_type_mention">Zmínky</string>
 	<string name="notification_type_poll">Ankety</string>
 	<string name="choose_account">Vybrat účet</string>
@@ -280,7 +276,6 @@
 	<string name="notify_none">nikoho</string>
 	<string name="notify_favorites">Oblíbí si můj příspěvek</string>
 	<string name="notify_follow">Začne mě sledovat</string>
-	<string name="notify_reblog">Boostne můj příspěvek</string>
 	<string name="notify_mention">Zmíní mě</string>
 	<string name="settings_boring">Nudná část</string>
 	<string name="settings_account">Nastavení účtu</string>
@@ -301,7 +296,6 @@
 	<string name="hide_content">Skrýt obsah</string>
 	<string name="new_post">Nový příspěvek</string>
 	<string name="button_reply">Odpovědět</string>
-	<string name="button_reblog">Boostnout</string>
 	<string name="button_favorite">Oblíbit</string>
 	<string name="button_share">Sdílet</string>
 	<string name="media_no_description">Média bez popisu</string>
@@ -317,8 +311,6 @@
 	<string name="followed_user">Nyní sledujete %s</string>
 	<string name="following_user_requested">Požádáno o sledování %s</string>
 	<string name="open_in_browser">Otevřít v prohlížeči</string>
-	<string name="hide_boosts_from_user">Skrýt boosty od %s</string>
-	<string name="show_boosts_from_user">Zobrazit boosty od %s</string>
 	<string name="signup_reason">Proč se chcete připojit?</string>
 	<string name="signup_reason_note">Toto nám pomůže posoudit vaši žádost.</string>
 	<string name="clear">Vyčistit</string>
@@ -366,15 +358,8 @@
 		<item quantity="many">%,d oblíbení</item>
 		<item quantity="other">%,d oblíbení</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d boostnul</item>
-		<item quantity="few">%,d boosty</item>
-		<item quantity="many">%,d boostů</item>
-		<item quantity="other">%,d boostů</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s přes %2$s</string>
 	<string name="time_now">teď</string>
-	<string name="post_info_reblogs">Boosty</string>
 	<string name="post_info_favorites">Oblíbení</string>
 	<string name="edit_history">Historie úprav</string>
 	<string name="last_edit_at_x">Poslední úprava %s</string>
@@ -440,7 +425,6 @@
 	<string name="welcome_page1_title">Co je Mastodon?</string>
 	<string name="welcome_page1_text">Představte si, že máte e-mailovou adresu, která končí @example.com.\n\nStále můžete od kohokoliv odesílat a přijímat e-maily, i když jejich e-mail končí na @gmail.com nebo @icloud.com nebo @example.com.</string>
 	<string name="welcome_page2_title">Takový je Mastodon.</string>
-	<string name="welcome_page2_text">Vaše uživatelské jméno může být @gothgirl654@example.social, ale stále můžete sledovat, boostovat a chatovat s @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Jak si vybrat server?</string>
 	<string name="welcome_page3_text">Různí lidé si vybírají různé servery z různých důvodů. Art.example je skvělým místem pro umělce, zatímco glasgow.example může být dobrou volbou pro Skoty.\n\nS žádným z našich doporučených serverů nemůžete udělat chybu, takže bez ohledu na to, který z nich si vyberete (nebo pokud zadáte svůj vlastní do vyhledávacího řádku serveru), nikde neprohloupíte.</string>
 	<string name="signup_random_server_explain">Pokud budete pokračovat bez výběru, vybereme server založený na vašem jazyce.</string>

From 46fd05d88e9933e0a62d4c0afa9d9731e3ef87fa Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:23 +0200
Subject: [PATCH 031/124] New translations strings.xml (Dutch)

---
 mastodon/src/main/res/values-nl-rNL/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-nl-rNL/strings.xml b/mastodon/src/main/res/values-nl-rNL/strings.xml
index 10da07992..7979e8e7a 100644
--- a/mastodon/src/main/res/values-nl-rNL/strings.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Verificatie aan het voorbereiden…</string>
 	<string name="finishing_auth">Verificatie afronden…</string>
-	<string name="user_boosted">%s boostte</string>
 	<string name="in_reply_to">Als reactie op %s</string>
 	<string name="notifications">Meldingen</string>
 	<string name="user_followed_you">volgt jou</string>
 	<string name="user_sent_follow_request">heeft je een volgverzoek gestuurd</string>
 	<string name="user_favorited">markeerde als favoriet</string>
-	<string name="notification_boosted">boostte jouw bericht</string>
 	<string name="poll_ended">poll is beëindigd</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Terwijl wij jouw rapportage beoordelen, kun je deze acties tegen %s ondernemen.</string>
 	<string name="unfollow_user">Ontvolgen</string>
 	<string name="unfollow">Ontvolgen</string>
-	<string name="mute_user_explain">Je ziet hun berichten en boosts niet op je starttijdlijn. Ze zullen niet weten dat ze worden genegeerd.</string>
 	<string name="block_user_explain">Het is niet meer mogelijk om je te volgen of om je berichten te zien, maar het is wel mogelijk om erachter te komen dat je deze account hebt geblokkeerd.</string>
 	<string name="report_personal_title">Wil je dit niet zien?</string>
 	<string name="report_personal_subtitle">Als je iets ziet dat je niet leuk vindt op Mastodon, dan kun je de persoon op meerdere manieren van je tijdlijn verwijderen.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Overslaan</string>
 	<string name="notification_type_follow">Nieuwe volgers</string>
 	<string name="notification_type_favorite">Favorieten</string>
-	<string name="notification_type_reblog">Boosts</string>
 	<string name="notification_type_mention">Vermeldingen</string>
 	<string name="notification_type_poll">Polls</string>
 	<string name="choose_account">Account kiezen</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">niemand</string>
 	<string name="notify_favorites">Mijn bericht als favoriet markeert</string>
 	<string name="notify_follow">Mij volgt</string>
-	<string name="notify_reblog">boost mijn bericht</string>
 	<string name="notify_mention">Mij vermeldt</string>
 	<string name="settings_boring">De saaie zone</string>
 	<string name="settings_account">Accountinstellingen</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Inhoud verbergen</string>
 	<string name="new_post">Nieuw bericht</string>
 	<string name="button_reply">Reageren</string>
-	<string name="button_reblog">Boost</string>
 	<string name="button_favorite">Toevoegen aan favorieten</string>
 	<string name="button_share">Delen</string>
 	<string name="media_no_description">Media zonder beschrijving</string>
@@ -287,8 +281,6 @@
 	<string name="followed_user">Je volgt %s nu</string>
 	<string name="following_user_requested">Je volgverzoek is aan %s verstuurd</string>
 	<string name="open_in_browser">Openen in browser</string>
-	<string name="hide_boosts_from_user">Boosts van %s verbergen</string>
-	<string name="show_boosts_from_user">Boosts van %s tonen</string>
 	<string name="signup_reason">Waarom wil je je hier registreren?</string>
 	<string name="signup_reason_note">Dit helpt ons om jouw aanvraag te beoordelen.</string>
 	<string name="clear">Leegmaken</string>
@@ -330,13 +322,8 @@
 		<item quantity="one">%,d favoriet</item>
 		<item quantity="other">%,d favorieten</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d boost</item>
-		<item quantity="other">%,d boosts</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nu</string>
-	<string name="post_info_reblogs">Boosts</string>
 	<string name="post_info_favorites">Favorieten</string>
 	<string name="edit_history">Bewerkingsgeschiedenis</string>
 	<string name="last_edit_at_x">Laatste bewerking op %s</string>
@@ -398,7 +385,6 @@
 	<string name="welcome_page1_title">Wat is Mastodon?</string>
 	<string name="welcome_page1_text">Stel je voor dat je een e-mailadres hebt dat eindigt op @example.com.\n\nJe kunt nog steeds e-mailen met iemand, ook als hun e-mail eindigt in @gmail.com, @icloud.com of @voorbeeld.com.</string>
 	<string name="welcome_page2_title">Mastodon is precies zo.</string>
-	<string name="welcome_page2_text">Je volledige gebruikersnaam is @gothgirl654@example.social, maar je kunt nog steeds @fallout5ever@example.online volgen, boosten en berichten sturen.</string>
 	<string name="welcome_page3_title">Hoe kies ik een server?</string>
 	<string name="welcome_page3_text">Verschillende mensen kiezen om allerlei redenen een bepaalde server. art.example is een geweldige plek voor artiesten, terwijl belgium.example misschien een goede plek is voor Belgen.\n\nHet kan niet mis gaan als je een van onze aanbevolen servers kiest. Welke je ook kiest (en ook als je zelf een server invoert in de zoekbalk): je zult geen bericht missen.</string>
 	<string name="signup_random_server_explain">Als je doorgaat zonder een selectie te maken, kiezen we een server gebaseerd op jouw taal.</string>

From 359d61183c5a560d993e9d096977c94f928d1b97 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:24 +0200
Subject: [PATCH 032/124] New translations strings.xml (Ukrainian)

---
 mastodon/src/main/res/values-uk-rUA/strings.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings.xml b/mastodon/src/main/res/values-uk-rUA/strings.xml
index 75168ee6f..3355b4da4 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Підготовка до автентифікації…</string>
 	<string name="finishing_auth">Завершення автентифікації…</string>
-	<string name="user_boosted">%s Зробив репост</string>
 	<string name="in_reply_to">Відповісти %s</string>
 	<string name="notifications">Сповіщення</string>
 	<string name="user_followed_you">підписався(-лася) на вас</string>
 	<string name="user_sent_follow_request">відправив запит на підписку</string>
 	<string name="user_favorited">Вподобав(-ла) ваш допис</string>
-	<string name="notification_boosted">Поширив(-ла) ваш допис</string>
 	<string name="poll_ended">опитування завершено</string>
 	<string name="time_seconds">%dсек</string>
 	<string name="time_minutes">%dхв</string>
@@ -194,7 +192,6 @@
 	<string name="report_sent_subtitle">Поки ми переглядаємо, ви можете вжити власних заходів проти %s.</string>
 	<string name="unfollow_user">Відписатися від %s</string>
 	<string name="unfollow">Відписатися</string>
-	<string name="mute_user_explain">Ви не побачите їхні дописи чи репости на вашій домашній стрічці. Вони не знатимуть, що заглушені.</string>
 	<string name="block_user_explain">Вони більше не зможуть стежити або бачити Ваші пости, але вони зможуть побачити, що вони були заблоковані.</string>
 	<string name="report_personal_title">Не хочете бачити це?</string>
 	<string name="report_personal_subtitle">Якщо бачите щось, що вам не подобається в Mastodon, то можна вилучити людину зі свого досвіду.</string>
@@ -251,7 +248,6 @@
 	<string name="skip">Пропустити</string>
 	<string name="notification_type_follow">Нові підписники</string>
 	<string name="notification_type_favorite">Улюблені</string>
-	<string name="notification_type_reblog">Репости</string>
 	<string name="notification_type_mention">Згадки</string>
 	<string name="notification_type_poll">Опитування</string>
 	<string name="choose_account">Виберіть обліковий запис</string>
@@ -280,7 +276,6 @@
 	<string name="notify_none">ніхто</string>
 	<string name="notify_favorites">Вподобавує ваш допис</string>
 	<string name="notify_follow">Підписався на мене</string>
-	<string name="notify_reblog">Робить репост мого допису</string>
 	<string name="notify_mention">Згадує мене</string>
 	<string name="settings_boring">Нудна зона</string>
 	<string name="settings_account">Налаштування облікового запису</string>
@@ -301,7 +296,6 @@
 	<string name="hide_content">Приховати вміст</string>
 	<string name="new_post">Новий допис</string>
 	<string name="button_reply">Відповісти</string>
-	<string name="button_reblog">Репост</string>
 	<string name="button_favorite">Улюблене</string>
 	<string name="button_share">Поділитись</string>
 	<string name="media_no_description">Медіа без опису</string>
@@ -317,8 +311,6 @@
 	<string name="followed_user">Тепер ви підписані на %s</string>
 	<string name="following_user_requested">Запитано на підписку на %s</string>
 	<string name="open_in_browser">Відкрити у браузері</string>
-	<string name="hide_boosts_from_user">Сховати репости від %s</string>
-	<string name="show_boosts_from_user">Показати репости від %s</string>
 	<string name="signup_reason">Чому ви бажаєте приєднатися?</string>
 	<string name="signup_reason_note">Це допоможе нам переглянути вашу заявку.</string>
 	<string name="clear">Очистити</string>
@@ -366,15 +358,8 @@
 		<item quantity="many">%,d, улюблені</item>
 		<item quantity="other">%,d, улюблені</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d репост</item>
-		<item quantity="few">%,d репости</item>
-		<item quantity="many">%,d репостів</item>
-		<item quantity="other">%,d репостів</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s через %2$s</string>
 	<string name="time_now">щойно</string>
-	<string name="post_info_reblogs">Репости</string>
 	<string name="post_info_favorites">Улюблені</string>
 	<string name="edit_history">Змінити історію</string>
 	<string name="last_edit_at_x">Останнє редагування %s</string>
@@ -440,7 +425,6 @@
 	<string name="welcome_page1_title">Що таке Mastodon?</string>
 	<string name="welcome_page1_text">Уявіть, що у вас є електронної пошта, яка закінчується на @example.com.\n\nВи можете все ще надсилати та отримувати листи від будь-кого, навіть якщо їх електронна пошта закінчується на @gmail.com або @icloud.com або @example.com.</string>
 	<string name="welcome_page2_title">Mastodon такий.</string>
-	<string name="welcome_page2_text">Ваш індифікатор може бути @gothgirl654@example.social, але ви все ще можете підписуватися, репостити й спілкуватися з @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Як обрати сервер?</string>
 	<string name="welcome_page3_text">Різні люди обирають різні сервери з будь-якої кількості причин. art.example - це чудове місце для художників, в той час як glasgow.example може бути гарним вибором для шотландці.\n\nВи не можете піти не так з жодними з наших рекомендованих серверів, так чи інакше, незалежно від того, який вибір ви обираєте (або введете власний в панель пошуку сервера), ви ніколи ніде не помилитися в жодному місці.</string>
 	<string name="signup_random_server_explain">Ми підберемо сервер основі вашої мовою, якщо ви продовжите без вибору.</string>

From 391db2f1c973ca50112093ea5b6cb781a94814fc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:25 +0200
Subject: [PATCH 033/124] New translations strings.xml (Icelandic)

---
 mastodon/src/main/res/values-is-rIS/strings.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/mastodon/src/main/res/values-is-rIS/strings.xml b/mastodon/src/main/res/values-is-rIS/strings.xml
index 2354b10cd..89778de2a 100644
--- a/mastodon/src/main/res/values-is-rIS/strings.xml
+++ b/mastodon/src/main/res/values-is-rIS/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">Í lagi</string>
 	<string name="preparing_auth">Undirbý auðkenningu…</string>
 	<string name="finishing_auth">Lýk auðkenningu…</string>
-	<string name="user_boosted">%s endurbirti</string>
 	<string name="in_reply_to">Sem svar til %s</string>
 	<string name="notifications">Tilkynningar</string>
 	<string name="user_followed_you">fylgdi þér</string>
 	<string name="user_sent_follow_request">sendi þér beiðni um að fylgjast með þér</string>
 	<string name="user_favorited">setti færslu frá þér í eftirlæti</string>
-	<string name="notification_boosted">endurbirti færsluna þína</string>
 	<string name="poll_ended">könnun er lokið</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,8 +164,6 @@
 	<string name="report_sent_subtitle">Á meðan við yfirförum þetta, geturðu tekið til aðgerða gegn %s.</string>
 	<string name="unfollow_user">Hætta að fylgjast með %s</string>
 	<string name="unfollow">Hætta að fylgjast með</string>
-	<string name="mute_user_explain">Þú munt ekki sjá færslur eða endurbirtingar frá viðkomandi á streyminu þínu. 
-Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</string>
 	<string name="block_user_explain">Viðkomandi mun ekki lengur geta fylgst með eða séð færslurnar þínar, en munu sjá ef viðkomandi hefur verið útilokaður.</string>
 	<string name="report_personal_title">Langar þig ekki til að sjá þetta?</string>
 	<string name="report_personal_subtitle">Þegar þú sér eitthvað á Mastodon sem þér líkar ekki, þá geturðu fjarlægt viðkomandi eintakling úr umhverfinu þínu.</string>
@@ -224,7 +220,6 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="skip">Sleppa</string>
 	<string name="notification_type_follow">Nýir fylgjendur</string>
 	<string name="notification_type_favorite">Eftirlæti</string>
-	<string name="notification_type_reblog">Endurbirtingar</string>
 	<string name="notification_type_mention">Minnst á</string>
 	<string name="notification_type_poll">Kannanir</string>
 	<string name="choose_account">Veldu aðgang</string>
@@ -251,7 +246,6 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="notify_none">enginn</string>
 	<string name="notify_favorites">Setur færsluna mína í eftirlæti</string>
 	<string name="notify_follow">Fylgist með mér</string>
-	<string name="notify_reblog">Endurbirtir færsluna mína</string>
 	<string name="notify_mention">Minnist á mig</string>
 	<string name="settings_boring">Óhressa svæðið</string>
 	<string name="settings_account">Stillingar aðgangs</string>
@@ -272,7 +266,6 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="hide_content">Fela efni</string>
 	<string name="new_post">Ný færsla</string>
 	<string name="button_reply">Svara</string>
-	<string name="button_reblog">Endurbirta</string>
 	<string name="button_favorite">Eftirlæti</string>
 	<string name="button_share">Deila</string>
 	<string name="media_no_description">Myndefni án lýsingar</string>
@@ -288,8 +281,6 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="followed_user">Þú fylgist núna með %s</string>
 	<string name="following_user_requested">Bað um að fylgjast með %s</string>
 	<string name="open_in_browser">Opna í vafra</string>
-	<string name="hide_boosts_from_user">Fela endurbirtingar frá %s</string>
-	<string name="show_boosts_from_user">Sýna endurbirtingar frá %s</string>
 	<string name="signup_reason">Hvers vegna vilt þú taka þátt?</string>
 	<string name="signup_reason_note">Þetta mun hjálpa okkur við að yfirfara umsóknina þína.</string>
 	<string name="clear">Hreinsa</string>
@@ -331,13 +322,8 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 		<item quantity="one">%,d eftirlæti</item>
 		<item quantity="other">%,d eftirlæti</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d Eendurbirting</item>
-		<item quantity="other">%,d endurbirtingar</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s með %2$s</string>
 	<string name="time_now">núna</string>
-	<string name="post_info_reblogs">Endurbirtingar</string>
 	<string name="post_info_favorites">Eftirlæti</string>
 	<string name="edit_history">Breytingaferill</string>
 	<string name="last_edit_at_x">Síðasta breyting %s</string>
@@ -399,7 +385,6 @@ Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</s
 	<string name="welcome_page1_title">Hvað er Mastodon?</string>
 	<string name="welcome_page1_text">Ímyndaðu þér að þú sért með tölvupóstfang sem endar á @lén.is.\n\nÞú getur alltaf tekið við og sent tölvupóst til allra, jafnvel þótt tölvupóstfangið þeirra endi á @gmail.com, @icloud.com eða @lén.is.</string>
 	<string name="welcome_page2_title">Mastodon er eins og þetta.</string>
-	<string name="welcome_page2_text">Auðkennið þitt gæti verið @gothgirl654@example.social, en þú getur samt fylgst með, endurbirt og spjallað við @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Hvernig vel ég netþjón?</string>
 	<string name="welcome_page3_text">Mismunandi fólk velur sér mismunandi netþjóna af ýmsum ólíkum ástæðum. Netþjónninn art.example er frábær staður fyrir listafólk, á meðan glasgow.example gæti verið góður kostur fyrir suma skota.\n\nÞú getur eiginlega ekki lent á röngum stað á neinum að þeim netþjónum sem við mælum með, þannig að hvern þeirra sem þú velur (eða ef þú setur inn þinn eigin netþjón í leitarreitinn), þá ættirðu ekki að missa af neinu neinsstaðar.</string>
 	<string name="signup_random_server_explain">Við munum velja netþjón út frá tungumálinu þínu, ef þú heldur áfram án þess að velja neitt.</string>

From e737f4bf9a952203534074f186decf50de41fe9b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:26 +0200
Subject: [PATCH 034/124] New translations strings.xml (Indonesian)

---
 mastodon/src/main/res/values-in-rID/strings.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mastodon/src/main/res/values-in-rID/strings.xml b/mastodon/src/main/res/values-in-rID/strings.xml
index 65df36648..65bc6b8ab 100644
--- a/mastodon/src/main/res/values-in-rID/strings.xml
+++ b/mastodon/src/main/res/values-in-rID/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">Oke</string>
 	<string name="preparing_auth">Menyiapkan untuk autentikasi…</string>
 	<string name="finishing_auth">Menyelesaikan autentikasi…</string>
-	<string name="user_boosted">%s membagikan</string>
 	<string name="in_reply_to">Membalas ke %s</string>
 	<string name="notifications">Notifikasi</string>
 	<string name="user_followed_you">mengikuti Anda</string>
 	<string name="user_sent_follow_request">mengirim Anda permintaan pengikut</string>
 	<string name="user_favorited">memfavorit kiriman Anda</string>
-	<string name="notification_boosted">membagikan kiriman Anda</string>
 	<string name="poll_ended">pemungutan suara berakhir</string>
 	<string name="time_seconds">%dd</string>
 	<string name="time_minutes">%dm</string>
@@ -152,7 +150,6 @@
 	<string name="report_sent_subtitle">Saat kami sedang meninjau ini, Anda dapat mengambil tindakan terhadap %s.</string>
 	<string name="unfollow_user">Berhenti mengikuti %s</string>
 	<string name="unfollow">Berhenti mengikuti</string>
-	<string name="mute_user_explain">Anda tidak akan melihat kiriman atau pembagian mereka dalam umpan beranda Anda. Mereka tidak akan tahu bahwa mereka telah dibisukan.</string>
 	<string name="block_user_explain">Mereka tidak akan dapat mengikuti atau melihat kiriman Anda lagi, tetapi mereka dapat melihat jika mereka telah diblokir.</string>
 	<string name="report_personal_title">Tidak ingin melihat ini?</string>
 	<string name="report_personal_subtitle">Ketika Anda melihat sesuatu yang Anda tidak suka di Mastodon, Anda dapat menghapus orang dari pengalaman Anda.</string>
@@ -209,7 +206,6 @@
 	<string name="skip">Lewati</string>
 	<string name="notification_type_follow">Pengikut baru</string>
 	<string name="notification_type_favorite">Favorit</string>
-	<string name="notification_type_reblog">Pembagian</string>
 	<string name="notification_type_mention">Sebutan</string>
 	<string name="notification_type_poll">Pemungutan suara</string>
 	<string name="choose_account">Pilih akun</string>
@@ -235,7 +231,6 @@
 	<string name="notify_none">tidak ada</string>
 	<string name="notify_favorites">Memfavorit kiriman saya</string>
 	<string name="notify_follow">Mengikuti saya</string>
-	<string name="notify_reblog">Membagikan kiriman saya</string>
 	<string name="notify_mention">Menyebut saya</string>
 	<string name="settings_boring">Zona membosankan</string>
 	<string name="settings_account">Pengaturan akun</string>
@@ -256,7 +251,6 @@
 	<string name="hide_content">Sembunyikan konten</string>
 	<string name="new_post">Kiriman baru</string>
 	<string name="button_reply">Balas</string>
-	<string name="button_reblog">Bagikan ke pengikut</string>
 	<string name="button_favorite">Favorit</string>
 	<string name="button_share">Bagikan</string>
 	<string name="media_no_description">Media tanpa deskripsi</string>
@@ -272,8 +266,6 @@
 	<string name="followed_user">Anda sekarang mengikuti %s</string>
 	<string name="following_user_requested">Diminta untuk mengikuti %s</string>
 	<string name="open_in_browser">Buka di peramban</string>
-	<string name="hide_boosts_from_user">Sembunyikan pembagian dari %s</string>
-	<string name="show_boosts_from_user">Tampilkan pembagian dari %s</string>
 	<string name="signup_reason">Mengapa Anda ingin bergabung?</string>
 	<string name="signup_reason_note">Ini akan membantu kami meninjau aplikasi Anda.</string>
 	<string name="clear">Hapus</string>
@@ -312,12 +304,8 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d favorit</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="other">%,d pembagian</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s melalui %2$s</string>
 	<string name="time_now">sekarang</string>
-	<string name="post_info_reblogs">Pembagian</string>
 	<string name="post_info_favorites">Favorit</string>
 	<string name="edit_history">Riwayat penyuntingan</string>
 	<string name="last_edit_at_x">Terakhir disunting %s</string>
@@ -377,7 +365,6 @@
 	<string name="welcome_page1_title">Apa itu Mastodon?</string>
 	<string name="welcome_page1_text">Bayangkan Anda memikiki alamat surel yang berakhiran @contoh.com.\n\nAnda masih bisa mengirim dan menerima surel dari siapa pun, bahkan jika alamat surel mereka berakhiran @gmail.com atau @icloud.com atau @contoh.com.</string>
 	<string name="welcome_page2_title">Mastodon seperti itu.</string>
-	<string name="welcome_page2_text">Alamat akun Anda bisa seperti @gadisgothic654@contoh.social, tetapi Anda masih dapat mengikuti, membagikan, dan mengobrol dengan @fallout5selamanya@contoh.online.</string>
 	<string name="welcome_page3_title">Bagaimana saya memilih server?</string>
 	<string name="welcome_page3_text">Kebanyakan orang memilih server berbeda karena berbagai alasan. seni.contoh adalah tempat yang cocok bagi artis, sedangkan glasgow.example mungkin pilihan yang baik untuk para Scots.\n\nAnda tidak bisa salah dengan server yang kami rekomendasikan, jadi server apa yang Anda pilih (atau jika Anda memasukkan Anda sendiri di bilah pencarian server), Anda tidak akan melewatkan apa pun di mana pun.</string>
 	<string name="signup_random_server_explain">Kami akan memilih sebuah server berdasarkan bahasa Anda jika Anda melanjutkan tanpa memilih.</string>

From 76d77a0e7a03440e2d9247bedfee03a75df52400 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:27 +0200
Subject: [PATCH 035/124] New translations strings.xml (Thai)

---
 mastodon/src/main/res/values-th-rTH/strings.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mastodon/src/main/res/values-th-rTH/strings.xml b/mastodon/src/main/res/values-th-rTH/strings.xml
index e2c333b3c..a8e8f3415 100644
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">ตกลง</string>
 	<string name="preparing_auth">กำลังเตรียมการรับรองความถูกต้อง…</string>
 	<string name="finishing_auth">กำลังเสร็จสิ้นการรับรองความถูกต้อง…</string>
-	<string name="user_boosted">%s ได้ดัน</string>
 	<string name="in_reply_to">ในการตอบกลับถึง %s</string>
 	<string name="notifications">การแจ้งเตือน</string>
 	<string name="user_followed_you">ได้ติดตามคุณ</string>
 	<string name="user_sent_follow_request">ได้ส่งคำขอติดตามถึงคุณ</string>
 	<string name="user_favorited">ได้ชื่นชอบโพสต์ของคุณ</string>
-	<string name="notification_boosted">ได้ดันโพสต์ของคุณ</string>
 	<string name="poll_ended">การสำรวจความคิดเห็นได้สิ้นสุดแล้ว</string>
 	<string name="time_seconds">%d วินาที</string>
 	<string name="time_minutes">%d นาที</string>
@@ -152,7 +150,6 @@
 	<string name="report_sent_subtitle">ขณะที่เราตรวจทานสิ่งนี้ คุณสามารถดำเนินการกับ %s</string>
 	<string name="unfollow_user">เลิกติดตาม %s</string>
 	<string name="unfollow">เลิกติดตาม</string>
-	<string name="mute_user_explain">คุณจะไม่เห็นโพสต์หรือการดันของเขาในฟีดหน้าแรกของคุณ เขาจะไม่ทราบว่ามีการซ่อนเขา</string>
 	<string name="block_user_explain">เขาจะไม่สามารถติดตามหรือเห็นโพสต์ของคุณได้อีกต่อไป แต่เขาสามารถเห็นว่ามีการปิดกั้นเขาหรือไม่</string>
 	<string name="report_personal_title">ไม่ต้องการเห็นสิ่งนี้?</string>
 	<string name="report_personal_subtitle">เมื่อคุณเห็นบางอย่างที่คุณไม่ชอบใน Mastodon คุณสามารถเอาบุคคลออกจากประสบการณ์ของคุณ</string>
@@ -209,7 +206,6 @@
 	<string name="skip">ข้าม</string>
 	<string name="notification_type_follow">ผู้ติดตามใหม่</string>
 	<string name="notification_type_favorite">รายการโปรด</string>
-	<string name="notification_type_reblog">การดัน</string>
 	<string name="notification_type_mention">การกล่าวถึง</string>
 	<string name="notification_type_poll">การสำรวจความคิดเห็น</string>
 	<string name="choose_account">เลือกบัญชี</string>
@@ -235,7 +231,6 @@
 	<string name="notify_none">ไม่มีใคร</string>
 	<string name="notify_favorites">ชื่นชอบโพสต์ของฉัน</string>
 	<string name="notify_follow">ติดตามฉัน</string>
-	<string name="notify_reblog">ดันโพสต์ของฉัน</string>
 	<string name="notify_mention">กล่าวถึงฉัน</string>
 	<string name="settings_boring">โซนน่าเบื่อ</string>
 	<string name="settings_account">การตั้งค่าบัญชี</string>
@@ -256,7 +251,6 @@
 	<string name="hide_content">ซ่อนเนื้อหา</string>
 	<string name="new_post">โพสต์ใหม่</string>
 	<string name="button_reply">ตอบกลับ</string>
-	<string name="button_reblog">ดัน</string>
 	<string name="button_favorite">ชื่นชอบ</string>
 	<string name="button_share">แบ่งปัน</string>
 	<string name="media_no_description">สื่อที่ไม่มีคำอธิบาย</string>
@@ -272,8 +266,6 @@
 	<string name="followed_user">ตอนนี้คุณกำลังติดตาม %s</string>
 	<string name="following_user_requested">ขอติดตาม %s แล้ว</string>
 	<string name="open_in_browser">เปิดในเบราว์เซอร์</string>
-	<string name="hide_boosts_from_user">ซ่อนการดันจาก %s</string>
-	<string name="show_boosts_from_user">แสดงการดันจาก %s</string>
 	<string name="signup_reason">ทำไมคุณจึงต้องการเข้าร่วม?</string>
 	<string name="signup_reason_note">นี่จะช่วยให้เราตรวจทานใบสมัครของคุณ</string>
 	<string name="clear">ล้าง</string>
@@ -312,12 +304,8 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d รายการโปรด</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="other">%,d การดัน</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s ผ่าน %2$s</string>
 	<string name="time_now">ตอนนี้</string>
-	<string name="post_info_reblogs">การดัน</string>
 	<string name="post_info_favorites">รายการโปรด</string>
 	<string name="edit_history">ประวัติการแก้ไข</string>
 	<string name="last_edit_at_x">การแก้ไขล่าสุดเมื่อ %s</string>
@@ -377,7 +365,6 @@
 	<string name="welcome_page1_title">Mastodon คืออะไร?</string>
 	<string name="welcome_page1_text">จินตนาการว่าคุณมีที่อยู่อีเมลที่ลงท้ายด้วย @example.com\n\nคุณยังคงสามารถส่งและรับอีเมลจากใครก็ตาม แม้ว่าอีเมลของเขาจะลงท้ายด้วย @gmail.com หรือ @icloud.com หรือ @example.com ก็ตาม</string>
 	<string name="welcome_page2_title">Mastodon เป็นเช่นนั้น</string>
-	<string name="welcome_page2_text">นามของคุณอาจเป็น @gothgirl654@example.social แต่คุณยังคงสามารถติดตาม ดัน และแชทกับ @fallout5ever@example.online</string>
 	<string name="welcome_page3_title">ฉันจะเลือกเซิร์ฟเวอร์อย่างไร?</string>
 	<string name="welcome_page3_text">ต่างคนต่างเลือกเซิร์ฟเวอร์ด้วยเหตุผลต่าง ๆ art.example เป็นสถานที่ที่ยอดเยี่ยมสำหรับศิลปิน ขณะที่ glasgow.example อาจเป็นตัวเลือกที่ดีสำหรับชาวสกอต\n\nรับรองว่าคุณต้องชอบเซิร์ฟเวอร์ที่แนะนำของเราใดก็ตาม ดังนั้นไม่ว่าเซิร์ฟเวอร์ใดที่คุณเลือก (หรือหากคุณป้อนของคุณเองในแถบค้นหาเซิร์ฟเวอร์) คุณจะไม่พลาดความเคลื่อนไหวที่ใดก็ตาม</string>
 	<string name="signup_random_server_explain">เราจะเลือกเซิร์ฟเวอร์ตามภาษาของคุณหากคุณดำเนินการต่อโดยไม่ได้ทำการเลือก</string>

From cccdc5292eee914df382677523137838550d1b8e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:28 +0200
Subject: [PATCH 036/124] New translations strings.xml (Greek)

---
 mastodon/src/main/res/values-el-rGR/strings.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 539be0a64..8d9785abb 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">ΟΚ</string>
 	<string name="preparing_auth">Προετοιμασία για έλεγχο ταυτότητας…</string>
 	<string name="finishing_auth">Ολοκλήρωση ταυτοποίησης…</string>
-	<string name="user_boosted">%s αναδημοσίευσε</string>
 	<string name="in_reply_to">Σε απάντηση στο %s</string>
 	<string name="notifications">Ειδοποιήσεις</string>
 	<string name="user_followed_you">σε ακολουθεί</string>
 	<string name="user_sent_follow_request">σου έστειλε ένα αίτημα ακολούθησης</string>
 	<string name="user_favorited">σημείωσε ως αγαπημένη την ανάρτησή σου</string>
-	<string name="notification_boosted">αναδημοσίευσε την ανάρτηση σου</string>
 	<string name="poll_ended">η δημοσκόπηση έληξε</string>
 	<string name="time_seconds">%dδλ</string>
 	<string name="time_minutes">%dλ</string>
@@ -162,7 +160,6 @@
 	<string name="report_sent_subtitle">Ενώ το εξετάζουμε αυτό, μπορείς να δράσεις εναντίον του %s.</string>
 	<string name="unfollow_user">Κατάργηση ακολούθησης του %s</string>
 	<string name="unfollow">Άρση ακολούθησης</string>
-	<string name="mute_user_explain">Δεν θα βλέπεις τις αναρτήσεις ή τις αναδημοσιεύσεις τους στην αρχική σελίδα σου. Δεν θα ξέρουν ότι βρίσκονται σε σίγαση.</string>
 	<string name="block_user_explain">Δεν θα μπορούν πλέον να σε ακολουθούν ή να βλέπουν τις αναρτήσεις σου, αλλά μπορούν να δουν αν έχουν αποκλειστεί.</string>
 	<string name="report_personal_title">Δε θες να το βλέπεις αυτό;</string>
 	<string name="report_personal_subtitle">Όταν βλέπεις κάτι που δεν σου αρέσει στο Mastodon, μπορείς να αφαιρέσεις το άτομο από την εμπειρία σου.</string>
@@ -219,7 +216,6 @@
 	<string name="skip">Παράλειψη</string>
 	<string name="notification_type_follow">Νέοι ακόλουθοι</string>
 	<string name="notification_type_favorite">Αγαπημένα</string>
-	<string name="notification_type_reblog">Αναδημοσιεύσεις</string>
 	<string name="notification_type_mention">Επισημάνσεις</string>
 	<string name="notification_type_poll">Δημοσκοπήσεις</string>
 	<string name="choose_account">Επιλογή λογαριασμού</string>
@@ -246,7 +242,6 @@
 	<string name="notify_none">κανείς</string>
 	<string name="notify_favorites">Προσθέτει στα αγαπημένα την ανάρτησή μου</string>
 	<string name="notify_follow">Με ακολουθεί</string>
-	<string name="notify_reblog">Αναδημοσιεύει την ανάρτησή μου</string>
 	<string name="notify_mention">Με επισημαίνει</string>
 	<string name="settings_boring">Η βαρετή ζώνη</string>
 	<string name="settings_account">Ρυθμίσεις λογαριασμού</string>
@@ -267,7 +262,6 @@
 	<string name="hide_content">Απόκρυψη περιεχομένου</string>
 	<string name="new_post">Νέα ανάρτηση</string>
 	<string name="button_reply">Απάντηση</string>
-	<string name="button_reblog">Αναδημοσίευση</string>
 	<string name="button_favorite">Αγαπημένο</string>
 	<string name="button_share">Κοινοποίηση</string>
 	<string name="media_no_description">Πολυμέσα χωρίς περιγραφή</string>
@@ -283,8 +277,6 @@
 	<string name="followed_user">Ακολουθείς τον/την %s</string>
 	<string name="following_user_requested">Έγινε αίτημα ακολούθησης το %s</string>
 	<string name="open_in_browser">Άνοιξε στον περιηγητή</string>
-	<string name="hide_boosts_from_user">Απόκρυψη αναδημοσιεύσεων από %s</string>
-	<string name="show_boosts_from_user">Εμφάνιση αναδημοσιεύσεων από %s</string>
 	<string name="signup_reason">Γιατί θέλεις να συμμετάσχεις;</string>
 	<string name="signup_reason_note">Αυτό θα μας βοηθήσει να εξετάσουμε την αίτησή σου.</string>
 	<string name="clear">Εκκαθάριση</string>
@@ -323,13 +315,8 @@
 		<item quantity="one">%,d αγαπημένο</item>
 		<item quantity="other">%,d αγαπημένα</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d αναδημοσίευση</item>
-		<item quantity="other">%,d αναδημοσιεύσεις</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s μέσω %2$s</string>
 	<string name="time_now">τώρα</string>
-	<string name="post_info_reblogs">Αναδημοσιεύσεις</string>
 	<string name="post_info_favorites">Αγαπημένα</string>
 	<string name="edit_history">Επεξεργασία ιστορικού</string>
 	<string name="last_edit_at_x">Τελευταία επεξεργασία %s</string>

From b8c0dc31815b7a274eb6315ed5260fd9f694db9c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:29 +0200
Subject: [PATCH 037/124] New translations strings.xml (Belarusian)

---
 mastodon/src/main/res/values-be-rBY/strings.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/mastodon/src/main/res/values-be-rBY/strings.xml b/mastodon/src/main/res/values-be-rBY/strings.xml
index 6112ee790..e7ffb7503 100644
--- a/mastodon/src/main/res/values-be-rBY/strings.xml
+++ b/mastodon/src/main/res/values-be-rBY/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">Добра</string>
 	<string name="preparing_auth">Падрыхтоўка да аўтэнтыфікацыі…</string>
 	<string name="finishing_auth">Завяршэнне аўтэнтыфікацыі…</string>
-	<string name="user_boosted">%s пашырыў</string>
 	<string name="in_reply_to">У адказ %s</string>
 	<string name="notifications">Апавяшчэнні</string>
 	<string name="user_followed_you">падпісаўся(-лася) на вас</string>
 	<string name="user_sent_follow_request">адправіў запыт на падпіску</string>
 	<string name="user_favorited">упадабаў(-ла) ваш допіс</string>
-	<string name="notification_boosted">пашырыў(-ла) ваш допіс</string>
 	<string name="poll_ended">апытанне завершана</string>
 	<string name="time_seconds">%dсек</string>
 	<string name="time_minutes">%dхв</string>
@@ -194,7 +192,6 @@
 	<string name="report_sent_subtitle">Пакуль мы разглядаем яе, вы можаце прыняць меры супраць %s.</string>
 	<string name="unfollow_user">Адпісацца ад %s</string>
 	<string name="unfollow">Адпісацца</string>
-	<string name="mute_user_explain">Вы не ўбачыце іх допісы або пашырэнні ў сваёй хатняй стужцы. Яны не даведаюцца, што вы іх ігнаруеце.</string>
 	<string name="block_user_explain">Яны больш не змогуць падпісвацца на вас або бачыць вашыя допісы, але змогуць бачыць, што яны былі заблакіраваны.</string>
 	<string name="report_personal_title">Не хочаце бачыць гэта?</string>
 	<string name="report_personal_subtitle">Калі вы бачыце на Mastodon нешта, што вам не падабаецца, вы можаце выдаліць чалавека са свайго асяроддзя.</string>
@@ -251,7 +248,6 @@
 	<string name="skip">Прапусціць</string>
 	<string name="notification_type_follow">Новыя падпісчыкі</string>
 	<string name="notification_type_favorite">Абраныя</string>
-	<string name="notification_type_reblog">Пашырэнні</string>
 	<string name="notification_type_mention">Згадванні</string>
 	<string name="notification_type_poll">Апытанні</string>
 	<string name="choose_account">Выберыце ўліковы запіс</string>
@@ -280,7 +276,6 @@
 	<string name="notify_none">ніхто</string>
 	<string name="notify_favorites">Дадае мой допіс у абранае</string>
 	<string name="notify_follow">Падпісаўся на мяне</string>
-	<string name="notify_reblog">Пашырае мой допіс</string>
 	<string name="notify_mention">Згадвае мяне</string>
 	<string name="settings_boring">Нудная зона</string>
 	<string name="settings_account">Налады ўліковага запісу</string>
@@ -301,7 +296,6 @@
 	<string name="hide_content">Схаваць змест</string>
 	<string name="new_post">Новы допіс</string>
 	<string name="button_reply">Адказаць</string>
-	<string name="button_reblog">Пашырыць</string>
 	<string name="button_favorite">Абранае</string>
 	<string name="button_share">Абагуліць</string>
 	<string name="media_no_description">Медыя без апісання</string>
@@ -317,8 +311,6 @@
 	<string name="followed_user">Цяпер вы падпісаны на %s</string>
 	<string name="following_user_requested">Запытана падпісацца на %s</string>
 	<string name="open_in_browser">Адкрыць у браўзеры</string>
-	<string name="hide_boosts_from_user">Схаваць пашырэнні ад %s</string>
-	<string name="show_boosts_from_user">Паказаць пашырэнні ад %s</string>
 	<string name="signup_reason">Чаму вы хочаце далучыцца?</string>
 	<string name="signup_reason_note">Гэта дапаможа нам разгледзець вашу заяўку.</string>
 	<string name="clear">Ачысціць</string>
@@ -366,15 +358,8 @@
 		<item quantity="many">%,d абраных</item>
 		<item quantity="other">%,d абраных</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d рэпост</item>
-		<item quantity="few">%,d рэпосты</item>
-		<item quantity="many">%,d пашырэнняў</item>
-		<item quantity="other">%,d пашырэнняў</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s праз %2$s</string>
 	<string name="time_now">толькі што</string>
-	<string name="post_info_reblogs">Пашырэнні</string>
 	<string name="post_info_favorites">Абраныя</string>
 	<string name="edit_history">Гісторыя рэдагавання</string>
 	<string name="last_edit_at_x">Апошняе рэдагаванне %s</string>
@@ -440,7 +425,6 @@
 	<string name="welcome_page1_title">Што такое Mastodon?</string>
 	<string name="welcome_page1_text">Уявіце, што ў вас ёсць адрас электроннай пошты, які заканчваецца на @example.com.\n\nВы па-ранейшаму можаце адпраўляць і атрымліваць электронныя лісты ад каго захочаце, нават калі іх электронная пошта заканчваецца на @gmail.com, @icloud.com або @example.com.</string>
 	<string name="welcome_page2_title">Mastodon такі.</string>
-	<string name="welcome_page2_text">Ваш ідэнтыфікатар можа быць @gothgirl654@example.social, але вы ўсё яшчэ можаце падпісвацца, пашыраць і перапісвацца з @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Як выбраць сервер?</string>
 	<string name="welcome_page3_text">Розныя людзі выбіраюць розныя серверы па розных прычынах. art.example з\'яўляецца выдатным месцам для мастакоў, у той час як glasgow.example можа быць добрым выбарам для шатландцаў.\n\nВы не памыліцеся ні з адным з нашых рэкамендаваных сервераў, так што незалежна ад таго, які вы выбераце (або калі ўведзяце ваш уласны ў радку пошуку сервера), вы нідзе нічога не прапусціце.</string>
 	<string name="signup_random_server_explain">Мы абярэм сервер на аснове вашай мовы, калі вы працягнеце без выбару.</string>

From b2bca9dd2c317419d75299fe31c7efa4fed144b7 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:30 +0200
Subject: [PATCH 038/124] New translations strings.xml (Romanian)

---
 mastodon/src/main/res/values-ro-rRO/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mastodon/src/main/res/values-ro-rRO/strings.xml b/mastodon/src/main/res/values-ro-rRO/strings.xml
index 643943e8b..bdbb2428b 100644
--- a/mastodon/src/main/res/values-ro-rRO/strings.xml
+++ b/mastodon/src/main/res/values-ro-rRO/strings.xml
@@ -6,13 +6,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Se pregătește autentificarea…</string>
 	<string name="finishing_auth">Finalizare autentificare…</string>
-	<string name="user_boosted">%s au impulsionat</string>
 	<string name="in_reply_to">Ca răspuns la %s</string>
 	<string name="notifications">Notificări</string>
 	<string name="user_followed_you">te urmărește</string>
 	<string name="user_sent_follow_request">ți-a trimis o cerere de urmărire</string>
 	<string name="user_favorited">ți-a preferat postarea</string>
-	<string name="notification_boosted">a impulsionat postarea ta</string>
 	<string name="poll_ended">sondaj terminat</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>

From 8e5fd48ecd1ed011206d3100d6b7464b9dd67833 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:31 +0200
Subject: [PATCH 039/124] New translations strings.xml (French)

---
 mastodon/src/main/res/values-fr-rFR/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings.xml b/mastodon/src/main/res/values-fr-rFR/strings.xml
index bd81d5d18..4a6c9d155 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Préparation à l’authentification…</string>
 	<string name="finishing_auth">Fin de l’authentification…</string>
-	<string name="user_boosted">%s a partagé</string>
 	<string name="in_reply_to">En réponse à %s</string>
 	<string name="notifications">Notifications</string>
 	<string name="user_followed_you">s’est abonné à vous</string>
 	<string name="user_sent_follow_request">vous a envoyé une demande de suivi</string>
 	<string name="user_favorited">a ajouté votre message à ses favoris</string>
-	<string name="notification_boosted">a partagé votre message</string>
 	<string name="poll_ended">sondage terminé</string>
 	<string name="time_seconds">%d s</string>
 	<string name="time_minutes">%d m</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Pendant que nous étudions votre requête, vous pouvez prendre des mesures contre %s.</string>
 	<string name="unfollow_user">Ne plus suivre %s</string>
 	<string name="unfollow">Ne plus suivre</string>
-	<string name="mute_user_explain">Vous ne verrez pas leurs messages ou leurs partages dans votre flux personnel. Ils ne sauront pas qu’ils ont été mis en sourdine.</string>
 	<string name="block_user_explain">Ils ne seront plus en mesure de suivre ou de voir vos messages, mais ils peuvent voir s’ils ont été bloqués.</string>
 	<string name="report_personal_title">Vous ne voulez pas voir cela ?</string>
 	<string name="report_personal_subtitle">Quand vous voyez quelque chose que vous n’aimez pas sur Mastodon, vous pouvez retirer la personne de votre expérience.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Passer</string>
 	<string name="notification_type_follow">Nouveaux⋅elles abonné⋅e⋅s</string>
 	<string name="notification_type_favorite">Favoris</string>
-	<string name="notification_type_reblog">Partages</string>
 	<string name="notification_type_mention">Mentions</string>
 	<string name="notification_type_poll">Sondages</string>
 	<string name="choose_account">Choisir un compte</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">personne</string>
 	<string name="notify_favorites">Ajoute un de mes messages à ses favoris</string>
 	<string name="notify_follow">Me suit</string>
-	<string name="notify_reblog">Partage mon message</string>
 	<string name="notify_mention">Me mentionne</string>
 	<string name="settings_boring">Zone ennuyeuse</string>
 	<string name="settings_account">Paramètres du compte</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Masquer le contenu</string>
 	<string name="new_post">Nouveau message</string>
 	<string name="button_reply">Répondre</string>
-	<string name="button_reblog">Partager</string>
 	<string name="button_favorite">Ajouter aux favoris</string>
 	<string name="button_share">Partager</string>
 	<string name="media_no_description">Média sans description</string>
@@ -286,8 +280,6 @@
 	<string name="unfollowed_user">Vous ne suivez plus %s</string>
 	<string name="followed_user">Vous suivez maintenant %s</string>
 	<string name="open_in_browser">Ouvrir dans le navigateur</string>
-	<string name="hide_boosts_from_user">Masquer les partages de %s</string>
-	<string name="show_boosts_from_user">Afficher les partages de %s</string>
 	<string name="signup_reason">Pourquoi voulez-vous vous inscrire ?</string>
 	<string name="signup_reason_note">Cela nous aidera à examiner votre demande.</string>
 	<string name="clear">Effacer</string>
@@ -329,13 +321,8 @@
 		<item quantity="one">%,d favori</item>
 		<item quantity="other">%,d favoris</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d partage</item>
-		<item quantity="other">%,d partages</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">à l’instant</string>
-	<string name="post_info_reblogs">Partages</string>
 	<string name="post_info_favorites">Favoris</string>
 	<string name="edit_history">Historique des modifications</string>
 	<string name="last_edit_at_x">Dernière modification %s</string>
@@ -397,7 +384,6 @@
 	<string name="welcome_page1_title">Qu’est-ce que Mastodon ?</string>
 	<string name="welcome_page1_text">Imaginez que vous ayez une adresse e-mail qui se termine par @example.com.\n\nVous pouvez toujours envoyer et recevoir des e-mails de n\'importe qui, même si leur e-mail se termine par @gmail.com ou @icloud.com ou @example.com.</string>
 	<string name="welcome_page2_title">Mastodon est comme ça.</string>
-	<string name="welcome_page2_text">Votre identifiant devrait être @gothgirl654@example.social, mais vous pouvez toujours suivre, rebloguer et discuter avec @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Comment choisir un serveur?</string>
 	<string name="welcome_page3_text">Différentes personnes choisissent différents serveurs pour un certain nombre de raisons. art.example est un lieu idéal pour les artistes, tandis que glasgow.example pourrait être un bon choix pour les Écossais.\n\nVous ne pouvez pas vous tromper avec l\'un de nos serveurs recommandés et ainsi, quel que soit celui que vous choisissez (ou si vous entrez le vôtre dans la barre de recherche du serveur), vous ne manquerez jamais une info quelque part.</string>
 	<string name="signup_random_server_explain">Nous choisirons un serveur basé sur votre langue si vous continuez sans faire de sélection.</string>

From b3bd62bc6c9164bce788eec3a7626d879b15e834 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:32 +0200
Subject: [PATCH 040/124] New translations strings.xml (Arabic)

---
 .../src/main/res/values-ar-rSA/strings.xml     | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/mastodon/src/main/res/values-ar-rSA/strings.xml b/mastodon/src/main/res/values-ar-rSA/strings.xml
index 71da2f8cc..b3ea43676 100644
--- a/mastodon/src/main/res/values-ar-rSA/strings.xml
+++ b/mastodon/src/main/res/values-ar-rSA/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">حسنًا</string>
 	<string name="preparing_auth">جَارٍ الإعدَادُ لِلمُصادَقَة…</string>
 	<string name="finishing_auth">يُنهي المصادقة…</string>
-	<string name="user_boosted">أعادَ %s تَدوينَها</string>
 	<string name="in_reply_to">ردًا على %s</string>
 	<string name="notifications">الإشعارات</string>
 	<string name="user_followed_you">بَدَأ بِمُتابَعَتِك</string>
 	<string name="user_sent_follow_request">أرسَلَ طَلَبًا لِمُتابَعَتِك</string>
 	<string name="user_favorited">فَضَّلَ مَنشُورَك</string>
-	<string name="notification_boosted">أعادَ تَدوينَ مَنشُورِك</string>
 	<string name="poll_ended">انتهى استطلاعُ الرأي</string>
 	<string name="time_seconds">%d ثا</string>
 	<string name="time_minutes">%d د</string>
@@ -222,7 +220,6 @@
 	<string name="report_sent_subtitle">في أثناء مراجعتنا للبلاغ، يمكنك اتخاذ إجراء ضد @%s.</string>
 	<string name="unfollow_user">ألغ متابعة %s</string>
 	<string name="unfollow">ألغ المتابعة</string>
-	<string name="mute_user_explain">لن ترى منشوراتهم أو إعادة تدوينهم في التغذية الرئيسية. ولن يعلموا أنهم كتموا.</string>
 	<string name="block_user_explain">لن يتمكنوا من متابعتك أو رؤية منشوراتك، وسيكون بديهيًا لهم أنهم حجبوا.</string>
 	<string name="report_personal_title">لاترغب في مشاهدة هذا؟</string>
 	<string name="report_personal_subtitle">عندما ترى ما لا يعجبك في ماستدون، يمكنك إزالة صاحبها من تجربتك كمستخدم.</string>
@@ -279,7 +276,6 @@
 	<string name="skip">تخطى</string>
 	<string name="notification_type_follow">متابعُون جُدُد</string>
 	<string name="notification_type_favorite">المفضلة</string>
-	<string name="notification_type_reblog">المعاد تدوينها</string>
 	<string name="notification_type_mention">الذِكر</string>
 	<string name="notification_type_poll">استطلاع رأي</string>
 	<string name="choose_account">اختر حسابًا</string>
@@ -310,7 +306,6 @@
 	<string name="notify_none">لَا أحد</string>
 	<string name="notify_favorites">بِالإعْجاب بِمَنشوري</string>
 	<string name="notify_follow">بمتابعتي</string>
-	<string name="notify_reblog">بإعادة تدوين مَنشوري</string>
 	<string name="notify_mention">بِالإشارَةِ إليّ</string>
 	<string name="settings_boring">المنطِقَةُ المُملَّة</string>
 	<string name="settings_account">إعدادات الحساب</string>
@@ -331,7 +326,6 @@
 	<string name="hide_content">اخف المحتوى</string>
 	<string name="new_post">منشور جديد</string>
 	<string name="button_reply">ردّ</string>
-	<string name="button_reblog">أعد تدوين</string>
 	<string name="button_favorite">فضّل</string>
 	<string name="button_share">شارك</string>
 	<string name="media_no_description">وسائط بدون وصف</string>
@@ -346,8 +340,6 @@
 	<string name="unfollowed_user">ألغ متابعة %s</string>
 	<string name="followed_user">أنت تتابع %s</string>
 	<string name="open_in_browser">افتح في المتصفح</string>
-	<string name="hide_boosts_from_user">اخف ما أعاد %s تدوينه</string>
-	<string name="show_boosts_from_user">أظهر ما أعاد %s تدوينه</string>
 	<string name="signup_reason">لماذا تريد الانضمام؟</string>
 	<string name="signup_reason_note">هذا سوف يساعدنا في مراجعة تطبيقك.</string>
 	<string name="clear">امسح</string>
@@ -401,17 +393,8 @@
 		<item quantity="many">%,d تفضيلًا</item>
 		<item quantity="other">%,d تفضيل</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="zero">لا إعادات تدوين</item>
-		<item quantity="one">إعاد تدوين واحدة</item>
-		<item quantity="two">إعادتا تدوين</item>
-		<item quantity="few">%,d إعادات تدوين</item>
-		<item quantity="many">%,d إعادة تدوين</item>
-		<item quantity="other">%,d إعادة تدوين</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s عبر %2$s</string>
 	<string name="time_now">الآن</string>
-	<string name="post_info_reblogs">إعادات التدوين</string>
 	<string name="post_info_favorites">المفضلة</string>
 	<string name="edit_history">تاريخ التعديل</string>
 	<string name="last_edit_at_x">آخر تعديل %s</string>
@@ -481,7 +464,6 @@
 	<string name="welcome_page1_title">ما هو ماستدون؟</string>
 	<string name="welcome_page1_text">تخيل أن لديك عنوان بريد إلكتروني ينتهي بـ @example.com.\n\n رغم ذلك يمكنك إرسال واستقبال رسائل البريد الإلكتروني من أي شخص، حتى إذا كان بريدهم الإلكتروني الخاص ينتهي بـ @gmail.com أو @icloud.com أو @example.com.</string>
 	<string name="welcome_page2_title">ماستدون هكذا.</string>
-	<string name="welcome_page2_text">قد يكون مُعرّفُك @gothgirl654@example.social ، ولكنه بإمكانك متابعة وإعادة تدوين ومحادثة @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">كيف يمكنني اختيار خادم؟</string>
 	<string name="welcome_page3_text">يختار الأشخاص المختلفون خوادم مختلفة لأي عدد من الأسباب. يعد art.example مكانًا رائعًا للفنانين ، بينما قد يكون glasgow.example اختيارًا جيدًا للاسكتلنديين. \n\n لا يمكنك أن تخطئ في أي من الخوادم التي نوصي بها ، لذلك بغض النظر عن أي واحد تختاره (أو إذا قمت بإدخال الخادم الخاص بك في شريط البحث) ، فلن يفوتك أي شيء في أي مكان.</string>
 	<string name="signup_random_server_explain">سوف نختار خادماً بناءً على لغتك إذا قمت بالمتابعة دون إجراء إختيار.</string>

From 4e900247c5193af951cc6dcfdc45f74ff1aea617 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:33 +0200
Subject: [PATCH 041/124] New translations strings.xml (Catalan)

---
 mastodon/src/main/res/values-ca-rES/strings.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mastodon/src/main/res/values-ca-rES/strings.xml b/mastodon/src/main/res/values-ca-rES/strings.xml
index 981837428..ef190c57d 100644
--- a/mastodon/src/main/res/values-ca-rES/strings.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">D\'acord</string>
 	<string name="preparing_auth">Preparant l\'autenticació…</string>
 	<string name="finishing_auth">Finalitzant l\'autenticació…</string>
-	<string name="user_boosted">%s ha impulsat</string>
 	<string name="in_reply_to">En resposta a %s</string>
 	<string name="notifications">Notificacions</string>
 	<string name="user_followed_you">t\'ha seguit</string>
 	<string name="user_sent_follow_request">ha sol·licitat seguir-te</string>
 	<string name="user_favorited">ha afavorit la teva publicació</string>
-	<string name="notification_boosted">ha impulsat la teva publicació</string>
 	<string name="poll_ended">l\'enquesta ha finalitzat</string>
 	<string name="time_seconds">%d s</string>
 	<string name="time_minutes">%d min</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Mentre ho revisem, pots prendre mesures contra %s.</string>
 	<string name="unfollow_user">Deixar de seguir %s</string>
 	<string name="unfollow">Deixar de seguir</string>
-	<string name="mute_user_explain">No veuràs les seves publicacions o impulsos a la teva línia de temps personal. No sabran que han estat silenciats.</string>
 	<string name="block_user_explain">Ja no podran seguir ni veure les teves publicacions, però poden veure si han estat bloquejats.</string>
 	<string name="report_personal_title">No vols veure això?</string>
 	<string name="report_personal_subtitle">Quan veus alguna cosa que no t\'agrada a Mastodon, pots eliminar la persona de la vostra experiència.</string>
@@ -221,7 +218,6 @@
 	<string name="skip">Omet</string>
 	<string name="notification_type_follow">Seguidors nous</string>
 	<string name="notification_type_favorite">Favorits</string>
-	<string name="notification_type_reblog">Impulsos</string>
 	<string name="notification_type_mention">Mencions</string>
 	<string name="notification_type_poll">Enquestes</string>
 	<string name="choose_account">Selecciona un compte</string>
@@ -248,7 +244,6 @@
 	<string name="notify_none">ningú</string>
 	<string name="notify_favorites">Ha afavorit la meva publicació</string>
 	<string name="notify_follow">Em segueix</string>
-	<string name="notify_reblog">Impulsa la meva publicació</string>
 	<string name="notify_mention">Em menciona</string>
 	<string name="settings_boring">La zona avorrida</string>
 	<string name="settings_account">Configuració del compte</string>
@@ -269,7 +264,6 @@
 	<string name="hide_content">Amaga el contingut</string>
 	<string name="new_post">Nova publicació</string>
 	<string name="button_reply">Respon</string>
-	<string name="button_reblog">Impulsa</string>
 	<string name="button_favorite">Favorit</string>
 	<string name="button_share">Comparteix</string>
 	<string name="media_no_description">Multimèdia sense descripció</string>
@@ -284,8 +278,6 @@
 	<string name="unfollowed_user">S\'ha deixat de seguir %s</string>
 	<string name="followed_user">Ara estàs seguint %s</string>
 	<string name="open_in_browser">Obre al navegador</string>
-	<string name="hide_boosts_from_user">Amaga els impulsos de %s</string>
-	<string name="show_boosts_from_user">Mostra els impulsos de %s</string>
 	<string name="signup_reason_note">Això ens ajudarà a revisar la teva petició.</string>
 	<string name="clear">Esborra</string>
 	<string name="profile_header">Imatge de capçalera</string>
@@ -326,13 +318,8 @@
 		<item quantity="one">%,d favorit</item>
 		<item quantity="other">%,d favorits</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d impuls</item>
-		<item quantity="other">%,d impulsos</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s través de %2$s</string>
 	<string name="time_now">ara</string>
-	<string name="post_info_reblogs">Impulsos</string>
 	<string name="post_info_favorites">Favorits</string>
 	<string name="edit_history">Editar l’historial</string>
 	<string name="last_edit_at_x">Darrera edició: %s</string>

From c62a8635b99b94f341de7ee04e23aca7b97d1bfd Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:34 +0200
Subject: [PATCH 042/124] New translations strings.xml (Danish)

---
 mastodon/src/main/res/values-da-rDK/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-da-rDK/strings.xml b/mastodon/src/main/res/values-da-rDK/strings.xml
index e0d7baeb9..7483bcc1c 100644
--- a/mastodon/src/main/res/values-da-rDK/strings.xml
+++ b/mastodon/src/main/res/values-da-rDK/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">Ok</string>
 	<string name="preparing_auth">Forbereder godkendelse…</string>
 	<string name="finishing_auth">Afslutter godkendelse…</string>
-	<string name="user_boosted">%s boostede</string>
 	<string name="in_reply_to">Som svar til %s</string>
 	<string name="notifications">Meddelelser</string>
 	<string name="user_followed_you">begyndte at følge dig</string>
 	<string name="user_sent_follow_request">sendte dig en følgeanmodning</string>
 	<string name="user_favorited">favoritmarkerede dit indlæg</string>
-	<string name="notification_boosted">boostede dit indlæg</string>
 	<string name="poll_ended">afstemning afsluttet</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%d m</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Mens dette gennemgås, kan du selv bortfiltrere indlæg fra %s.</string>
 	<string name="unfollow_user">Følg ikke længere %s</string>
 	<string name="unfollow">Følg ikke længere</string>
-	<string name="mute_user_explain">Du vil ikke se den pågældendes indlæg eller boosts i din tidslinje. Vedkommende vil ikke få besked om dæmpningen.</string>
 	<string name="block_user_explain">Vedkommende vil ikke længere kunne følge dig eller se dine indlæg, men vedkommende kan se blokeringen.</string>
 	<string name="report_personal_title">Ønsker du ikke at se dette?</string>
 	<string name="report_personal_subtitle">Når du ser noget, du ikke kan lide på Mastodon, kan du fjerne personen fra din tidslinje.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Spring over</string>
 	<string name="notification_type_follow">Nye følgere</string>
 	<string name="notification_type_favorite">Favoritmarkeringer</string>
-	<string name="notification_type_reblog">Boosts</string>
 	<string name="notification_type_mention">Omtaler</string>
 	<string name="notification_type_poll">Afstemninger</string>
 	<string name="choose_account">Vælg konto</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">ingen</string>
 	<string name="notify_favorites">Favoritmarkerede mit indlæg</string>
 	<string name="notify_follow">Følger mig</string>
-	<string name="notify_reblog">Booster mit indlæg</string>
 	<string name="notify_mention">Nævner mig</string>
 	<string name="settings_boring">Den kedelige zone</string>
 	<string name="settings_account">Kontoindstillinger</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Skjul indhold</string>
 	<string name="new_post">Nyt indlæg</string>
 	<string name="button_reply">Svar</string>
-	<string name="button_reblog">Boost</string>
 	<string name="button_favorite">Favorit</string>
 	<string name="button_share">Del</string>
 	<string name="media_no_description">Medier uden beskrivelse</string>
@@ -286,8 +280,6 @@
 	<string name="unfollowed_user">Følg ikke længere %s</string>
 	<string name="followed_user">Du følger nu %s</string>
 	<string name="open_in_browser">Åbn i browser</string>
-	<string name="hide_boosts_from_user">Skjul boosts fra %s</string>
-	<string name="show_boosts_from_user">Vis boosts fra %s</string>
 	<string name="signup_reason">Hvorfor ønsker du at tilmelde dig?</string>
 	<string name="signup_reason_note">Dette hjælper os med at vurdere din ansøgning.</string>
 	<string name="clear">Ryd</string>
@@ -329,13 +321,8 @@
 		<item quantity="one">%,d favoritmarkering</item>
 		<item quantity="other">%,d favoritmarkeringer</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d boost</item>
-		<item quantity="other">%,d boosts</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nu</string>
-	<string name="post_info_reblogs">Boosts</string>
 	<string name="post_info_favorites">Favoritmarkeringer</string>
 	<string name="edit_history">Rediger historik</string>
 	<string name="last_edit_at_x">Senest ændret: %s</string>
@@ -396,7 +383,6 @@
 	<string name="welcome_page1_title">Hvad er Mastodon?</string>
 	<string name="welcome_page1_text">Det svarer til at du har en e-mailadresse, der slutter med @eksempel.dk.\n\nAlligevel kan du stadig både sende og modtage e-mails fra alle, selv om deres e-mail ender på @gmail.com eller @icloud.com eller @eksempel.dk.</string>
 	<string name="welcome_page2_title">Mastodon er ligesådan.</string>
-	<string name="welcome_page2_text">Dit brugernavn kan være @goth654@eksempel.social, men du kan stadig følge, booste, og chatte med @denanden@eksempel.online.</string>
 	<string name="welcome_page3_title">Hvordan vælger jeg en server?</string>
 	<string name="welcome_page3_text">Forskellige mennesker vælger forskellige servere af mange forskellige grunde. art.example er et godt sted for kunstnere, mens glasgow.example kan være et godt pluk for skotter.\n\nDu kan ikke gå galt i byen med en af vores anbefalingsservere, så uanset hvilken du vælger (eller hvis du indtaster din egen i serversøgelinjen), vil du aldrig gå glip af noget nogen steder.</string>
 	<string name="signup_random_server_explain">Vi vælger en server baseret på dit sprog, hvis du fortsætter uden at foretage et valg.</string>

From aa911896d6cf98e1d21efef91b2f2b18aa5f51c6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:35 +0200
Subject: [PATCH 043/124] New translations strings.xml (German)

---
 mastodon/src/main/res/values-de-rDE/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-de-rDE/strings.xml b/mastodon/src/main/res/values-de-rDE/strings.xml
index 00a163f27..bf34c86d1 100644
--- a/mastodon/src/main/res/values-de-rDE/strings.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Authentifizierung wird vorbereitet …</string>
 	<string name="finishing_auth">Authentifizierung wird abgeschlossen …</string>
-	<string name="user_boosted">%s hat diesen Beitrag geteilt</string>
 	<string name="in_reply_to">Als Antwort auf %s</string>
 	<string name="notifications">Benachrichtigungen</string>
 	<string name="user_followed_you">folgt dir jetzt</string>
 	<string name="user_sent_follow_request">hat dir eine Follower-Anfrage gesendet</string>
 	<string name="user_favorited">favorisierte</string>
-	<string name="notification_boosted">teilte</string>
 	<string name="poll_ended">Abstimmung beendet</string>
 	<string name="time_seconds">vor %d Sekunden</string>
 	<string name="time_minutes">vor %d Minuten</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Während wir den Vorfall überprüfen, kannst du gegen %s weitere Maßnahmen ergreifen.</string>
 	<string name="unfollow_user">%s entfolgen</string>
 	<string name="unfollow">Entfolgen</string>
-	<string name="mute_user_explain">Du wirst die eigenen und geteilten Beiträge des Kontos nicht mehr sehen können. Dass du das Profil stummgeschaltet hast, erfährt die Person nicht.</string>
 	<string name="block_user_explain">Dir wird es nicht länger möglich sein, die Beiträge dieses Konto zu sehen. Das blockierte Profil wird nicht mehr in der Lage sein, deine Beiträge zu sehen oder dir zu folgen. Die Person hinter dem Konto wird mitbekommen, dass du ihr Konto gesperrt hast.</string>
 	<string name="report_personal_title">Möchtest du das nicht mehr sehen?</string>
 	<string name="report_personal_subtitle">Wenn du etwas auf Mastodon siehst, das dir nicht gefällt, kannst du die Person aus deinem Umfeld entfernen.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Überspringen</string>
 	<string name="notification_type_follow">Neue Follower</string>
 	<string name="notification_type_favorite">Favoriten</string>
-	<string name="notification_type_reblog">Geteilte Beiträge</string>
 	<string name="notification_type_mention">Erwähnungen</string>
 	<string name="notification_type_poll">Umfragen</string>
 	<string name="choose_account">Konto auswählen</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">niemand</string>
 	<string name="notify_favorites">meinen Beitrag favorisiert</string>
 	<string name="notify_follow">mir folgt</string>
-	<string name="notify_reblog">einen meiner Beiträge geteilt hat</string>
 	<string name="notify_mention">mich erwähnt</string>
 	<string name="settings_boring">Langweiliges</string>
 	<string name="settings_account">Kontoeinstellungen</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Inhalt ausblenden</string>
 	<string name="new_post">Neuer Beitrag</string>
 	<string name="button_reply">Antworten</string>
-	<string name="button_reblog">Teilen</string>
 	<string name="button_favorite">Favorisieren</string>
 	<string name="button_share">Teilen</string>
 	<string name="media_no_description">Medien ohne Beschreibung</string>
@@ -287,8 +281,6 @@
 	<string name="followed_user">Du folgst nun %s</string>
 	<string name="following_user_requested">Deine Follower-Anfrage an %s wurde gesendet</string>
 	<string name="open_in_browser">Im Browser öffnen</string>
-	<string name="hide_boosts_from_user">geteilte Beiträge von %s ausblenden</string>
-	<string name="show_boosts_from_user">geteilte Beiträge von %s anzeigen</string>
 	<string name="signup_reason">Warum möchtest du beitreten?</string>
 	<string name="signup_reason_note">Das erleichtert uns die Prüfung deiner Anmeldung.</string>
 	<string name="clear">Leeren</string>
@@ -330,13 +322,8 @@
 		<item quantity="one">%,d × favorisiert</item>
 		<item quantity="other">%,d × favorisiert</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d × geteilt</item>
-		<item quantity="other">%,d × geteilt</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">jetzt</string>
-	<string name="post_info_reblogs">Geteilte Beiträge</string>
 	<string name="post_info_favorites">Favoriten</string>
 	<string name="edit_history">Verlauf bearbeiten</string>
 	<string name="last_edit_at_x">Zuletzt bearbeitet: %s</string>
@@ -398,7 +385,6 @@
 	<string name="welcome_page1_title">Was ist Mastodon?</string>
 	<string name="welcome_page1_text">Angenommen, du hast eine E-Mail-Adresse, die mit @example.com endet.\n\nDu kannst immer noch E-Mails von allen empfangen, auch wenn deren E-Mail-Adresse mit @gmail.com, @icloud.com oder @example.com endet.</string>
 	<string name="welcome_page2_title">Mastodon ist genau so.</string>
-	<string name="welcome_page2_text">Dein Nutzer*innenname könnte @GothGirl654@example.social sein, aber du kannst trotzdem @fallout5ever@example.online folgen, deren Beiträge teilen und dich mit der Person unterhalten.</string>
 	<string name="welcome_page3_title">Wie wähle ich einen Server aus?</string>
 	<string name="welcome_page3_text">Unterschiedliche Menschen wählen aus verschiedenen Gründen unterschiedliche Server. art.example ist ein toller Ort für Künstler*innen, während glasgow.example eine gute Wahl für Schott*innen sein könnte.\n\nWähle nach Möglichkeit einen kleinen Server aus, mit dessen Regeln du dich wohl fühlst und der dir vertrauenswürdig erscheint (über die Server-Suchleiste kannst du dich direkt mit dem Server deines Vertrauens verbinden).</string>
 	<string name="signup_random_server_explain">Wenn du ohne Auswahl fortfährst, wählen wir einen Server in deiner Sprache aus.</string>

From 0e677f8ce7b8293547b4179e2078a0353c44b657 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:36 +0200
Subject: [PATCH 044/124] New translations strings.xml (Basque)

---
 mastodon/src/main/res/values-eu-rES/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-eu-rES/strings.xml b/mastodon/src/main/res/values-eu-rES/strings.xml
index c9bd4030e..01b3f7833 100644
--- a/mastodon/src/main/res/values-eu-rES/strings.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">Ados</string>
 	<string name="preparing_auth">Autentifikaziorako prestatzen…</string>
 	<string name="finishing_auth">Autentikazioa bukatzen…</string>
-	<string name="user_boosted">%s(e)k bultzatu du</string>
 	<string name="in_reply_to">%s-(r)i erantzunez</string>
 	<string name="notifications">Jakinarazpenak</string>
 	<string name="user_followed_you">jarraitu zaitu</string>
 	<string name="user_sent_follow_request">jarraitzeko eskaera bidali dizu</string>
 	<string name="user_favorited">zure bidalketa gogoko du</string>
-	<string name="notification_boosted">zure bidalketa bultzatu du</string>
 	<string name="poll_ended">inkesta amaitu da</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Hau berrikusten dugun bitartean, %s erabiltzailearen aurkako neurriak hartu ditzakezu.</string>
 	<string name="unfollow_user">%s jarraitzeari utzi</string>
 	<string name="unfollow">Utzi jarraitzeari</string>
-	<string name="mute_user_explain">Ez dituzu bere bidalketa eta birbidalketak zure hasierako jarioan ikusiko. Ez dute jakingo isilarazi dituztenik.</string>
 	<string name="block_user_explain">Ezin izango dituzte zure bidalketak jarraitu edo ikusi, baina blokeatuta dauden ikusi ahal izango dute.</string>
 	<string name="report_personal_title">Ez duzu hau ikusi nahi?</string>
 	<string name="report_personal_subtitle">Mastodonen gustuko ez duzun zerbait ikusten duzunean, zure esperientziatik atera dezakezu pertsona hori.</string>
@@ -220,7 +217,6 @@
 	<string name="skip">Saltatu</string>
 	<string name="notification_type_follow">Jarraitzaile berriak</string>
 	<string name="notification_type_favorite">Gogokoak</string>
-	<string name="notification_type_reblog">Bultzadak</string>
 	<string name="notification_type_mention">Aipamenak</string>
 	<string name="notification_type_poll">Inkestak</string>
 	<string name="choose_account">Aukeratu kontua</string>
@@ -247,7 +243,6 @@
 	<string name="notify_none">inor ez</string>
 	<string name="notify_favorites">Nire bidalketa gogoko egitean</string>
 	<string name="notify_follow">Jarraitzen nau</string>
-	<string name="notify_reblog">Nire bidalketa bultzatu du</string>
 	<string name="notify_mention">Aipatu nau</string>
 	<string name="settings_boring">Eremu aspergarria</string>
 	<string name="settings_account">Kontuaren ezarpenak</string>
@@ -268,7 +263,6 @@
 	<string name="hide_content">Ezkutatu edukia</string>
 	<string name="new_post">Bidalketa berria</string>
 	<string name="button_reply">Erantzun</string>
-	<string name="button_reblog">Bultzada</string>
 	<string name="button_favorite">Gogokoa</string>
 	<string name="button_share">Partekatu</string>
 	<string name="media_no_description">Deskribapenik gabeko multimedia</string>
@@ -283,8 +277,6 @@
 	<string name="unfollowed_user">Utzi %s jarraitzeari</string>
 	<string name="followed_user">%s jarraitzen ari zara</string>
 	<string name="open_in_browser">Ireki nabigatzailean</string>
-	<string name="hide_boosts_from_user">Ezkutatu %s(r)en bultzadak</string>
-	<string name="show_boosts_from_user">Erakutsi %s(r)en bultzadak</string>
 	<string name="signup_reason">Zergatik elkartu nahi duzu?</string>
 	<string name="signup_reason_note">Honek zure eskaera berrikustean lagunduko digu.</string>
 	<string name="clear">Garbitu</string>
@@ -326,13 +318,8 @@
 		<item quantity="one">Gogoko bat</item>
 		<item quantity="other">%,d gogoko</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">Bultzada %,d</item>
-		<item quantity="other">%,d bultzada</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s %2$s -en bidez</string>
 	<string name="time_now">orain</string>
-	<string name="post_info_reblogs">Bultzadak</string>
 	<string name="post_info_favorites">Gogokoak</string>
 	<string name="edit_history">Editatu historia</string>
 	<string name="last_edit_at_x">Azken edizioa %s</string>
@@ -393,7 +380,6 @@
 	<string name="welcome_page1_title">Zer da Mastodon?</string>
 	<string name="welcome_page1_text">Imajinatu zure helbide elektronikoa adibidea.eus-en amaitzen dela. \n\n Oraindik edonoren mezu elektronikoak bidali eta jaso ditzakezu, baita posta elektronikoa @gmail.com edo @icloud.com edo @adibidea.eus helbideetan amaitzen bada ere.</string>
 	<string name="welcome_page2_title">Mastodon antzekoa da.</string>
-	<string name="welcome_page2_text">Zure kontua \"@pertsona1@mastodon.eus\" izan liteke, baina oraindik ere jarraitu, bultzatu edo txateatu dezakezu \"@pertsona2@mastodon.social\" edo bestelako edozein kontu.</string>
 	<string name="welcome_page3_title">Nola aukeratzen dut zerbitzari bat?</string>
 	<string name="welcome_page3_text">Hainbat pertsonak zerbitzari bat baino gehiago aukeratzen dituzte arrazoi ezberdinengatik. Adibidez, art.example leku ona da artistentzat eta mastodon.eus, berriz, euskaldunentzat. Gure gomendioetako zerbitzariekin, ez duzu hanka sartuko eta edozein dela ere zure aukera, beste zerbitzarietako kideekin harremana izan dezakezu (bilaketa-barran bilatuz).</string>
 	<string name="server_filter_any_language">Edozein hizkuntza</string>

From 56343dacffafcc9a3b023f64fa9e17bd6d06ab20 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:38 +0200
Subject: [PATCH 045/124] New translations strings.xml (Hebrew)

---
 mastodon/src/main/res/values-iw-rIL/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mastodon/src/main/res/values-iw-rIL/strings.xml b/mastodon/src/main/res/values-iw-rIL/strings.xml
index 3baf18b82..b49c907b3 100644
--- a/mastodon/src/main/res/values-iw-rIL/strings.xml
+++ b/mastodon/src/main/res/values-iw-rIL/strings.xml
@@ -6,13 +6,11 @@
 	<string name="ok">אוקיי</string>
 	<string name="preparing_auth">מתכונן לאימות…</string>
 	<string name="finishing_auth">מסיים אימות…</string>
-	<string name="user_boosted">%s עשה ריבלוג</string>
 	<string name="in_reply_to">בתגובה ל־%s</string>
 	<string name="notifications">עדכונים</string>
 	<string name="user_followed_you">עקבו אחריכם</string>
 	<string name="user_sent_follow_request">שלחו בקשה לעכוב אחריכם</string>
 	<string name="user_favorited">אהבו את הרשומה שלכם</string>
-	<string name="notification_boosted">עשו ריבלוג לרשומה שלכם</string>
 	<string name="poll_ended">הסקר נסגר</string>
 	<string name="time_seconds">%dשנ׳</string>
 	<string name="time_minutes">%dדק׳</string>

From de2654def3f3412a288ca2667b9a6e5bcbd9fc3a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:39 +0200
Subject: [PATCH 046/124] New translations strings.xml (Hungarian)

---
 mastodon/src/main/res/values-hu-rHU/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-hu-rHU/strings.xml b/mastodon/src/main/res/values-hu-rHU/strings.xml
index cd58a53d9..7e0fcaaca 100644
--- a/mastodon/src/main/res/values-hu-rHU/strings.xml
+++ b/mastodon/src/main/res/values-hu-rHU/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Felkészülés a hitelesítésre…</string>
 	<string name="finishing_auth">Hitelesítés befejezése…</string>
-	<string name="user_boosted">%s megtolta</string>
 	<string name="in_reply_to">Válaszolva %s számára</string>
 	<string name="notifications">Értesítések</string>
 	<string name="user_followed_you">bekövetett</string>
 	<string name="user_sent_follow_request">követési kérelmet küldött neked</string>
 	<string name="user_favorited">kedvencnek jelölte a bejegyzésedet</string>
-	<string name="notification_boosted">megtolta a bejegyzésedet</string>
 	<string name="poll_ended">a szavazás véget ért</string>
 	<string name="time_seconds">%dmp</string>
 	<string name="time_minutes">%dp</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Míg átnézzük, a következőket teheted %s ellen.</string>
 	<string name="unfollow_user">%s követésének megszüntetése</string>
 	<string name="unfollow">Követés megszüntetése</string>
-	<string name="mute_user_explain">Nem fogod látni a bejegyzéseiket vagy a megtolásaikat a kezdőlapon. Nem fogják tudni, hogy elnémították őket.</string>
 	<string name="block_user_explain">Többé nem fogják tudni követni vagy látni a bejegyzéseidet, de láthatják, ha letiltották őket.</string>
 	<string name="report_personal_title">Nem akarod ezt látni?</string>
 	<string name="report_personal_subtitle">Ha olyasmit látsz a Mastodonon, ami nem tetszik, eltávolíthatod az illetőt a felhasználói élményedből.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Átugrás</string>
 	<string name="notification_type_follow">Új követők</string>
 	<string name="notification_type_favorite">Kedvencek</string>
-	<string name="notification_type_reblog">Megtolások</string>
 	<string name="notification_type_mention">Említések</string>
 	<string name="notification_type_poll">Szavazások</string>
 	<string name="choose_account">Fiók kiválasztása</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">senki</string>
 	<string name="notify_favorites">Aki a kedvencének jelölte a posztom</string>
 	<string name="notify_follow">Aki követ engem</string>
-	<string name="notify_reblog">Megtolta a bejegyzésed</string>
 	<string name="notify_mention">Megemlített</string>
 	<string name="settings_boring">Az unalmas zóna</string>
 	<string name="settings_account">Fiókbeállítások</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Tartalom elrejtése</string>
 	<string name="new_post">Új bejegyzés</string>
 	<string name="button_reply">Válasz</string>
-	<string name="button_reblog">Megtolás</string>
 	<string name="button_favorite">Kedvenc</string>
 	<string name="button_share">Megosztás</string>
 	<string name="media_no_description">Média leírás nélkül</string>
@@ -286,8 +280,6 @@
 	<string name="unfollowed_user">%s követését visszavontad</string>
 	<string name="followed_user">Most már követed %s</string>
 	<string name="open_in_browser">Megnyitás böngészőben</string>
-	<string name="hide_boosts_from_user">%s megtolásainak elrejtése</string>
-	<string name="show_boosts_from_user">%s megtolásainak mutatása</string>
 	<string name="signup_reason">Miért szeretnél csatlakozni?</string>
 	<string name="signup_reason_note">Ez segít nekünk átnézni a jelentkezésedet.</string>
 	<string name="clear">Törlés</string>
@@ -329,13 +321,8 @@
 		<item quantity="one">%,d kedvenc</item>
 		<item quantity="other">%,d kedvenc</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d megtolás</item>
-		<item quantity="other">%,d megtolás</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s %2$s használatával</string>
 	<string name="time_now">most</string>
-	<string name="post_info_reblogs">Megtolások</string>
 	<string name="post_info_favorites">Kedvencek</string>
 	<string name="edit_history">Szerkesztési előzmények</string>
 	<string name="last_edit_at_x">Utoljára szerkesztve: %s</string>
@@ -397,7 +384,6 @@
 	<string name="welcome_page1_title">Mi a Mastodon?</string>
 	<string name="welcome_page1_text">Képzeld el, hogy az emailcímed @example.com-ra végződik.\n\nEttől még küldhtesz és fogadhatsz emailt bárkitől, akkor is, ha a címük @gmail.com-ra, @icloud.com-ra vagy @example.com-ra végződik.</string>
 	<string name="welcome_page2_title">Ilyen a Mastodon.</string>
-	<string name="welcome_page2_text">Lehet, hogy az azonosítód @gothgirl654@example.social, de ettől még követheted, megtolhatod és csetelhetsz @fallout5ever@example.online-nal.</string>
 	<string name="welcome_page3_title">Hogyan választok kiszolgálót?</string>
 	<string name="welcome_page3_text">Az emberek különböző okok miatt választanak más és más kiszolgálót. Az art.example egy jó hely lehet a művészek számára, miközben a glasgow.example a skótoknak lehet megfelelő.\n\nAz általunk javasolt kiszolgálókkal nem lehet probléma, de teljesen mindegy, hogy melyiket választod (vagy ha saját kiszolgálót használsz a keresőmezőben), nem maradsz le semmiről egy kiszolgálón sem.</string>
 	<string name="signup_random_server_explain">Választunk egy kiszolgálót a saját nyelvedhez, ha választás nélkül folytatod.</string>

From 79be91784dc92238bcb3e658fe953180967e48d6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:41 +0200
Subject: [PATCH 047/124] New translations strings.xml (Italian)

---
 mastodon/src/main/res/values-it-rIT/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-it-rIT/strings.xml b/mastodon/src/main/res/values-it-rIT/strings.xml
index 79ea6cc17..ecabc5afc 100644
--- a/mastodon/src/main/res/values-it-rIT/strings.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparazione all\'autenticazione…</string>
 	<string name="finishing_auth">Completamento autenticazione…</string>
-	<string name="user_boosted">%s ha condiviso</string>
 	<string name="in_reply_to">In risposta a %s</string>
 	<string name="notifications">Notifiche</string>
 	<string name="user_followed_you">ti segue</string>
 	<string name="user_sent_follow_request">ha richiesto di seguirti</string>
 	<string name="user_favorited">ha apprezzato il tuo post</string>
-	<string name="notification_boosted">ha condiviso il tuo post</string>
 	<string name="poll_ended">sondaggio terminato</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Mentre controlliamo, puoi fare questo contro %s.</string>
 	<string name="unfollow_user">Smetti di seguire %s</string>
 	<string name="unfollow">Smetti di seguire</string>
-	<string name="mute_user_explain">Non vedrai i loro post o i reblog nel tuo feed. Non sapranno di essere stati silenziati.</string>
 	<string name="block_user_explain">Non saranno più in grado di seguire o vedere i tuoi post, ma possono vedere se sono stati bloccati.</string>
 	<string name="report_personal_title">Non vuoi vedere questo?</string>
 	<string name="report_personal_subtitle">Quando vedi qualcosa che non ti piace su Mastodon, puoi rimuovere la persona dalla tua esperienza.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Salta</string>
 	<string name="notification_type_follow">Nuovi seguaci</string>
 	<string name="notification_type_favorite">Preferiti</string>
-	<string name="notification_type_reblog">Condivisioni</string>
 	<string name="notification_type_mention">Menzioni</string>
 	<string name="notification_type_poll">Sondaggi</string>
 	<string name="choose_account">Seleziona l\'account</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">nessuno</string>
 	<string name="notify_favorites">Apprezza i miei post</string>
 	<string name="notify_follow">Mi segue</string>
-	<string name="notify_reblog">Condivide i miei post</string>
 	<string name="notify_mention">Mi menziona</string>
 	<string name="settings_boring">La zona noiosa</string>
 	<string name="settings_account">Impostazioni dell\'account</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Nascondi il contenuto</string>
 	<string name="new_post">Nuovo post</string>
 	<string name="button_reply">Rispondi</string>
-	<string name="button_reblog">Condivisione</string>
 	<string name="button_favorite">Preferito</string>
 	<string name="button_share">Condividi</string>
 	<string name="media_no_description">Media senza descrizione</string>
@@ -287,8 +281,6 @@
 	<string name="followed_user">Hai cominciato a seguire %s</string>
 	<string name="following_user_requested">Richiesto di seguire %s</string>
 	<string name="open_in_browser">Apri nel browser</string>
-	<string name="hide_boosts_from_user">Nascondi le condivisioni di %s</string>
-	<string name="show_boosts_from_user">Mostra le condivisioni di %s</string>
 	<string name="signup_reason">Perché vuoi unirti?</string>
 	<string name="signup_reason_note">Questo ci aiuterà ad esaminare la tua richiesta.</string>
 	<string name="clear">Cancella</string>
@@ -330,13 +322,8 @@
 		<item quantity="one">%,d preferito</item>
 		<item quantity="other">%,d preferiti</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d condivisione</item>
-		<item quantity="other">%,d condivisioni</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s tramite %2$s</string>
 	<string name="time_now">ora</string>
-	<string name="post_info_reblogs">Condivisioni</string>
 	<string name="post_info_favorites">Preferiti</string>
 	<string name="edit_history">Cronologia delle modifiche</string>
 	<string name="last_edit_at_x">Ultima modifica: %s</string>
@@ -398,7 +385,6 @@
 	<string name="welcome_page1_title">Che cos\'è Mastodon?</string>
 	<string name="welcome_page1_text">Immaginate di avere un indirizzo email che termina con @example.com.\n\nPotete ancora inviare e ricevere email da chiunque, anche se la loro email termina in @gmail.com o @icloud.com o @example.com.</string>
 	<string name="welcome_page2_title">Mastodon è così.</string>
-	<string name="welcome_page2_text">Il tuo pseudonimo potrebbe essere @gothgirl654@example.social, ma puoi ancora seguire, condividere e chattare con @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Come scegliere un server?</string>
 	<string name="welcome_page3_text">Diverse persone scelgono server diversi per vari motivi. art.example è un server ottimo per gli artisti, mentre glasgow.example è una buona scelta per i Scozzesi. \n\nNon si può sbagliare con nessuno dei nostri server consigliati, e qualsiasi server scegli (o se cerchi un altro che conosci tu usando la barra di ricerca dei server) non perderai mai un colpo.</string>
 	<string name="signup_random_server_explain">Sceglieremo un server in base alla tua lingua se continui senza effettuare una selezione.</string>

From 1f7d97134bb505b4f490530db1468bbc86ba8767 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:42 +0200
Subject: [PATCH 048/124] New translations strings.xml (Japanese)

---
 mastodon/src/main/res/values-ja-rJP/strings.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mastodon/src/main/res/values-ja-rJP/strings.xml b/mastodon/src/main/res/values-ja-rJP/strings.xml
index e883e73d7..1de684504 100644
--- a/mastodon/src/main/res/values-ja-rJP/strings.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">認証を開始中…</string>
 	<string name="finishing_auth">認証を完了中…</string>
-	<string name="user_boosted">%sがブースト</string>
 	<string name="in_reply_to">%s へ返信</string>
 	<string name="notifications">通知</string>
 	<string name="user_followed_you">がフォロー</string>
 	<string name="user_sent_follow_request">フォローリクエストを送信しました</string>
 	<string name="user_favorited">がお気に入り登録</string>
-	<string name="notification_boosted">がブースト</string>
 	<string name="poll_ended">アンケートが終了しました</string>
 	<string name="time_seconds">%d秒前</string>
 	<string name="time_minutes">%d分前</string>
@@ -152,7 +150,6 @@
 	<string name="report_sent_subtitle">私たちが確認している間でも、あなたは%sさんに対して対応することができます。</string>
 	<string name="unfollow_user">フォロー解除%s</string>
 	<string name="unfollow">フォロー解除</string>
-	<string name="mute_user_explain">ホームに投稿やブーストは表示されなくなりますが、相手にミュートしたことは伝わりません。</string>
 	<string name="block_user_explain">相手はあなたの投稿を見ることやフォローすることは出来ません。相手はブロックされていることはわかります。</string>
 	<string name="report_personal_title">見えないようにしたいですか？</string>
 	<string name="report_personal_subtitle">Mastodonで気に入らないものを見ると、その人をあなたの体験から取り除くことができます。</string>
@@ -209,7 +206,6 @@
 	<string name="skip">スキップ</string>
 	<string name="notification_type_follow">新しいフォロワー</string>
 	<string name="notification_type_favorite">お気に入り</string>
-	<string name="notification_type_reblog">ブースト</string>
 	<string name="notification_type_mention">メンション</string>
 	<string name="notification_type_poll">投票</string>
 	<string name="choose_account">アカウントを選択</string>
@@ -235,7 +231,6 @@
 	<string name="notify_none">なし</string>
 	<string name="notify_favorites">お気に入り登録された</string>
 	<string name="notify_follow">フォローされた</string>
-	<string name="notify_reblog">ブーストされた</string>
 	<string name="notify_mention">メンションされた</string>
 	<string name="settings_boring">アプリについて</string>
 	<string name="settings_account">アカウント設定</string>
@@ -256,7 +251,6 @@
 	<string name="hide_content">内容を非表示</string>
 	<string name="new_post">新しい投稿</string>
 	<string name="button_reply">返信</string>
-	<string name="button_reblog">ブースト</string>
 	<string name="button_favorite">お気に入り</string>
 	<string name="button_share">共有</string>
 	<string name="media_no_description">説明のないメディア</string>
@@ -271,8 +265,6 @@
 	<string name="unfollowed_user">フォロー解除%s</string>
 	<string name="followed_user">%sさんをフォローしました</string>
 	<string name="open_in_browser">ブラウザで開く</string>
-	<string name="hide_boosts_from_user">%sさんのブーストを非表示</string>
-	<string name="show_boosts_from_user">%sさんのブーストを表示</string>
 	<string name="signup_reason">参加したい理由を入力してください</string>
 	<string name="signup_reason_note">申請を承認する際に役立つメッセージを添えてください.</string>
 	<string name="clear">クリア</string>
@@ -311,12 +303,8 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d お気に入り</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="other">%,d ブースト</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$sに%2$s経由</string>
 	<string name="time_now">今</string>
-	<string name="post_info_reblogs">ブースト</string>
 	<string name="post_info_favorites">お気に入り</string>
 	<string name="edit_history">編集履歴</string>
 	<string name="last_edit_at_x">最終更新日%s</string>
@@ -376,7 +364,6 @@
 	<string name="welcome_page1_title">Mastodonとは</string>
 	<string name="welcome_page1_text">Mastodonのしくみは電子メールとよく似ています。\n\n電子メールは ○○@example.com のようなメールアドレスを持っていれば、 □□@gmail.com や △△@icloud.com はもちろん、同じプロバイダの ◇◇@example.com など、どんな相手にもメールを送れます。</string>
 	<string name="welcome_page2_title">サーバーからサーバーへ</string>
-	<string name="welcome_page2_text">電子メールと同様に、@gothgirl654@example.social というMastodonアカウントがあれば、ほかのサーバーの @fallout5ever@example.online をフォローして投稿をブーストしたり、メンションを送ることができます。</string>
 	<string name="welcome_page3_title">サーバーをさがしてみよう</string>
 	<string name="welcome_page3_text">サーバーの選びかたは十人十色です。アーティスト同士が集まるサーバーもあれば、とある鉄道の沿線住民が集うサーバーもあります。\n\nアカウント作成に進むと、検索バーとおすすめのサーバーが表示されます。参加したいサーバーが決まっていない場合は、おすすめから選んでみましょう。どのサーバーを選んでも、どこの誰とでもつながれます。</string>
 	<string name="signup_random_server_explain">利用中の言語に基づいてサーバーを自動選択することもできます。</string>

From d1f90eb2317cd95a08f37699ea14a0c63de1d2ff Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:42 +0200
Subject: [PATCH 049/124] New translations strings.xml (Korean)

---
 mastodon/src/main/res/values-ko-rKR/strings.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings.xml b/mastodon/src/main/res/values-ko-rKR/strings.xml
index 092e2f39e..7b297129f 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">확인</string>
 	<string name="preparing_auth">인증 준비 중…</string>
 	<string name="finishing_auth">인증을 끝마치는 중…</string>
-	<string name="user_boosted">%s 님이 리블로그함</string>
 	<string name="in_reply_to">%s 님에게 답장</string>
 	<string name="notifications">알림</string>
 	<string name="user_followed_you">나를 팔로우함</string>
 	<string name="user_sent_follow_request">나에게 팔로우 요청을 보냄</string>
 	<string name="user_favorited">당신의 게시물을 좋아합니다</string>
-	<string name="notification_boosted">내 게시물을 리블로그했습니다</string>
 	<string name="poll_ended">투표 종료됨</string>
 	<string name="time_seconds">%d초</string>
 	<string name="time_minutes">%d분</string>
@@ -152,7 +150,6 @@
 	<string name="report_sent_subtitle">서버의 중재자들이 이것을 심사하는 동안, 당신은 %s에 대한 행동을 취할 수 있습니다.</string>
 	<string name="unfollow_user">%s 팔로우 해제</string>
 	<string name="unfollow">팔로우 해제</string>
-	<string name="mute_user_explain">상대방의 게시물이나 리블로그가 내 홈 피드에 보이지 않습니다. 상대방은 뮤트 당했다는 사실을 알지 못합니다.</string>
 	<string name="block_user_explain">상대방은 나를 팔로우 하거나 내 게시물을 볼 수 없게 됩니다, 하지만 내가 차단한 사실은 알 수 있습니다.</string>
 	<string name="report_personal_title">이런 것을 보지 않길 원하나요?</string>
 	<string name="report_personal_subtitle">마스토돈에서 보기 싫은 것을 보았다면, 해당하는 사람을 지울 수 있습니다.</string>
@@ -209,7 +206,6 @@
 	<string name="skip">건너뛰기</string>
 	<string name="notification_type_follow">새 팔로워</string>
 	<string name="notification_type_favorite">좋아함</string>
-	<string name="notification_type_reblog">리블로그</string>
 	<string name="notification_type_mention">멘션</string>
 	<string name="notification_type_poll">투표</string>
 	<string name="choose_account">계정 선택</string>
@@ -235,7 +231,6 @@
 	<string name="notify_none">아무도 없음</string>
 	<string name="notify_favorites">내 게시물을 좋아함</string>
 	<string name="notify_follow">나를 팔로우함</string>
-	<string name="notify_reblog">내 게시물을 공유함</string>
 	<string name="notify_mention">나를 멘션함</string>
 	<string name="settings_boring">지루한 영역</string>
 	<string name="settings_account">계정 설정</string>
@@ -256,7 +251,6 @@
 	<string name="hide_content">내용 숨기기</string>
 	<string name="new_post">새 게시물</string>
 	<string name="button_reply">답장</string>
-	<string name="button_reblog">리블로그</string>
 	<string name="button_favorite">좋아요</string>
 	<string name="button_share">공유</string>
 	<string name="media_no_description">설명이 없는 미디어</string>
@@ -271,8 +265,6 @@
 	<string name="unfollowed_user">%s 님을 팔로우 해제했습니다</string>
 	<string name="followed_user">이제 %s 님을 팔로우 합니다</string>
 	<string name="open_in_browser">브라우저에서 열기</string>
-	<string name="hide_boosts_from_user">%s 님의 리블로그 숨기기</string>
-	<string name="show_boosts_from_user">%s 님의 리블로그 보이기</string>
 	<string name="signup_reason">가입하려는 이유가 무엇인가요?</string>
 	<string name="signup_reason_note">이 정보는 우리가 심사를 하는 데에 참고할 수 있습니다.</string>
 	<string name="clear">모두 지우기</string>
@@ -311,12 +303,8 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d개의 좋아요</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="other">%,d개의 리블로그</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s에 %2$s에서</string>
 	<string name="time_now">방금</string>
-	<string name="post_info_reblogs">리블로그</string>
 	<string name="post_info_favorites">좋아요</string>
 	<string name="edit_history">수정 내역</string>
 	<string name="last_edit_at_x">마지막 수정: %s</string>
@@ -376,7 +364,6 @@
 	<string name="welcome_page1_title">마스토돈이란?</string>
 	<string name="welcome_page1_text">당신이 @example.com으로 끝나는 이메일 주소를 갖고 있다고 상상해보세요.\n\n당신은 이메일이 @gmail.com이나 @icloud.com 또는 @example.com으로 끝나는 모두에게 이메일을 보내거나 받을 수 있습니다.</string>
 	<string name="welcome_page2_title">마스토돈도 그렇답니다.</string>
-	<string name="welcome_page2_text">당신의 핸들이 @gothgirl654@example.social이더라도, 당신은 언제나 @fallout5ever@example.online을 팔로우하거나 리블로그, 대화할 수 있습니다.</string>
 	<string name="welcome_page3_title">서버는 어떻게 선택하나요?</string>
 	<string name="welcome_page3_text">다른 사람들은 여러가지 이유로 서로 다른 서버들을 선택합니다. art.example은 예술가들에게 훌륭한 곳인 반면, glasgow.example은 스코틀랜드인들에게 좋은 선택이 될 수 있습니다.\n\n저희가 추천하는 서버를 선택하면 잘못될 일이 없으므로, 당신은 어떠한 서버를 선택하더라도(또는 서버 검색란에 직접 입력하더라도) 어디서나 소식을 놓치지 않을 것입니다.</string>
 	<string name="signup_random_server_explain">아무 것도 고르지 않은 경우, 당신의 언어에 따라 서버를 골라드립니다.</string>

From 09c1a2cfa0eb9370a8b4ff79136eb7466e11f8f6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:44 +0200
Subject: [PATCH 050/124] New translations strings.xml (Norwegian)

---
 mastodon/src/main/res/values-no-rNO/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-no-rNO/strings.xml b/mastodon/src/main/res/values-no-rNO/strings.xml
index b308def99..71139ddc6 100644
--- a/mastodon/src/main/res/values-no-rNO/strings.xml
+++ b/mastodon/src/main/res/values-no-rNO/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Forbereder autentisering…</string>
 	<string name="finishing_auth">Ferdigstiller autentisering…</string>
-	<string name="user_boosted">%s fremhevet</string>
 	<string name="in_reply_to">Som svar på %s</string>
 	<string name="notifications">Varslinger</string>
 	<string name="user_followed_you">følger deg</string>
 	<string name="user_sent_follow_request">har sendt deg en følgeforespørsel</string>
 	<string name="user_favorited">favoriserte ditt innlegg</string>
-	<string name="notification_boosted">fremhevet ditt innlegg</string>
 	<string name="poll_ended">avstemming avsluttet</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Mens vi går gjennom dette, kan du iverksettet tiltak mot @%s.</string>
 	<string name="unfollow_user">Slutt å følge @%s</string>
 	<string name="unfollow">Slutt å følge</string>
-	<string name="mute_user_explain">Du vil ikke se innlegg eller fremhevinger i tidslinjen. De vil ikke vite at de er dempet.</string>
 	<string name="block_user_explain">De kan ikke lenger følge eller se dine innlegg, men de kan se om de er blokkert.</string>
 	<string name="report_personal_title">Ønsker du ikke å se dette?</string>
 	<string name="report_personal_subtitle">Når du ser noe du ikke liker på Mastodon, kan du fjerne denne personen fra opplevelsen din.</string>
@@ -210,7 +207,6 @@
 	<string name="skip">Hopp</string>
 	<string name="notification_type_follow">Nye følgere</string>
 	<string name="notification_type_favorite">Favoritter</string>
-	<string name="notification_type_reblog">Fremhevinger</string>
 	<string name="notification_type_mention">Nevnelser</string>
 	<string name="notification_type_poll">Avstemminger</string>
 	<string name="choose_account">Velg konto</string>
@@ -237,7 +233,6 @@
 	<string name="notify_none">ingen</string>
 	<string name="notify_favorites">Favorittmarker innlegget til</string>
 	<string name="notify_follow">Følger meg</string>
-	<string name="notify_reblog">Fremhevet innlegget mitt</string>
 	<string name="notify_mention">Nevner meg</string>
 	<string name="settings_boring">Kjedelige sone</string>
 	<string name="settings_account">Kontoinnstillinger</string>
@@ -258,7 +253,6 @@
 	<string name="hide_content">Skjul innhold</string>
 	<string name="new_post">Nytt innlegg</string>
 	<string name="button_reply">Svar</string>
-	<string name="button_reblog">Fremhev</string>
 	<string name="button_favorite">Favoritt</string>
 	<string name="button_share">Del</string>
 	<string name="media_no_description">Media uten beskrivelse</string>
@@ -273,8 +267,6 @@
 	<string name="unfollowed_user">Slutt å følge %s</string>
 	<string name="followed_user">Du følger nå %s</string>
 	<string name="open_in_browser">Åpne i nettleser</string>
-	<string name="hide_boosts_from_user">Skjul fremhevinger fra %s</string>
-	<string name="show_boosts_from_user">Vis fremhevinger fra %s</string>
 	<string name="signup_reason_note">Dette vil hjelpe oss med å gjennomgå din søknad.</string>
 	<string name="clear">Tøm</string>
 	<string name="profile_header">Toppbilde</string>
@@ -315,13 +307,8 @@
 		<item quantity="one">%,d favoritt</item>
 		<item quantity="other">%,d favoritter</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d fremhev</item>
-		<item quantity="other">%,d fremhevinger</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nå</string>
-	<string name="post_info_reblogs">Fremhevinger</string>
 	<string name="post_info_favorites">Favoritter</string>
 	<string name="edit_history">Rediger historikk</string>
 	<string name="last_edit_at_x">Sist redigert %s</string>
@@ -380,7 +367,6 @@
 	<string name="server_url">Server-URL</string>
 	<string name="welcome_page1_text">Forestill deg at du sender en e-postadresse som slutter med @example.com.\n\nDu kan fortsatt sende og motta e-post fra hvem som helst, selv om e-posten deres slutter på @gmail.com eller @icloud.com eller @example.com.</string>
 	<string name="welcome_page2_title">Mastodon er slik.</string>
-	<string name="welcome_page2_text">Ditt håndtak kan være @gothgirl654@example.social, men du kan fortsatt følge, fremheve og chatte med @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Hvordan velger jeg en server?</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->

From fa2d9fec5843de35e5eea5280f6bc0ef2db624d2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:45 +0200
Subject: [PATCH 051/124] New translations strings.xml (Polish)

---
 mastodon/src/main/res/values-pl-rPL/strings.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/mastodon/src/main/res/values-pl-rPL/strings.xml b/mastodon/src/main/res/values-pl-rPL/strings.xml
index 26e3f9cac..ee02202d5 100644
--- a/mastodon/src/main/res/values-pl-rPL/strings.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Przygotowywanie do uwierzytelniania…</string>
 	<string name="finishing_auth">Kończenie uwierzytelniania…</string>
-	<string name="user_boosted">%s podbił(a)</string>
 	<string name="in_reply_to">W odpowiedzi do %s</string>
 	<string name="notifications">Powiadomienia</string>
 	<string name="user_followed_you">zaczął(-ęła) Cię obserwować</string>
 	<string name="user_sent_follow_request">wysłał(-a) prośbę o możliwość obserwacji</string>
 	<string name="user_favorited">dodał(a) Twój wpis do ulubionych</string>
-	<string name="notification_boosted">podbił(a) Twój wpis</string>
 	<string name="poll_ended">głosowanie zakończyło się</string>
 	<string name="time_seconds">%d sek.</string>
 	<string name="time_minutes">%d min.</string>
@@ -194,7 +192,6 @@
 	<string name="report_sent_subtitle">W trakcie gdy będziemy się przyglądać tej sprawie, możesz podjąć działania dotyczące %s.</string>
 	<string name="unfollow_user">Przestań obserwować %s</string>
 	<string name="unfollow">Przestań obserwować</string>
-	<string name="mute_user_explain">Nie będziesz widzieć wpisów ani podbić tego użytkownika na stronie głównej. Ta osoba nie dowie się, że została wyciszona.</string>
 	<string name="block_user_explain">Ta osoba nie będzie mogła mogła Cię śledzić ani widzieć Twoich wpisów, ale może dowiedzieć się, że została zablokowana.</string>
 	<string name="report_personal_title">Nie chcesz tego widzieć?</string>
 	<string name="report_personal_subtitle">Gdy zobaczysz na Mastodonie coś, co Ci się nie spodoba, możesz usunąć daną osobę ze swojego doświadczenia.</string>
@@ -251,7 +248,6 @@
 	<string name="skip">Pomiń</string>
 	<string name="notification_type_follow">Nowi obserwujący</string>
 	<string name="notification_type_favorite">Polubienia</string>
-	<string name="notification_type_reblog">Podbicia</string>
 	<string name="notification_type_mention">Wspomienia</string>
 	<string name="notification_type_poll">Głosowania</string>
 	<string name="choose_account">Wybierz konto</string>
@@ -280,7 +276,6 @@
 	<string name="notify_none">nikt</string>
 	<string name="notify_favorites">Doda mój wpis do ulubionych</string>
 	<string name="notify_follow">Zacznie mnie obserwować</string>
-	<string name="notify_reblog">Podbija mój wpis</string>
 	<string name="notify_mention">Wspomni o mnie</string>
 	<string name="settings_boring">Nudne opcje</string>
 	<string name="settings_account">Ustawienia konta</string>
@@ -301,7 +296,6 @@
 	<string name="hide_content">Ukryj treść</string>
 	<string name="new_post">Nowy wpis</string>
 	<string name="button_reply">Odpowiedz</string>
-	<string name="button_reblog">Podbij</string>
 	<string name="button_favorite">Dodaj do ulubionych</string>
 	<string name="button_share">Udostępnij</string>
 	<string name="media_no_description">Media bez opisu</string>
@@ -316,8 +310,6 @@
 	<string name="unfollowed_user">Przestano obserwować %s</string>
 	<string name="followed_user">Od teraz obserwujesz %s</string>
 	<string name="open_in_browser">Otwórz w przeglądarce</string>
-	<string name="hide_boosts_from_user">Ukryj podbicia od %s</string>
-	<string name="show_boosts_from_user">Pokaż podbicia od %s</string>
 	<string name="signup_reason">Dlaczego chcesz dołączyć?</string>
 	<string name="signup_reason_note">To pomoże nam ocenić Twoją aplikację.</string>
 	<string name="clear">Wyczyść</string>
@@ -365,15 +357,8 @@
 		<item quantity="many">%,d ulubionych</item>
 		<item quantity="other">%,d ulubionych</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d podbicie</item>
-		<item quantity="few">%,d podbicia</item>
-		<item quantity="many">%,d podbić</item>
-		<item quantity="other">%,d podbić</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s przez %2$s</string>
 	<string name="time_now">przed chwilą</string>
-	<string name="post_info_reblogs">Podbicia</string>
 	<string name="post_info_favorites">Ulubione</string>
 	<string name="edit_history">Historia edycji</string>
 	<string name="last_edit_at_x">Ostatnia zmiana: %s</string>
@@ -439,7 +424,6 @@
 	<string name="welcome_page1_title">Czym jest Mastodon?</string>
 	<string name="welcome_page1_text">Wyobraź sobie, że masz adres e-mail, który kończy się @example.com.\n\nNadal możesz wysyłać i odbierać wiadomości od każdego, nawet jeśli ich e-mail kończy się na @gmail.com lub @icloud.com lub @przykład.com.</string>
 	<string name="welcome_page2_title">Mastodon jest taki.</string>
-	<string name="welcome_page2_text">Twój nick może brzmieć @gothgirl654@example.social, ale nadal możesz obserwować, reblogować i rozmawiać z @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Jak wybrać serwer?</string>
 	<string name="welcome_page3_text">Różne osoby wybierają różne serwery z różnych powodu. art.example to świetne miejsce dla artystów, podczas gdy glasgow.przykład może być dobrym wyborem dla Szkotów.\n\nNie zrobisz źle wybierając dowolny z naszych rekomendowanych serwerów, dlatego niezależnie od tego który wybierzesz (lub jeśli wpiszesz swój własny na pasku wyszukiwania serwera), nigdy nie przegapisz niczego.</string>
 	<string name="signup_random_server_explain">My wybierzemy serwer oparty na twoim języku, jeśli kontynuujesz bez dokonywania wyboru.</string>

From dffa4e4594f5c6c45b883ebc1779bb29971363ef Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:46 +0200
Subject: [PATCH 052/124] New translations strings.xml (Portuguese)

---
 mastodon/src/main/res/values-pt-rPT/strings.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/mastodon/src/main/res/values-pt-rPT/strings.xml b/mastodon/src/main/res/values-pt-rPT/strings.xml
index 2382b4ab1..f86eb8829 100644
--- a/mastodon/src/main/res/values-pt-rPT/strings.xml
+++ b/mastodon/src/main/res/values-pt-rPT/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">A preparar a autenticação…</string>
 	<string name="finishing_auth">A finalizar a autenticação…</string>
-	<string name="user_boosted">%s republicado</string>
 	<string name="in_reply_to">Responder a %s</string>
 	<string name="notifications">Notificações</string>
 	<string name="user_followed_you">seguiu-te</string>
 	<string name="user_sent_follow_request">pediu para te seguir</string>
 	<string name="user_favorited">gostou da sua publicação</string>
-	<string name="notification_boosted">republicou a sua publicação</string>
 	<string name="poll_ended">sondagem terminada</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Enquanto revemos a sua denúncia, pode tomar medidas contra %s.</string>
 	<string name="unfollow_user">Deixar de seguir %s</string>
 	<string name="unfollow">Deixar de seguir</string>
-	<string name="mute_user_explain">Não verá publicações e re-publicacões na sua fonte inicial. Eles não saberão que foram silenciados.</string>
 	<string name="block_user_explain">Eles não poderão segui-lo ou ver as suas publicações, mas conseguem ver se foram bloqueados.</string>
 	<string name="report_personal_title">Não quer ver isto?</string>
 	<string name="report_personal_subtitle">Quando vê algo que não gosta no Mastodon pode remover a pessoa da sua experiência.</string>
@@ -211,7 +208,6 @@
 	<string name="skip">Ignorar</string>
 	<string name="notification_type_follow">Novos seguidores</string>
 	<string name="notification_type_favorite">Favoritos</string>
-	<string name="notification_type_reblog">Re-publicacões</string>
 	<string name="notification_type_mention">Menções</string>
 	<string name="notification_type_poll">Sondagens</string>
 	<string name="choose_account">Escolher conta</string>
@@ -263,13 +259,8 @@
 		<item quantity="one">%,d favorito</item>
 		<item quantity="other">%,d favoritos</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d re-publicação</item>
-		<item quantity="other">%,d re-publicações</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">agora</string>
-	<string name="post_info_reblogs">Re-publicacões</string>
 	<string name="post_info_favorites">Favoritos</string>
 	<string name="edit_history">Editar histórico</string>
 	<string name="last_edit_at_x">Última edição: %s</string>

From 3c44c80e2e21db4b7254b15cc4e996deabacafd7 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:47 +0200
Subject: [PATCH 053/124] New translations strings.xml (Russian)

---
 mastodon/src/main/res/values-ru-rRU/strings.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/mastodon/src/main/res/values-ru-rRU/strings.xml b/mastodon/src/main/res/values-ru-rRU/strings.xml
index 5acf79889..587d7e307 100644
--- a/mastodon/src/main/res/values-ru-rRU/strings.xml
+++ b/mastodon/src/main/res/values-ru-rRU/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Подготовка к авторизации…</string>
 	<string name="finishing_auth">Завершение авторизации…</string>
-	<string name="user_boosted">%s продвинул(а)</string>
 	<string name="in_reply_to">В ответ %s</string>
 	<string name="notifications">Уведомления</string>
 	<string name="user_followed_you">подписался(ась) на вас</string>
 	<string name="user_sent_follow_request">прислал(а) запрос на подписку</string>
 	<string name="user_favorited">добавил(а) ваш пост в избранное</string>
-	<string name="notification_boosted">продвинул(а) ваш пост</string>
 	<string name="poll_ended">опрос завершён</string>
 	<string name="time_seconds">%dс</string>
 	<string name="time_minutes">%dм</string>
@@ -194,7 +192,6 @@
 	<string name="report_sent_subtitle">Пока мы рассматриваем его, вот действия, которые вы можете предпринять лично против %s.</string>
 	<string name="unfollow_user">Отписаться от %s</string>
 	<string name="unfollow">Отписаться</string>
-	<string name="mute_user_explain">Вы перестаните видеть посты и продвижения этого пользователя в домашней ленте. Он(а) не узнает, что вы игнорируете его/её.</string>
 	<string name="block_user_explain">Этот пользователь больше не сможет подписаться на вас или читать ваши посты. Он(а) сможет видеть, что заблокирован(а).</string>
 	<string name="report_personal_title">Не хотите видеть это?</string>
 	<string name="report_personal_subtitle">Если кто-то в Mastodon публикует то, что вам не нравится, вы можете скрыть его.</string>
@@ -251,7 +248,6 @@
 	<string name="skip">Пропустить</string>
 	<string name="notification_type_follow">Новые подписчики</string>
 	<string name="notification_type_favorite">Избранное</string>
-	<string name="notification_type_reblog">Продвижения</string>
 	<string name="notification_type_mention">Упоминания</string>
 	<string name="notification_type_poll">Опросы</string>
 	<string name="choose_account">Выберите аккаунт</string>
@@ -280,7 +276,6 @@
 	<string name="notify_none">никто</string>
 	<string name="notify_favorites">Добавляет мой пост в избранное</string>
 	<string name="notify_follow">Подписывается на меня</string>
-	<string name="notify_reblog">Продвигает мой пост</string>
 	<string name="notify_mention">Упоминает меня</string>
 	<string name="settings_boring">Зона скукотищи</string>
 	<string name="settings_account">Настройки учётной записи</string>
@@ -301,7 +296,6 @@
 	<string name="hide_content">Скрыть содержимое</string>
 	<string name="new_post">Новый пост</string>
 	<string name="button_reply">Ответить</string>
-	<string name="button_reblog">Продвинуть</string>
 	<string name="button_favorite">Добавить в избранное</string>
 	<string name="button_share">Поделиться</string>
 	<string name="media_no_description">Медиа без описания</string>
@@ -316,8 +310,6 @@
 	<string name="unfollowed_user">Вы отписались от %s</string>
 	<string name="followed_user">Вы подписались на %s</string>
 	<string name="open_in_browser">Открыть в браузере</string>
-	<string name="hide_boosts_from_user">Скрыть продвижения от %s</string>
-	<string name="show_boosts_from_user">Показывать продвижения от %s</string>
 	<string name="signup_reason">Почему вы хотите присоединиться?</string>
 	<string name="signup_reason_note">Это поможет нам рассмотреть вашу заявку.</string>
 	<string name="clear">Очистить</string>
@@ -359,15 +351,8 @@
 		<item quantity="many">%,d подписок</item>
 		<item quantity="other">%,d подписок</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d продвижение</item>
-		<item quantity="few">%,d продвижения</item>
-		<item quantity="many">%,d продвижений</item>
-		<item quantity="other">Продвижений: %,d</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s через %2$s</string>
 	<string name="time_now">только что</string>
-	<string name="post_info_reblogs">Продвинули</string>
 	<string name="post_info_favorites">Избранное</string>
 	<string name="edit_history">История изменений</string>
 	<string name="last_edit_at_x">Последнее изменение: %s</string>
@@ -433,7 +418,6 @@
 	<string name="welcome_page1_title">Что такое Mastodon?</string>
 	<string name="welcome_page1_text">Представьте, что у вас есть адрес электронной почты, который заканчивается на @example.com.\n\nВы можете отправлять и получать письма от всех, даже если их адрес заканчивается на @gmail.com или @icloud.com или @example.com.</string>
 	<string name="welcome_page2_title">Mastodon работает так же.</string>
-	<string name="welcome_page2_text">Имя вашей учетной записи может быть @gothgirl654@example.social, но вы все еще можете подписаться, продвигать посты, а также общаться с @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Как выбрать сервер?</string>
 	<string name="welcome_page3_text">Разные люди выбирают разные серверы по разным причинам. art.example — отличное место для художников, а glasgow.example может быть хорошим выбором для шотландцев.\n\nВы не ошибётесь с любым из рекомендованных серверов, поэтому независимо от того, какой из них вы выберете (или если вы введёте свой собственный в строке поиска сервера), вы никогда и нигде не пропустите ни одной детали.</string>
 	<string name="signup_random_server_explain">Мы выберем сервер на основе вашего языка, если вы продолжите, не сделав выбор.</string>

From b9e1c84304cecb935f40e7f48652fcaa8faba2e4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:48 +0200
Subject: [PATCH 054/124] New translations strings.xml (Slovenian)

---
 mastodon/src/main/res/values-sl-rSI/strings.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/mastodon/src/main/res/values-sl-rSI/strings.xml b/mastodon/src/main/res/values-sl-rSI/strings.xml
index bc84c4beb..c00fa3806 100644
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">V redu</string>
 	<string name="preparing_auth">Pripravljanje na preverjanje pristnosti …</string>
 	<string name="finishing_auth">Zaključevanje preverjanja pristnosti ...</string>
-	<string name="user_boosted">%s je poobjavil_a</string>
 	<string name="in_reply_to">Kot odgovor %s</string>
 	<string name="notifications">Obvestila</string>
 	<string name="user_followed_you">vam sledi</string>
 	<string name="user_sent_follow_request">vam je poslal_a zahtevo za sledenje</string>
 	<string name="user_favorited">je vzljubil_a vašo objavo</string>
-	<string name="notification_boosted">je poobjavil_a vašo objavo</string>
 	<string name="poll_ended">anketa je zaključena</string>
 	<string name="time_seconds">%d s</string>
 	<string name="time_minutes">%d m</string>
@@ -194,7 +192,6 @@
 	<string name="report_sent_subtitle">Medtem, ko to pregledujemo, lahko proti %s ukrepate.</string>
 	<string name="unfollow_user">Prenehaj slediti %s</string>
 	<string name="unfollow">Prenehaj slediti</string>
-	<string name="mute_user_explain">Njihovih objav ali poobjav ne boste videli v svojem domačem viru. Ne bodo vedeli, da so utišani.</string>
 	<string name="block_user_explain">Nič več ne bodo mogli slediti ali videti vaše objave, lahko pa vidijo, če so blokirani.</string>
 	<string name="report_personal_title">Ali ne želite tega videti?</string>
 	<string name="report_personal_subtitle">Če vidite nekaj, česar na Masodonu ne želite, lahko odstranite osebo iz svoje izkušnje.</string>
@@ -251,7 +248,6 @@
 	<string name="skip">Preskoči</string>
 	<string name="notification_type_follow">Novi sledilci</string>
 	<string name="notification_type_favorite">Priljubljeni</string>
-	<string name="notification_type_reblog">Poobjave</string>
 	<string name="notification_type_mention">Omembe</string>
 	<string name="notification_type_poll">Ankete</string>
 	<string name="choose_account">Izberite račun</string>
@@ -280,7 +276,6 @@
 	<string name="notify_none">nihče</string>
 	<string name="notify_favorites">mojo objavo da med priljubljene</string>
 	<string name="notify_follow">me sledi</string>
-	<string name="notify_reblog">prepošlje mojo objavo</string>
 	<string name="notify_mention">me omeni</string>
 	<string name="settings_boring">Cona dolgočasja</string>
 	<string name="settings_account">Nastavitve računa</string>
@@ -301,7 +296,6 @@
 	<string name="hide_content">Skrij vsebino</string>
 	<string name="new_post">Nova objava</string>
 	<string name="button_reply">Odgovori</string>
-	<string name="button_reblog">Poobjavi</string>
 	<string name="button_favorite">Priljubljen_a</string>
 	<string name="button_share">Deli</string>
 	<string name="media_no_description">Medij brez opisa</string>
@@ -317,8 +311,6 @@
 	<string name="followed_user">Zdaj sledite %s</string>
 	<string name="following_user_requested">Zaprošeni ste, da sledite %s</string>
 	<string name="open_in_browser">Odpri v brskalniku</string>
-	<string name="hide_boosts_from_user">Skrij poobjave %s</string>
-	<string name="show_boosts_from_user">Pokaži poobjave %s</string>
 	<string name="signup_reason">Zakaj se želite pridružiti?</string>
 	<string name="signup_reason_note">To nam bo pomagalo pregledati vašo prijavo.</string>
 	<string name="clear">Počisti</string>
@@ -366,15 +358,8 @@
 		<item quantity="few">%,d priljubljeni</item>
 		<item quantity="other">%,d priljubljenih</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d poobjava</item>
-		<item quantity="two">%,d poobjavi</item>
-		<item quantity="few">%,d poobjave</item>
-		<item quantity="other">%,d poobjav</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s prek %2$s</string>
 	<string name="time_now">zdaj</string>
-	<string name="post_info_reblogs">Poobjave</string>
 	<string name="post_info_favorites">Priljubljeni</string>
 	<string name="edit_history">Uredi zgodovino</string>
 	<string name="last_edit_at_x">Zadnjič urejano %s</string>
@@ -440,7 +425,6 @@
 	<string name="welcome_page1_title">Kaj je Mastodon?</string>
 	<string name="welcome_page1_text">Predstavljajte si, da imate e-poštni naslov, ki se konča s @primer.com.\n\nŠe vedno lahko pošiljate in prejemate e-sporočilo od vsakogar, tudi če se njihov e-naslov konča @gmail.com, @icloud.com ali @primer.com.</string>
 	<string name="welcome_page2_title">Mastodon je takšen.</string>
-	<string name="welcome_page2_text">Vaša ročica je morda @veselodekle654@primer.social, vendar lahko še vedno sledite, poobjavljate objave in klepetate z @nikoli2prepozno@primer.online.</string>
 	<string name="welcome_page3_title">Kako izberem strežnik?</string>
 	<string name="welcome_page3_text">Različni ljudje izbirajo različne strežnike iz najrazličnejših razlogov. art.example je krasno mesto za uemtnike, medtem ko je glasgow.example dobra izbira za Škode.\n\nNič ne morete storiti narobe s katerim koli od naših priporočenih strežnikov, tako da je povsem nepomembno, katerega ste izbrali (ali če vnesete lastnega v iskalno vrstico strežnikov) - nikoli ne boste zamudili niti najmanjših vsebin.</string>
 	<string name="signup_random_server_explain">Izbrali bomo strežnik na osnovi vašega jezika, če nadaljujete brez izbire.</string>

From 290897ea414bb4aaef4336308e604c571c71cd96 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:49 +0200
Subject: [PATCH 055/124] New translations strings.xml (Swedish)

---
 mastodon/src/main/res/values-sv-rSE/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-sv-rSE/strings.xml b/mastodon/src/main/res/values-sv-rSE/strings.xml
index d68d74198..2a5765356 100644
--- a/mastodon/src/main/res/values-sv-rSE/strings.xml
+++ b/mastodon/src/main/res/values-sv-rSE/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Förbereder för autentisering…</string>
 	<string name="finishing_auth">Slutför autentisering…</string>
-	<string name="user_boosted">%s boostade</string>
 	<string name="in_reply_to">Som svar på %s</string>
 	<string name="notifications">Notiser</string>
 	<string name="user_followed_you">följde dig</string>
 	<string name="user_sent_follow_request">skickade en förfrågning om att följa till dig</string>
 	<string name="user_favorited">favoritmarkerade dit inlägg</string>
-	<string name="notification_boosted">boostade ditt inlägg</string>
 	<string name="poll_ended">omröstning avslutad</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Medan vi granskar detta kan du vidta åtgärder mot %s.</string>
 	<string name="unfollow_user">Avfölj %s</string>
 	<string name="unfollow">Avfölj</string>
-	<string name="mute_user_explain">Du kommer inte att se deras inlägg eller boostar i ditt hemflöde. De kommer inte att veta att de har blivit tystade.</string>
 	<string name="block_user_explain">De kommer inte längre att kunna följa eller se dina inlägg, men de kan se om de har blockerats.</string>
 	<string name="report_personal_title">Vill du inte se det här?</string>
 	<string name="report_personal_subtitle">När du ser något som du inte gillar på Mastodon kan du ta bort personen från din upplevelse.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Hoppa över</string>
 	<string name="notification_type_follow">Nya följare</string>
 	<string name="notification_type_favorite">Favoriter</string>
-	<string name="notification_type_reblog">Boostar</string>
 	<string name="notification_type_mention">Omnämningar</string>
 	<string name="notification_type_poll">Omröstningar</string>
 	<string name="choose_account">Välj konto</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">ingen</string>
 	<string name="notify_favorites">Favoritmarkerar mitt inlägg</string>
 	<string name="notify_follow">Följer mig</string>
-	<string name="notify_reblog">Boostar mitt inlägg</string>
 	<string name="notify_mention">Nämner mig</string>
 	<string name="settings_boring">Den tråkiga zonen</string>
 	<string name="settings_account">Kontoinställningar</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Dölj innehåll</string>
 	<string name="new_post">Nytt inlägg</string>
 	<string name="button_reply">Svara</string>
-	<string name="button_reblog">Boosta</string>
 	<string name="button_favorite">Favoritmarkera</string>
 	<string name="button_share">Dela</string>
 	<string name="media_no_description">Media utan beskrivning</string>
@@ -286,8 +280,6 @@
 	<string name="unfollowed_user">Avföljde %s</string>
 	<string name="followed_user">Du följer nu %s</string>
 	<string name="open_in_browser">Öppna i webbläsare</string>
-	<string name="hide_boosts_from_user">Dölj boostar från %s</string>
-	<string name="show_boosts_from_user">Visa boostar från %s</string>
 	<string name="signup_reason">Varför vill du gå med?</string>
 	<string name="signup_reason_note">Detta kommer hjälpa oss att granska din ansökan.</string>
 	<string name="clear">Rensa</string>
@@ -329,13 +321,8 @@
 		<item quantity="one">%,d favorit</item>
 		<item quantity="other">%,d favoriter</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d boost</item>
-		<item quantity="other">%,d boostar</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nu</string>
-	<string name="post_info_reblogs">Boostar</string>
 	<string name="post_info_favorites">Favoriter</string>
 	<string name="edit_history">Redigera historik</string>
 	<string name="last_edit_at_x">Senaste redigering %s</string>
@@ -397,7 +384,6 @@
 	<string name="welcome_page1_title">Vad är Mastodon?</string>
 	<string name="welcome_page1_text">Tänk dig att du har en epostadress som slutar med @example.com.\n\nDu kan skicka och ta emot epost från vem som helst, även om deras epostadress slutar med @gmail.com, @icloud.com eller @example.com.</string>
 	<string name="welcome_page2_title">Mastodon fungerar så.</string>
-	<string name="welcome_page2_text">Ditt handtag kan vara @gothgirl654@example.social men du kan fortfarande följa, boosta och chatta med @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Hur väljer jag en server?</string>
 	<string name="welcome_page3_text">Olika personer väljer olika servrar av olika anledningar. art.example är en bra plats för konstnärer medan glasgow.exempel kan vara ett bra val för skottar.\n\nMed någon av våra rekommenderar servrar kan du inte hamna fel så oavsett vilken du väljer, eller om du skriver in din egen i serverns sökfältet, kommer du aldrig missa något.</string>
 	<string name="signup_random_server_explain">Vi kommer att välja en server baserat på ditt språk om du fortsätter utan att göra ett val.</string>

From cc40198c9e9a1d62579ce338f7d51b8b7c472848 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:50 +0200
Subject: [PATCH 056/124] New translations strings.xml (Turkish)

---
 mastodon/src/main/res/values-tr-rTR/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-tr-rTR/strings.xml b/mastodon/src/main/res/values-tr-rTR/strings.xml
index f9c197a7b..3b9957fe7 100644
--- a/mastodon/src/main/res/values-tr-rTR/strings.xml
+++ b/mastodon/src/main/res/values-tr-rTR/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">Tamam</string>
 	<string name="preparing_auth">Kimlik doğrulama için hazırlanıyor…</string>
 	<string name="finishing_auth">Kimlik doğrulama tamamlanıyor…</string>
-	<string name="user_boosted">%s yeniden paylaştı</string>
 	<string name="in_reply_to">%s için yanıt</string>
 	<string name="notifications">Bildirimler</string>
 	<string name="user_followed_you">seni takip etti</string>
 	<string name="user_sent_follow_request">sana bir takip isteği gönderdi</string>
 	<string name="user_favorited">gönderinizi favorilerine ekledi</string>
-	<string name="notification_boosted">gönderinizi yeniden paylaştı</string>
 	<string name="poll_ended">oylama sona erdi</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dd</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Biz bunu incelerken siz %s karşı önlem alabilirsiniz.</string>
 	<string name="unfollow_user">Takipten çık %s</string>
 	<string name="unfollow">Takipten çık</string>
-	<string name="mute_user_explain">Ana sayfa akışınızda gönderilerini görmezsiniz. Sessize alındıklarını bilmeyecekler.</string>
 	<string name="block_user_explain">Artık sizi takip edemez ve gönderilerinizi göremezler ama engellendiklerini görebilirler.</string>
 	<string name="report_personal_title">Bunu görmek istemiyor musun?</string>
 	<string name="report_personal_subtitle">Mastodon\'da beğenmediğiniz bir şey gördüğünüzde, o kişiyi deneyiminizden çıkarabilirsiniz.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Atla</string>
 	<string name="notification_type_follow">Yeni takipçiler</string>
 	<string name="notification_type_favorite">Favoriler</string>
-	<string name="notification_type_reblog">Yeniden paylaşımlar</string>
 	<string name="notification_type_mention">Bahsetmeler</string>
 	<string name="notification_type_poll">Anketler</string>
 	<string name="choose_account">Hesap seç</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">bilgilendirme</string>
 	<string name="notify_favorites">Gönderiğimi beğendiğinde</string>
 	<string name="notify_follow">Beni takip ettiğinde</string>
-	<string name="notify_reblog">Gönderimi yeniden paylaştığında</string>
 	<string name="notify_mention">Benden bahsettiğinde</string>
 	<string name="settings_boring">Sıkıcı bölge</string>
 	<string name="settings_account">Hesap ayarları</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">İçeriği gizle</string>
 	<string name="new_post">Yeni gönderi</string>
 	<string name="button_reply">Cevapla</string>
-	<string name="button_reblog">Yeniden paylaş</string>
 	<string name="button_favorite">Favorile</string>
 	<string name="button_share">Paylaş</string>
 	<string name="media_no_description">Açıklamasız medya</string>
@@ -286,8 +280,6 @@
 	<string name="unfollowed_user">%s takip edilmedi</string>
 	<string name="followed_user">%s kişisini takip ediyorsunuz</string>
 	<string name="open_in_browser">Tarayıcıda aç</string>
-	<string name="hide_boosts_from_user">%s kişisinin yeniden paylaşımlarını gizle</string>
-	<string name="show_boosts_from_user">%s kişisinin yeniden paylaşımlarını göster</string>
 	<string name="signup_reason">Neden katılmak istiyorsunuz?</string>
 	<string name="signup_reason_note">Bu, başvurunuzu incelememize yardımcı olacaktır.</string>
 	<string name="clear">Temizle</string>
@@ -329,13 +321,8 @@
 		<item quantity="one">%,d favori</item>
 		<item quantity="other">%,d favori</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d yeniden paylaşım</item>
-		<item quantity="other">%,d yeniden paylaşım</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s tarihinde %2$s uygulamasıyla</string>
 	<string name="time_now">şimdi</string>
-	<string name="post_info_reblogs">Yeniden Paylaşımlar</string>
 	<string name="post_info_favorites">Favoriler</string>
 	<string name="edit_history">Düzenleme geçmişi</string>
 	<string name="last_edit_at_x">Son düzenleme: %s</string>
@@ -397,7 +384,6 @@
 	<string name="welcome_page1_title">Mastodon nedir?</string>
 	<string name="welcome_page1_text">\@örnek.com ile biten bir e-posta adresiniz olduğunu düşünün. \n\n Kişilerin e-posta adresi @gmail.com, @icloud.com ya da @örnek.com ile bitse de herkese e-posta gönderebilir veya herkesten e-posta alabilirsiniz.</string>
 	<string name="welcome_page2_title">Mastodon da böyledir.</string>
-	<string name="welcome_page2_text">Adresiniz @acemicadi@ornek.social olabilir ama yine de @sessizgemi@ornek.online hesabını takip edebilir, gönderilerini paylaşabilir ve yanıtlayabilirsiniz.</string>
 	<string name="welcome_page3_title">Bir sunucuyu nasıl seçerim?</string>
 	<string name="welcome_page3_text">İnsanlar farklı sebeplerle farklı sunucular seçer. sanat.ornek sanatçılar için, istanbul.ornek İstanbullular için güzel bir seçenek olabilir. \n\n Bizim önerdiğimiz bir sunucuyu seçerek (ya da kendi sunucunuzu arama alanına yazabilirsiniz) yanlış bir şey yapmış olmazsınız, hangisini seçtiğiniz fark etmeksizin hiçbir olayı kaçırmayacaksınız.</string>
 	<string name="signup_random_server_explain">Herhangi bir seçim yapmadan devam ederseniz dilinize göre bir sunucu seçeceğiz.</string>

From 8e13d52e519d51e47c34f9dcf9fd8280b6c0d5d9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:51 +0200
Subject: [PATCH 057/124] New translations strings.xml (Chinese Simplified)

---
 mastodon/src/main/res/values-zh-rCN/strings.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings.xml b/mastodon/src/main/res/values-zh-rCN/strings.xml
index 9545fa52f..349faf4e5 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">确定</string>
 	<string name="preparing_auth">正在准备身份验证…</string>
 	<string name="finishing_auth">正在完成身份认证…</string>
-	<string name="user_boosted">%s 转发了</string>
 	<string name="in_reply_to">回复 %s</string>
 	<string name="notifications">通知</string>
 	<string name="user_followed_you">关注了你</string>
 	<string name="user_sent_follow_request">向你发送了关注请求</string>
 	<string name="user_favorited">喜欢了你的嘟文</string>
-	<string name="notification_boosted">转发了你的嘟文</string>
 	<string name="poll_ended">投票已结束</string>
 	<string name="time_seconds">%d 秒前</string>
 	<string name="time_minutes">%d 分钟前</string>
@@ -152,7 +150,6 @@
 	<string name="report_sent_subtitle">我们审查此问题期间，你也可以对 %s 采取行动。</string>
 	<string name="unfollow_user">不再关注 %s</string>
 	<string name="unfollow">取消关注</string>
-	<string name="mute_user_explain">你不会在你的主页里看到他们的嘟文和转发，他们也不会知道你隐藏了他们。</string>
 	<string name="block_user_explain">他们不能再关注你或看到你的嘟文，但他们可以知道他们是否被屏蔽。</string>
 	<string name="report_personal_title">不想看到这个？</string>
 	<string name="report_personal_subtitle">如果在Mastodon看到不喜欢的东西，可以尝试移除它。</string>
@@ -197,7 +194,6 @@
 	<string name="skip">跳过</string>
 	<string name="notification_type_follow">新关注者</string>
 	<string name="notification_type_favorite">喜欢</string>
-	<string name="notification_type_reblog">转发</string>
 	<string name="notification_type_mention">提及</string>
 	<string name="notification_type_poll">投票</string>
 	<string name="choose_account">选择账户</string>
@@ -223,7 +219,6 @@
 	<string name="notify_none">关闭通知</string>
 	<string name="notify_favorites">喜欢我的嘟文</string>
 	<string name="notify_follow">关注我</string>
-	<string name="notify_reblog">转发我的嘟文</string>
 	<string name="notify_mention">提及我</string>
 	<string name="settings_boring">更多</string>
 	<string name="settings_account">账户设置</string>
@@ -244,7 +239,6 @@
 	<string name="hide_content">隐藏内容</string>
 	<string name="new_post">新嘟文</string>
 	<string name="button_reply">回复</string>
-	<string name="button_reblog">转发</string>
 	<string name="button_favorite">喜欢</string>
 	<string name="button_share">分享</string>
 	<string name="media_no_description">没有描述的媒体</string>
@@ -259,8 +253,6 @@
 	<string name="unfollowed_user">取消关注 %s</string>
 	<string name="followed_user">你正在关注 %s</string>
 	<string name="open_in_browser">在浏览器中打开</string>
-	<string name="hide_boosts_from_user">隐藏来自 %s 的转发</string>
-	<string name="show_boosts_from_user">不再隐藏来自 %s 的转发</string>
 	<string name="signup_reason_note">这会帮助我们评估你的申请。</string>
 	<string name="clear">清除</string>
 	<string name="profile_header">资料页横幅图片</string>
@@ -298,12 +290,8 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d 次喜欢</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="other">%,d 次转发</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s 来自 %2$s</string>
 	<string name="time_now">刚刚</string>
-	<string name="post_info_reblogs">转发</string>
 	<string name="post_info_favorites">喜欢</string>
 	<string name="edit_history">编辑记录</string>
 	<string name="last_edit_at_x">编辑于 %s</string>

From 2c47d0e9edc8cd986d187e6033f900e4e891a43d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:52 +0200
Subject: [PATCH 058/124] New translations strings.xml (Chinese Traditional)

---
 mastodon/src/main/res/values-zh-rTW/strings.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mastodon/src/main/res/values-zh-rTW/strings.xml b/mastodon/src/main/res/values-zh-rTW/strings.xml
index 32b10ae85..2c1c5be7c 100644
--- a/mastodon/src/main/res/values-zh-rTW/strings.xml
+++ b/mastodon/src/main/res/values-zh-rTW/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">確定</string>
 	<string name="preparing_auth">正在準備認證……</string>
 	<string name="finishing_auth">正在結束認證……</string>
-	<string name="user_boosted">%s 已轉嘟</string>
 	<string name="in_reply_to">回覆給 %s</string>
 	<string name="notifications">通知</string>
 	<string name="user_followed_you">已跟隨您</string>
 	<string name="user_sent_follow_request">傳送跟隨請求給您</string>
 	<string name="user_favorited">已將您的嘟文加入最愛</string>
-	<string name="notification_boosted">已轉嘟您的嘟文</string>
 	<string name="poll_ended">投票已結束</string>
 	<string name="time_seconds">%d 秒</string>
 	<string name="time_minutes">%d 分</string>
@@ -152,7 +150,6 @@
 	<string name="report_sent_subtitle">當我們正在審核時，您可以對 %s 採取以下措施。</string>
 	<string name="unfollow_user">取消跟隨 %s</string>
 	<string name="unfollow">取消跟隨</string>
-	<string name="mute_user_explain">您不會在您的首頁時間軸中再見到他們的嘟文或轉嘟。他們不會知道他們已被靜音。</string>
 	<string name="block_user_explain">他們將無法跟隨您或是看到您的嘟文。他們能看到他們是否已被封鎖。</string>
 	<string name="report_personal_title">不想再看到這個？</string>
 	<string name="report_personal_subtitle">當您看到某些不喜歡的內容時，您可以將該帳號從您的體驗中移除。</string>
@@ -209,7 +206,6 @@
 	<string name="skip">跳過</string>
 	<string name="notification_type_follow">新的跟隨者</string>
 	<string name="notification_type_favorite">最愛</string>
-	<string name="notification_type_reblog">個轉嘟</string>
 	<string name="notification_type_mention">提及</string>
 	<string name="notification_type_poll">投票</string>
 	<string name="choose_account">選擇帳號</string>
@@ -235,7 +231,6 @@
 	<string name="notify_none">沒有人</string>
 	<string name="notify_favorites">將我的嘟文加到最愛</string>
 	<string name="notify_follow">跟隨我</string>
-	<string name="notify_reblog">轉嘟我的嘟文</string>
 	<string name="notify_mention">提及我</string>
 	<string name="settings_boring">無聊的區域</string>
 	<string name="settings_account">帳號設定</string>
@@ -256,7 +251,6 @@
 	<string name="hide_content">隱藏內容</string>
 	<string name="new_post">新嘟文</string>
 	<string name="button_reply">回覆</string>
-	<string name="button_reblog">轉嘟</string>
 	<string name="button_favorite">最愛</string>
 	<string name="button_share">分享</string>
 	<string name="media_no_description">沒有描述的媒體</string>
@@ -272,8 +266,6 @@
 	<string name="followed_user">您現在開始跟隨 %s</string>
 	<string name="following_user_requested">要求跟隨 %s</string>
 	<string name="open_in_browser">在瀏覽器中開啟</string>
-	<string name="hide_boosts_from_user">隱藏來自 %s 的轉嘟</string>
-	<string name="show_boosts_from_user">顯示來自 %s 的轉嘟</string>
 	<string name="signup_reason">為什麼想要加入呢？</string>
 	<string name="signup_reason_note">這會協助我們審核您的申請。</string>
 	<string name="clear">清除</string>
@@ -312,12 +304,8 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d 個最愛</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="other">%,d 個轉嘟</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s 透過 %2$s</string>
 	<string name="time_now">剛剛</string>
-	<string name="post_info_reblogs">轉嘟</string>
 	<string name="post_info_favorites">最愛</string>
 	<string name="edit_history">編輯記錄</string>
 	<string name="last_edit_at_x">上次編輯於 %s</string>
@@ -377,7 +365,6 @@
 	<string name="welcome_page1_title">什麼是 Mastodon？</string>
 	<string name="welcome_page1_text">想像您擁有以 @example.com 結尾的 email 信箱地址。\n\n您仍可發送及接收來自任何人的電子郵件，無論他們的信箱是來自 @gmail.com 或 @icloud.com 或 @example.com。</string>
 	<string name="welcome_page2_title">Mastodon 就像這樣。</string>
-	<string name="welcome_page2_text">您的帳號可以是 @gothgirl654@example.social，但您仍可跟隨、轉嘟或是與 @fallout5ever@example.online 聊天互動。</string>
 	<string name="welcome_page3_title">如何挑選伺服器？</string>
 	<string name="welcome_page3_text">不同人基於各式各樣的原因挑選不同的伺服器。art.example 也許對藝術家來說是個好地方，glasgow.example 也許對於蘇格蘭人來說是個好選擇。\n\n任何我們推薦的伺服器都是不錯的選擇（或著您也能從搜尋欄中輸入您自己的伺服器），您不會錯過任何來自聯邦宇宙角落的嘟嘟聲。</string>
 	<string name="signup_random_server_explain">如果您不選擇而繼續的話，我們將透過您的語言設定替您選擇一台伺服器。</string>

From 20dc9bb8b95ab6b48b814742159c8c765663d5ba Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:53 +0200
Subject: [PATCH 059/124] New translations strings.xml (Vietnamese)

---
 mastodon/src/main/res/values-vi-rVN/strings.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mastodon/src/main/res/values-vi-rVN/strings.xml b/mastodon/src/main/res/values-vi-rVN/strings.xml
index 255c1596c..fd5b1e0d2 100644
--- a/mastodon/src/main/res/values-vi-rVN/strings.xml
+++ b/mastodon/src/main/res/values-vi-rVN/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Chuẩn bị xác thực…</string>
 	<string name="finishing_auth">Hoàn tất xác thực…</string>
-	<string name="user_boosted">%s đăng lại</string>
 	<string name="in_reply_to">%s viết tiếp</string>
 	<string name="notifications">Thông báo</string>
 	<string name="user_followed_you">đã theo dõi bạn</string>
 	<string name="user_sent_follow_request">đã yêu cầu theo dõi bạn</string>
 	<string name="user_favorited">thích tút của bạn</string>
-	<string name="notification_boosted">đăng lại tút của bạn</string>
 	<string name="poll_ended">cuộc bình chọn kết thúc</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -152,7 +150,6 @@
 	<string name="report_sent_subtitle">Trong lúc chờ chúng tôi xem xét, bạn có thể áp dụng hành động với @%s.</string>
 	<string name="unfollow_user">Ngưng theo dõi %s</string>
 	<string name="unfollow">Ngưng theo dõi</string>
-	<string name="mute_user_explain">Bạn sẽ không thấy tút hoặc lượt đăng lại của họ trên bảng tin. Họ không biết rằng bạn ẩn họ.</string>
 	<string name="block_user_explain">Họ sẽ không thể theo dõi hoặc đọc tút của bạn, nhưng họ có thể hiểu bạn đã chặn họ.</string>
 	<string name="report_personal_title">Không muốn xem thứ này?</string>
 	<string name="report_personal_subtitle">Khi bạn thấy có gì đó mà bạn không thích trên Mastodon, bạn có thể tự loại bỏ chúng.</string>
@@ -209,7 +206,6 @@
 	<string name="skip">Bỏ qua</string>
 	<string name="notification_type_follow">Người theo dõi mới</string>
 	<string name="notification_type_favorite">Lượt thích</string>
-	<string name="notification_type_reblog">Đăng lại</string>
 	<string name="notification_type_mention">Lượt nhắc đến</string>
 	<string name="notification_type_poll">Cuộc bình chọn</string>
 	<string name="choose_account">Chọn tài khoản</string>
@@ -235,7 +231,6 @@
 	<string name="notify_none">không một ai</string>
 	<string name="notify_favorites">Thích tút của tôi</string>
 	<string name="notify_follow">Theo dõi tôi</string>
-	<string name="notify_reblog">Đăng lại tút của tôi</string>
 	<string name="notify_mention">Nhắc đến tôi</string>
 	<string name="settings_boring">Nhàm chán</string>
 	<string name="settings_account">Cài đặt tài khoản</string>
@@ -256,7 +251,6 @@
 	<string name="hide_content">Ẩn nội dung</string>
 	<string name="new_post">Viết tút</string>
 	<string name="button_reply">Trả lời</string>
-	<string name="button_reblog">Đăng lại</string>
 	<string name="button_favorite">Thích</string>
 	<string name="button_share">Chia sẻ</string>
 	<string name="media_no_description">Media chưa có mô tả</string>
@@ -272,8 +266,6 @@
 	<string name="followed_user">Bạn đã theo dõi %s</string>
 	<string name="following_user_requested">Yêu cầu theo dõi %s</string>
 	<string name="open_in_browser">Mở trong trình duyệt</string>
-	<string name="hide_boosts_from_user">Ẩn đăng lại từ %s</string>
-	<string name="show_boosts_from_user">Hiện đăng lại từ %s</string>
 	<string name="signup_reason">Vì sao bạn muốn tham gia?</string>
 	<string name="signup_reason_note">Điều này sẽ giúp chúng tôi phê duyệt đăng ký của bạn.</string>
 	<string name="clear">Xóa</string>
@@ -312,12 +304,8 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d lượt thích</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="other">%,d đăng lại</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s qua %2$s</string>
 	<string name="time_now">vừa xong</string>
-	<string name="post_info_reblogs">Lượt đăng lại</string>
 	<string name="post_info_favorites">Lượt thích</string>
 	<string name="edit_history">Lịch sử chỉnh sửa</string>
 	<string name="last_edit_at_x">Sửa lần cuối %s</string>
@@ -377,7 +365,6 @@
 	<string name="welcome_page1_title">Mastodon là gì?</string>
 	<string name="welcome_page1_text">Hãy tưởng tượng bạn có một địa chỉ email tên miền @example.com.\n\nBạn vẫn có thể gửi và nhận email từ bất kỳ ai, ngay cả khi email của họ là @gmail.com hoặc @icloud.com hoặc @example.com.</string>
 	<string name="welcome_page2_title">Mastodon tương tự vậy.</string>
-	<string name="welcome_page2_text">Địa chỉ của bạn có thể là @gothgirl654@example.social nhưng bạn vẫn có thể theo dõi, đăng lại tút và trò chuyện với @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Làm thế nào để chọn một máy chủ?</string>
 	<string name="welcome_page3_text">Mọi người chọn các máy chủ khác nhau vì nhiều lý do. art.example là một nơi tuyệt vời cho các nghệ sĩ, trong khi glasgow.example có thể là một lựa chọn tốt cho người Scotland.\n\nBạn có thể chọn bất kỳ máy chủ đề xuất nào của chúng tôi, vì vậy, bất kể bạn chọn máy chủ nào (hoặc tự chọn trong thanh tìm kiếm của máy chủ), bạn sẽ không bao giờ bỏ lỡ một nhịp nào ở bất cứ đâu.</string>
 	<string name="signup_random_server_explain">Chúng tôi sẽ chọn một máy chủ dựa trên ngôn ngữ của bạn nếu bạn tiếp tục mà không lựa chọn.</string>

From ecee9e01a6abf1b84999a7b7faf6152b988616d2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:54 +0200
Subject: [PATCH 060/124] New translations strings.xml (Galician)

---
 mastodon/src/main/res/values-gl-rES/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-gl-rES/strings.xml b/mastodon/src/main/res/values-gl-rES/strings.xml
index 2adfe9a88..f1a702643 100644
--- a/mastodon/src/main/res/values-gl-rES/strings.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparándose para a autenticación…</string>
 	<string name="finishing_auth">Rematando coa autenticación…</string>
-	<string name="user_boosted">%s promoveu</string>
 	<string name="in_reply_to">Como resposta a %s</string>
 	<string name="notifications">Notificacións</string>
 	<string name="user_followed_you">séguete</string>
 	<string name="user_sent_follow_request">enviouche unha solicitude de seguimento</string>
 	<string name="user_favorited">marcou a túa publicación como favorita</string>
-	<string name="notification_boosted">compartiu a túa publicación</string>
 	<string name="poll_ended">rematou a enquisa</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Mestras revisamos, podes tomar accións contra %s.</string>
 	<string name="unfollow_user">Deixar de seguir a %s</string>
 	<string name="unfollow">Deixar de seguir</string>
-	<string name="mute_user_explain">Non verás as súas publicacións ou repeticións na túa cronoloxía. Non saberá que foi acalada.</string>
 	<string name="block_user_explain">Non poderá seguirte nin ver o que publicas, pero pode ver se foi bloqueada.</string>
 	<string name="report_personal_title">Non queres ver esto?</string>
 	<string name="report_personal_subtitle">Cando ves en Mastodon algo que non che gusta podes retirar a esa persoa da túa experiencia como usuaria.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Omitir</string>
 	<string name="notification_type_follow">Novas seguidoras</string>
 	<string name="notification_type_favorite">Favoritas</string>
-	<string name="notification_type_reblog">Promocións</string>
 	<string name="notification_type_mention">Mencións</string>
 	<string name="notification_type_poll">Enquisas</string>
 	<string name="choose_account">Elixir conta</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">ninguén</string>
 	<string name="notify_favorites">Favorece unha publicación miña</string>
 	<string name="notify_follow">Me segue</string>
-	<string name="notify_reblog">Promove a miña publicación</string>
 	<string name="notify_mention">Me menciona</string>
 	<string name="settings_boring">A zona aburrida</string>
 	<string name="settings_account">Axustes da conta</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Agochar contido</string>
 	<string name="new_post">Nova publicación</string>
 	<string name="button_reply">Responder</string>
-	<string name="button_reblog">Promover</string>
 	<string name="button_favorite">Favorecer</string>
 	<string name="button_share">Compartir</string>
 	<string name="media_no_description">Multimedia sen descrición</string>
@@ -287,8 +281,6 @@
 	<string name="followed_user">Estás a seguir a %s</string>
 	<string name="following_user_requested">Solicitaches seguir a %s</string>
 	<string name="open_in_browser">Abrir nun navegador</string>
-	<string name="hide_boosts_from_user">Agochar promocións de @%s</string>
-	<string name="show_boosts_from_user">Mostrar promocións de %s</string>
 	<string name="signup_reason">Por qué queres unirte?</string>
 	<string name="signup_reason_note">Esto axudaranos a revisar a tua solicitude.</string>
 	<string name="clear">Limpar</string>
@@ -330,13 +322,8 @@
 		<item quantity="one">%,d favorita</item>
 		<item quantity="other">%,d favoritas</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d promoción</item>
-		<item quantity="other">%,d promocións</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s vía %2$s</string>
 	<string name="time_now">agora</string>
-	<string name="post_info_reblogs">Promocións</string>
 	<string name="post_info_favorites">Favoritas</string>
 	<string name="edit_history">Editar historial</string>
 	<string name="last_edit_at_x">Última edición %s</string>
@@ -398,7 +385,6 @@
 	<string name="welcome_page1_title">Qué é Mastodon?</string>
 	<string name="welcome_page1_text">Imaxina que tes un enderezo de email que remata con @exemplo.com.\n\nPodes recibir e enviar mensaxes con calquera persoa, incluso se o seu email remata en @gmail.com ou @icloud.com ou @exemplo.com.</string>
 	<string name="welcome_page2_title">Mastodon é o mesmo.</string>
-	<string name="welcome_page2_text">O teu identificador pode ser @rula654@exemplo.social, pero podes seguir, promover e conversar con @gz4libre@exemplo.online.</string>
 	<string name="welcome_page3_title">Como elexir un servidor?</string>
 	<string name="welcome_page3_text">Pode haber moitas razóns para elexir un servidor. art.exemplo é un bo lugar para artistas, mentras glasgow.exemplo podería ser axeitado para persoas escocesas.\n\nNon terás problemas con calquera dos servidores recomendados, así que independentemente do que elixas (ou se escribes o teu propio na caixa de busca) non botarás nada en falta.</string>
 	<string name="signup_random_server_explain">Elixiremos un servidor no teu idioma se segues sen seleccionar nada.</string>

From 89f83fbf6210e3fb5509e15d397b604bbd16c2d9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:55 +0200
Subject: [PATCH 061/124] New translations strings.xml (Portuguese, Brazilian)

---
 mastodon/src/main/res/values-pt-rBR/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-pt-rBR/strings.xml b/mastodon/src/main/res/values-pt-rBR/strings.xml
index 7fb16be90..1e6f4f07d 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparando para autenticação…</string>
 	<string name="finishing_auth">Finalizando autenticação…</string>
-	<string name="user_boosted">%s reblogou</string>
 	<string name="in_reply_to">Em resposta à %s</string>
 	<string name="notifications">Notificações</string>
 	<string name="user_followed_you">seguiu você</string>
 	<string name="user_sent_follow_request">enviou uma solicitação para seguir você</string>
 	<string name="user_favorited">favoritou seu post</string>
-	<string name="notification_boosted">reblogou sua publicação</string>
 	<string name="poll_ended">enquete encerrada</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Enquanto analisamos isso, você pode tomar medidas contra @%s.</string>
 	<string name="unfollow_user">Deixar de seguir %s</string>
 	<string name="unfollow">Deixar de seguir</string>
-	<string name="mute_user_explain">Você não verá as publicações ou reblogs dessa conta na sua pagina inicial. Essa pessoa não saberá que foi silenciada.</string>
 	<string name="block_user_explain">Essa conta não poderá mais te seguir ou ver suas publicações, mas ela poderá ver que foi bloqueada.</string>
 	<string name="report_personal_title">Não quer ver isto?</string>
 	<string name="report_personal_subtitle">Quando você ver algo que não gosta no Mastodon, pode remover a pessoa da sua experiência.</string>
@@ -223,7 +220,6 @@
 	<string name="skip">Pular</string>
 	<string name="notification_type_follow">Novos seguidores</string>
 	<string name="notification_type_favorite">Favoritos</string>
-	<string name="notification_type_reblog">Reblogs</string>
 	<string name="notification_type_mention">Menções</string>
 	<string name="notification_type_poll">Enquetes</string>
 	<string name="choose_account">Escolher conta</string>
@@ -250,7 +246,6 @@
 	<string name="notify_none">ninguém</string>
 	<string name="notify_favorites">Favoritam minha publicação</string>
 	<string name="notify_follow">Me seguirem</string>
-	<string name="notify_reblog">Rebloga minha publicação</string>
 	<string name="notify_mention">Me mencionarem</string>
 	<string name="settings_boring">A zona chata</string>
 	<string name="settings_account">Configurações da conta</string>
@@ -271,7 +266,6 @@
 	<string name="hide_content">Ocultar conteúdo</string>
 	<string name="new_post">Novo post</string>
 	<string name="button_reply">Responder</string>
-	<string name="button_reblog">Reblogar</string>
 	<string name="button_favorite">Favoritar</string>
 	<string name="button_share">Compartilhar</string>
 	<string name="media_no_description">Mídia sem descrição</string>
@@ -286,8 +280,6 @@
 	<string name="unfollowed_user">Deixou de seguir %s</string>
 	<string name="followed_user">Você agora está seguindo %s</string>
 	<string name="open_in_browser">Abrir no navegador</string>
-	<string name="hide_boosts_from_user">Ocultar reblogues de %s</string>
-	<string name="show_boosts_from_user">Mostrar reblogues de %s</string>
 	<string name="signup_reason">Por que você deseja se inscrever?</string>
 	<string name="signup_reason_note">Isso vai nos ajudar a revisar sua inscrição.</string>
 	<string name="clear">Limpar</string>
@@ -329,13 +321,8 @@
 		<item quantity="one">%,d favorito</item>
 		<item quantity="other">%,d favoritos</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d reblog</item>
-		<item quantity="other">%,d reblogs</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">agora</string>
-	<string name="post_info_reblogs">Reblogues</string>
 	<string name="post_info_favorites">Favoritos</string>
 	<string name="edit_history">Histórico de edição</string>
 	<string name="last_edit_at_x">Última edição %s</string>
@@ -397,7 +384,6 @@
 	<string name="welcome_page1_title">O que é o Mastodon?</string>
 	<string name="welcome_page1_text">Imagine que você tem um endereço de e-mail que termina com @example.com.\n\nVocê ainda pode enviar e receber e-mails de qualquer pessoa, mesmo que o e-mail deles termine em @gmail.com ou @icloud.com ou @example.com.</string>
 	<string name="welcome_page2_title">O Mastodon é assim.</string>
-	<string name="welcome_page2_text">Seu identificador pode ser @gothgirl654@exemplo.social, mas você ainda pode seguir, reblogar, e conversar com @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Como faço para escolher um servidor?</string>
 	<string name="welcome_page3_text">Pessoas diferentes escolhem servidores diferentes por vários motivos. O art.example é um ótimo lugar para artistas, enquanto glasgow.example pode ser uma boa escolha para escoceses.\n\nVocê não pode errar com nenhum de nossos servidores recomendados, portanto, independentemente de qual escolher (ou se inserir seu próprio na barra de pesquisa do servidor), você nunca perderá uma batida em lugar nenhum.</string>
 	<string name="signup_random_server_explain">Nós escolheremos um servidor com base no seu idioma se você continuar sem fazer uma seleção.</string>

From fdb39617d1fd0612136011936eb7aa43e4733012 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:56 +0200
Subject: [PATCH 062/124] New translations strings.xml (Persian)

---
 mastodon/src/main/res/values-fa-rIR/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mastodon/src/main/res/values-fa-rIR/strings.xml b/mastodon/src/main/res/values-fa-rIR/strings.xml
index 0a7c3b9ae..f09140ec9 100644
--- a/mastodon/src/main/res/values-fa-rIR/strings.xml
+++ b/mastodon/src/main/res/values-fa-rIR/strings.xml
@@ -14,7 +14,6 @@
 	<string name="user_followed_you">شما را دنبال می‌کند</string>
 	<string name="user_sent_follow_request">یک درخواست دنبال کردن برای شما ارسال کرد</string>
 	<string name="user_favorited">‫‬ فرسته‌تان را پسندید</string>
-	<string name="notification_boosted">مطلب شما را به‌اشتراک گذاشت</string>
 	<string name="poll_ended">نظرسنجی به پایان رسید</string>
 	<string name="time_seconds">%dثانیه</string>
 	<string name="time_minutes">%dدقیقه</string>

From b016d277e05810254f2782b98000cdfa88528359 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:57 +0200
Subject: [PATCH 063/124] New translations strings.xml (Bengali)

---
 mastodon/src/main/res/values-bn-rBD/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mastodon/src/main/res/values-bn-rBD/strings.xml b/mastodon/src/main/res/values-bn-rBD/strings.xml
index bf17bed94..cb0c6c171 100644
--- a/mastodon/src/main/res/values-bn-rBD/strings.xml
+++ b/mastodon/src/main/res/values-bn-rBD/strings.xml
@@ -12,7 +12,6 @@
 	<string name="user_followed_you">আপনাকে ফলো করেছেন</string>
 	<string name="user_sent_follow_request">ফলো করার জন্য অনুরোধ পাঠানো হয়েছে</string>
 	<string name="user_favorited">আপনার পোস্টটি পছন্দ করেছেন</string>
-	<string name="notification_boosted">আপনার পোস্টের প্রচার করা হয়েছে</string>
 	<string name="poll_ended">ভোট শেষ</string>
 	<string name="time_seconds">%d সে.</string>
 	<string name="time_minutes">%d মি.</string>

From 8efd7e8ebf2851fbbf162258d694f015a4d81433 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:58 +0200
Subject: [PATCH 064/124] New translations strings.xml (Croatian)

---
 mastodon/src/main/res/values-hr-rHR/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mastodon/src/main/res/values-hr-rHR/strings.xml b/mastodon/src/main/res/values-hr-rHR/strings.xml
index 91393f0fd..7f4453eba 100644
--- a/mastodon/src/main/res/values-hr-rHR/strings.xml
+++ b/mastodon/src/main/res/values-hr-rHR/strings.xml
@@ -173,7 +173,6 @@
 	<string name="report_sent_subtitle">Dok mi ovo pregledavamo, možete poduzeti mjere protiv %s.</string>
 	<string name="unfollow_user">Prestani pratiti %s</string>
 	<string name="unfollow">Prestani pratiti</string>
-	<string name="mute_user_explain">Nećeš vidjeti njihove postove ili reblogove u svom feedu na početnoj stranici. Neće znati da su utišani.</string>
 	<string name="block_user_explain">Više te neće moći pratiti ili vidjeti tvoje objave, ali mogu vidjeti jesu li blokirani.</string>
 	<string name="report_personal_title">Ne želiš vidjeti ovo?</string>
 	<string name="report_personal_subtitle">Kada vidiš nešto što ti se ne sviđa na Mastodonu, možeš ukloniti osobu iz svog iskustva.</string>
@@ -243,7 +242,6 @@
 	<string name="notify_none">nitko</string>
 	<string name="notify_favorites">Favorizira moj post</string>
 	<string name="notify_follow">Prati me</string>
-	<string name="notify_reblog">Rebloga moju objavu</string>
 	<string name="notify_mention">Spominje me</string>
 	<string name="settings_boring">Dosadna zona</string>
 	<string name="settings_account">Postavke računa</string>
@@ -264,7 +262,6 @@
 	<string name="hide_content">Sakrij sadržaj</string>
 	<string name="new_post">Nova objava</string>
 	<string name="button_reply">Odgovori</string>
-	<string name="button_reblog">Reblog</string>
 	<string name="button_favorite">Favorit</string>
 	<string name="button_share">Podijeli</string>
 	<string name="media_no_description">Medij bez opisa</string>

From a00f1417d2b8e544964b216c2495000683c5211a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:59 +0200
Subject: [PATCH 065/124] New translations strings.xml (Hindi)

---
 mastodon/src/main/res/values-hi-rIN/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mastodon/src/main/res/values-hi-rIN/strings.xml b/mastodon/src/main/res/values-hi-rIN/strings.xml
index 09b466a53..e3b5b51f7 100644
--- a/mastodon/src/main/res/values-hi-rIN/strings.xml
+++ b/mastodon/src/main/res/values-hi-rIN/strings.xml
@@ -8,7 +8,6 @@
 	<string name="user_followed_you">आपके साथ जुड़ा</string>
 	<string name="user_sent_follow_request">आपको एक अनुसरण अनुरोध भेजा है</string>
 	<string name="user_favorited">आपकी पोस्ट को पसंद किया</string>
-	<string name="notification_boosted">आपका पोस्ट को पुनः प्रसारित किया</string>
 	<string name="poll_ended">मतदान समाप्त</string>
 	<string name="poll_closed">बंद</string>
 	<string name="confirm_mute_title">म्यूट किए गए खाते</string>

From 5d7bcb629b622c2111c3352934b1cfe69396135a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:47:59 +0200
Subject: [PATCH 066/124] New translations strings.xml (Burmese)

---
 mastodon/src/main/res/values-my-rMM/strings.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mastodon/src/main/res/values-my-rMM/strings.xml b/mastodon/src/main/res/values-my-rMM/strings.xml
index c57b37301..038c42ea6 100644
--- a/mastodon/src/main/res/values-my-rMM/strings.xml
+++ b/mastodon/src/main/res/values-my-rMM/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">အိုကေ</string>
 	<string name="preparing_auth">အထောက်အထားစိစစ်ရန် ပြင်ဆင်နေသည်…</string>
 	<string name="finishing_auth">အထောက်အထားစိစစ်ခြင်းကို အပြီးသတ်နေသည်…</string>
-	<string name="user_boosted">%s က ရီဘလော့လုပ်ထားသည်</string>
 	<string name="in_reply_to">%s ကို ရီပလိုင်းပြန်ထား</string>
 	<string name="notifications">နိုတီများ</string>
 	<string name="user_followed_you">က သင့်ကို ဖော်လိုးလုပ်လိုက်သည်</string>
 	<string name="user_sent_follow_request">က သင့်ကို ဖော်လိုးဝါအဖြစ်တောင်းဆိုမှုတစ်ခု ပို့လိုက်သည်</string>
 	<string name="user_favorited">က သင့်ပို့စ်ကို နှစ်သက်ခဲ့သည်</string>
-	<string name="notification_boosted">က သင့်ပို့စ်ကို ရီဘလော့လုပ်လိုက်သည်</string>
 	<string name="poll_ended">ရဲ့ စစ်တမ်းပြီးဆုံးသွားပါပြီ</string>
 	<string name="time_seconds">%d စက္ကန့်</string>
 	<string name="time_minutes">%d မိနစ်</string>
@@ -180,7 +178,6 @@
 	<string name="notify_none">မည်သူကမျှ</string>
 	<string name="notify_favorites">ကျွန်ုပ်ပို့စ်ကို နှစ်သက်လျှင်</string>
 	<string name="notify_follow">ကျွန်ုပ်ကို ဖောလိုးလုပ်လျှင်</string>
-	<string name="notify_reblog">ကျွန်ုပ်ပို့စ်ကို reblog လုပ်လျှင်</string>
 	<string name="notify_mention">ကျွန်ုပ်ကို မန်းရှင်းခေါ်လျှင်</string>
 	<string name="settings_boring">ပျင်းစရာကောင်းသည်များ</string>
 	<string name="settings_account">အကောင့်ဆက်တင်များ</string>
@@ -204,7 +201,6 @@
 	<string name="my_profile">ကျွန်ုပ်၏ပရိုဖိုင်း</string>
 	<string name="media_viewer">မီဒီယာကြည့်ရှုခြင်း</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
-	<string name="post_info_reblogs">Reblog များ</string>
 	<string name="post_info_favorites">နှစ်သက်မှုများ</string>
 	<string name="edit_history">ပြင်ဆင်မှုမှတ်တမ်း</string>
 	<string name="last_edit_at_x">နောက်ဆုံးပြင်ဆင်ချိန်မှာ %s</string>

From adb7df3c717f316136a29b20a684034cc603e188 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:48:00 +0200
Subject: [PATCH 067/124] New translations strings.xml (Filipino)

---
 mastodon/src/main/res/values-fil-rPH/strings.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/values-fil-rPH/strings.xml b/mastodon/src/main/res/values-fil-rPH/strings.xml
index 4cbffe11e..e1832c86e 100644
--- a/mastodon/src/main/res/values-fil-rPH/strings.xml
+++ b/mastodon/src/main/res/values-fil-rPH/strings.xml
@@ -10,13 +10,11 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Paghahanda para sa pagpapatunay…</string>
 	<string name="finishing_auth">Natapos na ang pagpapatunay…</string>
-	<string name="user_boosted">%s reblogged</string>
 	<string name="in_reply_to">Bilang tugon kay %s</string>
 	<string name="notifications">Mga abiso</string>
 	<string name="user_followed_you">sinundan ka</string>
 	<string name="user_sent_follow_request">may nagpadala sa iyo ng follow request</string>
 	<string name="user_favorited">paborito ang iyong post</string>
-	<string name="notification_boosted">na reblogged ang iyong post</string>
 	<string name="poll_ended">natapos na ang poll</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -166,7 +164,6 @@
 	<string name="report_sent_subtitle">Habang sinusuri namin ito, maaari kang gumawa ng aksyon laban sa %s.</string>
 	<string name="unfollow_user">I-Unfollow %s</string>
 	<string name="unfollow">I-unfollow</string>
-	<string name="mute_user_explain">Hindi mo makikita ang kanilang mga post o reblogs sa iyong home feed. Hindi nila malalaman na sila ay na-mute.</string>
 	<string name="block_user_explain">Hindi na nila magagawang sundin o makita ang iyong mga post, ngunit maaari nilang makita kung na-block sila.</string>
 	<string name="report_personal_title">Ayaw mong makita ito?</string>
 	<string name="report_personal_subtitle">Kapag nakakita ka ng mga bagay na hindi mo gusto sa Mastodon, maaari mong alisin ang tao mula sa iyong karanasan.</string>
@@ -211,7 +208,6 @@
 	<string name="skip">Laktawan</string>
 	<string name="notification_type_follow">Mga Bagong Follower</string>
 	<string name="notification_type_favorite">Mga Paborito</string>
-	<string name="notification_type_reblog">Mga Reblog</string>
 	<string name="notification_type_mention">Mga binangit</string>
 	<string name="notification_type_poll">Mga botohan</string>
 	<string name="choose_account">Pumili ng account</string>
@@ -238,7 +234,6 @@
 	<string name="notify_none">walang simuman</string>
 	<string name="notify_favorites">Paborito Ang aking post</string>
 	<string name="notify_follow">Sumusunod sa akin</string>
-	<string name="notify_reblog">Reblogs ang aking post</string>
 	<string name="notify_mention">Banggitin ako</string>
 	<string name="settings_boring">Ang nakababagot na zone</string>
 	<string name="settings_account">Mga setting ng Account</string>
@@ -259,7 +254,6 @@
 	<string name="hide_content">Itago ang nilalaman</string>
 	<string name="new_post">Bagong post</string>
 	<string name="button_reply">Tumugon</string>
-	<string name="button_reblog">Reblog</string>
 	<string name="button_favorite">Paborito</string>
 	<string name="button_share">Ibahagi</string>
 	<string name="media_no_description">Media nang walang paglalarawan</string>
@@ -274,8 +268,6 @@
 	<string name="unfollowed_user">I-Unfollow %s</string>
 	<string name="followed_user">Sinusundan mo ngayon ang %s</string>
 	<string name="open_in_browser">Buksan sa browser</string>
-	<string name="hide_boosts_from_user">Itago ang mga reblog mula sa %s</string>
-	<string name="show_boosts_from_user">Ipakita ang mga reblog mula sa %s</string>
 	<string name="signup_reason_note">Makakatulong ito sa amin na suriin ang iyong aplikasyon.</string>
 	<string name="clear">I-Clear</string>
 	<string name="profile_header">Imahe ng Header</string>
@@ -316,13 +308,8 @@
 		<item quantity="one">%, d Paborito</item>
 		<item quantity="other">%, d paborito</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%, d reblog</item>
-		<item quantity="other">%, d reblog</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s sa pamamagitan ng %2$s</string>
 	<string name="time_now">ngayon</string>
-	<string name="post_info_reblogs">Mga Reblog</string>
 	<string name="post_info_favorites">Mga Paborito</string>
 	<string name="edit_history">I-Edit ang kasaysayan</string>
 	<string name="last_edit_at_x">Huling edit %s</string>
@@ -381,7 +368,6 @@
 	<string name="server_url">Ang URL ng server</string>
 	<string name="welcome_page1_text">Isipin na mayroon kang isang email address na nagtatapos sa @example. com. \n \nMaaari ka pa ring magpadala at tumanggap ng mga email mula sa sinuman, kahit na ang kanilang email ay nagtatapos sa @gmail.com o @icloud.com o @example.com.</string>
 	<string name="welcome_page2_title">Mastodon ay tulad na.</string>
-	<string name="welcome_page2_text">Ang iyong hawakan ay maaaring @gothgirl654@example.social, ngunit maaari mo pa ring sundin, reblog, at makipag-chat sa @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Paano ako pumili ng server?</string>
 	<string name="welcome_page3_text">Ang iba \'t ibang mga tao ay pumili ng iba\' t ibang mga server para sa anumang bilang ng mga kadahilanan. sining.ang halimbawa ay isang magandang lugar para sa mga artista, habang ang glasgow.halimbawa ay maaaring maging isang mahusay na pick para sa Scots.\n \nhindi ka maaaring magkamali sa alinman sa aming mga inirekumendang server, kaya anuman ang pipiliin mo (o kung ipinasok mo ang iyong sarili sa search bar ng server), hindi ka makaligtaan ng isang matalo kahit saan.</string>
 	<!-- %s is server domain -->

From 0f50fa6ba1dcb9e72532dbdeded063b3c85817e5 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:48:01 +0200
Subject: [PATCH 068/124] New translations strings.xml (Bosnian)

---
 mastodon/src/main/res/values-bs-rBA/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mastodon/src/main/res/values-bs-rBA/strings.xml b/mastodon/src/main/res/values-bs-rBA/strings.xml
index a2c8e0cc8..abc55ffca 100644
--- a/mastodon/src/main/res/values-bs-rBA/strings.xml
+++ b/mastodon/src/main/res/values-bs-rBA/strings.xml
@@ -123,7 +123,6 @@
 	<string name="report_sent_subtitle">Dok ovo razmatramo, možete poduzeti potrebno za %s.</string>
 	<string name="unfollow_user">Prestani pratiti %s</string>
 	<string name="unfollow">Prestani pratiti</string>
-	<string name="mute_user_explain">Nećete vidjeti objave i odgovore na vašem zidu. Osoba neče znati da ste je isključili.</string>
 	<string name="block_user_explain">Neće moći više pratiti vaše objave, ali mogu vidjeti ako su blokirani.</string>
 	<string name="report_personal_title">Ne želite ovo vidjeti?</string>
 	<string name="report_personal_subtitle">Kada vidite nešto nepoželjno na Mastodon-u, možete blokirati odredjeni profil.</string>
@@ -193,7 +192,6 @@
 	<string name="notify_none">nikoga</string>
 	<string name="notify_favorites">Svidjanje objave</string>
 	<string name="notify_follow">Prati me</string>
-	<string name="notify_reblog">Ponovio/la moju objavu</string>
 	<string name="notify_mention">Spominjanje</string>
 	<string name="settings_boring">Zona dosade</string>
 	<string name="settings_account">Postavke računa</string>
@@ -214,7 +212,6 @@
 	<string name="hide_content">Sakrij sadžaj</string>
 	<string name="new_post">Nova objava</string>
 	<string name="button_reply">Odgovori</string>
-	<string name="button_reblog">Dupliraj</string>
 	<string name="button_favorite">Svidja mi se</string>
 	<string name="button_share">Dijeli</string>
 	<string name="media_no_description">Medija bez opisa</string>

From 395ee0aa999364c11d45c01b8f8a3e76aa2b9cbf Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:48:03 +0200
Subject: [PATCH 069/124] New translations strings.xml (Scottish Gaelic)

---
 mastodon/src/main/res/values-gd-rGB/strings.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/mastodon/src/main/res/values-gd-rGB/strings.xml b/mastodon/src/main/res/values-gd-rGB/strings.xml
index 3e90a2a3d..37e778261 100644
--- a/mastodon/src/main/res/values-gd-rGB/strings.xml
+++ b/mastodon/src/main/res/values-gd-rGB/strings.xml
@@ -6,13 +6,11 @@
 	<string name="ok">Ceart ma-thà</string>
 	<string name="preparing_auth">Ag ullachadh an dearbhaidh…</string>
 	<string name="finishing_auth">A’ crìochnachadh an dearbhaidh…</string>
-	<string name="user_boosted">’Ga bhrosnachadh le %s</string>
 	<string name="in_reply_to">A’ freagairt dha %s</string>
 	<string name="notifications">Brathan</string>
 	<string name="user_followed_you">– ’s iad ’gad leantainn a-nis</string>
 	<string name="user_sent_follow_request">– ’s iad air iarrtas leantainn a chur thugad</string>
 	<string name="user_favorited">– ’s iad air am post agad a chur ris na h-annsachdan aca</string>
-	<string name="notification_boosted">– ’s iad air am post agad a bhrosnachadh</string>
 	<string name="poll_ended">Thàinig cunntas-bheachd gu crìoch</string>
 	<string name="time_seconds">%dd</string>
 	<string name="time_minutes">%dm</string>
@@ -190,7 +188,6 @@
 	<string name="report_sent_subtitle">Fhad ’s a bhios sinn a’ toirt sùil air, seo nas urrainn dhut dèanamh an aghaidh %s.</string>
 	<string name="unfollow_user">Na lean %s tuilleadh</string>
 	<string name="unfollow">Na lean tuilleadh</string>
-	<string name="mute_user_explain">Chan fhaic thu na postaichean aca is dè a bhrosnaich iad air inbhir na dachaigh agad tuilleadh. Cha bhi fios aca gun do mhùch thu iad.</string>
 	<string name="block_user_explain">Chan urrainn dhaibh ’gad leantainn is chan fhaic iad na postaichean agad tuilleadh ach chì iad gun deach am bacadh.</string>
 	<string name="report_personal_title">Nach eil thu airson seo fhaicinn?</string>
 	<string name="report_personal_subtitle">Nuair a chì thu rudeigin nach toigh leat air Mastodon, ’s urrainn dhut an neach a chumail fad air falbh uat.</string>
@@ -235,7 +232,6 @@
 	<string name="skip">Leum thairis air</string>
 	<string name="notification_type_follow">Luchd-leantainn ùr</string>
 	<string name="notification_type_favorite">Annsachdan</string>
-	<string name="notification_type_reblog">Brosnachaidhean</string>
 	<string name="notification_type_mention">Iomraidhean</string>
 	<string name="notification_type_poll">Cunntasan-bheachd</string>
 	<string name="choose_account">Tagh cunntas</string>
@@ -264,7 +260,6 @@
 	<string name="notify_none">nach bi duine sam bith</string>
 	<string name="notify_favorites">air post uam a chur ris na h-annsachdan</string>
 	<string name="notify_follow">air mo leantainn</string>
-	<string name="notify_reblog">air post uam a bhrosnachadh</string>
 	<string name="notify_mention">air iomradh a thoirt orm</string>
 	<string name="settings_boring">An earrann ràsanach</string>
 	<string name="settings_account">Roghainnean a’ chunntais</string>
@@ -285,7 +280,6 @@
 	<string name="hide_content">Falaich an t-susbaint</string>
 	<string name="new_post">Post ùr</string>
 	<string name="button_reply">Freagair</string>
-	<string name="button_reblog">Brosnaich</string>
 	<string name="button_favorite">Cuir ris na h-annsachdan</string>
 	<string name="button_share">Co-roinn</string>
 	<string name="media_no_description">Meadhan gun tuairisgeul</string>
@@ -300,8 +294,6 @@
 	<string name="unfollowed_user">Chan eil thu a’ leantainn %s tuilleadh</string>
 	<string name="followed_user">Tha thu a’ leantainn %s a-nis</string>
 	<string name="open_in_browser">Fosgail sa bhrabhsair</string>
-	<string name="hide_boosts_from_user">Falaich na brosnachaidhean o %s</string>
-	<string name="show_boosts_from_user">Seall na brosnachaidhean o %s</string>
 	<string name="signup_reason_note">Bidh e nas fhasa dhuinn lèirmheas a dhèanamh air d’ iarrtas.</string>
 	<string name="clear">Falamhaich</string>
 	<string name="profile_header">Dealbh a’ bhanna-chinn</string>
@@ -348,15 +340,8 @@
 		<item quantity="few">%,d annsachdan</item>
 		<item quantity="other">%,d annsachd</item>
 	</plurals>
-	<plurals name="x_reblogs">
-		<item quantity="one">%,d bhrosnachadh</item>
-		<item quantity="two">%,d bhrosnachadh</item>
-		<item quantity="few">%,d brosnachaidhean</item>
-		<item quantity="other">%,d brosnachadh</item>
-	</plurals>
 	<string name="timestamp_via_app">%1$s slighe %2$s</string>
 	<string name="time_now">an-dràsta</string>
-	<string name="post_info_reblogs">Brosnachaidhean</string>
 	<string name="post_info_favorites">Annsachdan</string>
 	<string name="edit_history">Eachdraidh nan deasachaidhean</string>
 	<string name="last_edit_at_x">An deasachadh mu dheireadh %s</string>

From a125fab57b0d5c73e690b639619aeb0d82b48a63 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 21:48:05 +0200
Subject: [PATCH 070/124] New translations strings.xml (Kabyle)

---
 mastodon/src/main/res/values-kab/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mastodon/src/main/res/values-kab/strings.xml b/mastodon/src/main/res/values-kab/strings.xml
index 5c3dd5a75..cf8e3eaed 100644
--- a/mastodon/src/main/res/values-kab/strings.xml
+++ b/mastodon/src/main/res/values-kab/strings.xml
@@ -161,7 +161,6 @@
 	<string name="report_sent_subtitle">Ideg nekkni nessenqad tuttra-inek•inem, tzemreḍ ad tḥadreḍ mgal %s.</string>
 	<string name="unfollow_user">Y•Teḥbes aḍfar n %s</string>
 	<string name="unfollow">Ur ṭṭafaṛ ara</string>
-	<string name="mute_user_explain">Ur tettwaliḍ ara tisuffaɣ-nsen neɣ iriblugen-nsen deg usuddem-inek•inem agejdan. Ur ẓerren ara belli tesgugmeḍ-ten.</string>
 	<string name="block_user_explain">Ur ttuɣalen ara ad izmiren ad ak•akem-ḍefren neɣ ad walin tisuffaɣ-inek•inem, maca ad walin ma yella ttusweḥlen.</string>
 	<string name="report_personal_title">Ur tebɣiḍ ara ad twaliḍ aya?</string>
 	<string name="report_personal_subtitle">Mi ara twaliḍ kra ur ak•am-neɛǧib ara ɣef Mastodon, tzemreḍ ad tekkseḍ amdan-nni seg tirmit-ik•im.</string>
@@ -235,7 +234,6 @@
 	<string name="notify_none">ula yiwen</string>
 	<string name="notify_favorites">Yerna tasuffeɣt-iw ɣer yismenyafen-ines</string>
 	<string name="notify_follow">Yeṭṭafar-iyi</string>
-	<string name="notify_reblog">Yules asuffeɣ n tduffeɣt-iw</string>
 	<string name="notify_mention">Ibder-iyi-d</string>
 	<string name="settings_boring">Tamnaḍt yessefcalen</string>
 	<string name="settings_account">Iɣewwaren n umiḍan</string>
@@ -256,7 +254,6 @@
 	<string name="hide_content">Ffer agbur</string>
 	<string name="new_post">Tasuffeɣt tamaynut</string>
 	<string name="button_reply">Err</string>
-	<string name="button_reblog">Aɛiwed n usuffeɣ</string>
 	<string name="button_favorite">Amenyaf</string>
 	<string name="button_share">Bḍu</string>
 	<string name="media_no_description">Amidyat s war aglam</string>

From 55270fe654c6393bd9619355ad055d706a6c623d Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Fri, 7 Apr 2023 22:55:29 +0300
Subject: [PATCH 071/124] Fix

---
 mastodon/src/main/res/color/m3_on_surface_overlay.xml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 mastodon/src/main/res/color/m3_on_surface_overlay.xml

diff --git a/mastodon/src/main/res/color/m3_on_surface_overlay.xml b/mastodon/src/main/res/color/m3_on_surface_overlay.xml
new file mode 100644
index 000000000..a01db2828
--- /dev/null
+++ b/mastodon/src/main/res/color/m3_on_surface_overlay.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	 <item android:color="?colorM3OnSurface" android:alpha="0.12"/>
+</selector>
\ No newline at end of file

From 924ea2d03a4b9746f21d6c15d306745bc00c317b Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Fri, 7 Apr 2023 22:58:04 +0300
Subject: [PATCH 072/124] Fix #557

---
 .../org/joinmastodon/android/fragments/ComposeFragment.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 371e5b02f..410266744 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1059,7 +1059,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(att.isUploadingOrProcessing())
 			att.cancelUpload();
 		attachments.remove(att);
-		uploadNextQueuedAttachment();
+		if(!areThereAnyUploadingAttachments())
+			uploadNextQueuedAttachment();
 		attachmentsView.removeView(att.view);
 		if(getMediaAttachmentsCount()==0)
 			attachmentsView.setVisibility(View.GONE);

From e1a821bc436f64e8d8e3706577c4a82a5b65df93 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 22:56:50 +0200
Subject: [PATCH 073/124] New translations strings.xml (Thai)

---
 .../src/main/res/values-th-rTH/strings.xml    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/mastodon/src/main/res/values-th-rTH/strings.xml b/mastodon/src/main/res/values-th-rTH/strings.xml
index a8e8f3415..80b6f290f 100644
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -10,11 +10,13 @@
 	<string name="ok">ตกลง</string>
 	<string name="preparing_auth">กำลังเตรียมการรับรองความถูกต้อง…</string>
 	<string name="finishing_auth">กำลังเสร็จสิ้นการรับรองความถูกต้อง…</string>
+	<string name="user_boosted">%s ได้ดัน</string>
 	<string name="in_reply_to">ในการตอบกลับถึง %s</string>
 	<string name="notifications">การแจ้งเตือน</string>
 	<string name="user_followed_you">ได้ติดตามคุณ</string>
 	<string name="user_sent_follow_request">ได้ส่งคำขอติดตามถึงคุณ</string>
 	<string name="user_favorited">ได้ชื่นชอบโพสต์ของคุณ</string>
+	<string name="notification_boosted">ได้ดันโพสต์ของคุณ</string>
 	<string name="poll_ended">การสำรวจความคิดเห็นได้สิ้นสุดแล้ว</string>
 	<string name="time_seconds">%d วินาที</string>
 	<string name="time_minutes">%d นาที</string>
@@ -150,6 +152,7 @@
 	<string name="report_sent_subtitle">ขณะที่เราตรวจทานสิ่งนี้ คุณสามารถดำเนินการกับ %s</string>
 	<string name="unfollow_user">เลิกติดตาม %s</string>
 	<string name="unfollow">เลิกติดตาม</string>
+	<string name="mute_user_explain">คุณจะไม่เห็นโพสต์หรือการดันของเขาในฟีดหน้าแรกของคุณ เขาจะไม่ทราบว่ามีการซ่อนเขา</string>
 	<string name="block_user_explain">เขาจะไม่สามารถติดตามหรือเห็นโพสต์ของคุณได้อีกต่อไป แต่เขาสามารถเห็นว่ามีการปิดกั้นเขาหรือไม่</string>
 	<string name="report_personal_title">ไม่ต้องการเห็นสิ่งนี้?</string>
 	<string name="report_personal_subtitle">เมื่อคุณเห็นบางอย่างที่คุณไม่ชอบใน Mastodon คุณสามารถเอาบุคคลออกจากประสบการณ์ของคุณ</string>
@@ -206,6 +209,7 @@
 	<string name="skip">ข้าม</string>
 	<string name="notification_type_follow">ผู้ติดตามใหม่</string>
 	<string name="notification_type_favorite">รายการโปรด</string>
+	<string name="notification_type_reblog">การดัน</string>
 	<string name="notification_type_mention">การกล่าวถึง</string>
 	<string name="notification_type_poll">การสำรวจความคิดเห็น</string>
 	<string name="choose_account">เลือกบัญชี</string>
@@ -231,6 +235,7 @@
 	<string name="notify_none">ไม่มีใคร</string>
 	<string name="notify_favorites">ชื่นชอบโพสต์ของฉัน</string>
 	<string name="notify_follow">ติดตามฉัน</string>
+	<string name="notify_reblog">ดันโพสต์ของฉัน</string>
 	<string name="notify_mention">กล่าวถึงฉัน</string>
 	<string name="settings_boring">โซนน่าเบื่อ</string>
 	<string name="settings_account">การตั้งค่าบัญชี</string>
@@ -251,6 +256,7 @@
 	<string name="hide_content">ซ่อนเนื้อหา</string>
 	<string name="new_post">โพสต์ใหม่</string>
 	<string name="button_reply">ตอบกลับ</string>
+	<string name="button_reblog">ดัน</string>
 	<string name="button_favorite">ชื่นชอบ</string>
 	<string name="button_share">แบ่งปัน</string>
 	<string name="media_no_description">สื่อที่ไม่มีคำอธิบาย</string>
@@ -266,6 +272,8 @@
 	<string name="followed_user">ตอนนี้คุณกำลังติดตาม %s</string>
 	<string name="following_user_requested">ขอติดตาม %s แล้ว</string>
 	<string name="open_in_browser">เปิดในเบราว์เซอร์</string>
+	<string name="hide_boosts_from_user">ซ่อนการดันจาก %s</string>
+	<string name="show_boosts_from_user">แสดงการดันจาก %s</string>
 	<string name="signup_reason">ทำไมคุณจึงต้องการเข้าร่วม?</string>
 	<string name="signup_reason_note">นี่จะช่วยให้เราตรวจทานใบสมัครของคุณ</string>
 	<string name="clear">ล้าง</string>
@@ -304,8 +312,12 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d รายการโปรด</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="other">%,d การดัน</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s ผ่าน %2$s</string>
 	<string name="time_now">ตอนนี้</string>
+	<string name="post_info_reblogs">การดัน</string>
 	<string name="post_info_favorites">รายการโปรด</string>
 	<string name="edit_history">ประวัติการแก้ไข</string>
 	<string name="last_edit_at_x">การแก้ไขล่าสุดเมื่อ %s</string>
@@ -365,6 +377,7 @@
 	<string name="welcome_page1_title">Mastodon คืออะไร?</string>
 	<string name="welcome_page1_text">จินตนาการว่าคุณมีที่อยู่อีเมลที่ลงท้ายด้วย @example.com\n\nคุณยังคงสามารถส่งและรับอีเมลจากใครก็ตาม แม้ว่าอีเมลของเขาจะลงท้ายด้วย @gmail.com หรือ @icloud.com หรือ @example.com ก็ตาม</string>
 	<string name="welcome_page2_title">Mastodon เป็นเช่นนั้น</string>
+	<string name="welcome_page2_text">นามของคุณอาจเป็น @gothgirl654@example.social แต่คุณยังคงสามารถติดตาม ดัน และแชทกับ @fallout5ever@example.online</string>
 	<string name="welcome_page3_title">ฉันจะเลือกเซิร์ฟเวอร์อย่างไร?</string>
 	<string name="welcome_page3_text">ต่างคนต่างเลือกเซิร์ฟเวอร์ด้วยเหตุผลต่าง ๆ art.example เป็นสถานที่ที่ยอดเยี่ยมสำหรับศิลปิน ขณะที่ glasgow.example อาจเป็นตัวเลือกที่ดีสำหรับชาวสกอต\n\nรับรองว่าคุณต้องชอบเซิร์ฟเวอร์ที่แนะนำของเราใดก็ตาม ดังนั้นไม่ว่าเซิร์ฟเวอร์ใดที่คุณเลือก (หรือหากคุณป้อนของคุณเองในแถบค้นหาเซิร์ฟเวอร์) คุณจะไม่พลาดความเคลื่อนไหวที่ใดก็ตาม</string>
 	<string name="signup_random_server_explain">เราจะเลือกเซิร์ฟเวอร์ตามภาษาของคุณหากคุณดำเนินการต่อโดยไม่ได้ทำการเลือก</string>
@@ -398,4 +411,21 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s ไม่อนุญาตการลงทะเบียนจาก %2$s ลองโดเมนอีเมลอื่นหรือ &lt;a&gt;เลือกเซิร์ฟเวอร์อื่น&lt;/a&gt;</string>
 	<string name="signup_username_taken">มีการใช้ชื่อผู้ใช้นี้แล้ว</string>
+	<string name="spoiler_show">แสดงต่อไป</string>
+	<string name="spoiler_hide">ซ่อนใหม่</string>
+	<string name="poll_multiple_choice">เลือกจำนวนหนึ่งหรือมากกว่า</string>
+	<string name="save_changes">บันทึกการเปลี่ยนแปลง</string>
+	<string name="profile_featured">แนะนำ</string>
+	<string name="profile_timeline">เส้นเวลา</string>
+	<string name="view_all">ดูทั้งหมด</string>
+	<string name="profile_endorsed_accounts">บัญชี</string>
+	<string name="verified_link">ลิงก์ที่ยืนยันแล้ว</string>
+	<string name="show">แสดง</string>
+	<string name="hide">ซ่อน</string>
+	<string name="join_default_server">เข้าร่วม %s</string>
+	<string name="pick_server">เลือกเซิร์ฟเวอร์ของฉันเอง</string>
+	<string name="signup_or_login">หรือ</string>
+	<string name="learn_more">เรียนรู้เพิ่มเติม</string>
+	<string name="welcome_to_mastodon">ยินดีต้อนรับสู่ Mastodon</string>
+	<string name="what_are_servers">เซิร์ฟเวอร์คืออะไร?</string>
 </resources>

From a80313ee6b900adb0bdb1973f502e3461c8f3ca3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2023 23:53:35 +0200
Subject: [PATCH 074/124] New translations strings.xml (Thai)

---
 mastodon/src/main/res/values-th-rTH/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mastodon/src/main/res/values-th-rTH/strings.xml b/mastodon/src/main/res/values-th-rTH/strings.xml
index 80b6f290f..38f21fb56 100644
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -427,5 +427,7 @@
 	<string name="signup_or_login">หรือ</string>
 	<string name="learn_more">เรียนรู้เพิ่มเติม</string>
 	<string name="welcome_to_mastodon">ยินดีต้อนรับสู่ Mastodon</string>
+	<string name="welcome_paragraph1">Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ หมายความว่าไม่มีบริษัทใดควบคุมเครือข่ายสังคม เครือข่ายสังคมประกอบด้วยเซิร์ฟเวอร์ที่ทำงานอย่างอิสระจำนวนมาก ทั้งหมดเชื่อมต่อเข้าด้วยกัน</string>
 	<string name="what_are_servers">เซิร์ฟเวอร์คืออะไร?</string>
+	<string name="welcome_paragraph2"><![CDATA[ทุกบัญชี Mastodon ได้รับการโฮสต์ในเซิร์ฟเวอร์ — แต่ละแห่งมีค่า กฎ และผู้ดูแลของเซิร์ฟเวอร์เอง ไม่ว่าคุณจะเลือกเซิร์ฟเวอร์ใด คุณสามารถติดตามและโต้ตอบกับผู้คนในเซิร์ฟเวอร์ใด ๆ]]></string>
 </resources>

From cb7887da41bf6bdcf3e53d73fb5847e042d12893 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 8 Apr 2023 21:38:06 +0200
Subject: [PATCH 075/124] New translations strings.xml (Greek)

---
 mastodon/src/main/res/values-el-rGR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 8d9785abb..0616b6618 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -10,6 +10,7 @@
 	<string name="ok">ΟΚ</string>
 	<string name="preparing_auth">Προετοιμασία για έλεγχο ταυτότητας…</string>
 	<string name="finishing_auth">Ολοκλήρωση ταυτοποίησης…</string>
+	<string name="user_boosted">%s ενισχύθηκε</string>
 	<string name="in_reply_to">Σε απάντηση στο %s</string>
 	<string name="notifications">Ειδοποιήσεις</string>
 	<string name="user_followed_you">σε ακολουθεί</string>

From ea1b6c58352851e782813dd3e346347b54616b60 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 8 Apr 2023 22:51:05 +0200
Subject: [PATCH 076/124] New translations strings.xml (Greek)

---
 .../src/main/res/values-el-rGR/strings.xml    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 0616b6618..db11657e5 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -16,6 +16,7 @@
 	<string name="user_followed_you">σε ακολουθεί</string>
 	<string name="user_sent_follow_request">σου έστειλε ένα αίτημα ακολούθησης</string>
 	<string name="user_favorited">σημείωσε ως αγαπημένη την ανάρτησή σου</string>
+	<string name="notification_boosted">ενίσχυσε την ανάρτησή σου</string>
 	<string name="poll_ended">η δημοσκόπηση έληξε</string>
 	<string name="time_seconds">%dδλ</string>
 	<string name="time_minutes">%dλ</string>
@@ -161,6 +162,7 @@
 	<string name="report_sent_subtitle">Ενώ το εξετάζουμε αυτό, μπορείς να δράσεις εναντίον του %s.</string>
 	<string name="unfollow_user">Κατάργηση ακολούθησης του %s</string>
 	<string name="unfollow">Άρση ακολούθησης</string>
+	<string name="mute_user_explain">Δεν θα βλέπεις τις αναρτήσεις ή τις ενισχύσεις τους στην αρχική σελίδα σου. Δεν θα ξέρουν ότι βρίσκονται σε σίγαση.</string>
 	<string name="block_user_explain">Δεν θα μπορούν πλέον να σε ακολουθούν ή να βλέπουν τις αναρτήσεις σου, αλλά μπορούν να δουν αν έχουν αποκλειστεί.</string>
 	<string name="report_personal_title">Δε θες να το βλέπεις αυτό;</string>
 	<string name="report_personal_subtitle">Όταν βλέπεις κάτι που δεν σου αρέσει στο Mastodon, μπορείς να αφαιρέσεις το άτομο από την εμπειρία σου.</string>
@@ -217,6 +219,7 @@
 	<string name="skip">Παράλειψη</string>
 	<string name="notification_type_follow">Νέοι ακόλουθοι</string>
 	<string name="notification_type_favorite">Αγαπημένα</string>
+	<string name="notification_type_reblog">Ενισχύσεις</string>
 	<string name="notification_type_mention">Επισημάνσεις</string>
 	<string name="notification_type_poll">Δημοσκοπήσεις</string>
 	<string name="choose_account">Επιλογή λογαριασμού</string>
@@ -243,6 +246,7 @@
 	<string name="notify_none">κανείς</string>
 	<string name="notify_favorites">Προσθέτει στα αγαπημένα την ανάρτησή μου</string>
 	<string name="notify_follow">Με ακολουθεί</string>
+	<string name="notify_reblog">Ενισχύει την ανάρτησή μου</string>
 	<string name="notify_mention">Με επισημαίνει</string>
 	<string name="settings_boring">Η βαρετή ζώνη</string>
 	<string name="settings_account">Ρυθμίσεις λογαριασμού</string>
@@ -263,6 +267,7 @@
 	<string name="hide_content">Απόκρυψη περιεχομένου</string>
 	<string name="new_post">Νέα ανάρτηση</string>
 	<string name="button_reply">Απάντηση</string>
+	<string name="button_reblog">Ενίσχυση</string>
 	<string name="button_favorite">Αγαπημένο</string>
 	<string name="button_share">Κοινοποίηση</string>
 	<string name="media_no_description">Πολυμέσα χωρίς περιγραφή</string>
@@ -278,6 +283,8 @@
 	<string name="followed_user">Ακολουθείς τον/την %s</string>
 	<string name="following_user_requested">Έγινε αίτημα ακολούθησης το %s</string>
 	<string name="open_in_browser">Άνοιξε στον περιηγητή</string>
+	<string name="hide_boosts_from_user">Απόκρυψη ενισχύσεων από @%s</string>
+	<string name="show_boosts_from_user">Εμφάνιση ενισχύσεων από @%s</string>
 	<string name="signup_reason">Γιατί θέλεις να συμμετάσχεις;</string>
 	<string name="signup_reason_note">Αυτό θα μας βοηθήσει να εξετάσουμε την αίτησή σου.</string>
 	<string name="clear">Εκκαθάριση</string>
@@ -296,6 +303,9 @@
 	<string name="trending_posts_info_banner">Αυτές είναι οι αναρτήσεις που κερδίζουν την προσοχή στη δική σου γωνιά του Mastodon.</string>
 	<string name="trending_hashtags_info_banner">Αυτές είναι οι ετικέτες που κερδίζουν την προσοχή στη δική σου γωνιά του Mastodon.</string>
 	<string name="trending_links_info_banner">Αυτές είναι οι ειδήσεις που μοιράζονται περισσότερο στη δική σου γωνιά στο Mastodon.</string>
+	<string name="local_timeline_info_banner">Αυτές είναι οι πιο πρόσφατες αναρτήσεις από τα άτομα που χρησιμοποιούν τον ίδιο διακομιστή Mastodon με εσένα.</string>
+	<string name="dismiss">Παράβλεψη</string>
+	<string name="see_new_posts">Δες νέες αναρτήσεις</string>
 	<string name="load_missing_posts">Φόρτωση αναρτήσεων που λείπουν</string>
 	<string name="follow_back">Ακολούθησε Και Συ</string>
 	<string name="button_follow_pending">Εκκρεμεί</string>
@@ -316,8 +326,13 @@
 		<item quantity="one">%,d αγαπημένο</item>
 		<item quantity="other">%,d αγαπημένα</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d ενίσχυση</item>
+		<item quantity="other">%,d ενισχύσεις</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s μέσω %2$s</string>
 	<string name="time_now">τώρα</string>
+	<string name="post_info_reblogs">Ενισχύσεις</string>
 	<string name="post_info_favorites">Αγαπημένα</string>
 	<string name="edit_history">Επεξεργασία ιστορικού</string>
 	<string name="last_edit_at_x">Τελευταία επεξεργασία %s</string>
@@ -363,12 +378,24 @@
 	<!-- %s is file size -->
 	<string name="download_update">Λήψη (%s)</string>
 	<string name="install_update">Εγκατάσταση</string>
+	<string name="privacy_policy_title">Το Απόρρητό σου</string>
+	<string name="privacy_policy_subtitle">Αν και η εφαρμογή Mastodon δεν συλλέγει δεδομένα, ο διακομιστής που εγγράφεσαι μπορεί να έχει διαφορετική πολιτική.\n\nΕάν διαφωνείς με την πολιτική του %s, μπορείς να επιστρέψεις και να επιλέξεις διαφορετικό διακομιστή.</string>
+	<string name="i_agree">Συμφωνώ</string>
+	<string name="empty_list">Αυτή η λίστα είναι κενή</string>
+	<string name="instance_signup_closed">Αυτός ο διακομιστής δεν δέχεται νέες εγγραφές.</string>
+	<string name="text_copied">Αντιγράφηκε στο πρόχειρο</string>
+	<string name="add_bookmark">Σελιδοδείκτης</string>
+	<string name="remove_bookmark">Αφαίρεση σελιδοδείκτη</string>
+	<string name="bookmarks">Σελιδοδείκτες</string>
+	<string name="your_favorites">Τα Αγαπημένα σας</string>
 	<string name="login_title">Καλώς Ήρθες Ξανά</string>
 	<string name="login_subtitle">Συνδέσου με τον διακομιστή όπου δημιούργησες τον λογαριασμό σου.</string>
 	<string name="server_url">URL διακομιστή</string>
 	<string name="welcome_page1_title">Τι είναι το Mastodon;</string>
 	<string name="welcome_page1_text">Φαντάσου ότι έχεις μια διεύθυνση email που τελειώνει με @example.com.\n\nΜπορείς ακόμα να στείλεις και να λάβεις μηνύματα από οποιονδήποτε, ακόμη και αν το email τους τελειώνει σε @gmail.com ή @icloud.com ή @example.com.</string>
 	<string name="welcome_page2_title">Έτσι είναι και το Mastodon.</string>
+	<string name="welcome_page2_text">Η λαβή σας μπορεί να είναι @gothgirl654@example.social, αλλά μπορείς ακόμα να ακολουθήσεις, ενισχύσεις και να συνομιλήσεις με τον @fallout5ever@example.online.</string>
+	<string name="welcome_page3_title">Πώς διαλέγω έναν διακομιστή;</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

From 75d3c2fdcec2afa07d18206dd91fa193a375206b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 8 Apr 2023 23:55:36 +0200
Subject: [PATCH 077/124] New translations strings.xml (Italian)

---
 mastodon/src/main/res/values-it-rIT/strings.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mastodon/src/main/res/values-it-rIT/strings.xml b/mastodon/src/main/res/values-it-rIT/strings.xml
index ecabc5afc..265d68542 100644
--- a/mastodon/src/main/res/values-it-rIT/strings.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings.xml
@@ -10,11 +10,13 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparazione all\'autenticazione…</string>
 	<string name="finishing_auth">Completamento autenticazione…</string>
+	<string name="user_boosted">%s ha condiviso</string>
 	<string name="in_reply_to">In risposta a %s</string>
 	<string name="notifications">Notifiche</string>
 	<string name="user_followed_you">ti segue</string>
 	<string name="user_sent_follow_request">ha richiesto di seguirti</string>
 	<string name="user_favorited">ha apprezzato il tuo post</string>
+	<string name="notification_boosted">ha condiviso il tuo post</string>
 	<string name="poll_ended">sondaggio terminato</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -164,6 +166,7 @@
 	<string name="report_sent_subtitle">Mentre controlliamo, puoi fare questo contro %s.</string>
 	<string name="unfollow_user">Smetti di seguire %s</string>
 	<string name="unfollow">Smetti di seguire</string>
+	<string name="mute_user_explain">Non vedrai i loro post o le condivisioni nel tuo feed. Non sapranno di essere stati silenziati.</string>
 	<string name="block_user_explain">Non saranno più in grado di seguire o vedere i tuoi post, ma possono vedere se sono stati bloccati.</string>
 	<string name="report_personal_title">Non vuoi vedere questo?</string>
 	<string name="report_personal_subtitle">Quando vedi qualcosa che non ti piace su Mastodon, puoi rimuovere la persona dalla tua esperienza.</string>
@@ -220,6 +223,7 @@
 	<string name="skip">Salta</string>
 	<string name="notification_type_follow">Nuovi seguaci</string>
 	<string name="notification_type_favorite">Preferiti</string>
+	<string name="notification_type_reblog">Condivisioni</string>
 	<string name="notification_type_mention">Menzioni</string>
 	<string name="notification_type_poll">Sondaggi</string>
 	<string name="choose_account">Seleziona l\'account</string>
@@ -418,4 +422,13 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s non consente iscrizioni da %2$s. Provane uno diverso o &lt;a&gt;scegli un altro server&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Questo nome utente è già in uso.</string>
+	<string name="profile_endorsed_accounts">Account</string>
+	<string name="verified_link">Collegamento verificato</string>
+	<string name="show">Mostra</string>
+	<string name="hide">Nascondi</string>
+	<string name="pick_server">Scegli il mio server</string>
+	<string name="signup_or_login">o</string>
+	<string name="learn_more">Scopri di più</string>
+	<string name="welcome_to_mastodon">Benvenuto/a su Mastodon</string>
+	<string name="what_are_servers">Cosa sono i server?</string>
 </resources>

From b2f9f7ae5466f24354544afa2bfb00166193074b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 9 Apr 2023 00:51:05 +0200
Subject: [PATCH 078/124] New translations strings.xml (Italian)

---
 mastodon/src/main/res/values-it-rIT/strings.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/mastodon/src/main/res/values-it-rIT/strings.xml b/mastodon/src/main/res/values-it-rIT/strings.xml
index 265d68542..d1aa69871 100644
--- a/mastodon/src/main/res/values-it-rIT/strings.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings.xml
@@ -270,6 +270,7 @@
 	<string name="hide_content">Nascondi il contenuto</string>
 	<string name="new_post">Nuovo post</string>
 	<string name="button_reply">Rispondi</string>
+	<string name="button_reblog">Condividi</string>
 	<string name="button_favorite">Preferito</string>
 	<string name="button_share">Condividi</string>
 	<string name="media_no_description">Media senza descrizione</string>
@@ -285,6 +286,8 @@
 	<string name="followed_user">Hai cominciato a seguire %s</string>
 	<string name="following_user_requested">Richiesto di seguire %s</string>
 	<string name="open_in_browser">Apri nel browser</string>
+	<string name="hide_boosts_from_user">Nascondi condivisioni da %s</string>
+	<string name="show_boosts_from_user">Mostra condivisioni da %s</string>
 	<string name="signup_reason">Perché vuoi unirti?</string>
 	<string name="signup_reason_note">Questo ci aiuterà ad esaminare la tua richiesta.</string>
 	<string name="clear">Cancella</string>
@@ -326,8 +329,13 @@
 		<item quantity="one">%,d preferito</item>
 		<item quantity="other">%,d preferiti</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d condivisione</item>
+		<item quantity="other">%,d condivisioni</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s tramite %2$s</string>
 	<string name="time_now">ora</string>
+	<string name="post_info_reblogs">Condivisioni</string>
 	<string name="post_info_favorites">Preferiti</string>
 	<string name="edit_history">Cronologia delle modifiche</string>
 	<string name="last_edit_at_x">Ultima modifica: %s</string>
@@ -389,6 +397,7 @@
 	<string name="welcome_page1_title">Che cos\'è Mastodon?</string>
 	<string name="welcome_page1_text">Immaginate di avere un indirizzo email che termina con @example.com.\n\nPotete ancora inviare e ricevere email da chiunque, anche se la loro email termina in @gmail.com o @icloud.com o @example.com.</string>
 	<string name="welcome_page2_title">Mastodon è così.</string>
+	<string name="welcome_page2_text">Il tuo account potrebbe essere @gothgirl654@esempio.social, ma puoi comunque seguire, condividere e chattare con @fallout5ever@esempio.online.</string>
 	<string name="welcome_page3_title">Come scegliere un server?</string>
 	<string name="welcome_page3_text">Diverse persone scelgono server diversi per vari motivi. art.example è un server ottimo per gli artisti, mentre glasgow.example è una buona scelta per i Scozzesi. \n\nNon si può sbagliare con nessuno dei nostri server consigliati, e qualsiasi server scegli (o se cerchi un altro che conosci tu usando la barra di ricerca dei server) non perderai mai un colpo.</string>
 	<string name="signup_random_server_explain">Sceglieremo un server in base alla tua lingua se continui senza effettuare una selezione.</string>
@@ -422,10 +431,18 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s non consente iscrizioni da %2$s. Provane uno diverso o &lt;a&gt;scegli un altro server&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Questo nome utente è già in uso.</string>
+	<string name="spoiler_show">Mostra comunque</string>
+	<string name="spoiler_hide">Ri-nascondere</string>
+	<string name="poll_multiple_choice">Scegli una o più risposte</string>
+	<string name="save_changes">Salva le modifiche</string>
+	<string name="profile_featured">In primo piano</string>
+	<string name="profile_timeline">Timeline</string>
+	<string name="view_all">Vedi tutto</string>
 	<string name="profile_endorsed_accounts">Account</string>
 	<string name="verified_link">Collegamento verificato</string>
 	<string name="show">Mostra</string>
 	<string name="hide">Nascondi</string>
+	<string name="join_default_server">Unisciti a %s</string>
 	<string name="pick_server">Scegli il mio server</string>
 	<string name="signup_or_login">o</string>
 	<string name="learn_more">Scopri di più</string>

From d93d66f702caa7c205f34cc996a42cf56ad4215e Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Sun, 9 Apr 2023 01:59:13 +0300
Subject: [PATCH 079/124] Prepare new release

---
 mastodon/build.gradle                        | 6 +++---
 mastodon/src/main/res/xml/locales_config.xml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index cd340876a..41c7c8b34 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -9,10 +9,10 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 51
-		versionName "1.3.0"
+		versionCode 52
+		versionName "1.2.1"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
+		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "ur-rIN", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
 
 	buildTypes {
diff --git a/mastodon/src/main/res/xml/locales_config.xml b/mastodon/src/main/res/xml/locales_config.xml
index 473134120..82dd869c5 100644
--- a/mastodon/src/main/res/xml/locales_config.xml
+++ b/mastodon/src/main/res/xml/locales_config.xml
@@ -46,6 +46,7 @@
 	<locale android:name="th-TH"/>
 	<locale android:name="tr-TR"/>
 	<locale android:name="uk-UA"/>
+	<locale android:name="ur-IN"/>
 	<locale android:name="vi-VN"/>
 	<locale android:name="zh-CN"/>
 	<locale android:name="zh-TW"/>

From a47106594bd50d57a529cf64dd904c5755bac14d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 9 Apr 2023 03:10:02 +0200
Subject: [PATCH 080/124] New translations strings.xml (Chinese Traditional)

---
 .../src/main/res/values-zh-rTW/strings.xml    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/mastodon/src/main/res/values-zh-rTW/strings.xml b/mastodon/src/main/res/values-zh-rTW/strings.xml
index 2c1c5be7c..5d10881b7 100644
--- a/mastodon/src/main/res/values-zh-rTW/strings.xml
+++ b/mastodon/src/main/res/values-zh-rTW/strings.xml
@@ -10,11 +10,13 @@
 	<string name="ok">確定</string>
 	<string name="preparing_auth">正在準備認證……</string>
 	<string name="finishing_auth">正在結束認證……</string>
+	<string name="user_boosted">%s 已轉嘟</string>
 	<string name="in_reply_to">回覆給 %s</string>
 	<string name="notifications">通知</string>
 	<string name="user_followed_you">已跟隨您</string>
 	<string name="user_sent_follow_request">傳送跟隨請求給您</string>
 	<string name="user_favorited">已將您的嘟文加入最愛</string>
+	<string name="notification_boosted">已轉嘟您的嘟文</string>
 	<string name="poll_ended">投票已結束</string>
 	<string name="time_seconds">%d 秒</string>
 	<string name="time_minutes">%d 分</string>
@@ -150,6 +152,7 @@
 	<string name="report_sent_subtitle">當我們正在審核時，您可以對 %s 採取以下措施。</string>
 	<string name="unfollow_user">取消跟隨 %s</string>
 	<string name="unfollow">取消跟隨</string>
+	<string name="mute_user_explain">您不會在您的首頁時間軸中再見到他們的嘟文或轉嘟。他們不會知道他們已被靜音。</string>
 	<string name="block_user_explain">他們將無法跟隨您或是看到您的嘟文。他們能看到他們是否已被封鎖。</string>
 	<string name="report_personal_title">不想再看到這個？</string>
 	<string name="report_personal_subtitle">當您看到某些不喜歡的內容時，您可以將該帳號從您的體驗中移除。</string>
@@ -206,6 +209,7 @@
 	<string name="skip">跳過</string>
 	<string name="notification_type_follow">新的跟隨者</string>
 	<string name="notification_type_favorite">最愛</string>
+	<string name="notification_type_reblog">轉嘟</string>
 	<string name="notification_type_mention">提及</string>
 	<string name="notification_type_poll">投票</string>
 	<string name="choose_account">選擇帳號</string>
@@ -231,6 +235,7 @@
 	<string name="notify_none">沒有人</string>
 	<string name="notify_favorites">將我的嘟文加到最愛</string>
 	<string name="notify_follow">跟隨我</string>
+	<string name="notify_reblog">已轉嘟我的嘟文</string>
 	<string name="notify_mention">提及我</string>
 	<string name="settings_boring">無聊的區域</string>
 	<string name="settings_account">帳號設定</string>
@@ -251,6 +256,7 @@
 	<string name="hide_content">隱藏內容</string>
 	<string name="new_post">新嘟文</string>
 	<string name="button_reply">回覆</string>
+	<string name="button_reblog">轉嘟</string>
 	<string name="button_favorite">最愛</string>
 	<string name="button_share">分享</string>
 	<string name="media_no_description">沒有描述的媒體</string>
@@ -266,6 +272,8 @@
 	<string name="followed_user">您現在開始跟隨 %s</string>
 	<string name="following_user_requested">要求跟隨 %s</string>
 	<string name="open_in_browser">在瀏覽器中開啟</string>
+	<string name="hide_boosts_from_user">隱藏來自 %s 的轉嘟</string>
+	<string name="show_boosts_from_user">顯示來自 %s 的轉嘟</string>
 	<string name="signup_reason">為什麼想要加入呢？</string>
 	<string name="signup_reason_note">這會協助我們審核您的申請。</string>
 	<string name="clear">清除</string>
@@ -304,8 +312,12 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d 個最愛</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="other">%,d 轉嘟</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s 透過 %2$s</string>
 	<string name="time_now">剛剛</string>
+	<string name="post_info_reblogs">轉嘟</string>
 	<string name="post_info_favorites">最愛</string>
 	<string name="edit_history">編輯記錄</string>
 	<string name="last_edit_at_x">上次編輯於 %s</string>
@@ -365,6 +377,7 @@
 	<string name="welcome_page1_title">什麼是 Mastodon？</string>
 	<string name="welcome_page1_text">想像您擁有以 @example.com 結尾的 email 信箱地址。\n\n您仍可發送及接收來自任何人的電子郵件，無論他們的信箱是來自 @gmail.com 或 @icloud.com 或 @example.com。</string>
 	<string name="welcome_page2_title">Mastodon 就像這樣。</string>
+	<string name="welcome_page2_text">您的帳號可以是 @gothgirl654@example.social，但您仍可跟隨、轉嘟或是與 @fallout5ever@example.online 聊天互動。</string>
 	<string name="welcome_page3_title">如何挑選伺服器？</string>
 	<string name="welcome_page3_text">不同人基於各式各樣的原因挑選不同的伺服器。art.example 也許對藝術家來說是個好地方，glasgow.example 也許對於蘇格蘭人來說是個好選擇。\n\n任何我們推薦的伺服器都是不錯的選擇（或著您也能從搜尋欄中輸入您自己的伺服器），您不會錯過任何來自聯邦宇宙角落的嘟嘟聲。</string>
 	<string name="signup_random_server_explain">如果您不選擇而繼續的話，我們將透過您的語言設定替您選擇一台伺服器。</string>
@@ -398,4 +411,12 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s 不允許 %2$s 之信箱註冊。請重新試試另一個電子郵件服務商，或 &lt;a&gt; 挑選另一個伺服器 &lt;/a&gt;。</string>
 	<string name="signup_username_taken">這個帳號已經被註冊過囉。</string>
+	<string name="spoiler_show">仍要顯示</string>
+	<string name="spoiler_hide">重新隱藏</string>
+	<string name="poll_multiple_choice">請選擇一個或多個</string>
+	<string name="save_changes">儲存變更</string>
+	<string name="profile_featured">推薦主題標籤</string>
+	<string name="profile_timeline">時間軸</string>
+	<string name="view_all">檢視全部</string>
+	<string name="profile_endorsed_accounts">帳號</string>
 </resources>

From 94fb676b0cb690b34e698b8245c35c15eba12c33 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 9 Apr 2023 04:29:35 +0200
Subject: [PATCH 081/124] New translations strings.xml (Chinese Traditional)

---
 mastodon/src/main/res/values-zh-rTW/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mastodon/src/main/res/values-zh-rTW/strings.xml b/mastodon/src/main/res/values-zh-rTW/strings.xml
index 5d10881b7..0fdf2d82a 100644
--- a/mastodon/src/main/res/values-zh-rTW/strings.xml
+++ b/mastodon/src/main/res/values-zh-rTW/strings.xml
@@ -419,4 +419,15 @@
 	<string name="profile_timeline">時間軸</string>
 	<string name="view_all">檢視全部</string>
 	<string name="profile_endorsed_accounts">帳號</string>
+	<string name="verified_link">已驗證連結</string>
+	<string name="show">顯示</string>
+	<string name="hide">隱藏</string>
+	<string name="join_default_server">加入 %s</string>
+	<string name="pick_server">選擇我的伺服器</string>
+	<string name="signup_or_login">或</string>
+	<string name="learn_more">了解更多</string>
+	<string name="welcome_to_mastodon">歡迎來到 Mastodon</string>
+	<string name="welcome_paragraph1">Mastodon 是去中心化的社交網路，意思是沒有單一公司掌控它。它由許多獨立運行而互相連接的伺服器組成。</string>
+	<string name="what_are_servers">伺服器是什麼？</string>
+	<string name="welcome_paragraph2"><![CDATA[所有的 Mastodon 帳號皆託管於一個伺服器上 — 其擁有各自之價值觀、規則、與管理者。無論您選擇何者，您皆能跟隨並與其他任何伺服器上的人們互動。]]></string>
 </resources>

From 51809df8ca28f7a8b2c4fee99a8683542d8284cc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 9 Apr 2023 07:25:51 +0200
Subject: [PATCH 082/124] New translations strings.xml (Thai)

---
 mastodon/src/main/res/values-th-rTH/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-th-rTH/strings.xml b/mastodon/src/main/res/values-th-rTH/strings.xml
index 38f21fb56..4212c7052 100644
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -429,5 +429,5 @@
 	<string name="welcome_to_mastodon">ยินดีต้อนรับสู่ Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ หมายความว่าไม่มีบริษัทใดควบคุมเครือข่ายสังคม เครือข่ายสังคมประกอบด้วยเซิร์ฟเวอร์ที่ทำงานอย่างอิสระจำนวนมาก ทั้งหมดเชื่อมต่อเข้าด้วยกัน</string>
 	<string name="what_are_servers">เซิร์ฟเวอร์คืออะไร?</string>
-	<string name="welcome_paragraph2"><![CDATA[ทุกบัญชี Mastodon ได้รับการโฮสต์ในเซิร์ฟเวอร์ — แต่ละแห่งมีค่า กฎ และผู้ดูแลของเซิร์ฟเวอร์เอง ไม่ว่าคุณจะเลือกเซิร์ฟเวอร์ใด คุณสามารถติดตามและโต้ตอบกับผู้คนในเซิร์ฟเวอร์ใด ๆ]]></string>
+	<string name="welcome_paragraph2"><![CDATA[ทุกบัญชี Mastodon ได้รับการโฮสต์ในเซิร์ฟเวอร์ — แต่ละแห่งมีค่า, กฎ และผู้ดูแลของเซิร์ฟเวอร์เอง ไม่ว่าคุณจะเลือกเซิร์ฟเวอร์ใด คุณสามารถติดตามและโต้ตอบกับผู้คนในเซิร์ฟเวอร์ใด ๆ]]></string>
 </resources>

From 268e5639f62b1934abb9c91c7484a08ff0d8a585 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 9 Apr 2023 16:26:19 +0200
Subject: [PATCH 083/124] New translations strings.xml (Greek)

---
 mastodon/src/main/res/values-el-rGR/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index db11657e5..f3d753b0c 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -396,6 +396,12 @@
 	<string name="welcome_page2_title">Έτσι είναι και το Mastodon.</string>
 	<string name="welcome_page2_text">Η λαβή σας μπορεί να είναι @gothgirl654@example.social, αλλά μπορείς ακόμα να ακολουθήσεις, ενισχύσεις και να συνομιλήσεις με τον @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Πώς διαλέγω έναν διακομιστή;</string>
+	<string name="welcome_page3_text">Διαφορετικά άτομα επιλέγουν διαφορετικούς διακομιστές για διάφορους λόγους. Ο art.example είναι ένα εξαιρετικό μέρος για καλλιτέχνες, ενώ ο glasgow.example μπορεί να είναι καλή επιλογή για Σκωτσέζους.\n\nΔεν μπορείς να κάνεις λάθος επιλογή με κανέναν από τους προτεινόμενους διακομιστές μας, έτσι ανεξάρτητα από το ποιον θα επιλέξεις (ή αν εισάγεις τον δικο σου στη γραμμή αναζήτησης διακομιστή), θα είσαι πάντα στον παλμό των πραγμάτων.</string>
+	<string name="signup_random_server_explain">Θα διαλέξουμε ένα διακομιστή με βάση τη γλώσσα σας αν συνεχίσεις χωρίς να κάνεις μια επιλογή.</string>
+	<string name="server_filter_any_language">Οποιαδήποτε Γλώσσα</string>
+	<string name="server_filter_instant_signup">Άμεση Εγγραφή</string>
+	<string name="server_filter_manual_review">Χειροκίνητη Αξιολόγηση</string>
+	<string name="server_filter_any_signup_speed">Οποιαδήποτε Ταχύτητα Εγγραφής</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

From f85bb995ba60b1d829cd802cfb1d818ddab8fb48 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 9 Apr 2023 17:56:44 +0200
Subject: [PATCH 084/124] New translations strings.xml (Greek)

---
 .../src/main/res/values-el-rGR/strings.xml    | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index f3d753b0c..c6d90ac27 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -32,6 +32,10 @@
 		<item quantity="one">ακόλουθος</item>
 		<item quantity="other">ακόλουθοι</item>
 	</plurals>
+	<plurals name="following">
+		<item quantity="one">ακολουθεί</item>
+		<item quantity="other">ακολουθούν</item>
+	</plurals>
 	<plurals name="posts">
 		<item quantity="one">ανάρτηση</item>
 		<item quantity="other">αναρτήσεις</item>
@@ -402,7 +406,49 @@
 	<string name="server_filter_instant_signup">Άμεση Εγγραφή</string>
 	<string name="server_filter_manual_review">Χειροκίνητη Αξιολόγηση</string>
 	<string name="server_filter_any_signup_speed">Οποιαδήποτε Ταχύτητα Εγγραφής</string>
+	<string name="server_filter_region_europe">Ευρώπη</string>
+	<string name="server_filter_region_north_america">Βόρεια Αμερική</string>
+	<string name="server_filter_region_south_america">Νότια Αμερική</string>
+	<string name="server_filter_region_africa">Αφρική</string>
+	<string name="server_filter_region_asia">Ασία</string>
+	<string name="server_filter_region_oceania">Oceania</string>
+	<string name="not_accepting_new_members">Δεν δέχεται νέα μέλη</string>
+	<string name="category_special_interests">Ειδικά Ενδιαφέροντα</string>
+	<string name="signup_passwords_dont_match">Οι κωδικοί πρόσβασης δεν ταιριάζουν</string>
+	<string name="pick_server_for_me">Διάλεξε για μένα</string>
+	<string name="profile_add_row">Προσθήκη γραμμής</string>
+	<string name="profile_setup">Ρύθμιση προφίλ</string>
+	<string name="profile_setup_subtitle">Μπορείς πάντα να το ολοκληρώσεις αργότερα στην καρτέλα Προφίλ.</string>
+	<string name="profile_setup_explanation">Μπορείς να προσθέσεις έως και τέσσερα πεδία προφίλ για οτιδήποτε θες. Τοποθεσία, συνδέσμους, αντωνυμίες - δεν υπάρχουν όρια.</string>
+	<string name="popular_on_mastodon">Δημοφιλή στο Mastodon</string>
+	<string name="follow_all">Ακολούθησε όλους</string>
+	<string name="server_rules_disagree">Διαφωνώ</string>
+	<string name="privacy_policy_explanation">Σύνοψη: Δεν συλλέγουμε ή επεξεργαζόμαστε τίποτα.</string>
 	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Διαφωνώ με %s</string>
+	<string name="profile_bio">Βιογραφικό</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Ακολούθηση χρηστών…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">Ο %1$s δεν επιτρέπει εγγραφές από %2$s. Δοκιμάστε μια διαφορετική ή &lt;a&gt;επιλέξτε έναν διαφορετικό διακομιστή&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Αυτό το όνομα χρήστη χρησιμοποιείται.</string>
+	<string name="spoiler_show">Εμφάνιση ούτως ή άλλως</string>
+	<string name="spoiler_hide">Απόκρυψη ξανά</string>
+	<string name="poll_multiple_choice">Επίλεξε ένα ή περισσότερα</string>
+	<string name="save_changes">Αποθήκευση αλλαγών</string>
+	<string name="profile_featured">Προτεινόμενα</string>
+	<string name="profile_timeline">Ροή</string>
+	<string name="view_all">Εμφάνιση όλων</string>
+	<string name="profile_endorsed_accounts">Λογαριασμοί</string>
+	<string name="verified_link">Επαληθευμένος σύνδεσμος</string>
+	<string name="show">Εμφάνιση</string>
+	<string name="hide">Απόκρυψη</string>
+	<string name="join_default_server">Συμμετοχή %s</string>
+	<string name="pick_server">Επίλεξε το δικό μου διακομιστή</string>
+	<string name="signup_or_login">ή</string>
+	<string name="learn_more">Μάθε περισσότερα</string>
+	<string name="welcome_to_mastodon">Καλώς ήρθες στο Mastodon</string>
+	<string name="welcome_paragraph1">Το Mastodon είναι ένα αποκεντρωμένο κοινωνικό δίκτυο, που σημαίνει ότι καμία εταιρεία δεν το ελέγχει. Αποτελείται από πολλούς ανεξάρτητους διακομιστές, όλοι συνδεδεμένοι μαζί.</string>
+	<string name="what_are_servers">Τι είναι οι διακομιστές;</string>
+	<string name="welcome_paragraph2"><![CDATA[Κάθε λογαριασμός Mastodon φιλοξενείται σε ένα διακομιστή - ο καθένας με τις δικές του αξίες, κανόνες, & διαχειριστές. Ανεξάρτητα από το ποιον μπορεί να επιλέξεις, μπορείς να ακολουθήσεις και να αλληλεπιδράσεις με άτομα από οποιονδήποτε διακομιστή.]]></string>
 </resources>

From 0d10e09fd6f3220e21c8a2a3fcb36c6ef1effdbb Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 9 Apr 2023 23:47:00 +0200
Subject: [PATCH 085/124] New translations strings.xml (Slovenian)

---
 .../src/main/res/values-sl-rSI/strings.xml    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/mastodon/src/main/res/values-sl-rSI/strings.xml b/mastodon/src/main/res/values-sl-rSI/strings.xml
index c00fa3806..094cb307c 100644
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -10,11 +10,13 @@
 	<string name="ok">V redu</string>
 	<string name="preparing_auth">Pripravljanje na preverjanje pristnosti …</string>
 	<string name="finishing_auth">Zaključevanje preverjanja pristnosti ...</string>
+	<string name="user_boosted">%s je izpostavil/a</string>
 	<string name="in_reply_to">Kot odgovor %s</string>
 	<string name="notifications">Obvestila</string>
 	<string name="user_followed_you">vam sledi</string>
 	<string name="user_sent_follow_request">vam je poslal_a zahtevo za sledenje</string>
 	<string name="user_favorited">je vzljubil_a vašo objavo</string>
+	<string name="notification_boosted">je izpostavil/a vašo objavo</string>
 	<string name="poll_ended">anketa je zaključena</string>
 	<string name="time_seconds">%d s</string>
 	<string name="time_minutes">%d m</string>
@@ -192,6 +194,7 @@
 	<string name="report_sent_subtitle">Medtem, ko to pregledujemo, lahko proti %s ukrepate.</string>
 	<string name="unfollow_user">Prenehaj slediti %s</string>
 	<string name="unfollow">Prenehaj slediti</string>
+	<string name="mute_user_explain">Njihovih objav ali poobjav ne boste videli v svojem domačem viru. Ne bodo vedeli, da so utišani.</string>
 	<string name="block_user_explain">Nič več ne bodo mogli slediti ali videti vaše objave, lahko pa vidijo, če so blokirani.</string>
 	<string name="report_personal_title">Ali ne želite tega videti?</string>
 	<string name="report_personal_subtitle">Če vidite nekaj, česar na Masodonu ne želite, lahko odstranite osebo iz svoje izkušnje.</string>
@@ -248,6 +251,7 @@
 	<string name="skip">Preskoči</string>
 	<string name="notification_type_follow">Novi sledilci</string>
 	<string name="notification_type_favorite">Priljubljeni</string>
+	<string name="notification_type_reblog">Izpostavitve</string>
 	<string name="notification_type_mention">Omembe</string>
 	<string name="notification_type_poll">Ankete</string>
 	<string name="choose_account">Izberite račun</string>
@@ -276,6 +280,7 @@
 	<string name="notify_none">nihče</string>
 	<string name="notify_favorites">mojo objavo da med priljubljene</string>
 	<string name="notify_follow">me sledi</string>
+	<string name="notify_reblog">Izpostavi mojo objavo </string>
 	<string name="notify_mention">me omeni</string>
 	<string name="settings_boring">Cona dolgočasja</string>
 	<string name="settings_account">Nastavitve računa</string>
@@ -296,6 +301,7 @@
 	<string name="hide_content">Skrij vsebino</string>
 	<string name="new_post">Nova objava</string>
 	<string name="button_reply">Odgovori</string>
+	<string name="button_reblog">Izpostavi</string>
 	<string name="button_favorite">Priljubljen_a</string>
 	<string name="button_share">Deli</string>
 	<string name="media_no_description">Medij brez opisa</string>
@@ -311,6 +317,8 @@
 	<string name="followed_user">Zdaj sledite %s</string>
 	<string name="following_user_requested">Zaprošeni ste, da sledite %s</string>
 	<string name="open_in_browser">Odpri v brskalniku</string>
+	<string name="hide_boosts_from_user">Skrij izpostavitve od %s</string>
+	<string name="show_boosts_from_user">Pokaži izpostavitve osebe %s</string>
 	<string name="signup_reason">Zakaj se želite pridružiti?</string>
 	<string name="signup_reason_note">To nam bo pomagalo pregledati vašo prijavo.</string>
 	<string name="clear">Počisti</string>
@@ -458,4 +466,19 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s ne dovoljuje prijav s/z %2$s. Poskusite drugega ali &lt;a&gt;izberite drug strežnik&lt;/a&gt;.</string>
 	<string name="signup_username_taken">To ime je že zasedeno.</string>
+	<string name="spoiler_hide">Ponovno skrij</string>
+	<string name="poll_multiple_choice">Izberi eno ali več izbir</string>
+	<string name="save_changes">Shrani spremembe</string>
+	<string name="profile_timeline">Časovnica</string>
+	<string name="view_all">Prikaži vse</string>
+	<string name="profile_endorsed_accounts">Računi</string>
+	<string name="verified_link">Preverjena povezava</string>
+	<string name="show">Pokaži</string>
+	<string name="hide">Skrij</string>
+	<string name="join_default_server">Pridruži se %s</string>
+	<string name="pick_server">Izberi moj lasten strežnik</string>
+	<string name="signup_or_login">ali</string>
+	<string name="learn_more">Več o tem</string>
+	<string name="welcome_to_mastodon">Dobrodošli na Mastodon</string>
+	<string name="what_are_servers">Kaj so strežniki?</string>
 </resources>

From 9e6a355db0634cdfa7948d9953ae602063a5417e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 10 Apr 2023 00:54:45 +0200
Subject: [PATCH 086/124] New translations strings.xml (Slovenian)

---
 mastodon/src/main/res/values-sl-rSI/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mastodon/src/main/res/values-sl-rSI/strings.xml b/mastodon/src/main/res/values-sl-rSI/strings.xml
index 094cb307c..1021feee7 100644
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -368,6 +368,7 @@
 	</plurals>
 	<string name="timestamp_via_app">%1$s prek %2$s</string>
 	<string name="time_now">zdaj</string>
+	<string name="post_info_reblogs">Izpostavitve</string>
 	<string name="post_info_favorites">Priljubljeni</string>
 	<string name="edit_history">Uredi zgodovino</string>
 	<string name="last_edit_at_x">Zadnjič urejano %s</string>
@@ -433,6 +434,7 @@
 	<string name="welcome_page1_title">Kaj je Mastodon?</string>
 	<string name="welcome_page1_text">Predstavljajte si, da imate e-poštni naslov, ki se konča s @primer.com.\n\nŠe vedno lahko pošiljate in prejemate e-sporočilo od vsakogar, tudi če se njihov e-naslov konča @gmail.com, @icloud.com ali @primer.com.</string>
 	<string name="welcome_page2_title">Mastodon je takšen.</string>
+	<string name="welcome_page2_text">Vaša ročica je morda @veselodekle654@primer.social, vendar lahko še vedno sledite, izpostavljate oz. poobjavljate objave in klepetate z @nikoli2prepozno@primer.online.</string>
 	<string name="welcome_page3_title">Kako izberem strežnik?</string>
 	<string name="welcome_page3_text">Različni ljudje izbirajo različne strežnike iz najrazličnejših razlogov. art.example je krasno mesto za uemtnike, medtem ko je glasgow.example dobra izbira za Škode.\n\nNič ne morete storiti narobe s katerim koli od naših priporočenih strežnikov, tako da je povsem nepomembno, katerega ste izbrali (ali če vnesete lastnega v iskalno vrstico strežnikov) - nikoli ne boste zamudili niti najmanjših vsebin.</string>
 	<string name="signup_random_server_explain">Izbrali bomo strežnik na osnovi vašega jezika, če nadaljujete brez izbire.</string>
@@ -466,9 +468,11 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s ne dovoljuje prijav s/z %2$s. Poskusite drugega ali &lt;a&gt;izberite drug strežnik&lt;/a&gt;.</string>
 	<string name="signup_username_taken">To ime je že zasedeno.</string>
+	<string name="spoiler_show">Vseeno pokaži</string>
 	<string name="spoiler_hide">Ponovno skrij</string>
 	<string name="poll_multiple_choice">Izberi eno ali več izbir</string>
 	<string name="save_changes">Shrani spremembe</string>
+	<string name="profile_featured">Predstavljeni</string>
 	<string name="profile_timeline">Časovnica</string>
 	<string name="view_all">Prikaži vse</string>
 	<string name="profile_endorsed_accounts">Računi</string>
@@ -480,5 +484,7 @@
 	<string name="signup_or_login">ali</string>
 	<string name="learn_more">Več o tem</string>
 	<string name="welcome_to_mastodon">Dobrodošli na Mastodon</string>
+	<string name="welcome_paragraph1">Mastodon je decentralizirano družbeno omrežje, kar pomeni, da ga ne upravlja nobeno posamezno podjetje. Sestavljajo ga številni neodvisni strežniki, ki so medsebojno povezani.</string>
 	<string name="what_are_servers">Kaj so strežniki?</string>
+	<string name="welcome_paragraph2"><![CDATA[Vsak račun Mastodon gostuje na strežniku — vsak strežnik ima svoje vrednote, pravila in skbrnike. Vseeno je, katerega izberete - sledite in komunicirate lahko z osebbami na poljubnem strežniku.]]></string>
 </resources>

From 58d2c3e5a67a863a2e656cb54e39c1c37618f16f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 11 Apr 2023 17:28:22 +0200
Subject: [PATCH 087/124] New translations strings.xml (Indonesian)

---
 mastodon/src/main/res/values-in-rID/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mastodon/src/main/res/values-in-rID/strings.xml b/mastodon/src/main/res/values-in-rID/strings.xml
index 65bc6b8ab..2ce0952e8 100644
--- a/mastodon/src/main/res/values-in-rID/strings.xml
+++ b/mastodon/src/main/res/values-in-rID/strings.xml
@@ -15,6 +15,7 @@
 	<string name="user_followed_you">mengikuti Anda</string>
 	<string name="user_sent_follow_request">mengirim Anda permintaan pengikut</string>
 	<string name="user_favorited">memfavorit kiriman Anda</string>
+	<string name="notification_boosted">mem-boost kiriman Anda</string>
 	<string name="poll_ended">pemungutan suara berakhir</string>
 	<string name="time_seconds">%dd</string>
 	<string name="time_minutes">%dm</string>
@@ -398,4 +399,14 @@
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 	<string name="signup_email_domain_blocked">%1$s tidak memperbolehkan pendaftaran dari %2$s. Coba yang lain atau &lt;a&gt;pilih server lain&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Nama pengguna ini sudah diambil.</string>
+	<string name="save_changes">Simpan perubahan</string>
+	<string name="profile_timeline">Linimasa</string>
+	<string name="view_all">Lihat semua</string>
+	<string name="profile_endorsed_accounts">Akun</string>
+	<string name="verified_link">Pranala terverifikasi</string>
+	<string name="show">Tampilkan</string>
+	<string name="hide">Sembunyikan</string>
+	<string name="join_default_server">Gabung %s</string>
+	<string name="learn_more">Pelajari lebih lanjut</string>
+	<string name="welcome_to_mastodon">Selamat datang di Mastodon</string>
 </resources>

From eef33266fc20a71e661918ff587b1286a529e7af Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Wed, 12 Apr 2023 18:34:28 +0300
Subject: [PATCH 088/124] Remove unused code and strings

---
 .../android/fragments/SplashFragment.java     | 57 -------------------
 mastodon/src/main/res/values/strings.xml      |  6 --
 2 files changed, 63 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
index 5359eea81..1855f566b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
@@ -177,61 +177,4 @@ public class SplashFragment extends AppKitFragment{
 		super.onHidden();
 		motionEffect.deactivate();
 	}
-
-	private class PagerAdapter extends RecyclerView.Adapter<PagerViewHolder>{
-
-		@NonNull
-		@Override
-		public PagerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new PagerViewHolder(viewType);
-		}
-
-		@Override
-		public void onBindViewHolder(@NonNull PagerViewHolder holder, int position){}
-
-		@Override
-		public int getItemCount(){
-			return 3;
-		}
-
-		@Override
-		public int getItemViewType(int position){
-			return position;
-		}
-	}
-
-	private class PagerViewHolder extends RecyclerView.ViewHolder{
-		public PagerViewHolder(int page){
-			super(new LinearLayout(getActivity()));
-			LinearLayout ll=(LinearLayout) itemView;
-			ll.setOrientation(LinearLayout.VERTICAL);
-			int pad=V.dp(16);
-			ll.setPadding(pad, pad, pad, pad);
-			ll.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-
-			TextView title=new TextView(getActivity());
-			title.setTextAppearance(R.style.m3_headline_medium);
-			title.setText(switch(page){
-				case 0 -> getString(R.string.welcome_page1_title);
-				case 1 -> getString(R.string.welcome_page2_title);
-				case 2 -> getString(R.string.welcome_page3_title);
-				default -> throw new IllegalStateException("Unexpected value: "+page);
-			});
-			title.setTextColor(0xFF17063B);
-			LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(page==0 ? 46 : 36));
-			lp.bottomMargin=V.dp(page==0 ? 4 : 14);
-			ll.addView(title, lp);
-
-			TextView text=new TextView(getActivity());
-			text.setTextAppearance(R.style.m3_body_medium);
-			text.setText(switch(page){
-				case 0 -> R.string.welcome_page1_text;
-				case 1 -> R.string.welcome_page2_text;
-				case 2 -> R.string.welcome_page3_text;
-				default -> throw new IllegalStateException("Unexpected value: "+page);
-			});
-			text.setTextColor(0xFF17063B);
-			ll.addView(text, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-		}
-	}
 }
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 0147f48d5..af057bc92 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -402,12 +402,6 @@
 	<string name="login_title">Welcome Back</string>
 	<string name="login_subtitle">Log in with the server where you created your account.</string>
 	<string name="server_url">Server URL</string>
-	<string name="welcome_page1_title">What is Mastodon?</string>
-	<string name="welcome_page1_text">Imagine you have an email address that ends with @example.com.\n\nYou can still send and receive emails from anyone, even if their email ends in @gmail.com or @icloud.com or @example.com.</string>
-	<string name="welcome_page2_title">Mastodon is like that.</string>
-	<string name="welcome_page2_text">Your handle might be @gothgirl654@example.social, but you can still follow, boost, and chat with @fallout5ever@example.online.</string>
-	<string name="welcome_page3_title">How do I pick a server?</string>
-	<string name="welcome_page3_text">Different people choose different servers for any number of reasons. art.example is a great place for artists, while glasgow.example might be a good pick for Scots.\n\nYou can’t go wrong with any of our recommend servers, so regardless of which one you pick (or if you enter your own in the server search bar), you’ll never miss a beat anywhere.</string>
 	<string name="signup_random_server_explain">We\'ll pick a server based on your language if you continue without making a selection.</string>
 	<string name="server_filter_any_language">Any Language</string>
 	<string name="server_filter_instant_signup">Instant Sign-up</string>

From 2c9731ec2a1daa2e620861ae1fd9a7847984f05e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:30 +0200
Subject: [PATCH 089/124] New translations strings.xml (Spanish)

---
 mastodon/src/main/res/values-es-rES/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-es-rES/strings.xml b/mastodon/src/main/res/values-es-rES/strings.xml
index 1e9e3f1fb..fb696ba44 100644
--- a/mastodon/src/main/res/values-es-rES/strings.xml
+++ b/mastodon/src/main/res/values-es-rES/strings.xml
@@ -382,11 +382,6 @@
 	<string name="login_title">Qué bueno verle de nuevo</string>
 	<string name="login_subtitle">Inicie sesión con el servidor donde creó su cuenta.</string>
 	<string name="server_url">URL del servidor</string>
-	<string name="welcome_page1_title">¿Qué es Mastodon?</string>
-	<string name="welcome_page1_text">Imagina que tienes una dirección de correo electrónico que termina con @ejemplo.com.\n\nPuedes enviar y recibir correos electrónicos de cualquier persona, incluso si su correo electrónico termina en @gmail.com o @icloud.com o @ejemplo.com.</string>
-	<string name="welcome_page2_title">Mastodon es parecido.</string>
-	<string name="welcome_page3_title">¿Cómo elijo un servidor?</string>
-	<string name="welcome_page3_text">Diferentes personas eligen diferentes servidores por diferentes motivos. Por ejemplo, art.example es un buen lugar para artistas, mientras que madrid.example puede ser una buena elección para los madrileños.\n\nNo te equivocarás con ninguno de nuestros servidores recomendados, por lo que independientemente del que escojas (o si introduces tu propio servidor en la barra de búsqueda), no te perderás ni una en ningún lugar.</string>
 	<string name="signup_random_server_explain">Seleccionaremos un servidor basado en tu idioma si continúas sin hacer una selección.</string>
 	<string name="server_filter_any_language">Cualquier idioma</string>
 	<string name="server_filter_instant_signup">Registro instantáneo</string>

From 4a758bd488f5bbd78fcc35e44ff991248ef2bfb9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:31 +0200
Subject: [PATCH 090/124] New translations strings.xml (Czech)

---
 mastodon/src/main/res/values-cs-rCZ/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-cs-rCZ/strings.xml b/mastodon/src/main/res/values-cs-rCZ/strings.xml
index 774bdb7e7..219566573 100644
--- a/mastodon/src/main/res/values-cs-rCZ/strings.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings.xml
@@ -422,11 +422,6 @@
 	<string name="login_title">Vítejte zpět</string>
 	<string name="login_subtitle">Přihlaste se pomocí serveru, kde jste vytvořili svůj účet.</string>
 	<string name="server_url">URL serveru</string>
-	<string name="welcome_page1_title">Co je Mastodon?</string>
-	<string name="welcome_page1_text">Představte si, že máte e-mailovou adresu, která končí @example.com.\n\nStále můžete od kohokoliv odesílat a přijímat e-maily, i když jejich e-mail končí na @gmail.com nebo @icloud.com nebo @example.com.</string>
-	<string name="welcome_page2_title">Takový je Mastodon.</string>
-	<string name="welcome_page3_title">Jak si vybrat server?</string>
-	<string name="welcome_page3_text">Různí lidé si vybírají různé servery z různých důvodů. Art.example je skvělým místem pro umělce, zatímco glasgow.example může být dobrou volbou pro Skoty.\n\nS žádným z našich doporučených serverů nemůžete udělat chybu, takže bez ohledu na to, který z nich si vyberete (nebo pokud zadáte svůj vlastní do vyhledávacího řádku serveru), nikde neprohloupíte.</string>
 	<string name="signup_random_server_explain">Pokud budete pokračovat bez výběru, vybereme server založený na vašem jazyce.</string>
 	<string name="server_filter_any_language">Libovolný jazyk</string>
 	<string name="server_filter_instant_signup">Okamžitá registrace</string>

From a8fdaf1a479d406fa03e0c851e8a9c8661a79cb9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:32 +0200
Subject: [PATCH 091/124] New translations strings.xml (Dutch)

---
 mastodon/src/main/res/values-nl-rNL/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-nl-rNL/strings.xml b/mastodon/src/main/res/values-nl-rNL/strings.xml
index 7979e8e7a..9fff69a4f 100644
--- a/mastodon/src/main/res/values-nl-rNL/strings.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings.xml
@@ -382,11 +382,6 @@
 	<string name="login_title">Welkom terug</string>
 	<string name="login_subtitle">Bij de server waar je je account hebt aangemaakt inloggen.</string>
 	<string name="server_url">Server-URL</string>
-	<string name="welcome_page1_title">Wat is Mastodon?</string>
-	<string name="welcome_page1_text">Stel je voor dat je een e-mailadres hebt dat eindigt op @example.com.\n\nJe kunt nog steeds e-mailen met iemand, ook als hun e-mail eindigt in @gmail.com, @icloud.com of @voorbeeld.com.</string>
-	<string name="welcome_page2_title">Mastodon is precies zo.</string>
-	<string name="welcome_page3_title">Hoe kies ik een server?</string>
-	<string name="welcome_page3_text">Verschillende mensen kiezen om allerlei redenen een bepaalde server. art.example is een geweldige plek voor artiesten, terwijl belgium.example misschien een goede plek is voor Belgen.\n\nHet kan niet mis gaan als je een van onze aanbevolen servers kiest. Welke je ook kiest (en ook als je zelf een server invoert in de zoekbalk): je zult geen bericht missen.</string>
 	<string name="signup_random_server_explain">Als je doorgaat zonder een selectie te maken, kiezen we een server gebaseerd op jouw taal.</string>
 	<string name="server_filter_any_language">Elke taal</string>
 	<string name="server_filter_instant_signup">Direct aanmelden</string>

From a55fed450226d08b071ad257481912298b2c6dab Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:33 +0200
Subject: [PATCH 092/124] New translations strings.xml (Ukrainian)

---
 mastodon/src/main/res/values-uk-rUA/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings.xml b/mastodon/src/main/res/values-uk-rUA/strings.xml
index 3355b4da4..3ed29ec5c 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings.xml
@@ -422,11 +422,6 @@
 	<string name="login_title">З поверненням</string>
 	<string name="login_subtitle">Увійдіть за допомогою сервера, де ви створили свій обліковий запис.</string>
 	<string name="server_url">URL-адреса сервера</string>
-	<string name="welcome_page1_title">Що таке Mastodon?</string>
-	<string name="welcome_page1_text">Уявіть, що у вас є електронної пошта, яка закінчується на @example.com.\n\nВи можете все ще надсилати та отримувати листи від будь-кого, навіть якщо їх електронна пошта закінчується на @gmail.com або @icloud.com або @example.com.</string>
-	<string name="welcome_page2_title">Mastodon такий.</string>
-	<string name="welcome_page3_title">Як обрати сервер?</string>
-	<string name="welcome_page3_text">Різні люди обирають різні сервери з будь-якої кількості причин. art.example - це чудове місце для художників, в той час як glasgow.example може бути гарним вибором для шотландці.\n\nВи не можете піти не так з жодними з наших рекомендованих серверів, так чи інакше, незалежно від того, який вибір ви обираєте (або введете власний в панель пошуку сервера), ви ніколи ніде не помилитися в жодному місці.</string>
 	<string name="signup_random_server_explain">Ми підберемо сервер основі вашої мовою, якщо ви продовжите без вибору.</string>
 	<string name="server_filter_any_language">Будь-яка мова</string>
 	<string name="server_filter_instant_signup">Миттєва Реєстрація</string>

From 788e5bd12e03fd0543dff545204fd0f29bccb03a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:34 +0200
Subject: [PATCH 093/124] New translations strings.xml (Icelandic)

---
 mastodon/src/main/res/values-is-rIS/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-is-rIS/strings.xml b/mastodon/src/main/res/values-is-rIS/strings.xml
index 89778de2a..cf09fb5a6 100644
--- a/mastodon/src/main/res/values-is-rIS/strings.xml
+++ b/mastodon/src/main/res/values-is-rIS/strings.xml
@@ -382,11 +382,6 @@
 	<string name="login_title">Velkomin aftur</string>
 	<string name="login_subtitle">Skráðu þig inn á netþjóninn þar sem þú útbjóst notandaaðganginn þinn.</string>
 	<string name="server_url">Vefslóð netþjóns</string>
-	<string name="welcome_page1_title">Hvað er Mastodon?</string>
-	<string name="welcome_page1_text">Ímyndaðu þér að þú sért með tölvupóstfang sem endar á @lén.is.\n\nÞú getur alltaf tekið við og sent tölvupóst til allra, jafnvel þótt tölvupóstfangið þeirra endi á @gmail.com, @icloud.com eða @lén.is.</string>
-	<string name="welcome_page2_title">Mastodon er eins og þetta.</string>
-	<string name="welcome_page3_title">Hvernig vel ég netþjón?</string>
-	<string name="welcome_page3_text">Mismunandi fólk velur sér mismunandi netþjóna af ýmsum ólíkum ástæðum. Netþjónninn art.example er frábær staður fyrir listafólk, á meðan glasgow.example gæti verið góður kostur fyrir suma skota.\n\nÞú getur eiginlega ekki lent á röngum stað á neinum að þeim netþjónum sem við mælum með, þannig að hvern þeirra sem þú velur (eða ef þú setur inn þinn eigin netþjón í leitarreitinn), þá ættirðu ekki að missa af neinu neinsstaðar.</string>
 	<string name="signup_random_server_explain">Við munum velja netþjón út frá tungumálinu þínu, ef þú heldur áfram án þess að velja neitt.</string>
 	<string name="server_filter_any_language">Hvaða tungumál sem er</string>
 	<string name="server_filter_instant_signup">Nýskráning á stundinni</string>

From f240a3d996f5153093d8f3214c89f3d0ffe0f058 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:35 +0200
Subject: [PATCH 094/124] New translations strings.xml (Indonesian)

---
 mastodon/src/main/res/values-in-rID/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-in-rID/strings.xml b/mastodon/src/main/res/values-in-rID/strings.xml
index 2ce0952e8..cff729e0b 100644
--- a/mastodon/src/main/res/values-in-rID/strings.xml
+++ b/mastodon/src/main/res/values-in-rID/strings.xml
@@ -363,11 +363,6 @@
 	<string name="login_title">Selamat Datang Kembali</string>
 	<string name="login_subtitle">Masuk dengan server di mana Anda buat akun Anda.</string>
 	<string name="server_url">URL Server</string>
-	<string name="welcome_page1_title">Apa itu Mastodon?</string>
-	<string name="welcome_page1_text">Bayangkan Anda memikiki alamat surel yang berakhiran @contoh.com.\n\nAnda masih bisa mengirim dan menerima surel dari siapa pun, bahkan jika alamat surel mereka berakhiran @gmail.com atau @icloud.com atau @contoh.com.</string>
-	<string name="welcome_page2_title">Mastodon seperti itu.</string>
-	<string name="welcome_page3_title">Bagaimana saya memilih server?</string>
-	<string name="welcome_page3_text">Kebanyakan orang memilih server berbeda karena berbagai alasan. seni.contoh adalah tempat yang cocok bagi artis, sedangkan glasgow.example mungkin pilihan yang baik untuk para Scots.\n\nAnda tidak bisa salah dengan server yang kami rekomendasikan, jadi server apa yang Anda pilih (atau jika Anda memasukkan Anda sendiri di bilah pencarian server), Anda tidak akan melewatkan apa pun di mana pun.</string>
 	<string name="signup_random_server_explain">Kami akan memilih sebuah server berdasarkan bahasa Anda jika Anda melanjutkan tanpa memilih.</string>
 	<string name="server_filter_any_language">Bahasa Apa Pun</string>
 	<string name="server_filter_instant_signup">Pendaftaran Instan</string>

From 1868bfe8e3b8154a63601fa175678b7628b96740 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:36 +0200
Subject: [PATCH 095/124] New translations strings.xml (Thai)

---
 mastodon/src/main/res/values-th-rTH/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/mastodon/src/main/res/values-th-rTH/strings.xml b/mastodon/src/main/res/values-th-rTH/strings.xml
index 4212c7052..dfacbc5ba 100644
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -374,12 +374,6 @@
 	<string name="login_title">ยินดีต้อนรับกลับมา</string>
 	<string name="login_subtitle">เข้าสู่ระบบด้วยเซิร์ฟเวอร์ที่ซึ่งคุณได้สร้างบัญชีของคุณ</string>
 	<string name="server_url">URL ของเซิร์ฟเวอร์</string>
-	<string name="welcome_page1_title">Mastodon คืออะไร?</string>
-	<string name="welcome_page1_text">จินตนาการว่าคุณมีที่อยู่อีเมลที่ลงท้ายด้วย @example.com\n\nคุณยังคงสามารถส่งและรับอีเมลจากใครก็ตาม แม้ว่าอีเมลของเขาจะลงท้ายด้วย @gmail.com หรือ @icloud.com หรือ @example.com ก็ตาม</string>
-	<string name="welcome_page2_title">Mastodon เป็นเช่นนั้น</string>
-	<string name="welcome_page2_text">นามของคุณอาจเป็น @gothgirl654@example.social แต่คุณยังคงสามารถติดตาม ดัน และแชทกับ @fallout5ever@example.online</string>
-	<string name="welcome_page3_title">ฉันจะเลือกเซิร์ฟเวอร์อย่างไร?</string>
-	<string name="welcome_page3_text">ต่างคนต่างเลือกเซิร์ฟเวอร์ด้วยเหตุผลต่าง ๆ art.example เป็นสถานที่ที่ยอดเยี่ยมสำหรับศิลปิน ขณะที่ glasgow.example อาจเป็นตัวเลือกที่ดีสำหรับชาวสกอต\n\nรับรองว่าคุณต้องชอบเซิร์ฟเวอร์ที่แนะนำของเราใดก็ตาม ดังนั้นไม่ว่าเซิร์ฟเวอร์ใดที่คุณเลือก (หรือหากคุณป้อนของคุณเองในแถบค้นหาเซิร์ฟเวอร์) คุณจะไม่พลาดความเคลื่อนไหวที่ใดก็ตาม</string>
 	<string name="signup_random_server_explain">เราจะเลือกเซิร์ฟเวอร์ตามภาษาของคุณหากคุณดำเนินการต่อโดยไม่ได้ทำการเลือก</string>
 	<string name="server_filter_any_language">ภาษาใด ๆ</string>
 	<string name="server_filter_instant_signup">การลงทะเบียนทันที</string>

From b439c64adde7b7aeb8fc25d052c0a1999b7d4593 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:37 +0200
Subject: [PATCH 096/124] New translations strings.xml (Greek)

---
 mastodon/src/main/res/values-el-rGR/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index c6d90ac27..764a4ab5d 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -395,12 +395,6 @@
 	<string name="login_title">Καλώς Ήρθες Ξανά</string>
 	<string name="login_subtitle">Συνδέσου με τον διακομιστή όπου δημιούργησες τον λογαριασμό σου.</string>
 	<string name="server_url">URL διακομιστή</string>
-	<string name="welcome_page1_title">Τι είναι το Mastodon;</string>
-	<string name="welcome_page1_text">Φαντάσου ότι έχεις μια διεύθυνση email που τελειώνει με @example.com.\n\nΜπορείς ακόμα να στείλεις και να λάβεις μηνύματα από οποιονδήποτε, ακόμη και αν το email τους τελειώνει σε @gmail.com ή @icloud.com ή @example.com.</string>
-	<string name="welcome_page2_title">Έτσι είναι και το Mastodon.</string>
-	<string name="welcome_page2_text">Η λαβή σας μπορεί να είναι @gothgirl654@example.social, αλλά μπορείς ακόμα να ακολουθήσεις, ενισχύσεις και να συνομιλήσεις με τον @fallout5ever@example.online.</string>
-	<string name="welcome_page3_title">Πώς διαλέγω έναν διακομιστή;</string>
-	<string name="welcome_page3_text">Διαφορετικά άτομα επιλέγουν διαφορετικούς διακομιστές για διάφορους λόγους. Ο art.example είναι ένα εξαιρετικό μέρος για καλλιτέχνες, ενώ ο glasgow.example μπορεί να είναι καλή επιλογή για Σκωτσέζους.\n\nΔεν μπορείς να κάνεις λάθος επιλογή με κανέναν από τους προτεινόμενους διακομιστές μας, έτσι ανεξάρτητα από το ποιον θα επιλέξεις (ή αν εισάγεις τον δικο σου στη γραμμή αναζήτησης διακομιστή), θα είσαι πάντα στον παλμό των πραγμάτων.</string>
 	<string name="signup_random_server_explain">Θα διαλέξουμε ένα διακομιστή με βάση τη γλώσσα σας αν συνεχίσεις χωρίς να κάνεις μια επιλογή.</string>
 	<string name="server_filter_any_language">Οποιαδήποτε Γλώσσα</string>
 	<string name="server_filter_instant_signup">Άμεση Εγγραφή</string>

From 49492c07885407e54507d73be69fbbba0b5ffe3a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:38 +0200
Subject: [PATCH 097/124] New translations strings.xml (Belarusian)

---
 mastodon/src/main/res/values-be-rBY/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-be-rBY/strings.xml b/mastodon/src/main/res/values-be-rBY/strings.xml
index e7ffb7503..7834f6cb9 100644
--- a/mastodon/src/main/res/values-be-rBY/strings.xml
+++ b/mastodon/src/main/res/values-be-rBY/strings.xml
@@ -422,11 +422,6 @@
 	<string name="login_title">З вяртаннем</string>
 	<string name="login_subtitle">Увайдзіце з дапамогай сервера, на якім вы стварылі свой уліковы запіс.</string>
 	<string name="server_url">URL-адрас сервера</string>
-	<string name="welcome_page1_title">Што такое Mastodon?</string>
-	<string name="welcome_page1_text">Уявіце, што ў вас ёсць адрас электроннай пошты, які заканчваецца на @example.com.\n\nВы па-ранейшаму можаце адпраўляць і атрымліваць электронныя лісты ад каго захочаце, нават калі іх электронная пошта заканчваецца на @gmail.com, @icloud.com або @example.com.</string>
-	<string name="welcome_page2_title">Mastodon такі.</string>
-	<string name="welcome_page3_title">Як выбраць сервер?</string>
-	<string name="welcome_page3_text">Розныя людзі выбіраюць розныя серверы па розных прычынах. art.example з\'яўляецца выдатным месцам для мастакоў, у той час як glasgow.example можа быць добрым выбарам для шатландцаў.\n\nВы не памыліцеся ні з адным з нашых рэкамендаваных сервераў, так што незалежна ад таго, які вы выбераце (або калі ўведзяце ваш уласны ў радку пошуку сервера), вы нідзе нічога не прапусціце.</string>
 	<string name="signup_random_server_explain">Мы абярэм сервер на аснове вашай мовы, калі вы працягнеце без выбару.</string>
 	<string name="server_filter_any_language">Любая мова</string>
 	<string name="server_filter_instant_signup">Імгненная рэгістрацыя</string>

From 63bde032b3276ae316387639d079b9fbc69d002f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:40 +0200
Subject: [PATCH 098/124] New translations strings.xml (French)

---
 mastodon/src/main/res/values-fr-rFR/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings.xml b/mastodon/src/main/res/values-fr-rFR/strings.xml
index 4a6c9d155..526adc178 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings.xml
@@ -381,11 +381,6 @@
 	<string name="login_title">Content de vous revoir</string>
 	<string name="login_subtitle">Connectez-vous avec le serveur sur lequel vous avez créé votre compte.</string>
 	<string name="server_url">URL du serveur</string>
-	<string name="welcome_page1_title">Qu’est-ce que Mastodon ?</string>
-	<string name="welcome_page1_text">Imaginez que vous ayez une adresse e-mail qui se termine par @example.com.\n\nVous pouvez toujours envoyer et recevoir des e-mails de n\'importe qui, même si leur e-mail se termine par @gmail.com ou @icloud.com ou @example.com.</string>
-	<string name="welcome_page2_title">Mastodon est comme ça.</string>
-	<string name="welcome_page3_title">Comment choisir un serveur?</string>
-	<string name="welcome_page3_text">Différentes personnes choisissent différents serveurs pour un certain nombre de raisons. art.example est un lieu idéal pour les artistes, tandis que glasgow.example pourrait être un bon choix pour les Écossais.\n\nVous ne pouvez pas vous tromper avec l\'un de nos serveurs recommandés et ainsi, quel que soit celui que vous choisissez (ou si vous entrez le vôtre dans la barre de recherche du serveur), vous ne manquerez jamais une info quelque part.</string>
 	<string name="signup_random_server_explain">Nous choisirons un serveur basé sur votre langue si vous continuez sans faire de sélection.</string>
 	<string name="server_filter_any_language">N\'importe quelle langue</string>
 	<string name="server_filter_instant_signup">Inscription instantanée</string>

From c083c8bce530b7abc1852b8e717df25ee2ade1dd Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:41 +0200
Subject: [PATCH 099/124] New translations strings.xml (Arabic)

---
 mastodon/src/main/res/values-ar-rSA/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-ar-rSA/strings.xml b/mastodon/src/main/res/values-ar-rSA/strings.xml
index b3ea43676..1875230cf 100644
--- a/mastodon/src/main/res/values-ar-rSA/strings.xml
+++ b/mastodon/src/main/res/values-ar-rSA/strings.xml
@@ -461,11 +461,6 @@
 	<string name="login_title">مرحبا بك مجددًا</string>
 	<string name="login_subtitle">قم بتسجيل الدخول باستخدام الخادم حيث قمتَ بإنشاء حسابك فيه.</string>
 	<string name="server_url">رابط الخادم</string>
-	<string name="welcome_page1_title">ما هو ماستدون؟</string>
-	<string name="welcome_page1_text">تخيل أن لديك عنوان بريد إلكتروني ينتهي بـ @example.com.\n\n رغم ذلك يمكنك إرسال واستقبال رسائل البريد الإلكتروني من أي شخص، حتى إذا كان بريدهم الإلكتروني الخاص ينتهي بـ @gmail.com أو @icloud.com أو @example.com.</string>
-	<string name="welcome_page2_title">ماستدون هكذا.</string>
-	<string name="welcome_page3_title">كيف يمكنني اختيار خادم؟</string>
-	<string name="welcome_page3_text">يختار الأشخاص المختلفون خوادم مختلفة لأي عدد من الأسباب. يعد art.example مكانًا رائعًا للفنانين ، بينما قد يكون glasgow.example اختيارًا جيدًا للاسكتلنديين. \n\n لا يمكنك أن تخطئ في أي من الخوادم التي نوصي بها ، لذلك بغض النظر عن أي واحد تختاره (أو إذا قمت بإدخال الخادم الخاص بك في شريط البحث) ، فلن يفوتك أي شيء في أي مكان.</string>
 	<string name="signup_random_server_explain">سوف نختار خادماً بناءً على لغتك إذا قمت بالمتابعة دون إجراء إختيار.</string>
 	<string name="server_filter_any_language">أي لغة</string>
 	<string name="server_filter_instant_signup">تسجيل فوري</string>

From afd0cca1766f8a4a09e6b8d4e1e93c5d6c640a76 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:42 +0200
Subject: [PATCH 100/124] New translations strings.xml (Danish)

---
 mastodon/src/main/res/values-da-rDK/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-da-rDK/strings.xml b/mastodon/src/main/res/values-da-rDK/strings.xml
index 7483bcc1c..97eef95b5 100644
--- a/mastodon/src/main/res/values-da-rDK/strings.xml
+++ b/mastodon/src/main/res/values-da-rDK/strings.xml
@@ -380,11 +380,6 @@
 	<string name="login_title">Velkommen tilbage</string>
 	<string name="login_subtitle">Log ind med serveren hvor du oprettede din bruger.</string>
 	<string name="server_url">Server-URL</string>
-	<string name="welcome_page1_title">Hvad er Mastodon?</string>
-	<string name="welcome_page1_text">Det svarer til at du har en e-mailadresse, der slutter med @eksempel.dk.\n\nAlligevel kan du stadig både sende og modtage e-mails fra alle, selv om deres e-mail ender på @gmail.com eller @icloud.com eller @eksempel.dk.</string>
-	<string name="welcome_page2_title">Mastodon er ligesådan.</string>
-	<string name="welcome_page3_title">Hvordan vælger jeg en server?</string>
-	<string name="welcome_page3_text">Forskellige mennesker vælger forskellige servere af mange forskellige grunde. art.example er et godt sted for kunstnere, mens glasgow.example kan være et godt pluk for skotter.\n\nDu kan ikke gå galt i byen med en af vores anbefalingsservere, så uanset hvilken du vælger (eller hvis du indtaster din egen i serversøgelinjen), vil du aldrig gå glip af noget nogen steder.</string>
 	<string name="signup_random_server_explain">Vi vælger en server baseret på dit sprog, hvis du fortsætter uden at foretage et valg.</string>
 	<string name="server_filter_any_language">Hvilket som helst sprog</string>
 	<string name="server_filter_instant_signup">Øjeblikkelig tilmelding</string>

From 22ac112bdbed80f15dc1a93921aeb6908b69274f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:43 +0200
Subject: [PATCH 101/124] New translations strings.xml (German)

---
 mastodon/src/main/res/values-de-rDE/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-de-rDE/strings.xml b/mastodon/src/main/res/values-de-rDE/strings.xml
index bf34c86d1..e911f8cc8 100644
--- a/mastodon/src/main/res/values-de-rDE/strings.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings.xml
@@ -382,11 +382,6 @@
 	<string name="login_title">Willkommen zurück</string>
 	<string name="login_subtitle">Melde dich mit dem Server an, auf dem du dein Konto erstellt hast.</string>
 	<string name="server_url">Serveradresse</string>
-	<string name="welcome_page1_title">Was ist Mastodon?</string>
-	<string name="welcome_page1_text">Angenommen, du hast eine E-Mail-Adresse, die mit @example.com endet.\n\nDu kannst immer noch E-Mails von allen empfangen, auch wenn deren E-Mail-Adresse mit @gmail.com, @icloud.com oder @example.com endet.</string>
-	<string name="welcome_page2_title">Mastodon ist genau so.</string>
-	<string name="welcome_page3_title">Wie wähle ich einen Server aus?</string>
-	<string name="welcome_page3_text">Unterschiedliche Menschen wählen aus verschiedenen Gründen unterschiedliche Server. art.example ist ein toller Ort für Künstler*innen, während glasgow.example eine gute Wahl für Schott*innen sein könnte.\n\nWähle nach Möglichkeit einen kleinen Server aus, mit dessen Regeln du dich wohl fühlst und der dir vertrauenswürdig erscheint (über die Server-Suchleiste kannst du dich direkt mit dem Server deines Vertrauens verbinden).</string>
 	<string name="signup_random_server_explain">Wenn du ohne Auswahl fortfährst, wählen wir einen Server in deiner Sprache aus.</string>
 	<string name="server_filter_any_language">Alle Sprachen</string>
 	<string name="server_filter_instant_signup">Schnellregistrierung</string>

From e0c2c208aeec72a43022d35446258050873975f8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:44 +0200
Subject: [PATCH 102/124] New translations strings.xml (Basque)

---
 mastodon/src/main/res/values-eu-rES/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-eu-rES/strings.xml b/mastodon/src/main/res/values-eu-rES/strings.xml
index 01b3f7833..29f7c5432 100644
--- a/mastodon/src/main/res/values-eu-rES/strings.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings.xml
@@ -377,11 +377,6 @@
 	<string name="login_title">Ongi etorri berriro ere</string>
 	<string name="login_subtitle">Hasi saioa kontua sortu zenuen zerbitzariarekin.</string>
 	<string name="server_url">Zerbitzariaren URLa</string>
-	<string name="welcome_page1_title">Zer da Mastodon?</string>
-	<string name="welcome_page1_text">Imajinatu zure helbide elektronikoa adibidea.eus-en amaitzen dela. \n\n Oraindik edonoren mezu elektronikoak bidali eta jaso ditzakezu, baita posta elektronikoa @gmail.com edo @icloud.com edo @adibidea.eus helbideetan amaitzen bada ere.</string>
-	<string name="welcome_page2_title">Mastodon antzekoa da.</string>
-	<string name="welcome_page3_title">Nola aukeratzen dut zerbitzari bat?</string>
-	<string name="welcome_page3_text">Hainbat pertsonak zerbitzari bat baino gehiago aukeratzen dituzte arrazoi ezberdinengatik. Adibidez, art.example leku ona da artistentzat eta mastodon.eus, berriz, euskaldunentzat. Gure gomendioetako zerbitzariekin, ez duzu hanka sartuko eta edozein dela ere zure aukera, beste zerbitzarietako kideekin harremana izan dezakezu (bilaketa-barran bilatuz).</string>
 	<string name="server_filter_any_language">Edozein hizkuntza</string>
 	<string name="server_filter_instant_signup">Berehalako erregistroa</string>
 	<string name="server_filter_region_europe">Europa</string>

From 871dfda79e984b00d38d19c2c4a9019fa7e141ef Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:47 +0200
Subject: [PATCH 103/124] New translations strings.xml (Hungarian)

---
 mastodon/src/main/res/values-hu-rHU/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-hu-rHU/strings.xml b/mastodon/src/main/res/values-hu-rHU/strings.xml
index 7e0fcaaca..a5f4fb7b7 100644
--- a/mastodon/src/main/res/values-hu-rHU/strings.xml
+++ b/mastodon/src/main/res/values-hu-rHU/strings.xml
@@ -381,11 +381,6 @@
 	<string name="login_title">Üdv újra</string>
 	<string name="login_subtitle">Azon a kiszolgálón jelentkezz be, ahol a fiókodat létrehoztad.</string>
 	<string name="server_url">Kiszolgáló URL</string>
-	<string name="welcome_page1_title">Mi a Mastodon?</string>
-	<string name="welcome_page1_text">Képzeld el, hogy az emailcímed @example.com-ra végződik.\n\nEttől még küldhtesz és fogadhatsz emailt bárkitől, akkor is, ha a címük @gmail.com-ra, @icloud.com-ra vagy @example.com-ra végződik.</string>
-	<string name="welcome_page2_title">Ilyen a Mastodon.</string>
-	<string name="welcome_page3_title">Hogyan választok kiszolgálót?</string>
-	<string name="welcome_page3_text">Az emberek különböző okok miatt választanak más és más kiszolgálót. Az art.example egy jó hely lehet a művészek számára, miközben a glasgow.example a skótoknak lehet megfelelő.\n\nAz általunk javasolt kiszolgálókkal nem lehet probléma, de teljesen mindegy, hogy melyiket választod (vagy ha saját kiszolgálót használsz a keresőmezőben), nem maradsz le semmiről egy kiszolgálón sem.</string>
 	<string name="signup_random_server_explain">Választunk egy kiszolgálót a saját nyelvedhez, ha választás nélkül folytatod.</string>
 	<string name="server_filter_any_language">Bármely Nyelv</string>
 	<string name="server_filter_instant_signup">Azonnali Regisztráció</string>

From ac88b9e19cde81d12c81911008a04a844e5e7214 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:48 +0200
Subject: [PATCH 104/124] New translations strings.xml (Italian)

---
 mastodon/src/main/res/values-it-rIT/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/mastodon/src/main/res/values-it-rIT/strings.xml b/mastodon/src/main/res/values-it-rIT/strings.xml
index d1aa69871..26c273f79 100644
--- a/mastodon/src/main/res/values-it-rIT/strings.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings.xml
@@ -394,12 +394,6 @@
 	<string name="login_title">Bentornato/a</string>
 	<string name="login_subtitle">Accedi con il server in cui hai creato il tuo account.</string>
 	<string name="server_url">URL del server</string>
-	<string name="welcome_page1_title">Che cos\'è Mastodon?</string>
-	<string name="welcome_page1_text">Immaginate di avere un indirizzo email che termina con @example.com.\n\nPotete ancora inviare e ricevere email da chiunque, anche se la loro email termina in @gmail.com o @icloud.com o @example.com.</string>
-	<string name="welcome_page2_title">Mastodon è così.</string>
-	<string name="welcome_page2_text">Il tuo account potrebbe essere @gothgirl654@esempio.social, ma puoi comunque seguire, condividere e chattare con @fallout5ever@esempio.online.</string>
-	<string name="welcome_page3_title">Come scegliere un server?</string>
-	<string name="welcome_page3_text">Diverse persone scelgono server diversi per vari motivi. art.example è un server ottimo per gli artisti, mentre glasgow.example è una buona scelta per i Scozzesi. \n\nNon si può sbagliare con nessuno dei nostri server consigliati, e qualsiasi server scegli (o se cerchi un altro che conosci tu usando la barra di ricerca dei server) non perderai mai un colpo.</string>
 	<string name="signup_random_server_explain">Sceglieremo un server in base alla tua lingua se continui senza effettuare una selezione.</string>
 	<string name="server_filter_any_language">Qualsiasi lingua</string>
 	<string name="server_filter_instant_signup">Iscrizione immediata</string>

From 0d62e33dc73ae0debfa7a7c1dc0fc50a1c66e1ef Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:49 +0200
Subject: [PATCH 105/124] New translations strings.xml (Japanese)

---
 mastodon/src/main/res/values-ja-rJP/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-ja-rJP/strings.xml b/mastodon/src/main/res/values-ja-rJP/strings.xml
index 1de684504..fccbf1335 100644
--- a/mastodon/src/main/res/values-ja-rJP/strings.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings.xml
@@ -361,11 +361,6 @@
 	<string name="login_title">アカウントでログイン</string>
 	<string name="login_subtitle">アカウントのあるサーバーのURLを入力してください。</string>
 	<string name="server_url">サーバーのURL</string>
-	<string name="welcome_page1_title">Mastodonとは</string>
-	<string name="welcome_page1_text">Mastodonのしくみは電子メールとよく似ています。\n\n電子メールは ○○@example.com のようなメールアドレスを持っていれば、 □□@gmail.com や △△@icloud.com はもちろん、同じプロバイダの ◇◇@example.com など、どんな相手にもメールを送れます。</string>
-	<string name="welcome_page2_title">サーバーからサーバーへ</string>
-	<string name="welcome_page3_title">サーバーをさがしてみよう</string>
-	<string name="welcome_page3_text">サーバーの選びかたは十人十色です。アーティスト同士が集まるサーバーもあれば、とある鉄道の沿線住民が集うサーバーもあります。\n\nアカウント作成に進むと、検索バーとおすすめのサーバーが表示されます。参加したいサーバーが決まっていない場合は、おすすめから選んでみましょう。どのサーバーを選んでも、どこの誰とでもつながれます。</string>
 	<string name="signup_random_server_explain">利用中の言語に基づいてサーバーを自動選択することもできます。</string>
 	<string name="server_filter_any_language">すべての言語</string>
 	<string name="server_filter_instant_signup">開放</string>

From c9efc2cb2bb360a72f83ae029e01e2c7eda2a00e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:50 +0200
Subject: [PATCH 106/124] New translations strings.xml (Korean)

---
 mastodon/src/main/res/values-ko-rKR/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings.xml b/mastodon/src/main/res/values-ko-rKR/strings.xml
index 7b297129f..451cfed41 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings.xml
@@ -361,11 +361,6 @@
 	<string name="login_title">돌아오신 것을 환영합니다</string>
 	<string name="login_subtitle">계정을 생성한 서버에 로그인하세요.</string>
 	<string name="server_url">서버 URL</string>
-	<string name="welcome_page1_title">마스토돈이란?</string>
-	<string name="welcome_page1_text">당신이 @example.com으로 끝나는 이메일 주소를 갖고 있다고 상상해보세요.\n\n당신은 이메일이 @gmail.com이나 @icloud.com 또는 @example.com으로 끝나는 모두에게 이메일을 보내거나 받을 수 있습니다.</string>
-	<string name="welcome_page2_title">마스토돈도 그렇답니다.</string>
-	<string name="welcome_page3_title">서버는 어떻게 선택하나요?</string>
-	<string name="welcome_page3_text">다른 사람들은 여러가지 이유로 서로 다른 서버들을 선택합니다. art.example은 예술가들에게 훌륭한 곳인 반면, glasgow.example은 스코틀랜드인들에게 좋은 선택이 될 수 있습니다.\n\n저희가 추천하는 서버를 선택하면 잘못될 일이 없으므로, 당신은 어떠한 서버를 선택하더라도(또는 서버 검색란에 직접 입력하더라도) 어디서나 소식을 놓치지 않을 것입니다.</string>
 	<string name="signup_random_server_explain">아무 것도 고르지 않은 경우, 당신의 언어에 따라 서버를 골라드립니다.</string>
 	<string name="server_filter_any_language">모든 언어</string>
 	<string name="server_filter_instant_signup">즉시 가입</string>

From b4e80f7fcab9909b5cd2f83f45a6b0cc52c77bff Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:51 +0200
Subject: [PATCH 107/124] New translations strings.xml (Norwegian)

---
 mastodon/src/main/res/values-no-rNO/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mastodon/src/main/res/values-no-rNO/strings.xml b/mastodon/src/main/res/values-no-rNO/strings.xml
index 71139ddc6..355360281 100644
--- a/mastodon/src/main/res/values-no-rNO/strings.xml
+++ b/mastodon/src/main/res/values-no-rNO/strings.xml
@@ -365,9 +365,6 @@
 	<string name="login_title">Velkommen tilbake</string>
 	<string name="login_subtitle">Logg inn med serveren der du opprettet kontoen din.</string>
 	<string name="server_url">Server-URL</string>
-	<string name="welcome_page1_text">Forestill deg at du sender en e-postadresse som slutter med @example.com.\n\nDu kan fortsatt sende og motta e-post fra hvem som helst, selv om e-posten deres slutter på @gmail.com eller @icloud.com eller @example.com.</string>
-	<string name="welcome_page2_title">Mastodon er slik.</string>
-	<string name="welcome_page3_title">Hvordan velger jeg en server?</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

From 3c946212b1e44668e4e530c2e40cad9d63217615 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:52 +0200
Subject: [PATCH 108/124] New translations strings.xml (Polish)

---
 mastodon/src/main/res/values-pl-rPL/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-pl-rPL/strings.xml b/mastodon/src/main/res/values-pl-rPL/strings.xml
index ee02202d5..7b02b7f81 100644
--- a/mastodon/src/main/res/values-pl-rPL/strings.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings.xml
@@ -421,11 +421,6 @@
 	<string name="login_title">Witaj ponownie</string>
 	<string name="login_subtitle">Zaloguj się na serwer, na którym utworzyłeś swoje konto.</string>
 	<string name="server_url">Adres URL serwera</string>
-	<string name="welcome_page1_title">Czym jest Mastodon?</string>
-	<string name="welcome_page1_text">Wyobraź sobie, że masz adres e-mail, który kończy się @example.com.\n\nNadal możesz wysyłać i odbierać wiadomości od każdego, nawet jeśli ich e-mail kończy się na @gmail.com lub @icloud.com lub @przykład.com.</string>
-	<string name="welcome_page2_title">Mastodon jest taki.</string>
-	<string name="welcome_page3_title">Jak wybrać serwer?</string>
-	<string name="welcome_page3_text">Różne osoby wybierają różne serwery z różnych powodu. art.example to świetne miejsce dla artystów, podczas gdy glasgow.przykład może być dobrym wyborem dla Szkotów.\n\nNie zrobisz źle wybierając dowolny z naszych rekomendowanych serwerów, dlatego niezależnie od tego który wybierzesz (lub jeśli wpiszesz swój własny na pasku wyszukiwania serwera), nigdy nie przegapisz niczego.</string>
 	<string name="signup_random_server_explain">My wybierzemy serwer oparty na twoim języku, jeśli kontynuujesz bez dokonywania wyboru.</string>
 	<string name="server_filter_any_language">Dowolny język</string>
 	<string name="server_filter_instant_signup">Natychmiastowa rejestracja</string>

From 657bb949757b4a341bbd52772e6d007cc17eab04 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:54 +0200
Subject: [PATCH 109/124] New translations strings.xml (Russian)

---
 mastodon/src/main/res/values-ru-rRU/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-ru-rRU/strings.xml b/mastodon/src/main/res/values-ru-rRU/strings.xml
index 587d7e307..d12fcc7ae 100644
--- a/mastodon/src/main/res/values-ru-rRU/strings.xml
+++ b/mastodon/src/main/res/values-ru-rRU/strings.xml
@@ -415,11 +415,6 @@
 	<string name="login_title">С возвращением</string>
 	<string name="login_subtitle">Войдите на сервер, на котором вы создали свою учётную запись.</string>
 	<string name="server_url">URL-адрес сервера</string>
-	<string name="welcome_page1_title">Что такое Mastodon?</string>
-	<string name="welcome_page1_text">Представьте, что у вас есть адрес электронной почты, который заканчивается на @example.com.\n\nВы можете отправлять и получать письма от всех, даже если их адрес заканчивается на @gmail.com или @icloud.com или @example.com.</string>
-	<string name="welcome_page2_title">Mastodon работает так же.</string>
-	<string name="welcome_page3_title">Как выбрать сервер?</string>
-	<string name="welcome_page3_text">Разные люди выбирают разные серверы по разным причинам. art.example — отличное место для художников, а glasgow.example может быть хорошим выбором для шотландцев.\n\nВы не ошибётесь с любым из рекомендованных серверов, поэтому независимо от того, какой из них вы выберете (или если вы введёте свой собственный в строке поиска сервера), вы никогда и нигде не пропустите ни одной детали.</string>
 	<string name="signup_random_server_explain">Мы выберем сервер на основе вашего языка, если вы продолжите, не сделав выбор.</string>
 	<string name="server_filter_any_language">Любой язык</string>
 	<string name="server_filter_instant_signup">Мгновенная регистрация</string>

From 6af177b5963e0823febafb6fdd78f6477010b842 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:55 +0200
Subject: [PATCH 110/124] New translations strings.xml (Slovenian)

---
 mastodon/src/main/res/values-sl-rSI/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/mastodon/src/main/res/values-sl-rSI/strings.xml b/mastodon/src/main/res/values-sl-rSI/strings.xml
index 1021feee7..dcc8d2d87 100644
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -431,12 +431,6 @@
 	<string name="login_title">Dobrodošli nazaj</string>
 	<string name="login_subtitle">Prijavite se na strežniku, na katerem ste ustvarili svoj račun.</string>
 	<string name="server_url">URL strežnika</string>
-	<string name="welcome_page1_title">Kaj je Mastodon?</string>
-	<string name="welcome_page1_text">Predstavljajte si, da imate e-poštni naslov, ki se konča s @primer.com.\n\nŠe vedno lahko pošiljate in prejemate e-sporočilo od vsakogar, tudi če se njihov e-naslov konča @gmail.com, @icloud.com ali @primer.com.</string>
-	<string name="welcome_page2_title">Mastodon je takšen.</string>
-	<string name="welcome_page2_text">Vaša ročica je morda @veselodekle654@primer.social, vendar lahko še vedno sledite, izpostavljate oz. poobjavljate objave in klepetate z @nikoli2prepozno@primer.online.</string>
-	<string name="welcome_page3_title">Kako izberem strežnik?</string>
-	<string name="welcome_page3_text">Različni ljudje izbirajo različne strežnike iz najrazličnejših razlogov. art.example je krasno mesto za uemtnike, medtem ko je glasgow.example dobra izbira za Škode.\n\nNič ne morete storiti narobe s katerim koli od naših priporočenih strežnikov, tako da je povsem nepomembno, katerega ste izbrali (ali če vnesete lastnega v iskalno vrstico strežnikov) - nikoli ne boste zamudili niti najmanjših vsebin.</string>
 	<string name="signup_random_server_explain">Izbrali bomo strežnik na osnovi vašega jezika, če nadaljujete brez izbire.</string>
 	<string name="server_filter_any_language">Katerikoli jezik</string>
 	<string name="server_filter_instant_signup">Takojšnja prijava</string>

From f759150982c0a6980867ddcf993ef4bfe0231b18 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:56 +0200
Subject: [PATCH 111/124] New translations strings.xml (Swedish)

---
 mastodon/src/main/res/values-sv-rSE/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-sv-rSE/strings.xml b/mastodon/src/main/res/values-sv-rSE/strings.xml
index 2a5765356..099b54deb 100644
--- a/mastodon/src/main/res/values-sv-rSE/strings.xml
+++ b/mastodon/src/main/res/values-sv-rSE/strings.xml
@@ -381,11 +381,6 @@
 	<string name="login_title">Välkommen tillbaka</string>
 	<string name="login_subtitle">Logga in på den server där du skapade ditt konto.</string>
 	<string name="server_url">Server-URL</string>
-	<string name="welcome_page1_title">Vad är Mastodon?</string>
-	<string name="welcome_page1_text">Tänk dig att du har en epostadress som slutar med @example.com.\n\nDu kan skicka och ta emot epost från vem som helst, även om deras epostadress slutar med @gmail.com, @icloud.com eller @example.com.</string>
-	<string name="welcome_page2_title">Mastodon fungerar så.</string>
-	<string name="welcome_page3_title">Hur väljer jag en server?</string>
-	<string name="welcome_page3_text">Olika personer väljer olika servrar av olika anledningar. art.example är en bra plats för konstnärer medan glasgow.exempel kan vara ett bra val för skottar.\n\nMed någon av våra rekommenderar servrar kan du inte hamna fel så oavsett vilken du väljer, eller om du skriver in din egen i serverns sökfältet, kommer du aldrig missa något.</string>
 	<string name="signup_random_server_explain">Vi kommer att välja en server baserat på ditt språk om du fortsätter utan att göra ett val.</string>
 	<string name="server_filter_any_language">Vilket språk som helst</string>
 	<string name="server_filter_instant_signup">Omedelbar registrering</string>

From 8330b9f1c50565479c10fd7e5ce75f05c7f01007 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:57 +0200
Subject: [PATCH 112/124] New translations strings.xml (Turkish)

---
 mastodon/src/main/res/values-tr-rTR/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-tr-rTR/strings.xml b/mastodon/src/main/res/values-tr-rTR/strings.xml
index 3b9957fe7..c834f7df0 100644
--- a/mastodon/src/main/res/values-tr-rTR/strings.xml
+++ b/mastodon/src/main/res/values-tr-rTR/strings.xml
@@ -381,11 +381,6 @@
 	<string name="login_title">Hoşgeldin</string>
 	<string name="login_subtitle">Hesabınızı oluşturduğunuz sunucu ile giriş yapın.</string>
 	<string name="server_url">Sunucu URL\'si</string>
-	<string name="welcome_page1_title">Mastodon nedir?</string>
-	<string name="welcome_page1_text">\@örnek.com ile biten bir e-posta adresiniz olduğunu düşünün. \n\n Kişilerin e-posta adresi @gmail.com, @icloud.com ya da @örnek.com ile bitse de herkese e-posta gönderebilir veya herkesten e-posta alabilirsiniz.</string>
-	<string name="welcome_page2_title">Mastodon da böyledir.</string>
-	<string name="welcome_page3_title">Bir sunucuyu nasıl seçerim?</string>
-	<string name="welcome_page3_text">İnsanlar farklı sebeplerle farklı sunucular seçer. sanat.ornek sanatçılar için, istanbul.ornek İstanbullular için güzel bir seçenek olabilir. \n\n Bizim önerdiğimiz bir sunucuyu seçerek (ya da kendi sunucunuzu arama alanına yazabilirsiniz) yanlış bir şey yapmış olmazsınız, hangisini seçtiğiniz fark etmeksizin hiçbir olayı kaçırmayacaksınız.</string>
 	<string name="signup_random_server_explain">Herhangi bir seçim yapmadan devam ederseniz dilinize göre bir sunucu seçeceğiz.</string>
 	<string name="server_filter_any_language">Herhangi Bir Dil</string>
 	<string name="server_filter_instant_signup">Koşulsuz Kayıt</string>

From e15c4fa342d67ae61cd6f036abd158d680ca774d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:58 +0200
Subject: [PATCH 113/124] New translations strings.xml (Chinese Simplified)

---
 mastodon/src/main/res/values-zh-rCN/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings.xml b/mastodon/src/main/res/values-zh-rCN/strings.xml
index 349faf4e5..f9b4a79e8 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings.xml
@@ -346,7 +346,6 @@
 	<string name="login_title">欢迎回来</string>
 	<string name="login_subtitle">登陆到你创建账户的服务器。</string>
 	<string name="server_url">服务器地址</string>
-	<string name="welcome_page3_title">如何选择服务器？</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

From c3702db577e21c03f8c2303b2b71e3d7e561852c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:59 +0200
Subject: [PATCH 114/124] New translations strings.xml (Chinese Traditional)

---
 mastodon/src/main/res/values-zh-rTW/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/mastodon/src/main/res/values-zh-rTW/strings.xml b/mastodon/src/main/res/values-zh-rTW/strings.xml
index 0fdf2d82a..85abe2439 100644
--- a/mastodon/src/main/res/values-zh-rTW/strings.xml
+++ b/mastodon/src/main/res/values-zh-rTW/strings.xml
@@ -374,12 +374,6 @@
 	<string name="login_title">歡迎回來</string>
 	<string name="login_subtitle">以您建立帳號之伺服器登入。</string>
 	<string name="server_url">伺服器 URL</string>
-	<string name="welcome_page1_title">什麼是 Mastodon？</string>
-	<string name="welcome_page1_text">想像您擁有以 @example.com 結尾的 email 信箱地址。\n\n您仍可發送及接收來自任何人的電子郵件，無論他們的信箱是來自 @gmail.com 或 @icloud.com 或 @example.com。</string>
-	<string name="welcome_page2_title">Mastodon 就像這樣。</string>
-	<string name="welcome_page2_text">您的帳號可以是 @gothgirl654@example.social，但您仍可跟隨、轉嘟或是與 @fallout5ever@example.online 聊天互動。</string>
-	<string name="welcome_page3_title">如何挑選伺服器？</string>
-	<string name="welcome_page3_text">不同人基於各式各樣的原因挑選不同的伺服器。art.example 也許對藝術家來說是個好地方，glasgow.example 也許對於蘇格蘭人來說是個好選擇。\n\n任何我們推薦的伺服器都是不錯的選擇（或著您也能從搜尋欄中輸入您自己的伺服器），您不會錯過任何來自聯邦宇宙角落的嘟嘟聲。</string>
 	<string name="signup_random_server_explain">如果您不選擇而繼續的話，我們將透過您的語言設定替您選擇一台伺服器。</string>
 	<string name="server_filter_any_language">任何語言</string>
 	<string name="server_filter_instant_signup">立即註冊</string>

From ebc37eac7509160203a3a01a0a3f870365e677f7 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:36:59 +0200
Subject: [PATCH 115/124] New translations strings.xml (Vietnamese)

---
 mastodon/src/main/res/values-vi-rVN/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-vi-rVN/strings.xml b/mastodon/src/main/res/values-vi-rVN/strings.xml
index fd5b1e0d2..d39da98f2 100644
--- a/mastodon/src/main/res/values-vi-rVN/strings.xml
+++ b/mastodon/src/main/res/values-vi-rVN/strings.xml
@@ -362,11 +362,6 @@
 	<string name="login_title">Chào mừng quay trở lại!</string>
 	<string name="login_subtitle">Đăng nhập với máy chủ nơi bạn tạo tài khoản.</string>
 	<string name="server_url">URL Máy chủ</string>
-	<string name="welcome_page1_title">Mastodon là gì?</string>
-	<string name="welcome_page1_text">Hãy tưởng tượng bạn có một địa chỉ email tên miền @example.com.\n\nBạn vẫn có thể gửi và nhận email từ bất kỳ ai, ngay cả khi email của họ là @gmail.com hoặc @icloud.com hoặc @example.com.</string>
-	<string name="welcome_page2_title">Mastodon tương tự vậy.</string>
-	<string name="welcome_page3_title">Làm thế nào để chọn một máy chủ?</string>
-	<string name="welcome_page3_text">Mọi người chọn các máy chủ khác nhau vì nhiều lý do. art.example là một nơi tuyệt vời cho các nghệ sĩ, trong khi glasgow.example có thể là một lựa chọn tốt cho người Scotland.\n\nBạn có thể chọn bất kỳ máy chủ đề xuất nào của chúng tôi, vì vậy, bất kể bạn chọn máy chủ nào (hoặc tự chọn trong thanh tìm kiếm của máy chủ), bạn sẽ không bao giờ bỏ lỡ một nhịp nào ở bất cứ đâu.</string>
 	<string name="signup_random_server_explain">Chúng tôi sẽ chọn một máy chủ dựa trên ngôn ngữ của bạn nếu bạn tiếp tục mà không lựa chọn.</string>
 	<string name="server_filter_any_language">Mọi ngôn ngữ</string>
 	<string name="server_filter_instant_signup">Đăng ký nhanh</string>

From 565cd14d882956cc21d682f0dab643e11c7a02fc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:37:00 +0200
Subject: [PATCH 116/124] New translations strings.xml (Galician)

---
 mastodon/src/main/res/values-gl-rES/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-gl-rES/strings.xml b/mastodon/src/main/res/values-gl-rES/strings.xml
index f1a702643..b62170d76 100644
--- a/mastodon/src/main/res/values-gl-rES/strings.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings.xml
@@ -382,11 +382,6 @@
 	<string name="login_title">Benvida outra vez</string>
 	<string name="login_subtitle">Accede co servidor onde creaches a conta.</string>
 	<string name="server_url">URL do servidor</string>
-	<string name="welcome_page1_title">Qué é Mastodon?</string>
-	<string name="welcome_page1_text">Imaxina que tes un enderezo de email que remata con @exemplo.com.\n\nPodes recibir e enviar mensaxes con calquera persoa, incluso se o seu email remata en @gmail.com ou @icloud.com ou @exemplo.com.</string>
-	<string name="welcome_page2_title">Mastodon é o mesmo.</string>
-	<string name="welcome_page3_title">Como elexir un servidor?</string>
-	<string name="welcome_page3_text">Pode haber moitas razóns para elexir un servidor. art.exemplo é un bo lugar para artistas, mentras glasgow.exemplo podería ser axeitado para persoas escocesas.\n\nNon terás problemas con calquera dos servidores recomendados, así que independentemente do que elixas (ou se escribes o teu propio na caixa de busca) non botarás nada en falta.</string>
 	<string name="signup_random_server_explain">Elixiremos un servidor no teu idioma se segues sen seleccionar nada.</string>
 	<string name="server_filter_any_language">Calquer idioma</string>
 	<string name="server_filter_instant_signup">Rexistro Instantáneo</string>

From bfb3bcdbfbc836afdfd74cbe8ebe931ab87dcb6a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:37:02 +0200
Subject: [PATCH 117/124] New translations strings.xml (Portuguese, Brazilian)

---
 mastodon/src/main/res/values-pt-rBR/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/values-pt-rBR/strings.xml b/mastodon/src/main/res/values-pt-rBR/strings.xml
index 1e6f4f07d..5f022027d 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings.xml
@@ -381,11 +381,6 @@
 	<string name="login_title">Bem-vindo de Volta</string>
 	<string name="login_subtitle">Faça login no servidor onde você criou sua conta.</string>
 	<string name="server_url">URL do servidor</string>
-	<string name="welcome_page1_title">O que é o Mastodon?</string>
-	<string name="welcome_page1_text">Imagine que você tem um endereço de e-mail que termina com @example.com.\n\nVocê ainda pode enviar e receber e-mails de qualquer pessoa, mesmo que o e-mail deles termine em @gmail.com ou @icloud.com ou @example.com.</string>
-	<string name="welcome_page2_title">O Mastodon é assim.</string>
-	<string name="welcome_page3_title">Como faço para escolher um servidor?</string>
-	<string name="welcome_page3_text">Pessoas diferentes escolhem servidores diferentes por vários motivos. O art.example é um ótimo lugar para artistas, enquanto glasgow.example pode ser uma boa escolha para escoceses.\n\nVocê não pode errar com nenhum de nossos servidores recomendados, portanto, independentemente de qual escolher (ou se inserir seu próprio na barra de pesquisa do servidor), você nunca perderá uma batida em lugar nenhum.</string>
 	<string name="signup_random_server_explain">Nós escolheremos um servidor com base no seu idioma se você continuar sem fazer uma seleção.</string>
 	<string name="server_filter_any_language">Qualquer idioma</string>
 	<string name="server_filter_instant_signup">Cadastro Rápido</string>

From e18567dd829530ecdcae6357325cbdb38a200917 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:37:06 +0200
Subject: [PATCH 118/124] New translations strings.xml (Filipino)

---
 mastodon/src/main/res/values-fil-rPH/strings.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mastodon/src/main/res/values-fil-rPH/strings.xml b/mastodon/src/main/res/values-fil-rPH/strings.xml
index e1832c86e..26f704eee 100644
--- a/mastodon/src/main/res/values-fil-rPH/strings.xml
+++ b/mastodon/src/main/res/values-fil-rPH/strings.xml
@@ -366,10 +366,6 @@
 	<string name="login_title">Maligayang pagbalik,</string>
 	<string name="login_subtitle">Mag-Log in gamit ang server kung saan mo nilikha ang iyong account.</string>
 	<string name="server_url">Ang URL ng server</string>
-	<string name="welcome_page1_text">Isipin na mayroon kang isang email address na nagtatapos sa @example. com. \n \nMaaari ka pa ring magpadala at tumanggap ng mga email mula sa sinuman, kahit na ang kanilang email ay nagtatapos sa @gmail.com o @icloud.com o @example.com.</string>
-	<string name="welcome_page2_title">Mastodon ay tulad na.</string>
-	<string name="welcome_page3_title">Paano ako pumili ng server?</string>
-	<string name="welcome_page3_text">Ang iba \'t ibang mga tao ay pumili ng iba\' t ibang mga server para sa anumang bilang ng mga kadahilanan. sining.ang halimbawa ay isang magandang lugar para sa mga artista, habang ang glasgow.halimbawa ay maaaring maging isang mahusay na pick para sa Scots.\n \nhindi ka maaaring magkamali sa alinman sa aming mga inirekumendang server, kaya anuman ang pipiliin mo (o kung ipinasok mo ang iyong sarili sa search bar ng server), hindi ka makaligtaan ng isang matalo kahit saan.</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->

From 19cb8703a6c5963a36d4a6ab85fac03e8fd2291f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Apr 2023 17:37:10 +0200
Subject: [PATCH 119/124] New translations strings.xml (Kabyle)

---
 mastodon/src/main/res/values-kab/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mastodon/src/main/res/values-kab/strings.xml b/mastodon/src/main/res/values-kab/strings.xml
index cf8e3eaed..43d15a49d 100644
--- a/mastodon/src/main/res/values-kab/strings.xml
+++ b/mastodon/src/main/res/values-kab/strings.xml
@@ -312,7 +312,6 @@
 	<string name="add_bookmark">Creḍ</string>
 	<string name="your_favorites">Imenyifen-ik·im</string>
 	<string name="login_title">Ansuf yess·ek·em</string>
-	<string name="welcome_page1_title">D acu-t Maṣṭudun?</string>
 	<string name="server_filter_any_language">Yal tutlayt</string>
 	<string name="server_filter_region_europe">Turuft</string>
 	<string name="server_filter_region_africa">Tafriqt</string>

From 0de227ab9c2f6ce8a8cd340833de3dfa02cd7904 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Wed, 12 Apr 2023 18:47:02 +0300
Subject: [PATCH 120/124] Use fixed colors for SplashFragment

fixes #561
---
 .../drawable/bg_button_m3_outlined_white.xml  | 25 +++++++++++++++++++
 .../res/drawable/bg_button_m3_text_white.xml  |  9 +++++++
 .../src/main/res/layout/fragment_splash.xml   | 14 ++++++++---
 mastodon/src/main/res/values/styles.xml       |  7 ++++++
 4 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/bg_button_m3_outlined_white.xml
 create mode 100644 mastodon/src/main/res/drawable/bg_button_m3_text_white.xml

diff --git a/mastodon/src/main/res/drawable/bg_button_m3_outlined_white.xml b/mastodon/src/main/res/drawable/bg_button_m3_outlined_white.xml
new file mode 100644
index 000000000..99a5afc4b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_outlined_white.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="#1effffff" xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<selector>
+			<item android:state_enabled="true">
+				<shape>
+					<stroke android:color="?colorM3Outline" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item>
+				<shape>
+					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask">
+		 <shape>
+			   <solid android:color="#000"/>
+			   <corners android:radius="20dp"/>
+		 </shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_text_white.xml b/mastodon/src/main/res/drawable/bg_button_m3_text_white.xml
new file mode 100644
index 000000000..24dc754fd
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_text_white.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="#1effffff" xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@android:id/mask">
+		 <shape>
+			   <solid android:color="#000"/>
+			   <corners android:radius="20dp"/>
+		 </shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_splash.xml b/mastodon/src/main/res/layout/fragment_splash.xml
index 497ab5f39..7fcbe1f7a 100644
--- a/mastodon/src/main/res/layout/fragment_splash.xml
+++ b/mastodon/src/main/res/layout/fragment_splash.xml
@@ -6,7 +6,7 @@
 	android:layout_height="match_parent"
 	android:fitsSystemWindows="true"
 	android:clipToPadding="false"
-	android:theme="@style/Theme.Mastodon.Dark">
+	android:theme="@style/Theme.Mastodon.Dark.SplashFragment">
 
 	<View
 		android:id="@+id/blue_fill"
@@ -120,7 +120,9 @@
 			android:layout_marginLeft="16dp"
 			android:layout_marginRight="16dp"
 			android:layout_marginTop="8dp"
+			android:textColor="#FFF"
 			style="@style/Widget.Mastodon.M3.Button.Outlined"
+			android:background="@drawable/bg_button_m3_outlined_white"
 			android:text="@string/pick_server"/>
 
 
@@ -137,7 +139,7 @@
 				android:layout_height="1dp"
 				android:layout_weight="1"
 				android:layout_gravity="center_vertical"
-				android:background="?colorM3Secondary"/>
+				android:background="#B2FFFFFF"/>
 
 			<TextView
 				android:layout_width="wrap_content"
@@ -146,7 +148,7 @@
 				android:layout_marginRight="8dp"
 				android:textAllCaps="true"
 				android:textAppearance="@style/m3_label_large"
-				android:textColor="?colorM3Secondary"
+				android:textColor="#B2FFFFFF"
 				android:layout_gravity="center_vertical"
 				android:text="@string/signup_or_login"/>
 
@@ -155,7 +157,7 @@
 				android:layout_height="1dp"
 				android:layout_weight="1"
 				android:layout_gravity="center_vertical"
-				android:background="?colorM3Secondary"/>
+				android:background="#B2FFFFFF"/>
 
 		</LinearLayout>
 
@@ -172,7 +174,9 @@
 				android:layout_height="wrap_content"
 				android:layout_margin="8dp"
 				android:layout_weight="1"
+				android:textColor="#FFF"
 				style="@style/Widget.Mastodon.M3.Button.Text"
+				android:background="@drawable/bg_button_m3_text_white"
 				android:text="@string/learn_more"/>
 
 			<Button
@@ -181,7 +185,9 @@
 				android:layout_height="wrap_content"
 				android:layout_margin="8dp"
 				android:layout_weight="1"
+				android:textColor="#FFF"
 				style="@style/Widget.Mastodon.M3.Button.Text"
+				android:background="@drawable/bg_button_m3_text_white"
 				android:text="@string/log_in"/>
 
 		</LinearLayout>
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 92098d9f8..84304c001 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -146,6 +146,13 @@
 		<item name="colorM3OnErrorContainer">#F9DEDC</item>
 	</style>
 
+	<style name="Theme.Mastodon.Dark.SplashFragment">
+		<item name="colorM3Primary">#563ACC</item>
+		<item name="colorM3OnPrimary">#FFF</item>
+		<item name="colorM3Outline">#FFF</item>
+		<item name="colorM3OnSurface">#FFF</item>
+	</style>
+
 	<style name="Theme.Mastodon.Dark.TrueBlack">
 		<item name="colorWindowBackground">#000</item>
 

From 4ef18f1f4a94bb5a8453cface7f6b68ba18b03a1 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Wed, 12 Apr 2023 19:20:23 +0300
Subject: [PATCH 121/124] Add touch interaction for the SplashFragment art

---
 mastodon/build.gradle                         |   4 +-
 .../android/fragments/SplashFragment.java     |  21 ++--
 .../android/ui/InterpolatingMotionEffect.java | 102 ++++++++++++++++--
 3 files changed, 104 insertions(+), 23 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 41c7c8b34..ca3c8a78f 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 52
-		versionName "1.2.1"
+		versionCode 53
+		versionName "1.2.2"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "ur-rIN", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
index 1855f566b..6b6097458 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
@@ -1,20 +1,13 @@
 package org.joinmastodon.android.fragments;
 
-import android.graphics.Canvas;
-import android.graphics.Paint;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.style.ReplacementSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -28,10 +21,7 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
 import org.parceler.Parcels;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -74,11 +64,12 @@ public class SplashFragment extends AppKitFragment{
 		artContainer=contentView.findViewById(R.id.art_container);
 		blueFill=contentView.findViewById(R.id.blue_fill);
 		greenFill=contentView.findViewById(R.id.green_fill);
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_clouds), V.dp(-5), V.dp(5), V.dp(-5), V.dp(5)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_right_hill), V.dp(-15), V.dp(25), V.dp(-10), V.dp(10)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_left_hill), V.dp(-25), V.dp(15), V.dp(-15), V.dp(15)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_center_hill), V.dp(-14), V.dp(14), V.dp(-5), V.dp(25)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_plane_elephant), V.dp(-20), V.dp(12), V.dp(-20), V.dp(12)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artClouds, V.dp(-5), V.dp(5), V.dp(-5), V.dp(5)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artRightHill, V.dp(-15), V.dp(25), V.dp(-10), V.dp(10)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artLeftHill, V.dp(-25), V.dp(15), V.dp(-15), V.dp(15)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artCenterHill, V.dp(-14), V.dp(14), V.dp(-5), V.dp(25)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artPlaneElephant, V.dp(-20), V.dp(12), V.dp(-20), V.dp(12)));
+		artContainer.setOnTouchListener(motionEffect);
 
 		contentView.setSizeListener(new SizeListenerFrameLayout.OnSizeChangedListener(){
 			@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/InterpolatingMotionEffect.java b/mastodon/src/main/java/org/joinmastodon/android/ui/InterpolatingMotionEffect.java
index 1302aa65d..4221d1c29 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/InterpolatingMotionEffect.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/InterpolatingMotionEffect.java
@@ -1,17 +1,25 @@
 package org.joinmastodon.android.ui;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
 import android.view.WindowManager;
+import android.view.animation.PathInterpolator;
 
 import java.util.ArrayList;
 
-public class InterpolatingMotionEffect implements SensorEventListener{
+import androidx.dynamicanimation.animation.DynamicAnimation;
+import androidx.dynamicanimation.animation.FloatValueHolder;
+import androidx.dynamicanimation.animation.SpringAnimation;
+import androidx.dynamicanimation.animation.SpringForce;
+
+public class InterpolatingMotionEffect implements SensorEventListener, View.OnTouchListener{
 
 	private SensorManager sm;
 	private WindowManager wm;
@@ -20,6 +28,34 @@ public class InterpolatingMotionEffect implements SensorEventListener{
 	private Sensor accelerometer;
 	private boolean accelerometerEnabled;
 	private ArrayList<ViewEffect> views=new ArrayList<>();
+	private float pitch, roll;
+	private float touchDownX, touchDownY, touchAddX, touchAddY, touchAddLastAnimX, touchAddLastAnimY;
+	private PathInterpolator touchInterpolator=new PathInterpolator(0.5f, 1f, 0.89f, 1f);
+	private SpringAnimation touchSpringX, touchSpringY;
+	private FloatValueHolder touchSpringXHolder=new FloatValueHolder(){
+		@Override
+		public float getValue(){
+			return touchAddX;
+		}
+
+		@Override
+		public void setValue(float value){
+			touchAddX=value;
+			updateEffects();
+		}
+	};
+	private FloatValueHolder touchSpringYHolder=new FloatValueHolder(){
+		@Override
+		public float getValue(){
+			return touchAddY;
+		}
+
+		@Override
+		public void setValue(float value){
+			touchAddY=value;
+			updateEffects();
+		}
+	};
 
 	public InterpolatingMotionEffect(Context context){
 		sm=context.getSystemService(SensorManager.class);
@@ -50,8 +86,8 @@ public class InterpolatingMotionEffect implements SensorEventListener{
 		float z=event.values[2]/SensorManager.GRAVITY_EARTH;
 
 
-		float pitch=(float) (Math.atan2(x, Math.sqrt(y*y+z*z))/Math.PI*2.0);
-		float roll=(float) (Math.atan2(y, Math.sqrt(x*x+z*z))/Math.PI*2.0);
+		pitch=(float) (Math.atan2(x, Math.sqrt(y*y+z*z))/Math.PI*2.0);
+		roll=(float) (Math.atan2(y, Math.sqrt(x*x+z*z))/Math.PI*2.0);
 
 		switch(rotation){
 			case Surface.ROTATION_0:
@@ -88,9 +124,7 @@ public class InterpolatingMotionEffect implements SensorEventListener{
 		}else if(roll<-1f){
 			roll=-2f-roll;
 		}
-		for(ViewEffect view:views){
-			view.update(pitch, roll);
-		}
+		updateEffects();
 	}
 
 	@Override
@@ -110,6 +144,62 @@ public class InterpolatingMotionEffect implements SensorEventListener{
 		views.clear();
 	}
 
+	@SuppressLint("ClickableViewAccessibility")
+	@Override
+	public boolean onTouch(View v, MotionEvent ev){
+		switch(ev.getAction()){
+			case MotionEvent.ACTION_DOWN -> {
+				if(touchSpringX!=null){
+					touchAddLastAnimX=touchAddX;
+					touchSpringX.cancel();
+					touchSpringX=null;
+				}else{
+					touchAddLastAnimX=0;
+				}
+				if(touchSpringY!=null){
+					touchAddLastAnimY=touchAddY;
+					touchSpringY.cancel();
+					touchSpringY=null;
+				}else{
+					touchAddLastAnimY=0;
+				}
+				touchDownX=ev.getX();
+				touchDownY=ev.getY();
+			}
+			case MotionEvent.ACTION_MOVE -> {
+				touchAddX=touchInterpolator.getInterpolation(Math.min(1f, Math.abs((ev.getX()-touchDownX)/(v.getWidth()/2f))));
+				touchAddY=touchInterpolator.getInterpolation(Math.min(1f, Math.abs((ev.getY()-touchDownY)/(v.getHeight()/2f))));
+				if(ev.getX()>touchDownX)
+					touchAddX=-touchAddX;
+				if(ev.getY()<touchDownY)
+					touchAddY=-touchAddY;
+				touchAddX+=touchAddLastAnimX;
+				touchAddY+=touchAddLastAnimY;
+				updateEffects();
+			}
+			case MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+				touchSpringX=new SpringAnimation(touchSpringXHolder, 0f);
+				touchSpringX.setMinimumVisibleChange(0.01f);
+				touchSpringX.getSpring().setStiffness(SpringForce.STIFFNESS_LOW).setDampingRatio(0.85f);
+				touchSpringX.addEndListener((animation, canceled, value, velocity)->touchSpringX=null);
+				touchSpringX.start();
+				touchSpringY=new SpringAnimation(touchSpringYHolder, 0f);
+				touchSpringY.setMinimumVisibleChange(0.01f);
+				touchSpringY.getSpring().setStiffness(SpringForce.STIFFNESS_LOW).setDampingRatio(0.85f);
+				touchSpringY.addEndListener((animation, canceled, value, velocity)->touchSpringY=null);
+				touchSpringY.start();
+				updateEffects();
+			}
+		}
+		return true;
+	}
+
+	private void updateEffects(){
+		for(ViewEffect view:views){
+			view.update(Math.min(1f, Math.max(-1f, pitch+touchAddX)), Math.min(1f, Math.max(-1f, roll+touchAddY)));
+		}
+	}
+
 	public static class ViewEffect{
 		private View view;
 		private float minX, maxX, minY, maxY;

From 2385d102ae9817bfa78d9a45120fe487af92a20c Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 13 Apr 2023 21:42:43 +0200
Subject: [PATCH 122/124] fix header username displacement

---
 .../src/main/res/layout/display_item_header.xml  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index 957afcbb2..b976d7400 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -3,7 +3,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingTop="13dp"
 	android:paddingEnd="4dp"
 	android:paddingStart="16dp">
 
@@ -11,6 +10,7 @@
 		android:id="@+id/more"
 		android:layout_width="36dp"
 		android:layout_height="36dp"
+		android:layout_marginTop="13dp"
 		android:layout_alignParentTop="true"
 		android:layout_alignParentEnd="true"
 		android:background="?android:actionBarItemBackground"
@@ -23,6 +23,7 @@
 		android:id="@+id/delete_notification"
 		android:layout_width="36dp"
 		android:layout_height="36dp"
+		android:layout_marginTop="13dp"
 		android:layout_toStartOf="@id/more"
 		android:visibility="gone"
 		android:background="?android:actionBarItemBackground"
@@ -36,6 +37,7 @@
 		android:id="@+id/visibility"
 		android:layout_width="36dp"
 		android:layout_height="36dp"
+		android:layout_marginTop="13dp"
 		android:layout_toStartOf="@id/delete_notification"
 		android:background="?android:actionBarItemBackground"
 		android:scaleType="center"
@@ -46,6 +48,7 @@
 		android:id="@+id/collapse_btn"
 		android:layout_width="36dp"
 		android:layout_height="36dp"
+		android:layout_marginTop="13dp"
 		android:layout_toStartOf="@id/visibility"
 		android:background="?android:actionBarItemBackground"
 		android:visibility="gone"
@@ -70,6 +73,7 @@
 		android:id="@+id/unread_indicator"
 		android:layout_width="36dp"
 		android:layout_height="36dp"
+		android:layout_marginTop="13dp"
 		android:layout_toStartOf="@id/collapse_btn"
 		android:visibility="gone"
 		android:tint="?android:colorAccent"
@@ -83,18 +87,16 @@
 		android:layout_alignParentStart="true"
 		android:layout_alignParentTop="true"
 		android:layout_marginEnd="12dp"
-		android:layout_marginTop="3dp" />
+		android:layout_marginTop="16dp" />
 
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:id="@+id/name_wrap"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="8dp"
-		android:layout_marginTop="3dp"
-		android:paddingTop="3sp"
 		android:layout_toStartOf="@id/unread_indicator"
 		android:layout_toEndOf="@id/avatar"
-		android:minHeight="24sp">
+		android:layout_above="@+id/username_wrap">
 
 		<TextView
 			android:id="@+id/name"
@@ -121,13 +123,15 @@
 	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
 
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
+		android:id="@id/username_wrap"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_below="@id/name_wrap"
 		android:layout_marginEnd="8dp"
 		android:layout_toStartOf="@id/unread_indicator"
 		android:layout_toEndOf="@id/avatar"
+		android:layout_alignBottom="@id/avatar"
 		android:layoutDirection="locale"
+		android:paddingBottom="3sp"
 		android:orientation="horizontal">
 
 		<TextView

From 2dae662333e410f60d406343af8bd4fe71b60c3c Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 13 Apr 2023 23:03:07 +0200
Subject: [PATCH 123/124] fix username displacement in compose

---
 mastodon/src/main/res/layout/fragment_compose.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index cf71e4a86..cd851f354 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -73,7 +73,6 @@
 				<RelativeLayout
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:paddingTop="16dp"
 					android:paddingRight="16dp"
 					android:paddingLeft="16dp">
 
@@ -81,6 +80,7 @@
 						android:id="@+id/self_avatar"
 						android:layout_width="46sp"
 						android:layout_height="46sp"
+						android:layout_marginTop="16dp"
 						android:layout_alignParentStart="true"
 						android:layout_alignParentTop="true"
 						android:layout_marginEnd="12dp" />
@@ -90,8 +90,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_toEndOf="@id/self_avatar"
-						android:paddingTop="3sp"
-						android:minHeight="24sp"
+						android:layout_above="@+id/self_username"
 						android:ellipsize="end"
 						android:singleLine="true"
 						android:textAppearance="@style/m3_title_medium"
@@ -103,7 +102,7 @@
 						android:layout_height="wrap_content"
 						android:layout_marginStart="8sp"
 						android:layout_toEndOf="@id/self_name"
-						android:paddingTop="3sp"
+						android:layout_above="@id/self_username"
 						android:ellipsize="end"
 						android:fontFamily="sans-serif"
 						android:singleLine="true"
@@ -112,14 +111,15 @@
 						tools:text="@string/sk_local_only" />
 
 					<TextView
-						android:id="@+id/self_username"
+						android:id="@id/self_username"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/self_name"
 						android:layout_toEndOf="@id/self_avatar"
+						android:layout_alignBottom="@id/self_avatar"
 						android:ellipsize="end"
 						android:singleLine="true"
 						android:textAppearance="@style/m3_title_small"
+						android:paddingBottom="3sp"
 						tools:text="\@Gargron" />
 
 				</RelativeLayout>

From 15fcb0e25d1ca9a30738452c09d142f33cbe9f7f Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 13 Apr 2023 23:17:46 +0200
Subject: [PATCH 124/124] fix alt badge padding and margin

---
 .../MediaGridStatusDisplayItem.java           | 20 +++++++++----------
 .../utils/MediaAttachmentViewController.java  |  4 ----
 mastodon/src/main/res/layout/alt_badge.xml    |  2 +-
 .../res/layout/overlay_image_alt_text.xml     |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
index eb0fb9056..bd1c7c06f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
@@ -1,7 +1,5 @@
 package org.joinmastodon.android.ui.displayitems;
 
-import static org.joinmastodon.android.ui.utils.MediaAttachmentViewController.altWrapPadding;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
@@ -202,15 +200,16 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 					btnL-=loc[0];
 					btnT-=loc[1];
 
+					ViewGroup.MarginLayoutParams margins = (ViewGroup.MarginLayoutParams) altTextWrapper.getLayoutParams();
 					ArrayList<Animator> anims=new ArrayList<>();
 					anims.add(ObjectAnimator.ofFloat(altTextButton, View.ALPHA, 1, 0));
 					anims.add(ObjectAnimator.ofFloat(noAltTextButton, View.ALPHA, 1, 0));
 					anims.add(ObjectAnimator.ofFloat(altTextScroller, View.ALPHA, 0, 1));
 					anims.add(ObjectAnimator.ofFloat(altTextClose, View.ALPHA, 0, 1));
-					anims.add(ObjectAnimator.ofInt(altTextWrapper, "left", btnL+altWrapPadding[0], altTextWrapper.getLeft()));
-					anims.add(ObjectAnimator.ofInt(altTextWrapper, "top", btnT+altWrapPadding[1], altTextWrapper.getTop()));
-					anims.add(ObjectAnimator.ofInt(altTextWrapper, "right", btnL+v.getWidth()-altWrapPadding[2], altTextWrapper.getRight()));
-					anims.add(ObjectAnimator.ofInt(altTextWrapper, "bottom", btnT+v.getHeight()-altWrapPadding[3], altTextWrapper.getBottom()));
+					anims.add(ObjectAnimator.ofInt(altTextWrapper, "left", btnL+margins.leftMargin, altTextWrapper.getLeft()));
+					anims.add(ObjectAnimator.ofInt(altTextWrapper, "top", btnT+margins.topMargin, altTextWrapper.getTop()));
+					anims.add(ObjectAnimator.ofInt(altTextWrapper, "right", btnL+v.getWidth()-margins.rightMargin, altTextWrapper.getRight()));
+					anims.add(ObjectAnimator.ofInt(altTextWrapper, "bottom", btnT+v.getHeight()-margins.bottomMargin, altTextWrapper.getBottom()));
 					for(Animator a:anims)
 						a.setDuration(300);
 
@@ -265,15 +264,16 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 			btnL-=loc[0];
 			btnT-=loc[1];
 
+			ViewGroup.MarginLayoutParams margins = (ViewGroup.MarginLayoutParams) altTextWrapper.getLayoutParams();
 			ArrayList<Animator> anims=new ArrayList<>();
 			anims.add(ObjectAnimator.ofFloat(altTextButton, View.ALPHA, 1));
 			anims.add(ObjectAnimator.ofFloat(noAltTextButton, View.ALPHA, 1));
 			anims.add(ObjectAnimator.ofFloat(altTextScroller, View.ALPHA, 0));
 			anims.add(ObjectAnimator.ofFloat(altTextClose, View.ALPHA, 0));
-			anims.add(ObjectAnimator.ofInt(altTextWrapper, "left", btnL+altWrapPadding[0]));
-			anims.add(ObjectAnimator.ofInt(altTextWrapper, "top", btnT+altWrapPadding[1]));
-			anims.add(ObjectAnimator.ofInt(altTextWrapper, "right", btnL+btn.getWidth()-altWrapPadding[2]));
-			anims.add(ObjectAnimator.ofInt(altTextWrapper, "bottom", btnT+btn.getHeight()-altWrapPadding[3]));
+			anims.add(ObjectAnimator.ofInt(altTextWrapper, "left", btnL+margins.leftMargin));
+			anims.add(ObjectAnimator.ofInt(altTextWrapper, "top", btnT+margins.topMargin));
+			anims.add(ObjectAnimator.ofInt(altTextWrapper, "right", btnL+btn.getWidth()-margins.rightMargin));
+			anims.add(ObjectAnimator.ofInt(altTextWrapper, "bottom", btnT+btn.getHeight()-margins.bottomMargin));
 			for(Animator a:anims)
 				a.setDuration(300);
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
index db0d9653f..c1d293583 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
@@ -19,7 +19,6 @@ public class MediaAttachmentViewController{
 	public final MediaGridStatusDisplayItem.GridItemType type;
 	public final ImageView photo;
 	public final View altButton, noAltButton, btnsWrap;
-	public static int[] altWrapPadding = null;
 	private BlurhashCrossfadeDrawable crossfadeDrawable=new BlurhashCrossfadeDrawable();
 	private final Context context;
 	private boolean didClear;
@@ -37,9 +36,6 @@ public class MediaAttachmentViewController{
 		btnsWrap=view.findViewById(R.id.alt_badges);
 		this.type=type;
 		this.context=context;
-		if (altWrapPadding == null) {
-			altWrapPadding = new int[] { btnsWrap.getPaddingLeft(), btnsWrap.getPaddingTop(), btnsWrap.getPaddingRight(), btnsWrap.getPaddingBottom() };
-		}
 	}
 
 	public void bind(Attachment attachment, Status status){
diff --git a/mastodon/src/main/res/layout/alt_badge.xml b/mastodon/src/main/res/layout/alt_badge.xml
index 955f8f5cb..d4996e868 100644
--- a/mastodon/src/main/res/layout/alt_badge.xml
+++ b/mastodon/src/main/res/layout/alt_badge.xml
@@ -27,7 +27,7 @@
 		android:gravity="center"
 		android:includeFontPadding="false"
 		android:paddingHorizontal="5dp"
-		android:paddingVertical="1dp"
+		android:paddingVertical="2dp"
 		android:background="@drawable/bg_image_alt_overlay"
 		android:text="@string/sk_alt_button"/>
 
diff --git a/mastodon/src/main/res/layout/overlay_image_alt_text.xml b/mastodon/src/main/res/layout/overlay_image_alt_text.xml
index f092abd87..713926ea8 100644
--- a/mastodon/src/main/res/layout/overlay_image_alt_text.xml
+++ b/mastodon/src/main/res/layout/overlay_image_alt_text.xml
@@ -26,7 +26,7 @@
 		android:gravity="center"
 		android:includeFontPadding="false"
 		android:paddingHorizontal="5dp"
-		android:paddingVertical="1dp"
+		android:paddingVertical="2dp"
 		android:text="@string/sk_alt_button"/>
 
 	<ImageButton