From 509b16aee180d062caec676d04eb71d9d5138d88 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 12 Dec 2022 19:25:31 -0300
Subject: [PATCH 01/35] remove strings

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

diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 90b3c527a..f8f68bc51 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -49,4 +49,13 @@
   <string name="sk_color_theme_yellow">Yellow</string>
   <string name="sk_color_theme_material_you">Material You</string>
   <string name="sk_not_supported">Not supported on your device</string>
+  <string name="sk_poll_allow_multiple">Allow multiple choices</string>
+  <string name="sk_translate_post">Translate</string>
+	<string name="sk_translate_show_original">Show original</string>
+	<string name="sk_translated_using">Translated using %s</string>
+  <string name="sk_post_language">Language: %s</string>
+	<string name="sk_available_languages">Available languages</string>
+  <string name="sk_language_name">%s (%s)</string>
+	<string name="sk_clear_recent_languages">Clear recent languages</string>
+	<string name="sk_confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string>
 </resources>

From 49962a47347d4a3b28a922b59c71ad7d3e3973e5 Mon Sep 17 00:00:00 2001
From: ca <rubenx@duck.com>
Date: Wed, 7 Dec 2022 23:30:42 +0000
Subject: [PATCH 02/35] Translated using Weblate (Catalan)

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ca/
---
 mastodon/src/main/res/values-ca-rES/strings_sk.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-ca-rES/strings_sk.xml b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
index 9cc36c86b..4697d86af 100644
--- a/mastodon/src/main/res/values-ca-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
@@ -38,4 +38,13 @@
     <string name="sk_settings_always_reveal_content_warnings">Mostra sempre els avisos de contingut</string>
     <string name="sk_settings_contribute">Contribueix a Megalodon</string>
     <string name="sk_settings_show_federated_timeline">Mostra la línia de temps federada</string>
+    <string name="sk_notification_type_status">Publicacions</string>
+    <string name="sk_notify_posts">Notificacions de publicacions</string>
+    <string name="sk_settings_color_picker">Color de tema</string>
+    <string name="sk_color_theme_pink">Rosa</string>
+    <string name="sk_color_theme_purple">Lila</string>
+    <string name="sk_color_theme_green">Verd</string>
+    <string name="sk_color_theme_blue">Blau</string>
+    <string name="sk_color_theme_brown">Marró</string>
+    <string name="sk_color_theme_yellow">Groc</string>
 </resources>
\ No newline at end of file

From 82429950271b98cfeb0ce0905b6db67a4dfc6e7a Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Wed, 7 Dec 2022 19:03:14 +0000
Subject: [PATCH 03/35] Translated using Weblate (Spanish)

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
---
 mastodon/src/main/res/values-es-rES/strings_sk.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index 39978dd9c..de22887c1 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -38,4 +38,13 @@
     <string name="sk_settings_contribute">Contribuir a Megalodon</string>
     <string name="sk_settings_show_federated_timeline">Mostrar el timeline federado</string>
     <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_notification_type_status">Publicaciones</string>
+    <string name="sk_notify_posts">Publicar notificaciones</string>
+    <string name="sk_settings_color_picker">Colores para los temas</string>
+    <string name="sk_color_theme_pink">Rosa</string>
+    <string name="sk_color_theme_purple">Violeta</string>
+    <string name="sk_color_theme_green">Verde</string>
+    <string name="sk_color_theme_blue">Azul</string>
+    <string name="sk_color_theme_brown">Marrón</string>
+    <string name="sk_color_theme_yellow">Amarillo</string>
 </resources>
\ No newline at end of file

From 86dd72422217e9aeebe3e24ee16c574bed70a8ab Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitoschido@gmail.com>
Date: Thu, 8 Dec 2022 11:21:29 +0000
Subject: [PATCH 04/35] Translated using Weblate (Spanish)

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
---
 mastodon/src/main/res/values-es-rES/strings_sk.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index de22887c1..ed58c8f6a 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -16,8 +16,8 @@
     <string name="sk_image_description">Descripción de la imagen</string>
     <string name="sk_visibility_unlisted">Sin listar</string>
     <string name="sk_settings_show_replies">Mostrar respuestas</string>
-    <string name="sk_settings_show_boosts">Mostrar boosts</string>
-    <string name="sk_settings_load_new_posts">Cargar nuevos posts automáticamente</string>
+    <string name="sk_settings_show_boosts">Mostrar impulsos</string>
+    <string name="sk_settings_load_new_posts">Cargar publicaciones nuevas automáticamente</string>
     <string name="sk_settings_show_interaction_counts">Mostrar contadores de interacciones</string>
     <string name="sk_mark_media_as_sensitive">Marcar medio como sensible</string>
     <string name="sk_user_post_notifications_on">Activadas las notificaciones de posts para %s</string>
@@ -36,7 +36,7 @@
     <string name="sk_settings_always_reveal_content_warnings">Mostrar siempre advertencias de contenido</string>
     <string name="sk_disable_marquee">Desactivar desplazamiento de texto en barras del título</string>
     <string name="sk_settings_contribute">Contribuir a Megalodon</string>
-    <string name="sk_settings_show_federated_timeline">Mostrar el timeline federado</string>
+    <string name="sk_settings_show_federated_timeline">Mostrar cronología federada</string>
     <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_notification_type_status">Publicaciones</string>
     <string name="sk_notify_posts">Publicar notificaciones</string>

From 4e8e3ee440f178ad238265ca026f424f0c005d49 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Wed, 7 Dec 2022 18:58:37 +0000
Subject: [PATCH 05/35] Translated using Weblate (French)

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 43a575277..876575fec 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -38,4 +38,13 @@
     <string name="sk_settings_show_interaction_counts">Afficher le nombre d\'interactions</string>
     <string name="sk_federated_timeline">Fédération</string>
     <string name="sk_federated_timeline_info_banner">Ce sont les messages les plus récents des membres de votre fédération.</string>
+    <string name="sk_notification_type_status">Messages</string>
+    <string name="sk_notify_posts">Notifications des messages</string>
+    <string name="sk_color_theme_pink">Rose</string>
+    <string name="sk_color_theme_purple">Violet</string>
+    <string name="sk_color_theme_green">Vert</string>
+    <string name="sk_color_theme_blue">Bleu</string>
+    <string name="sk_color_theme_brown">Marron</string>
+    <string name="sk_color_theme_yellow">Jaune</string>
+    <string name="sk_settings_color_picker">Couleur d\'accentuation</string>
 </resources>
\ No newline at end of file

From 1ca5b6def2abdfaee49e5ef1314481ef1452ae4a Mon Sep 17 00:00:00 2001
From: Christian Elbrianno <christian.elbrianno41@gmail.com>
Date: Thu, 8 Dec 2022 17:02:05 +0000
Subject: [PATCH 06/35] Translated using Weblate (Indonesian)

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index 7a111ed77..a633217d6 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -38,4 +38,13 @@
     <string name="sk_settings_always_reveal_content_warnings">Selalu ungkap peringatan konten</string>
     <string name="sk_disable_marquee">Nonaktifkan teks bergulir dalam bilah judul</string>
     <string name="sk_settings_show_federated_timeline">Tampilkan lini masa federasi</string>
+    <string name="sk_notification_type_status">Kiriman</string>
+    <string name="sk_notify_posts">Notifikasi kiriman</string>
+    <string name="sk_settings_color_picker">Warna tema</string>
+    <string name="sk_color_theme_pink">Merah muda</string>
+    <string name="sk_color_theme_purple">Ungu</string>
+    <string name="sk_color_theme_green">Hijau</string>
+    <string name="sk_color_theme_blue">Biru</string>
+    <string name="sk_color_theme_brown">Cokelat</string>
+    <string name="sk_color_theme_yellow">Kuning</string>
 </resources>
\ No newline at end of file

From 659333342f2d3b379bba1fda507153a34d39a076 Mon Sep 17 00:00:00 2001
From: tippete <paolo@paolomiraglia.it>
Date: Fri, 9 Dec 2022 16:53:30 +0000
Subject: [PATCH 07/35] Translated using Weblate (Italian)

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/it/
---
 .../src/main/res/values-it-rIT/strings_sk.xml | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-it-rIT/strings_sk.xml b/mastodon/src/main/res/values-it-rIT/strings_sk.xml
index 045e125f3..7a3645aa3 100644
--- a/mastodon/src/main/res/values-it-rIT/strings_sk.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings_sk.xml
@@ -1,3 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="sk_notification_type_status">Post</string>
+    <string name="sk_notify_posts">Notifiche post</string>
+    <string name="sk_settings_color_picker">Colore del tema</string>
+    <string name="sk_color_theme_pink">Rosa</string>
+    <string name="sk_color_theme_purple">Viola</string>
+    <string name="sk_color_theme_green">Verde</string>
+    <string name="sk_color_theme_blue">Blu</string>
+    <string name="sk_color_theme_brown">Marrone</string>
+    <string name="sk_color_theme_yellow">Giallo</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_pinned_posts">Fissati</string>
+    <string name="sk_delete_and_redraft">Elimina e riscrivi</string>
+    <string name="sk_user_post_notifications_on">Attivate notifiche per i post di %s</string>
+    <string name="sk_user_post_notifications_off">Disattivate notifiche per i post di %s</string>
+    <string name="sk_confirm_delete_and_redraft_title">Elimina e riscrivi post</string>
+    <string name="sk_confirm_delete_and_redraft">Sei sicuro di voler eliminare e riscrivere questo post\?</string>
+    <string name="sk_pin_post">Fissa sul profilo</string>
+    <string name="sk_confirm_pin_post_title">Fissa post sul profilo</string>
+    <string name="sk_confirm_pin_post">Vuoi fissare questo post al tuo profilo\?</string>
+    <string name="sk_pinning">Fissando il post…</string>
+    <string name="sk_unpin_post">Togli dal profilo</string>
+    <string name="sk_follow_requests">Richieste di seguirti</string>
+    <string name="sk_accept_follow_request">Accetta richiesta di seguirti</string>
+    <string name="sk_confirm_unpin_post_title">Togli post dal profilo</string>
+    <string name="sk_confirm_unpin_post">Sei sicuro di voler togliere questo post\?</string>
+    <string name="sk_unpinning">Togliendo il post…</string>
+    <string name="sk_image_description">Descrizione immagine</string>
+    <string name="sk_visibility_unlisted">Non in elenco</string>
+    <string name="sk_settings_show_replies">Mostra risposte</string>
+    <string name="sk_settings_show_boosts">Mostra boost</string>
+    <string name="sk_settings_load_new_posts">Carica automaticamente nuovi post</string>
+    <string name="sk_settings_show_interaction_counts">Mostra conteggi interazioni</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">Segnala media come sensibile</string>
+    <string name="sk_federated_timeline">Federata</string>
+    <string name="sk_federated_timeline_info_banner">Questi sono i post più recenti dalle persone nella tua federazione.</string>
+    <string name="sk_update_available">Megalodon %s è pronto da scaricare.</string>
+    <string name="sk_update_ready">Megalodon %s è scaricato e pronto da installare.</string>
+    <string name="sk_check_for_update">Verifica aggiornamenti</string>
+    <string name="sk_no_update_available">Non ci sono aggiornamenti disponibili</string>
+    <string name="sk_list_timelines">Liste</string>
+    <string name="sk_settings_always_reveal_content_warnings">Apri sempre contenuti segnalati come sensibili</string>
+    <string name="sk_lists_with_user">Liste con %s</string>
+    <string name="sk_settings_contribute">Contribuisci a Megalodon</string>
+    <string name="sk_settings_show_federated_timeline">Mostra timeline federata</string>
+    <string name="sk_disable_marquee">Disabilita scorrimento titoli</string>
+    <string name="sk_reject_follow_request">Rifiuta richiesta di seguirti</string>
+</resources>
\ No newline at end of file

From fe200996dbb9fab1173cfaf595e1be54f35d8990 Mon Sep 17 00:00:00 2001
From: edxkl <edu200399lim@gmail.com>
Date: Fri, 9 Dec 2022 02:02:09 +0000
Subject: [PATCH 08/35] Translated using Weblate (Portuguese (Brazil))

Currently translated at 93.6% (44 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pt_BR/
---
 mastodon/src/main/res/values-pt-rBR/strings_sk.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
index 48451fdee..bade9b3c3 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -38,4 +38,10 @@
     <string name="sk_settings_show_federated_timeline">Mostre a linha do tempo federada</string>
     <string name="sk_visibility_unlisted">Não-listado</string>
     <string name="sk_settings_show_interaction_counts">Mostrar contagens de interação</string>
+    <string name="sk_color_theme_purple">Roxo</string>
+    <string name="sk_color_theme_green">Verde</string>
+    <string name="sk_color_theme_blue">Azul</string>
+    <string name="sk_color_theme_brown">Marrom</string>
+    <string name="sk_color_theme_yellow">Amarelo</string>
+    <string name="sk_color_theme_pink">Rosa</string>
 </resources>
\ No newline at end of file

From 1701fc71c462f0b3ebf422285bbb0c24c7252772 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Wed, 7 Dec 2022 19:07:12 +0000
Subject: [PATCH 09/35] Translated using Weblate (French)

Currently translated at 100.0% (7 of 7 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
---
 metadata/fr-FR/changelogs/55.txt    | 4 ++++
 metadata/fr-FR/changelogs/56.txt    | 6 ++++++
 metadata/fr-FR/full_description.txt | 8 +-------
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 metadata/fr-FR/changelogs/55.txt
 create mode 100644 metadata/fr-FR/changelogs/56.txt

diff --git a/metadata/fr-FR/changelogs/55.txt b/metadata/fr-FR/changelogs/55.txt
new file mode 100644
index 000000000..594677deb
--- /dev/null
+++ b/metadata/fr-FR/changelogs/55.txt
@@ -0,0 +1,4 @@
+- Correction du rendu des balises HTML et activation du formatage Markdown
+- Initialisation du <a href="https://translate.codeberg.org/projects/megalodon">projet de traduction Weblate</a>
+- Ajout d'une option pour activer la chronologie fédérée
+- Les versions 52-54 contenaient de petits ajustements pour une sortie sur Google Play
diff --git a/metadata/fr-FR/changelogs/56.txt b/metadata/fr-FR/changelogs/56.txt
new file mode 100644
index 000000000..7ca369e80
--- /dev/null
+++ b/metadata/fr-FR/changelogs/56.txt
@@ -0,0 +1,6 @@
+- Thèmes de couleurs personnalisés par @LucasGGamerM
+- Nouveau logo textuel "megalodon" soumis par @LucasGGamerM
+- Meilleure recherche d'emoji lors de la composition
+- Vote amélioré (afficher son propre vote, toujours afficher le bouton de vote, ne pas couper les réponses longues)
+- Ajout d'un paramètre de notification push pour les notifications de messages
+- Corrections de bogues
diff --git a/metadata/fr-FR/full_description.txt b/metadata/fr-FR/full_description.txt
index 641ef311a..0a51f4a75 100644
--- a/metadata/fr-FR/full_description.txt
+++ b/metadata/fr-FR/full_description.txt
@@ -1,4 +1,4 @@
-Megalodon est une version modifiée de <a href="https://github.com/mastodon/mastodon-android">Mastodon officiel pour Android</a> ajoutant des fonctionnalités importantes qui manquent dans l'application officielle, telles que la timeline fédérée, la publication non répertoriée, les signets et une visionneuse de description d'image.
+Megalodon est une version modifiée de <a href="https://github.com/mastodon/mastodon-android">Mastodon officiel pour Android</a> ajoutant des fonctionnalités importantes qui manquent dans l'application officielle, telles que la timeline fédérée, la publication non répertoriée et une visionneuse de description d'image.
 
 <b>Principales fonctionnalités</b>
 
@@ -6,12 +6,6 @@ Megalodon est une version modifiée de <a href="https://github.com/mastodon/mast
 - <b>Timeline fédérée</b> : Affichez tous les messages publics des personnes de tout le voisinage du Fediverse auxquel votre instance est connectée.
 - <b>Visionneuse de description d'image</b> : Vérifiez rapidement si une image ou une vidéo est associée à un texte alternatif.
 - <b>Épingler des publications</b> : Épinglez vos publications les plus importantes à votre profil et voyez ce que les autres ont épinglé en utilisant l'onglet "Épinglé".
-- <b>Signets</b> : Enregistrez rapidement les messages et retrouvez-les plus tard dans la liste des signets.
 - <b>Suivez des hashtags</b> : Voir les nouveaux messages avec des hashtags spécifiques directement dans votre timeline d'accueil en les suivant.
 - <b>Répondre aux demandes de suivi</b> : Acceptez ou refusez les demandes de suivi à partir de vos notifications ou de la liste dédiée aux demandes de suivi.
 - <b>Supprimer et reformuler</b> : La fonctionnalité la plus appréciée qui rend l'édition possible sans fonction d'édition réelle.
-
-<b>Fonctionnalités officielles inédites, disponibles à l'avance</b>
-
-- Modification des publications
-- Mise à jour intégrée pour les versions de GitHub

From 02ef34b451fbbb1a70202a349ad5e31a1158f6bf Mon Sep 17 00:00:00 2001
From: Christian Elbrianno <christian.elbrianno41@gmail.com>
Date: Thu, 8 Dec 2022 17:05:09 +0000
Subject: [PATCH 10/35] Translated using Weblate (Indonesian)

Currently translated at 71.4% (5 of 7 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/id/
---
 metadata/id/full_description.txt | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/metadata/id/full_description.txt b/metadata/id/full_description.txt
index 1a97bf216..462855171 100644
--- a/metadata/id/full_description.txt
+++ b/metadata/id/full_description.txt
@@ -1,4 +1,4 @@
-Megalodon adalah versi modifikasi <a href="https://github.com/mastodon/mastodon-android">aplikasi Android Mastodon resmi</a> yang menambahkan fitur penting yang belum ada di aplikasi, seperti lini masa federasi, pengiriman tidak terdaftar, markah dan penampil deskripsi gambar.
+Megalodon adalah versi modifikasi <a href="https://github.com/mastodon/mastodon-android">aplikasi Android Mastodon resmi</a> yang menambahkan fitur penting yang belum ada di aplikasi, seperti lini masa federasi, pengiriman tidak terdaftar, dan penampil deskripsi gambar.
 
 <b>Fitur unggulan</b>
 
@@ -6,12 +6,6 @@ Megalodon adalah versi modifikasi <a href="https://github.com/mastodon/mastodon-
 - <b>Lini masa federasi</b>: Lihat semua kiriman publik dari orang-orang di semua tetangga Fediverse lainnya yang instansi rumah Anda terhubung.
 - <b>Penampil deskripsi gambar</b>: Periksa secara cepat jika gambar atau video nemiliki deskripsi alternatif.
 - <b>Menyematkan kiriman</b>: Sematkan kiriman penting Anda ke profil Anda dan lihat apa yang telah disematkan oleh orang lain menggunakan tab “Disematkan”.
-- <b>Markah</b>: Simpan kiriman secara cepat dan temukan nanti dalam tab Markah.
 - <b>Ikuti tagar</b>: Lihat kiriman baru dari tagar spesifik secara langsung dalam lini masa beranda Anda dengan mengikutinya.
 - <b>Menjawab permintaan pengikut</b>: Tolak atau terima permintaan pengikut dari notifikasi Anda atau daftar permintaan pengikut khusus.
 - <b>Hapus dan draf ulang</b>: Fitur yang banyak disukai yang membuat penyuntingan memungkinkan tanpa fungsi penyuntingan yang asli.
-
-<b>Fitur resmi yang belum dirilis, tersedia dari awal</b>
-
-- Menyunting kiriman
-- Pembaruan terintegrasi untuk rilis GitHub

From 2fa1d542687fc7d7dcf9b0c19fc455d8b520f440 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Wed, 7 Dec 2022 19:11:12 +0000
Subject: [PATCH 11/35] Translated using Weblate (Spanish)

Currently translated at 100.0% (7 of 7 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/es/
---
 metadata/es/changelogs/55.txt    |  4 ++++
 metadata/es/changelogs/56.txt    |  6 ++++++
 metadata/es/full_description.txt | 24 +++++++++---------------
 3 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 metadata/es/changelogs/55.txt
 create mode 100644 metadata/es/changelogs/56.txt

diff --git a/metadata/es/changelogs/55.txt b/metadata/es/changelogs/55.txt
new file mode 100644
index 000000000..0e195dc8b
--- /dev/null
+++ b/metadata/es/changelogs/55.txt
@@ -0,0 +1,4 @@
+- Solucione la representación rota de las etiquetas HTML y habilite la representación del formato Markdown
+- Inicialice el <a href="https://translate.codeberg.org/projects/megalodon">proyecto de traducción de Weblate</a>
+- Agregar alternar para la línea de tiempo federada
+- Las versiones 52-54 fueron pequeños ajustes para un lanzamiento en Google Play
diff --git a/metadata/es/changelogs/56.txt b/metadata/es/changelogs/56.txt
new file mode 100644
index 000000000..2bc339e2a
--- /dev/null
+++ b/metadata/es/changelogs/56.txt
@@ -0,0 +1,6 @@
+- Temas personalizados por @LucasGGamerM
+- Nuevo logotipo del texto "megalodón" enviado por @LucasGGamerM
+- Mejor búsqueda de emojis
+- Votación modificada (mostrar el voto propio, mostrar siempre el botón de voto, no cortar las respuestas largas)
+- Agregar las configuraciones de las notificaciones push
+- Corrección de errores
diff --git a/metadata/es/full_description.txt b/metadata/es/full_description.txt
index 7cf6f11b6..78ba350bc 100644
--- a/metadata/es/full_description.txt
+++ b/metadata/es/full_description.txt
@@ -1,17 +1,11 @@
-Megalodon es una versión modificada de la <a href="https://github.com/mastodon/mastodon-android">aplicación oficial de Mastodon para Android</a> que ha añadido opciones importantes que no tiene la versión oficial , como la línea de tiempo federada, la publicación sin listar, marcadores y un visor de la descripción de las imágenes.
+Megalodon es una versión modificada de <a href="https://github.com/mastodon/mastodon-android">Mastodon oficial para Android</a> que agrega funciones importantes que faltan en la aplicación oficial, como la línea de tiempo federada, no listada publicación y un visor de descripción de imágenes.
 
-<b>Funcionalidades clave</b>
+<b>Características clave</b>
 
-— <b>Publicación sin listar</b>: Escribe de forma pública sin que la publicación se muestre en las tendencias, etiquetas o líneas de tiempo públicas.
-— <b>Línea de tiempo federada</b>: Visualiza todas las publicaciones de personas del resto de barrios del Fedivers a los que está conectada tu instancia.
-— <b>Visor de la descripción de las imágenes.</b>: Comprueba rápidamente si una imagen o un vídeo tiene un texto alternativo adjunto.
-— <b>Fijar publicaciones</b>: Fija tus publicaciones más importantes en tu perfil y mira qué han fijado otras personas en la pestaña Fijado.
-— <b>Marcadores</b>: Guarda rápidamente publicaciones y búscalas más tarde en la lista de marcadores.
-— <b>Seguimiento de etiquetas</b>: Visualiza nuevas publicaciones de etiquetas específicas directamente en la línea de tiempo, siguiendo estas etiquetas.
-— <b>Responder las solicitudes de seguimiento</b>: Acepta o rechaza solicitudes de seguimiento desde las notificaciones o en la lista de solicitudes de seguimiento dedicada.
-— <b>Eliminar y volver a escribir</b>: La característica tan querida que hizo posible la edición sin una función de edición real.
-
-<b>Funcionalidades oficiales no lanzadas, disponibles por adelantado</b>
-
-— Edición de publicaciones
-- Actualizador integrado para los lanzamientos de GitHub
+- <b>Publicación no listada</b>: publique públicamente sin que su publicación aparezca en tendencias, hashtags o líneas de tiempo públicas.
+- <b>Línea de tiempo federada</b>: muestra todos los mensajes públicos de personas en todo el vecindario de la Fediverse a la que está conectada tu instancia.
+- <b>Visor de descripción de imágenes</b>: comprueba rápidamente si una imagen o vídeo tiene texto alternativo asociado.
+- <b>Fijar publicaciones</b>: fije sus publicaciones más importantes a su perfil y vea lo que otros han fijado utilizando la pestaña "Fijado".
+- <b>Seguir hashtags</b>: vea nuevas publicaciones con hashtags específicos directamente en su línea de tiempo de inicio siguiéndolas.
+- <b>Responder a solicitudes de seguimiento</b>: acepte o rechace solicitudes de seguimiento desde sus notificaciones o desde la lista dedicada a solicitudes de seguimiento.
+- <b>Eliminar y reformular</b>: la característica más popular que hace posible la edición sin una función de edición real.

From 6b89a747e2dcfbfca1ddc661263dbaa83536ccaa Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Sat, 10 Dec 2022 00:12:59 +0000
Subject: [PATCH 12/35] Translated using Weblate (Korean)

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 .../src/main/res/values-ko-rKR/strings_sk.xml | 79 +++++++++++--------
 1 file changed, 47 insertions(+), 32 deletions(-)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index b00f9e7a2..867575082 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -1,35 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="sk_pinned_posts">고정됨</string>
-	<string name="sk_delete_and_redraft">삭제하고 다시 쓰기</string>
-	<string name="sk_confirm_delete_and_redraft_title">게시물 삭제하고 다시 쓰기</string>
-	<string name="sk_confirm_delete_and_redraft">정말로 이 게시물을 삭제하고 다시 쓰시겠습니까?</string>
-	<string name="sk_pin_post">고정</string>
-	<string name="sk_confirm_pin_post_title">게시물 고정</string>
-	<string name="sk_confirm_pin_post">정말로 이 게시물을 고정하시겠습니까?</string>
-	<string name="sk_pinning">고정 중…</string>
-	<string name="sk_unpin_post">고정 해제</string>
-	<string name="sk_confirm_unpin_post_title">게시물 고정 해제</string>
-	<string name="sk_confirm_unpin_post">정말로 이 게시물을 고정 해제하시겠습니까?</string>
-	<string name="sk_unpinning">고정 해제 중…</string>
-	<string name="sk_image_description">이미지 설명</string>
-	<string name="sk_visibility_unlisted">타임라인에 비표시</string>
-  <string name="sk_settings_show_replies">답장 표시</string>
-	<string name="sk_settings_show_boosts">리블로그 표시</string>
-	<string name="sk_settings_load_new_posts">자동으로 새 포스트 불러오기</string>
-	<string name="sk_settings_show_interaction_counts">상호 작용 수 표시</string>
-	<string name="sk_mark_media_as_sensitive">미디어를 민감함으로 설정하기</string>
-	<string name="sk_user_post_notifications_on">%s의 게시물 알림 켜기</string>
-	<string name="sk_user_post_notifications_off">%s의 게시물 알림 끄기</string>
-	<string name="sk_federated_timeline">연합</string>
-	<string name="sk_federated_timeline_info_banner">당신이 속한 연합에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
-	<string name="sk_check_for_update">업데이트 확인</string>
-	<string name="sk_no_update_available">사용 가능한 업데이트 없음</string>
-	<string name="sk_list_timelines">리스트</string>
-	<string name="sk_follow_requests">팔로우 요청</string>
-	<string name="sk_accept_follow_request">팔로우 요청 허가</string>
-	<string name="sk_reject_follow_request">팔로우 요청 거부</string>
-	<string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
-	<string name="sk_settings_always_reveal_content_warnings">열람주의 툿을 항상 펼치기</string>
-	<string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
+    <string name="sk_pinned_posts">고정됨</string>
+    <string name="sk_delete_and_redraft">삭제하고 다시 쓰기</string>
+    <string name="sk_confirm_delete_and_redraft_title">게시물 삭제하고 다시 쓰기</string>
+    <string name="sk_confirm_delete_and_redraft">정말로 이 게시물을 삭제하고 다시 쓰시겠습니까?</string>
+    <string name="sk_pin_post">고정</string>
+    <string name="sk_confirm_pin_post_title">게시물 고정</string>
+    <string name="sk_confirm_pin_post">정말로 이 게시물을 고정하시겠습니까?</string>
+    <string name="sk_pinning">고정 중…</string>
+    <string name="sk_unpin_post">고정 해제</string>
+    <string name="sk_confirm_unpin_post_title">게시물 고정 해제</string>
+    <string name="sk_confirm_unpin_post">정말로 이 게시물을 고정 해제하시겠습니까?</string>
+    <string name="sk_unpinning">고정 해제 중…</string>
+    <string name="sk_image_description">이미지 설명</string>
+    <string name="sk_visibility_unlisted">타임라인에 비표시</string>
+    <string name="sk_settings_show_replies">답장 표시</string>
+    <string name="sk_settings_show_boosts">리블로그 표시</string>
+    <string name="sk_settings_load_new_posts">자동으로 새 게시물 불러오기</string>
+    <string name="sk_settings_show_interaction_counts">반응 수 표시</string>
+    <string name="sk_mark_media_as_sensitive">미디어를 민감함으로 설정하기</string>
+    <string name="sk_user_post_notifications_on">%s 님의 게시물 알림 켜기</string>
+    <string name="sk_user_post_notifications_off">%s 님의 게시물 알림 끄기</string>
+    <string name="sk_federated_timeline">연합</string>
+    <string name="sk_federated_timeline_info_banner">당신이 속한 연합에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
+    <string name="sk_check_for_update">업데이트 확인</string>
+    <string name="sk_no_update_available">사용 가능한 업데이트 없음</string>
+    <string name="sk_list_timelines">리스트</string>
+    <string name="sk_follow_requests">팔로우 요청</string>
+    <string name="sk_accept_follow_request">팔로우 요청 허가</string>
+    <string name="sk_reject_follow_request">팔로우 요청 거부</string>
+    <string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
+    <string name="sk_settings_always_reveal_content_warnings">열람주의 게시물을 항상 펼치기</string>
+    <string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_update_available">Megalodon %s 버전을 다운로드할 수 있습니다.</string>
+    <string name="sk_update_ready">Megalodon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
+    <string name="sk_settings_show_federated_timeline">연합 타임라인 표시</string>
+    <string name="sk_notification_type_status">게시물</string>
+    <string name="sk_notify_posts">게시물 알림</string>
+    <string name="sk_settings_color_picker">테마 색상</string>
+    <string name="sk_color_theme_pink">분홍색</string>
+    <string name="sk_color_theme_purple">보라색</string>
+    <string name="sk_color_theme_green">초록색</string>
+    <string name="sk_color_theme_blue">파란색</string>
+    <string name="sk_color_theme_brown">갈색</string>
+    <string name="sk_color_theme_yellow">노란색</string>
+    <string name="sk_settings_contribute">Megalodon에 기여</string>
 </resources>
\ No newline at end of file

From bf953e96fa4d4eaf00a7a1df9fb50fe97aa8a3fd Mon Sep 17 00:00:00 2001
From: plutonemhikari <plutonemhikari@yandex.com>
Date: Sat, 10 Dec 2022 14:32:10 +0000
Subject: [PATCH 13/35] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
---
 mastodon/src/main/res/values-zh-rCN/strings_sk.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
index 7abafb49c..7ba75fa53 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -38,4 +38,13 @@
     <string name="sk_settings_show_federated_timeline">显示联邦时间轴</string>
     <string name="sk_follow_requests">关注请求</string>
     <string name="sk_settings_always_reveal_content_warnings">总是显示内容警告</string>
+    <string name="sk_settings_color_picker">主题色</string>
+    <string name="sk_color_theme_pink">粉</string>
+    <string name="sk_color_theme_purple">紫</string>
+    <string name="sk_color_theme_green">绿</string>
+    <string name="sk_color_theme_blue">蓝</string>
+    <string name="sk_color_theme_brown">棕</string>
+    <string name="sk_color_theme_yellow">黄</string>
+    <string name="sk_notification_type_status">嘟文</string>
+    <string name="sk_notify_posts">嘟文通知</string>
 </resources>
\ No newline at end of file

From 8ed93baf8d3eae8b512d0048f3d26db60285bbd7 Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitoschido@gmail.com>
Date: Sat, 10 Dec 2022 01:28:45 +0000
Subject: [PATCH 14/35] Translated using Weblate (Spanish)

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
---
 .../src/main/res/values-es-rES/strings_sk.xml | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index ed58c8f6a..13d8c9687 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -3,27 +3,27 @@
     <string name="sk_pinned_posts">Anclado</string>
     <string name="sk_delete_and_redraft">Eliminar y editar</string>
     <string name="sk_confirm_delete_and_redraft_title">Eliminar y editar post</string>
-    <string name="sk_confirm_delete_and_redraft">Seguro que quiere eliminar y volver a editar este post\?</string>
-    <string name="sk_pin_post">Fijar en perfil</string>
-    <string name="sk_confirm_pin_post_title">Fijar post en perfil</string>
-    <string name="sk_confirm_pin_post">Desea fijar el post en su perfil\?</string>
-    <string name="sk_pinning">Fijando post…</string>
-    <string name="sk_unpin_post">Quitar del perfil</string>
-    <string name="sk_confirm_unpin_post_title">Quitar post del perfil</string>
-    <string name="sk_confirm_unpin_post">Está seguro que quiere quitar el post\?</string>
+    <string name="sk_confirm_delete_and_redraft">¿Confirma que quiere eliminar y volver a editar esta publicación\?</string>
+    <string name="sk_pin_post">Anclar en perfil</string>
+    <string name="sk_confirm_pin_post_title">Anclar publicación en perfil</string>
+    <string name="sk_confirm_pin_post">¿Quiere anclar la publicación en su perfil\?</string>
+    <string name="sk_pinning">Anclando publicación…</string>
+    <string name="sk_unpin_post">Desanclar del perfil</string>
+    <string name="sk_confirm_unpin_post_title">Desanclar publicación del perfil</string>
+    <string name="sk_confirm_unpin_post">¿Confirma que quiere desanclar esta publicación\?</string>
     <string name="sk_app_name">Megalodon</string>
-    <string name="sk_unpinning">Quitando post…</string>
+    <string name="sk_unpinning">Desanclando publicación…</string>
     <string name="sk_image_description">Descripción de la imagen</string>
-    <string name="sk_visibility_unlisted">Sin listar</string>
+    <string name="sk_visibility_unlisted">Descatalogada</string>
     <string name="sk_settings_show_replies">Mostrar respuestas</string>
     <string name="sk_settings_show_boosts">Mostrar impulsos</string>
     <string name="sk_settings_load_new_posts">Cargar publicaciones nuevas automáticamente</string>
     <string name="sk_settings_show_interaction_counts">Mostrar contadores de interacciones</string>
-    <string name="sk_mark_media_as_sensitive">Marcar medio como sensible</string>
+    <string name="sk_mark_media_as_sensitive">Marcar medio como delicado</string>
     <string name="sk_user_post_notifications_on">Activadas las notificaciones de posts para %s</string>
     <string name="sk_user_post_notifications_off">Desactivadas las notificaciones de posts para %s</string>
     <string name="sk_federated_timeline">Federación</string>
-    <string name="sk_federated_timeline_info_banner">Estos son los posts más recientes de las personas de tu federación.</string>
+    <string name="sk_federated_timeline_info_banner">Estas son las publicaciones más recientes de las personas de su federación.</string>
     <string name="sk_update_available">Megalodon %s está listo para descargar.</string>
     <string name="sk_update_ready">Megalodon %s se ha descargado y está listo para instalarse.</string>
     <string name="sk_check_for_update">Buscar actualizaciones</string>

From ba362f445753d7de6893926a90b25cb1dc2c84a9 Mon Sep 17 00:00:00 2001
From: kaea <jakubkolakowski6@protonmail.com>
Date: Fri, 9 Dec 2022 21:01:28 +0000
Subject: [PATCH 15/35] Translated using Weblate (Polish)

Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pl/
---
 mastodon/src/main/res/values-pl-rPL/strings_sk.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
index 8e3a80d6c..9feac040f 100644
--- a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
@@ -38,4 +38,13 @@
     <string name="sk_settings_show_federated_timeline">Pokaż oś czasu znanej sieci Fediverse</string>
     <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_visibility_unlisted">Nienotowany</string>
+    <string name="sk_notification_type_status">Posty</string>
+    <string name="sk_notify_posts">Powiadomienia postów</string>
+    <string name="sk_settings_color_picker">Motyw</string>
+    <string name="sk_color_theme_pink">Różowy</string>
+    <string name="sk_color_theme_purple">Fioletowy</string>
+    <string name="sk_color_theme_green">Zielony</string>
+    <string name="sk_color_theme_blue">Niebieski</string>
+    <string name="sk_color_theme_brown">Brązowy</string>
+    <string name="sk_color_theme_yellow">Żółty</string>
 </resources>
\ No newline at end of file

From 236acab54f1b47106482ff015f33fd52db2f8e65 Mon Sep 17 00:00:00 2001
From: edxkl <edu200399lim@gmail.com>
Date: Fri, 9 Dec 2022 22:33:25 +0000
Subject: [PATCH 16/35] Translated using Weblate (Portuguese (Brazil))

Currently translated at 97.8% (46 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pt_BR/
---
 mastodon/src/main/res/values-pt-rBR/strings_sk.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
index bade9b3c3..9c9bf585d 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -44,4 +44,6 @@
     <string name="sk_color_theme_brown">Marrom</string>
     <string name="sk_color_theme_yellow">Amarelo</string>
     <string name="sk_color_theme_pink">Rosa</string>
+    <string name="sk_notification_type_status">Postagens</string>
+    <string name="sk_settings_color_picker">Cor do tema</string>
 </resources>
\ No newline at end of file

From 00bec7174acf712b4c25a7dcdfdff685d2a74a12 Mon Sep 17 00:00:00 2001
From: edxkl <edu200399lim@gmail.com>
Date: Fri, 9 Dec 2022 23:41:08 +0000
Subject: [PATCH 17/35] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (7 of 7 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/pt_BR/
---
 metadata/pt-BR/changelogs/55.txt    | 4 ++++
 metadata/pt-BR/changelogs/56.txt    | 6 ++++++
 metadata/pt-BR/full_description.txt | 8 +-------
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 metadata/pt-BR/changelogs/55.txt
 create mode 100644 metadata/pt-BR/changelogs/56.txt

diff --git a/metadata/pt-BR/changelogs/55.txt b/metadata/pt-BR/changelogs/55.txt
new file mode 100644
index 000000000..4ef8ff9df
--- /dev/null
+++ b/metadata/pt-BR/changelogs/55.txt
@@ -0,0 +1,4 @@
+- Corrigido o problema de renderização de tags HTML e habilitada a formatação Markdown de renderização
+- Criado o <a href="https://translate.codeberg.org/projects/megalodon">projeto de tradução Weblate</a>
+- Adicionada a opção de ativar ou desativar a linha do tempo Federada
+- As versões 52-54 foram pequenos ajustes para o lançamento na Google Play
diff --git a/metadata/pt-BR/changelogs/56.txt b/metadata/pt-BR/changelogs/56.txt
new file mode 100644
index 000000000..ea96ff86e
--- /dev/null
+++ b/metadata/pt-BR/changelogs/56.txt
@@ -0,0 +1,6 @@
+- Temas de cores personalizados por @LucasGGamerM
+- Novo logotipo de texto "megalodon" enviado por @LucasGGamerM
+- Melhor pesquisa de emojis durante a composição
+- Votação aprimorada (exibe o próprio voto, sempre exibe o botão de votação, não corta respostas longas)
+- Adicionar configuração de notificação push para notificações de postagem
+- Correções de bugs
diff --git a/metadata/pt-BR/full_description.txt b/metadata/pt-BR/full_description.txt
index 1cb9bd656..dd43d2e77 100644
--- a/metadata/pt-BR/full_description.txt
+++ b/metadata/pt-BR/full_description.txt
@@ -1,4 +1,4 @@
-Megalodon é uma versão modificada do <a href="https://github.com/mastodon/mastodon-android">aplicativo oficial do Mastodon para Android</a> adicionando importantes funcionalidades que estão faltando no aplicativo oficial, como a linha do tempo federada, postagens não listadas, marcadores e um visualizador de descrições de imagem.
+Megalodon é uma versão modificada do <a href="https://github.com/mastodon/mastodon-android">aplicativo oficial do Mastodon para Android</a> adicionando importantes funcionalidades que estão faltando no aplicativo oficial, como a linha do tempo federada, postagens não listadas e um visualizador de descrições de imagem.
 
 <b>Principais recursos</b>
 
@@ -6,12 +6,6 @@ Megalodon é uma versão modificada do <a href="https://github.com/mastodon/mast
 - <b>Linha do tempo federada</b>: Veja todas as postagens públicas de pessoas em todo o Fediverso que sua instância está conectada.
 - <b>Visualizador de descrição de imagem</b>: Verifique rapidamente se uma imagem ou vídeo tem um texto alternativo anexado a ele.
 - <b>Fixando postagens</b>: Fixe suas postagens mais importantes em seu perfil e veja o que outras pessoas fixaram usando a guia "Fixado".
-- <b>Favoritos</b>: Salve postagens rapidamente e encontre-as mais tarde na lista de favoritos.
 - <b>Seguir hashtags</b>: Veja novas postagens de hashtags específicas diretamente em sua linha do tempo inicial seguindo-as.
 - <b>Respondendo a solicitações de seguir</b>: Aceite ou recuse pedidos para seguir de suas notificações ou da lista dedicada de solicitações de seguir.
 - <b>Excluir e reescrever</b>: O recurso muito amado que tornou a edição possível sem uma função de edição real.
-
-<b>Recursos oficiais inéditos, disponíveis com antecedência</b>
-
-- Editando postagens
-- Atualizador integrado para versões do GitHub

From cd31b2ae5a5c41d05243ddf6b84dabf19e400ea1 Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Sat, 10 Dec 2022 00:28:00 +0000
Subject: [PATCH 18/35] Translated using Weblate (Korean)

Currently translated at 100.0% (7 of 7 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ko/
---
 metadata/ko/changelogs/50.txt     |  4 ++++
 metadata/ko/changelogs/51.txt     |  6 ++++++
 metadata/ko/changelogs/55.txt     |  4 ++++
 metadata/ko/changelogs/56.txt     |  6 ++++++
 metadata/ko/full_description.txt  | 11 +++++++++++
 metadata/ko/short_description.txt |  1 +
 metadata/ko/title.txt             |  1 +
 7 files changed, 33 insertions(+)
 create mode 100644 metadata/ko/changelogs/50.txt
 create mode 100644 metadata/ko/changelogs/51.txt
 create mode 100644 metadata/ko/changelogs/55.txt
 create mode 100644 metadata/ko/changelogs/56.txt
 create mode 100644 metadata/ko/full_description.txt
 create mode 100644 metadata/ko/short_description.txt
 create mode 100644 metadata/ko/title.txt

diff --git a/metadata/ko/changelogs/50.txt b/metadata/ko/changelogs/50.txt
new file mode 100644
index 000000000..1c2b67de0
--- /dev/null
+++ b/metadata/ko/changelogs/50.txt
@@ -0,0 +1,4 @@
+- F-Droid에 릴리스하기 위한 파일을 준비
+- 자동 업데이트를 수정
+- 단색 아이콘을 런처 아이콘에 다시 추가
+- 게시글 밑의 잘못된 ‘타임라인에 비표시’ 아이콘을 교체
diff --git a/metadata/ko/changelogs/51.txt b/metadata/ko/changelogs/51.txt
new file mode 100644
index 000000000..697f20b73
--- /dev/null
+++ b/metadata/ko/changelogs/51.txt
@@ -0,0 +1,6 @@
+- 답글 작성 중에 원본 게시물을 볼 수 있도록 함 (“…님에게 답글”을 클릭하여)
+- 업스트림의 변경 및 버그 수정 병합
+- 사용하지 않는 “App Center” 코드 제거
+- Play Store를 위해 연합 타임라인이 없는 릴리스 추가
+- 쉬운 로그인을 위해 별도의 redirect URI 추가
+- 기여 링크 변경
diff --git a/metadata/ko/changelogs/55.txt b/metadata/ko/changelogs/55.txt
new file mode 100644
index 000000000..7e063e469
--- /dev/null
+++ b/metadata/ko/changelogs/55.txt
@@ -0,0 +1,4 @@
+- HTML 렌더링 깨짐 수정 및 마크다운 포맷 렌더링 활성화
+- <a href="https://translate.codeberg.org/projects/megalodon">Weblate 번역 프로젝트</a> 초기 설정
+- 연합 타임라인 전환 추가
+- 52~54 버전은 Google Play에 릴리스하기 위한 작은 조정임
diff --git a/metadata/ko/changelogs/56.txt b/metadata/ko/changelogs/56.txt
new file mode 100644
index 000000000..7cbb243c7
--- /dev/null
+++ b/metadata/ko/changelogs/56.txt
@@ -0,0 +1,6 @@
+- @LucasGGamerM 님의 색상 테마 사용자화
+- @LucasGGamerM 님이 제시한 새로운 "megalodon" 텍스트 로고
+- 게시물 작성 시 더 나은 에모지 검색
+- 투표 변경 (소유한 투표 표시, 항상 투표 버튼 표시, 긴 항목을 자르지 않음)
+- 게시물 알림 설정 추가
+- 버그 수정
diff --git a/metadata/ko/full_description.txt b/metadata/ko/full_description.txt
new file mode 100644
index 000000000..aa1e658a5
--- /dev/null
+++ b/metadata/ko/full_description.txt
@@ -0,0 +1,11 @@
+Megalodon은 <a href="https://github.com/mastodon/mastodon-android">공식 마스토돈 안드로이드 앱</a>의 수정된 버전으로, 공식 앱에서 누락된 연합 타임라인, 타임라인에 비표시하여 게시, 이미지 설명 표시와 같은 중요한 기능들을 추가했습니다.
+
+<b>주요 기능</b>
+
+- <b>타임라인에 비표시하여 게시</b>: 모두가 볼 수 있지만 트렌드, 해시태그 및 공개된 타임라인에 보이지 않습니다.
+- <b>연합 타임라인</b>: 사용 중인 인스턴스에 연결된 연합우주의 사람들이 올린 모든 공개된 게시물을 확인하세요.
+- <b>이미지 설명 표시</b>: 이미지나 동영상에 대체 텍스트가 있는지 빠르게 확인하세요.
+- <b>게시물 고정</b>: 가장 중요한 게시물을 프로필에 고정하고 “고정됨” 탭으로 다른 사용자가 고정한 게시물을 확인하세요.
+- <b>해시태그 팔로우</b>: 특정 해시태그를 팔로우하고 해시태그가 포함된 새로운 게시물을 홈 타임라인에서 바로 확인하세요.
+- <b>팔로우 요청에 응답</b>: 알림 또는 전용 팔로우 요청 목록을 통해 팔로우 요청을 허가하거나 거부하세요.
+- <b>삭제하고 다시 쓰기</b>: 실제 수정 기능 없이도 수정이 가능하도록 해 많은 사랑을 받고 있는 기능입니다.
diff --git a/metadata/ko/short_description.txt b/metadata/ko/short_description.txt
new file mode 100644
index 000000000..8272548a4
--- /dev/null
+++ b/metadata/ko/short_description.txt
@@ -0,0 +1 @@
+분홍색이고 더 많은 기능이 있는 안드로이드용 마스토돈
diff --git a/metadata/ko/title.txt b/metadata/ko/title.txt
new file mode 100644
index 000000000..cf946e02c
--- /dev/null
+++ b/metadata/ko/title.txt
@@ -0,0 +1 @@
+Megalodon

From ca92cc6dc16ff987aa32a7232fe25def3c050904 Mon Sep 17 00:00:00 2001
From: sk22 <sk22@mailbox.org>
Date: Sat, 10 Dec 2022 18:56:14 -0300
Subject: [PATCH 19/35] Translated using Weblate (English)

Currently translated at 100.0% (56 of 56 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/en/
---
 mastodon/src/main/res/values/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index f8f68bc51..222669391 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -58,4 +58,4 @@
   <string name="sk_language_name">%s (%s)</string>
 	<string name="sk_clear_recent_languages">Clear recent languages</string>
 	<string name="sk_confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string>
-</resources>
+</resources>
\ No newline at end of file

From f7195c778709664ac6f7742cb887db4a3949145e Mon Sep 17 00:00:00 2001
From: sk22 <sk22@mailbox.org>
Date: Sat, 10 Dec 2022 18:54:23 -0300
Subject: [PATCH 20/35] Translated using Weblate (German)

Currently translated at 100.0% (56 of 56 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
---
 mastodon/src/main/res/values-de-rDE/strings_sk.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index d6279f72a..06ab774a7 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -47,4 +47,13 @@
     <string name="sk_color_theme_yellow">Gelb</string>
     <string name="sk_notification_type_status">Beiträge</string>
     <string name="sk_color_theme_blue">Blau</string>
+    <string name="sk_poll_allow_multiple">Mehrfachantworten erlauben</string>
+    <string name="sk_translated_using">Übersetzt mit %s</string>
+    <string name="sk_post_language">Sprache: %s</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Sicher, dass du die Liste der zuletzt verwendeten Sprachen leeren willst\?</string>
+    <string name="sk_translate_post">Übersetzen</string>
+    <string name="sk_translate_show_original">Original anzeigen</string>
+    <string name="sk_available_languages">Verfügbare Sprachen</string>
+    <string name="sk_clear_recent_languages">Zuletzt verwendete Sprachen leeren</string>
 </resources>
\ No newline at end of file

From f77d9dcee220bd33c23a395c6d7dbc81858d08ad Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Sun, 11 Dec 2022 14:31:05 +0000
Subject: [PATCH 21/35] Translated using Weblate (Korean)

Currently translated at 100.0% (56 of 56 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 mastodon/src/main/res/values-ko-rKR/strings_sk.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index 867575082..982f60566 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -47,4 +47,13 @@
     <string name="sk_color_theme_brown">갈색</string>
     <string name="sk_color_theme_yellow">노란색</string>
     <string name="sk_settings_contribute">Megalodon에 기여</string>
+    <string name="sk_poll_allow_multiple">다중 선택 허용</string>
+    <string name="sk_translate_post">번역하기</string>
+    <string name="sk_translate_show_original">원본 보기</string>
+    <string name="sk_post_language">언어: %s</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_translated_using">%s에서 번역함</string>
+    <string name="sk_available_languages">모든 언어</string>
+    <string name="sk_clear_recent_languages">최근 사용한 언어 지우기</string>
+    <string name="sk_confirm_clear_recent_languages">정말로 최근 사용한 언어를 지우시겠습니까\?</string>
 </resources>
\ No newline at end of file

From 80c56d71cb2a7c4317ab6075cee360af29ae727f Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitoschido@gmail.com>
Date: Mon, 12 Dec 2022 09:05:37 +0000
Subject: [PATCH 22/35] Translated using Weblate (Spanish)

Currently translated at 100.0% (56 of 56 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
---
 mastodon/src/main/res/values-es-rES/strings_sk.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index 13d8c9687..0ff95638f 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="sk_pinned_posts">Anclado</string>
     <string name="sk_delete_and_redraft">Eliminar y editar</string>
-    <string name="sk_confirm_delete_and_redraft_title">Eliminar y editar post</string>
+    <string name="sk_confirm_delete_and_redraft_title">Eliminar y editar publicación</string>
     <string name="sk_confirm_delete_and_redraft">¿Confirma que quiere eliminar y volver a editar esta publicación\?</string>
     <string name="sk_pin_post">Anclar en perfil</string>
     <string name="sk_confirm_pin_post_title">Anclar publicación en perfil</string>
@@ -18,7 +18,7 @@
     <string name="sk_settings_show_replies">Mostrar respuestas</string>
     <string name="sk_settings_show_boosts">Mostrar impulsos</string>
     <string name="sk_settings_load_new_posts">Cargar publicaciones nuevas automáticamente</string>
-    <string name="sk_settings_show_interaction_counts">Mostrar contadores de interacciones</string>
+    <string name="sk_settings_show_interaction_counts">Mostrar recuentos de interacciones</string>
     <string name="sk_mark_media_as_sensitive">Marcar medio como delicado</string>
     <string name="sk_user_post_notifications_on">Activadas las notificaciones de posts para %s</string>
     <string name="sk_user_post_notifications_off">Desactivadas las notificaciones de posts para %s</string>
@@ -47,4 +47,13 @@
     <string name="sk_color_theme_blue">Azul</string>
     <string name="sk_color_theme_brown">Marrón</string>
     <string name="sk_color_theme_yellow">Amarillo</string>
+    <string name="sk_poll_allow_multiple">Permitir respuesta múltiple</string>
+    <string name="sk_translate_post">Traducir</string>
+    <string name="sk_translate_show_original">Mostrar original</string>
+    <string name="sk_translated_using">Traducido mediante %s</string>
+    <string name="sk_post_language">Idioma: %s</string>
+    <string name="sk_available_languages">Idiomas disponibles</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">¿Confirma que quiere vaciar sus idiomas usados recientemente\?</string>
+    <string name="sk_clear_recent_languages">Vaciar idiomas usados recientemente</string>
 </resources>
\ No newline at end of file

From 6f48a7c4a4374fe301cda62ce24757c8990b4a20 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Sun, 11 Dec 2022 01:18:55 +0000
Subject: [PATCH 23/35] Translated using Weblate (French)

Currently translated at 100.0% (56 of 56 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 876575fec..4e565d3a2 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -47,4 +47,13 @@
     <string name="sk_color_theme_brown">Marron</string>
     <string name="sk_color_theme_yellow">Jaune</string>
     <string name="sk_settings_color_picker">Couleur d\'accentuation</string>
+    <string name="sk_poll_allow_multiple">Autoriser plusieurs choix</string>
+    <string name="sk_translate_post">Traduire</string>
+    <string name="sk_translate_show_original">Afficher l\'original</string>
+    <string name="sk_translated_using">Traduit en utilisant %s</string>
+    <string name="sk_post_language">Langue : %s</string>
+    <string name="sk_available_languages">Langues disponibles</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Êtes-vous sûr de vouloir effacer vos langues récemment utilisées \?</string>
+    <string name="sk_clear_recent_languages">Effacer les langues récemment utilisées</string>
 </resources>
\ No newline at end of file

From e6a5fa1c3f477caecd2fd7cec1de83f2a55ccbf2 Mon Sep 17 00:00:00 2001
From: lunarna <lunarna@tutanota.com>
Date: Mon, 12 Dec 2022 00:46:54 +0000
Subject: [PATCH 24/35] Translated using Weblate (Polish)

Currently translated at 100.0% (56 of 56 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pl/
---
 .../src/main/res/values-pl-rPL/strings_sk.xml | 55 +++++++++++--------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
index 9feac040f..c91c33994 100644
--- a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="sk_delete_and_redraft">Usuń i zmodyfikuj</string>
-    <string name="sk_pin_post">Przypomnij do profilu</string>
-    <string name="sk_confirm_pin_post_title">Przypomnij post na profilu</string>
-    <string name="sk_confirm_pin_post">Czy chcesz przypiąć ten post na swoim profilu\?</string>
-    <string name="sk_pinning">Przypinanie postu…</string>
-    <string name="sk_unpin_post">Odepnij post z profilu</string>
-    <string name="sk_confirm_unpin_post_title">Odepnij post z profilu</string>
-    <string name="sk_unpinning">Odpinanie postu…</string>
+    <string name="sk_pin_post">Przypnij do profilu</string>
+    <string name="sk_confirm_pin_post_title">Przypnij wpis do profilu</string>
+    <string name="sk_confirm_pin_post">Czy chcesz przypiąć ten wpis do swojego profilu\?</string>
+    <string name="sk_pinning">Przypinanie wpisu…</string>
+    <string name="sk_unpin_post">Odepnij z profilu</string>
+    <string name="sk_confirm_unpin_post_title">Odepnij wpis z profilu</string>
+    <string name="sk_unpinning">Odpinanie wpisu…</string>
     <string name="sk_settings_show_replies">Pokaż odpowiedzi</string>
     <string name="sk_settings_show_boosts">Pokaż podbicia</string>
-    <string name="sk_settings_load_new_posts">Automatycznie wczytuj nowe posty</string>
+    <string name="sk_settings_load_new_posts">Automatycznie wczytuj nowe wpisy</string>
     <string name="sk_settings_show_interaction_counts">Pokaż dane ilości interakcji</string>
     <string name="sk_mark_media_as_sensitive">Oznacz jako wrażliwe</string>
     <string name="sk_user_post_notifications_on">Włączono powiadomienia dla postu %s</string>
     <string name="sk_user_post_notifications_off">Wyłączono powiadomienia dla postu %s</string>
-    <string name="sk_federated_timeline">Znana sieć fediverse</string>
-    <string name="sk_federated_timeline_info_banner">To są najnowsze post ze znanej sieci fediverse dla twojego serwera.</string>
+    <string name="sk_federated_timeline">Globalne</string>
+    <string name="sk_federated_timeline_info_banner">To są najnowsze post ze znanej sieci fediwersum dla twojego serwera.</string>
     <string name="sk_update_available">Megalodon %s jest dostępny do pobrania.</string>
     <string name="sk_update_ready">Megalodon %s został pobrany i jest gotowy do instalacji.</string>
-    <string name="sk_check_for_update">Szukaj uaktualnień</string>
-    <string name="sk_no_update_available">Brak dostępnych uaktualnień</string>
+    <string name="sk_check_for_update">Sprawdź dostępność aktualizacji</string>
+    <string name="sk_no_update_available">Brak dostępnych aktualizacji</string>
     <string name="sk_app_name">Megalodon</string>
     <string name="sk_pinned_posts">Przypięte</string>
-    <string name="sk_confirm_delete_and_redraft">Jesteś pewnien, że chcesz usunąć zmodyfikowany post\?</string>
-    <string name="sk_confirm_unpin_post">Jesteś pewien, że chcesz odpiąć ten post\?</string>
-    <string name="sk_image_description">Opis obrazka</string>
-    <string name="sk_confirm_delete_and_redraft_title">Usuń i zmodyfikuj post</string>
+    <string name="sk_confirm_delete_and_redraft">Jesteś pewnien, że chcesz usunąć zmodyfikowany wpis\?</string>
+    <string name="sk_confirm_unpin_post">Jesteś pewien, że chcesz odpiąć ten wpis\?</string>
+    <string name="sk_image_description">Opis zdjęcia</string>
+    <string name="sk_confirm_delete_and_redraft_title">Usuń i zmodyfikuj wpis</string>
     <string name="sk_list_timelines">Listy</string>
-    <string name="sk_follow_requests">Prośby o obserwowanie</string>
-    <string name="sk_accept_follow_request">Zaakceptuj prośby o obserwowanie</string>
-    <string name="sk_reject_follow_request">Odrzuć prośby o obserwowanie</string>
+    <string name="sk_follow_requests">Prośby o obserwację</string>
+    <string name="sk_accept_follow_request">Zaakceptuj prośby o obserwację</string>
+    <string name="sk_reject_follow_request">Odrzuć prośby o obserwację</string>
     <string name="sk_lists_with_user">Listy z %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Zawsze odkrywaj ostrzeżenia o zawartości</string>
     <string name="sk_disable_marquee">Wyłącz tekst przewijany w paskach tytułowych</string>
     <string name="sk_settings_contribute">Wspomóż Megalodon</string>
-    <string name="sk_settings_show_federated_timeline">Pokaż oś czasu znanej sieci Fediverse</string>
+    <string name="sk_settings_show_federated_timeline">Pokaż globalną oś czasu</string>
     <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
-    <string name="sk_visibility_unlisted">Nienotowany</string>
-    <string name="sk_notification_type_status">Posty</string>
-    <string name="sk_notify_posts">Powiadomienia postów</string>
+    <string name="sk_visibility_unlisted">Niewidoczny</string>
+    <string name="sk_notification_type_status">Wpisy</string>
+    <string name="sk_notify_posts">Powiadomienia wpisów</string>
     <string name="sk_settings_color_picker">Motyw</string>
     <string name="sk_color_theme_pink">Różowy</string>
     <string name="sk_color_theme_purple">Fioletowy</string>
@@ -47,4 +47,13 @@
     <string name="sk_color_theme_blue">Niebieski</string>
     <string name="sk_color_theme_brown">Brązowy</string>
     <string name="sk_color_theme_yellow">Żółty</string>
+    <string name="sk_poll_allow_multiple">Pozwalaj na wybieranie wielu opcji</string>
+    <string name="sk_translate_post">Przetłumacz</string>
+    <string name="sk_translate_show_original">Pokaż oryginał</string>
+    <string name="sk_translated_using">Przetłumaczono przy użyciu %s</string>
+    <string name="sk_post_language">Język: %s</string>
+    <string name="sk_available_languages">Dostępne języki</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Czy na pewno chcesz wyczyścić ostatnio użyte języki\?</string>
+    <string name="sk_clear_recent_languages">Wyczyść ostatnio użyte języki</string>
 </resources>
\ No newline at end of file

From 0407e958f1e2e20d7e16533377dc108b26bc472f Mon Sep 17 00:00:00 2001
From: edxkl <edu200399lim@gmail.com>
Date: Mon, 12 Dec 2022 14:07:34 +0000
Subject: [PATCH 25/35] Translated using Weblate (Portuguese (Brazil))

Currently translated at 96.4% (54 of 56 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pt_BR/
---
 mastodon/src/main/res/values-pt-rBR/strings_sk.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
index 9c9bf585d..f54052b1b 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -46,4 +46,12 @@
     <string name="sk_color_theme_pink">Rosa</string>
     <string name="sk_notification_type_status">Postagens</string>
     <string name="sk_settings_color_picker">Cor do tema</string>
+    <string name="sk_translate_post">Traduzir</string>
+    <string name="sk_translate_show_original">Mostrar original</string>
+    <string name="sk_translated_using">Traduzido usando %s</string>
+    <string name="sk_post_language">Idioma: %s</string>
+    <string name="sk_available_languages">Idiomas disponíveis</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Tem certeza de que deseja limpar os idiomas usados recentemente\?</string>
+    <string name="sk_clear_recent_languages">Limpar idiomas usados recentemente</string>
 </resources>
\ No newline at end of file

From 7dfc7dd9efe7787975019bbcdc71e9370d234bd8 Mon Sep 17 00:00:00 2001
From: nitrogenez <nitrogenesis.developer@gmail.com>
Date: Mon, 12 Dec 2022 01:10:48 +0000
Subject: [PATCH 26/35] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (56 of 56 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
---
 .../src/main/res/values-uk-rUA/strings_sk.xml | 58 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
index 045e125f3..af0f61ac8 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -1,3 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="sk_notify_posts">Сповіщення про пости</string>
+    <string name="sk_settings_color_picker">Колірна тема</string>
+    <string name="sk_color_theme_purple">Фіолетовий</string>
+    <string name="sk_color_theme_green">Зелений</string>
+    <string name="sk_color_theme_blue">Синий</string>
+    <string name="sk_color_theme_brown">Коричневий</string>
+    <string name="sk_color_theme_yellow">Жовтий</string>
+    <string name="sk_poll_allow_multiple">Дозволити кілька виборів</string>
+    <string name="sk_translate_post">Перекласти</string>
+    <string name="sk_translate_show_original">Показати оригінал</string>
+    <string name="sk_translated_using">Перекладено через %s</string>
+    <string name="sk_post_language">Мова: %s</string>
+    <string name="sk_available_languages">Доступні мови</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_clear_recent_languages">Очистити нещодавно використані мови</string>
+    <string name="sk_settings_always_reveal_content_warnings">Завжди відкривати вміст</string>
+    <string name="sk_notification_type_status">Пости</string>
+    <string name="sk_color_theme_pink">Рожевий</string>
+    <string name="sk_confirm_clear_recent_languages">Ви впевнені, що хочете очистити нещодавно використані мови\?</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_pinned_posts">Закріплене</string>
+    <string name="sk_delete_and_redraft">Видалити та переробити</string>
+    <string name="sk_confirm_delete_and_redraft_title">Видалити та переробити пост</string>
+    <string name="sk_confirm_delete_and_redraft">Ви впевнені, що хочете видалити та переробити цей пост\?</string>
+    <string name="sk_pin_post">Закріпити у профіль</string>
+    <string name="sk_confirm_pin_post_title">Закріпити пост у профіль</string>
+    <string name="sk_confirm_pin_post">Чи хочете ви закріпити цей пост у ваш профіль\?</string>
+    <string name="sk_pinning">Закріпляємо пост…</string>
+    <string name="sk_unpin_post">Відкріпити з профілю</string>
+    <string name="sk_confirm_unpin_post_title">Відкріпити пост з профілю</string>
+    <string name="sk_confirm_unpin_post">Ви впевнені, що хочете відкріпити цей пост\?</string>
+    <string name="sk_unpinning">Відкріпляємо пост…</string>
+    <string name="sk_image_description">Опис зображення</string>
+    <string name="sk_visibility_unlisted">Не у списку</string>
+    <string name="sk_settings_show_replies">Показувати відповіді</string>
+    <string name="sk_settings_load_new_posts">Автоматично завантажувати нові пости</string>
+    <string name="sk_settings_show_interaction_counts">Показати кількість взаємодій</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_follow_requests">Запити на підписку</string>
+    <string name="sk_accept_follow_request">Прийняти запит на підписку</string>
+    <string name="sk_reject_follow_request">Відхилити запит на підписку</string>
+    <string name="sk_lists_with_user">Списки з %s</string>
+    <string name="sk_disable_marquee">Вимкнути прокручування тексту у рядках заголовка</string>
+    <string name="sk_settings_contribute">Допомогти у розробці Megalodon</string>
+    <string name="sk_mark_media_as_sensitive">Помітити медіа як чутливу</string>
+    <string name="sk_settings_show_boosts">Показувати бусти</string>
+    <string name="sk_user_post_notifications_on">Увімкнено сповіщення про пости для %s</string>
+    <string name="sk_user_post_notifications_off">Вимкнено сповіщення про пости для %s</string>
+    <string name="sk_federated_timeline">Федерація</string>
+    <string name="sk_federated_timeline_info_banner">Це найновіші публікації людей у вашій федерації.</string>
+    <string name="sk_update_available">Megalodon %s готовий до завантаження.</string>
+    <string name="sk_update_ready">Megalodon %s завантажений й готовий до встановлення.</string>
+    <string name="sk_check_for_update">Перевірити оновлення</string>
+    <string name="sk_no_update_available">Немає доступних оновлень</string>
+    <string name="sk_list_timelines">Списки</string>
+    <string name="sk_settings_show_federated_timeline">Показувати федеративну стрічку</string>
+</resources>
\ No newline at end of file

From 0f95694083e4761ff107cda313e424c2fdfa2114 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Sun, 11 Dec 2022 01:23:25 +0000
Subject: [PATCH 27/35] Translated using Weblate (French)

Currently translated at 100.0% (8 of 8 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
---
 metadata/fr-FR/changelogs/58.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 metadata/fr-FR/changelogs/58.txt

diff --git a/metadata/fr-FR/changelogs/58.txt b/metadata/fr-FR/changelogs/58.txt
new file mode 100644
index 000000000..41dd97752
--- /dev/null
+++ b/metadata/fr-FR/changelogs/58.txt
@@ -0,0 +1,5 @@
+- Ajout d'un sélecteur de langue
+- Ajout d'une fonction de traduction
+- Amélioration de la sémantique pour voter sur les sondages (boutons radio et cases à cocher)
+- Ajout d'une option pour permettre de voter pour plusieurs options dans les sondages
+- Corrections de bogues

From 9767b11626e600e0df811192f6feb392eb81cd89 Mon Sep 17 00:00:00 2001
From: edxkl <edu200399lim@gmail.com>
Date: Mon, 12 Dec 2022 14:05:32 +0000
Subject: [PATCH 28/35] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (8 of 8 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/pt_BR/
---
 metadata/pt-BR/changelogs/58.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 metadata/pt-BR/changelogs/58.txt

diff --git a/metadata/pt-BR/changelogs/58.txt b/metadata/pt-BR/changelogs/58.txt
new file mode 100644
index 000000000..dc555fa45
--- /dev/null
+++ b/metadata/pt-BR/changelogs/58.txt
@@ -0,0 +1,5 @@
+- Adicionado o seletor de idioma
+- Adicionada a função de tradução
+- Melhorada a semântica para votação em enquetes (botões de opção e caixas de seleção)
+- Adicionada a opção que permite a votação de várias opções nas enquetes
+- Correções de bugs

From 8e82cf1e99a2a03d5b025450c768571adc2584fe Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitoschido@gmail.com>
Date: Mon, 12 Dec 2022 03:50:32 +0000
Subject: [PATCH 29/35] Translated using Weblate (Spanish)

Currently translated at 100.0% (8 of 8 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/es/
---
 metadata/es/changelogs/55.txt    |  8 ++++----
 metadata/es/changelogs/58.txt    |  5 +++++
 metadata/es/full_description.txt | 18 +++++++++---------
 3 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 metadata/es/changelogs/58.txt

diff --git a/metadata/es/changelogs/55.txt b/metadata/es/changelogs/55.txt
index 0e195dc8b..21e9518c9 100644
--- a/metadata/es/changelogs/55.txt
+++ b/metadata/es/changelogs/55.txt
@@ -1,4 +1,4 @@
-- Solucione la representación rota de las etiquetas HTML y habilite la representación del formato Markdown
-- Inicialice el <a href="https://translate.codeberg.org/projects/megalodon">proyecto de traducción de Weblate</a>
-- Agregar alternar para la línea de tiempo federada
-- Las versiones 52-54 fueron pequeños ajustes para un lanzamiento en Google Play
+- Corrige la representación errónea de etiquetas HTML y activa el formato Markdown
+- Inicializa el <a href="https://translate.codeberg.org/projects/megalodon">proyecto de traducción vía Weblate</a>
+- Añade un alternador para la cronología federada
+- Las versiones 52-54 fueron ajustes menores para una versión para Google Play
diff --git a/metadata/es/changelogs/58.txt b/metadata/es/changelogs/58.txt
new file mode 100644
index 000000000..cfa779155
--- /dev/null
+++ b/metadata/es/changelogs/58.txt
@@ -0,0 +1,5 @@
+- Se añadió un selector de idiomas
+- Se incluye una función para traducir
+- Mejora la semántica para votar en encuestas (botones de opción y casillas)
+- Permite votar por varias opciones en las encuestas
+- Corrige varios defectos
diff --git a/metadata/es/full_description.txt b/metadata/es/full_description.txt
index 78ba350bc..be7dd314a 100644
--- a/metadata/es/full_description.txt
+++ b/metadata/es/full_description.txt
@@ -1,11 +1,11 @@
-Megalodon es una versión modificada de <a href="https://github.com/mastodon/mastodon-android">Mastodon oficial para Android</a> que agrega funciones importantes que faltan en la aplicación oficial, como la línea de tiempo federada, no listada publicación y un visor de descripción de imágenes.
+Megalodon es una versión modificada de la <a href="https://github.com/mastodon/mastodon-android">aplicación oficial de Mastodon para Android</a> que añade funcionalidades importantes que le faltan a esta, como la cronología federada, la publicación descatalogada y un visor de descripciones de imágenes.
 
-<b>Características clave</b>
+<b>Funcionalidades importantes</b>
 
-- <b>Publicación no listada</b>: publique públicamente sin que su publicación aparezca en tendencias, hashtags o líneas de tiempo públicas.
-- <b>Línea de tiempo federada</b>: muestra todos los mensajes públicos de personas en todo el vecindario de la Fediverse a la que está conectada tu instancia.
-- <b>Visor de descripción de imágenes</b>: comprueba rápidamente si una imagen o vídeo tiene texto alternativo asociado.
-- <b>Fijar publicaciones</b>: fije sus publicaciones más importantes a su perfil y vea lo que otros han fijado utilizando la pestaña "Fijado".
-- <b>Seguir hashtags</b>: vea nuevas publicaciones con hashtags específicos directamente en su línea de tiempo de inicio siguiéndolas.
-- <b>Responder a solicitudes de seguimiento</b>: acepte o rechace solicitudes de seguimiento desde sus notificaciones o desde la lista dedicada a solicitudes de seguimiento.
-- <b>Eliminar y reformular</b>: la característica más popular que hace posible la edición sin una función de edición real.
+- <b>Publicación descatalogada</b>: haga envíos públicos sin que estos figuren en tendencias, etiquetas o cronologías públicas.
+- <b>Cronología federada</b>: vea todos los envíos públicos de las personas en las instalaciones del Fediverso que estén conectadas con su instalación hogar.
+- <b>Visor de descripciones de imágenes</b>: compruebe con rapidez si una imagen o un vídeo tiene texto alternativo.
+- <b>Anclaje de publicaciones</b>: ancle sus envíos más importantes a su perfil y vea lo que otros han anclado mediante la pestaña «Ancladas».
+- <b>Seguir etiquetas</b>: vea envíos etiquetados directamente en su cronología de inicio siguiéndolas.
+- <b>Respuesta a solicitudes de seguimiento</b>: acepte o rechace solicitudes de seguimiento desde sus notificaciones o desde la lista dedicada.
+- <b>Eliminar y reescribir</b>: la tan querida función que hizo posible editar los envíos ante la falta de una función Editar propiamente dicha.

From 11cdce6c903608fcc81c52a59ea00d5fcf93962d Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Sun, 11 Dec 2022 14:54:23 +0000
Subject: [PATCH 30/35] Translated using Weblate (Korean)

Currently translated at 100.0% (8 of 8 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ko/
---
 metadata/ko/changelogs/58.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 metadata/ko/changelogs/58.txt

diff --git a/metadata/ko/changelogs/58.txt b/metadata/ko/changelogs/58.txt
new file mode 100644
index 000000000..b47b62d77
--- /dev/null
+++ b/metadata/ko/changelogs/58.txt
@@ -0,0 +1,5 @@
+- 언어 선택기 추가
+- 번역 기능 추가
+- 투표 기능의 보다 명확한 표현 (라디오 버튼 및 체크박스)
+- 투표 생성 시 다중 선택이 가능하도록 옵션 추가
+- 버그 수정

From 9917712f667044e2eaeaaed0406c9617982e0986 Mon Sep 17 00:00:00 2001
From: lunarna <lunarna@tutanota.com>
Date: Mon, 12 Dec 2022 00:49:28 +0000
Subject: [PATCH 31/35] Translated using Weblate (Polish)

Currently translated at 25.0% (2 of 8 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/pl/
---
 metadata/pl/short_description.txt | 1 +
 metadata/pl/title.txt             | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 metadata/pl/short_description.txt
 create mode 100644 metadata/pl/title.txt

diff --git a/metadata/pl/short_description.txt b/metadata/pl/short_description.txt
new file mode 100644
index 000000000..0bcddc8f2
--- /dev/null
+++ b/metadata/pl/short_description.txt
@@ -0,0 +1 @@
+Mastodon na Android ale jest różowy i ma więcej funkcji
diff --git a/metadata/pl/title.txt b/metadata/pl/title.txt
new file mode 100644
index 000000000..cf946e02c
--- /dev/null
+++ b/metadata/pl/title.txt
@@ -0,0 +1 @@
+Megalodon

From ffa21b26af2ef2cf22844c9c841f4e20d8026783 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 12 Dec 2022 19:18:01 -0300
Subject: [PATCH 32/35] add custom login fragment

---
 .../joinmastodon/android/MainActivity.java    |   4 +-
 .../onboarding/InstanceCatalogFragment.java   |   2 +-
 .../onboarding/MegalodonLoginFragment.java    | 267 ++++++++++++++++++
 .../android/ui/AccountSwitcherSheet.java      |   7 +-
 .../drawable/ic_fluent_globe_20_regular.xml   |   3 +
 .../src/main/res/layout/display_item_text.xml |   3 +-
 .../res/layout/fragment_megalodon_welcome.xml |  60 ++++
 .../res/layout/header_megalodon_welcome.xml   |  59 ++++
 .../res/layout/item_megalodon_instance.xml    |  14 +
 mastodon/src/main/res/values/strings_sk.xml   |  15 +-
 10 files changed, 419 insertions(+), 15 deletions(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_globe_20_regular.xml
 create mode 100644 mastodon/src/main/res/layout/fragment_megalodon_welcome.xml
 create mode 100644 mastodon/src/main/res/layout/header_megalodon_welcome.xml
 create mode 100644 mastodon/src/main/res/layout/item_megalodon_instance.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
index d98df3d10..4427fc242 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -14,9 +14,9 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
-import org.joinmastodon.android.fragments.SplashFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
+import org.joinmastodon.android.fragments.onboarding.MegalodonLoginFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
@@ -33,7 +33,7 @@ public class MainActivity extends FragmentStackActivity{
 
 		if(savedInstanceState==null){
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new SplashFragment());
+				showFragmentClearingBackStack(new MegalodonLoginFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
index a188711b4..98c7eee4a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
@@ -84,7 +84,7 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		isSignup=getArguments().getBoolean("signup");
+		isSignup=getArguments() != null && getArguments().getBoolean("signup");
 	}
 
 	protected abstract void proceedWithAuthOrSignup(Instance instance);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java
new file mode 100644
index 000000000..ca8b67520
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java
@@ -0,0 +1,267 @@
+package org.joinmastodon.android.fragments.onboarding;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.Space;
+import android.widget.TextView;
+import android.widget.Toolbar;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.catalog.CatalogInstance;
+import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import me.grishka.appkit.FragmentStackActivity;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.PaginatedList;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class MegalodonLoginFragment extends InstanceCatalogFragment {
+	private View headerView;
+
+	public MegalodonLoginFragment() {
+		super(R.layout.fragment_megalodon_welcome, 1);
+	}
+
+	@Override
+	public void onAttach(Context context){
+		super.onAttach(context);
+		setRefreshEnabled(false);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		dataLoaded();
+	}
+
+	@Override
+	protected void onUpdateToolbar(){
+		super.onUpdateToolbar();
+
+		if (!canGoBack()) {
+			ImageView toolbarLogo=new ImageView(getActivity());
+			toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
+			toolbarLogo.setImageResource(R.drawable.logo);
+			toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+
+			FrameLayout logoWrap=new FrameLayout(getActivity());
+			FrameLayout.LayoutParams logoParams=new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
+			logoParams.setMargins(0, V.dp(2), 0, 0);
+			logoWrap.addView(toolbarLogo, logoParams);
+
+			getToolbar().addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
+		} else {
+			setTitle(R.string.add_account);
+		}
+	}
+
+	@Override
+	protected void proceedWithAuthOrSignup(Instance instance) {
+		AccountSessionManager.getInstance().authenticate(getActivity(), instance);
+	}
+
+	@Override
+	protected void updateFilteredList(){
+		boolean addFakeInstance = currentSearchQuery.length()>0 && currentSearchQuery.matches("^\\S+\\.[^\\.]+$");
+		if(addFakeInstance){
+			fakeInstance.domain=fakeInstance.normalizedDomain=currentSearchQuery;
+			fakeInstance.description=getString(R.string.loading_instance);
+			if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
+				if(list.findViewHolderForAdapterPosition(1) instanceof InstanceViewHolder ivh){
+					ivh.rebind();
+				}
+			}
+			if(filteredData.isEmpty()){
+				filteredData.add(fakeInstance);
+				adapter.notifyItemInserted(0);
+			}
+		}
+		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
+		filteredData.clear();
+		if(currentSearchQuery.length()>0){
+			boolean foundExactMatch=false;
+			for(CatalogInstance inst:data){
+				if(inst.normalizedDomain.contains(currentSearchQuery)){
+					filteredData.add(inst);
+					if(inst.normalizedDomain.equals(currentSearchQuery))
+						foundExactMatch=true;
+				}
+			}
+			if(!foundExactMatch && addFakeInstance) {
+				filteredData.add(0, fakeInstance);
+				adapter.notifyItemChanged(0);
+			}
+		}
+		UiUtils.updateList(prevData, filteredData, list, adapter, Objects::equals);
+		for(int i=0;i<list.getChildCount();i++){
+			list.getChildAt(i).invalidateOutline();
+		}
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorWindowBackground));
+		list.setItemAnimator(new BetterItemAnimator());
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count) {}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		headerView=getActivity().getLayoutInflater().inflate(R.layout.header_megalodon_welcome, list, false);
+		searchEdit=headerView.findViewById(R.id.search_edit);
+		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
+
+		headerView.findViewById(R.id.more).setVisibility(View.GONE);
+		headerView.findViewById(R.id.visibility).setVisibility(View.GONE);
+		((TextView) headerView.findViewById(R.id.username)).setText("@megalodon");
+		((TextView) headerView.findViewById(R.id.name)).setText(R.string.sk_app_name);
+		((TextView) headerView.findViewById(R.id.timestamp)).setText(R.string.time_now);
+		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
+		((FragmentStackActivity) getActivity()).invalidateSystemBarColors(this);
+
+		searchEdit.addTextChangedListener(new TextWatcher(){
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after){}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count){
+				nextButton.setEnabled(false);
+				chosenInstance = null;
+				searchEdit.removeCallbacks(searchDebouncer);
+				searchEdit.postDelayed(searchDebouncer, 300);
+			}
+
+			@Override
+			public void afterTextChanged(Editable s){}
+		});
+
+		mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
+		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
+		View spacer = new Space(getActivity());
+		spacer.setMinimumHeight(V.dp(8));
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(spacer));
+		return mergeAdapter;
+	}
+
+	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder>{
+		public InstancesAdapter(){
+			super(imgLoader);
+		}
+
+		@NonNull
+		@Override
+		public InstanceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new InstanceViewHolder();
+		}
+
+		@Override
+		public void onBindViewHolder(InstanceViewHolder holder, int position){
+			holder.bind(filteredData.get(position));
+			chosenInstance = filteredData.get(position);
+			if (chosenInstance != fakeInstance) nextButton.setEnabled(true);
+			super.onBindViewHolder(holder, position);
+		}
+
+		@Override
+		public int getItemCount(){
+			return filteredData.size();
+		}
+
+		@Override
+		public int getItemViewType(int position){
+			return -1;
+		}
+	}
+
+	private class InstanceViewHolder extends BindableViewHolder<CatalogInstance> implements UsableRecyclerView.Clickable{
+		private final TextView title, description, userCount, lang;
+		private final RadioButton radioButton;
+
+		public InstanceViewHolder(){
+			super(getActivity(), R.layout.item_megalodon_instance, list);
+
+//			itemView.setPadding(V.dp(16), V.dp(16), V.dp(16), V.dp(16));
+//			TypedValue value = new TypedValue();
+//			getActivity().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, value, true);
+//			itemView.setBackground(getActivity().getTheme().getDrawable(R.drawable.bg_search_field));
+			title=findViewById(R.id.title);
+			description=findViewById(R.id.description);
+			userCount=findViewById(R.id.user_count);
+			lang=findViewById(R.id.lang);
+			radioButton=findViewById(R.id.radiobtn);
+			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N){
+					UiUtils.fixCompoundDrawableTintOnAndroid6(userCount);
+					UiUtils.fixCompoundDrawableTintOnAndroid6(lang);
+			}
+		}
+
+		@Override
+		public void onBind(CatalogInstance item){
+			title.setText(item.normalizedDomain);
+			description.setText(item.description);
+			if (item == fakeInstance) {
+				userCount.setVisibility(View.GONE);
+				lang.setVisibility(View.GONE);
+			} else {
+				userCount.setVisibility(View.VISIBLE);
+				lang.setVisibility(View.VISIBLE);
+				userCount.setText(UiUtils.abbreviateNumber(item.totalUsers));
+				lang.setText(item.language.toUpperCase());
+			}
+			radioButton.setChecked(chosenInstance==item);
+			radioButton.setVisibility(View.GONE);
+		}
+
+		@Override
+		public void onClick(){
+			if(chosenInstance!=null){
+					int idx=filteredData.indexOf(chosenInstance);
+					if(idx!=-1){
+						RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(mergeAdapter.getPositionForAdapter(adapter)+idx);
+						if(holder instanceof InstanceViewHolder ivh){
+							ivh.radioButton.setChecked(false);
+						}
+					}
+			}
+			radioButton.setChecked(true);
+			if(chosenInstance==null)
+					nextButton.setEnabled(true);
+			chosenInstance=item;
+			loadInstanceInfo(chosenInstance.domain, false);
+			onNextClick(null);
+		}
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
index 87fb04570..4ad938f33 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
@@ -2,14 +2,12 @@ package org.joinmastodon.android.ui;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -25,8 +23,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.SplashFragment;
-import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.fragments.onboarding.MegalodonLoginFragment;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
@@ -80,7 +77,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 		holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
 		holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
 		adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{
-			Nav.go(activity, SplashFragment.class, null);
+			Nav.go(activity, MegalodonLoginFragment.class, null);
 			dismiss();
 		}));
 
diff --git a/mastodon/src/main/res/drawable/ic_fluent_globe_20_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_globe_20_regular.xml
new file mode 100644
index 000000000..d9a4a3ab6
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_globe_20_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M10 18c4.418 0 8-3.582 8-8s-3.582-8-8-8-8 3.582-8 8 3.582 8 8 8zm0-15c0.657 0 1.407 0.59 2.022 1.908 0.217 0.466 0.406 1.002 0.559 1.592H7.419c0.153-0.59 0.342-1.126 0.56-1.592C8.592 3.59 9.342 3 10 3zM7.072 4.485C6.796 5.077 6.565 5.757 6.389 6.5H3.936c0.837-1.446 2.176-2.565 3.778-3.118-0.241 0.33-0.456 0.704-0.642 1.103zM6.192 7.5C6.068 8.288 6 9.13 6 10c0 0.87 0.067 1.712 0.193 2.5H3.46C3.163 11.724 3 10.88 3 10c0-0.88 0.163-1.724 0.46-2.5h2.733zm0.197 6c0.176 0.743 0.407 1.422 0.683 2.015 0.186 0.399 0.401 0.773 0.642 1.103-1.602-0.553-2.941-1.672-3.778-3.118H6.39zm1.03 0h5.162c-0.153 0.59-0.342 1.126-0.56 1.592C11.408 16.41 10.658 17 10 17c-0.657 0-1.407-0.59-2.022-1.908C7.761 14.626 7.572 14.09 7.42 13.5zm5.375-1H7.206C7.073 11.725 7 10.883 7 10s0.074-1.725 0.206-2.5h5.588C12.927 8.275 13 9.117 13 10s-0.073 1.725-0.206 2.5zm0.817 1h2.453c-0.837 1.446-2.176 2.565-3.778 3.118 0.241-0.33 0.456-0.704 0.642-1.103 0.276-0.593 0.507-1.272 0.683-2.015zm2.93-1h-2.734C13.933 11.712 14 10.87 14 10c0-0.87-0.067-1.712-0.193-2.5h2.733C16.837 8.276 17 9.12 17 10c0 0.88-0.163 1.724-0.46 2.5zm-4.255-9.118c1.602 0.553 2.941 1.672 3.778 3.118H13.61c-0.176-0.743-0.407-1.423-0.683-2.015-0.186-0.399-0.401-0.773-0.642-1.103z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/layout/display_item_text.xml b/mastodon/src/main/res/layout/display_item_text.xml
index f93838606..cd6d935ab 100644
--- a/mastodon/src/main/res/layout/display_item_text.xml
+++ b/mastodon/src/main/res/layout/display_item_text.xml
@@ -17,7 +17,8 @@
 			android:layout_marginTop="6dp"
 			android:layout_marginBottom="8dp"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content">
+			android:layout_height="wrap_content"
+			android:visibility="gone">
 			<View
 				android:id="@+id/border_top"
 				android:layout_width="match_parent"
diff --git a/mastodon/src/main/res/layout/fragment_megalodon_welcome.xml b/mastodon/src/main/res/layout/fragment_megalodon_welcome.xml
new file mode 100644
index 000000000..3d2df9250
--- /dev/null
+++ b/mastodon/src/main/res/layout/fragment_megalodon_welcome.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<me.grishka.appkit.views.FragmentRootLinearLayout
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:id="@+id/appkit_loader_root"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="?colorBackgroundLight">
+
+	<include layout="@layout/appkit_toolbar"/>
+
+	<FrameLayout
+		android:id="@+id/appkit_loader_content"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<include layout="@layout/loading"
+			android:id="@+id/loading"/>
+
+		<ViewStub android:layout="?errorViewLayout"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/error"
+			android:visibility="gone"/>
+
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/content_stub"/>
+
+	</FrameLayout>
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="0.5dp"
+		android:background="?attr/colorPollVoted"/>
+
+	<LinearLayout
+		android:id="@+id/button_bar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?colorBackgroundLight"
+		android:outlineProvider="bounds"
+		android:orientation="horizontal"
+		android:elevation="0dp">
+
+		<Button
+			style="?primaryLargeButtonStyle"
+			android:id="@+id/btn_next"
+			android:minWidth="145dp"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_margin="16dp"
+			android:layout_weight="1"
+			android:text="@string/next" />
+
+	</LinearLayout>
+</me.grishka.appkit.views.FragmentRootLinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/header_megalodon_welcome.xml b/mastodon/src/main/res/layout/header_megalodon_welcome.xml
new file mode 100644
index 000000000..a1ae29f82
--- /dev/null
+++ b/mastodon/src/main/res/layout/header_megalodon_welcome.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<include layout="@layout/display_item_header" />
+
+	<TextView
+		style="@style/m3_headline_small"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="16dp"
+		android:layout_marginVertical="12dp"
+		android:text="@string/sk_welcome_title"
+		/>
+
+	<TextView
+		style="@style/m3_body_large"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingHorizontal="16dp"
+		android:text="@string/sk_welcome_text" />
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="0.5dp"
+		android:layout_marginTop="16dp"
+		android:background="?attr/colorPollVoted"/>
+
+	<EditText
+		android:id="@+id/search_edit"
+		android:layout_width="match_parent"
+		android:layout_height="56dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="8dp"
+		android:layout_marginHorizontal="16dp"
+		android:inputType="textFilter|textNoSuggestions"
+		android:singleLine="true"
+		android:imeOptions="actionGo"
+		android:drawableStart="@drawable/ic_fluent_globe_20_regular"
+		android:drawablePadding="12dp"
+		android:drawableTint="?android:textColorSecondary"
+		android:background="@drawable/bg_search_field"
+		android:paddingHorizontal="16dp"
+		android:elevation="0dp"
+		android:hint="@string/sk_example_domain"/>
+
+
+	<ViewStub
+		android:layout="?errorViewLayout"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/error"
+		android:visibility="gone" />
+
+</LinearLayout>
diff --git a/mastodon/src/main/res/layout/item_megalodon_instance.xml b/mastodon/src/main/res/layout/item_megalodon_instance.xml
new file mode 100644
index 000000000..fafccb4f7
--- /dev/null
+++ b/mastodon/src/main/res/layout/item_megalodon_instance.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="8dp">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_search_field">
+        <include layout="@layout/item_instance_catalog" />
+    </FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 222669391..4692f5da1 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -51,11 +51,14 @@
   <string name="sk_not_supported">Not supported on your device</string>
   <string name="sk_poll_allow_multiple">Allow multiple choices</string>
   <string name="sk_translate_post">Translate</string>
-	<string name="sk_translate_show_original">Show original</string>
-	<string name="sk_translated_using">Translated using %s</string>
+  <string name="sk_translate_show_original">Show original</string>
+  <string name="sk_translated_using">Translated using %s</string>
   <string name="sk_post_language">Language: %s</string>
-	<string name="sk_available_languages">Available languages</string>
+  <string name="sk_available_languages">Available languages</string>
   <string name="sk_language_name">%s (%s)</string>
-	<string name="sk_clear_recent_languages">Clear recent languages</string>
-	<string name="sk_confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string>
-</resources>
\ No newline at end of file
+  <string name="sk_clear_recent_languages">Clear recent languages</string>
+  <string name="sk_confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string>
+  <string name="sk_welcome_title">Welcome!</string>
+  <string name="sk_welcome_text">The shark salutes you! To get started, please enter your home instance’s domain name below.</string>
+  <string name="sk_example_domain">example.social</string>
+</resources>

From 97d81eb1b2f1bf45768d1a8f0e213939d7435a33 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 13 Dec 2022 12:36:06 -0300
Subject: [PATCH 33/35] Rebranding

---
 .../org/joinmastodon/android/MainActivity.java |  4 ++--
 ...ragment.java => MoshidonLoginFragment.java} | 18 +++++-------------
 .../android/ui/AccountSwitcherSheet.java       |  4 ++--
 ...lcome.xml => fragment_moshidon_welcome.xml} |  0
 4 files changed, 9 insertions(+), 17 deletions(-)
 rename mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/{MegalodonLoginFragment.java => MoshidonLoginFragment.java} (94%)
 rename mastodon/src/main/res/layout/{fragment_megalodon_welcome.xml => fragment_moshidon_welcome.xml} (100%)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
index 4427fc242..3958119e0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -16,7 +16,7 @@ import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
-import org.joinmastodon.android.fragments.onboarding.MegalodonLoginFragment;
+import org.joinmastodon.android.fragments.onboarding.MoshidonLoginFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
@@ -33,7 +33,7 @@ public class MainActivity extends FragmentStackActivity{
 
 		if(savedInstanceState==null){
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new MegalodonLoginFragment());
+				showFragmentClearingBackStack(new MoshidonLoginFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MoshidonLoginFragment.java
similarity index 94%
rename from mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java
rename to mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MoshidonLoginFragment.java
index ca8b67520..7a96c3926 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MoshidonLoginFragment.java
@@ -5,22 +5,18 @@ import android.content.res.ColorStateList;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
-import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.Space;
 import android.widget.TextView;
 import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
@@ -28,27 +24,23 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
 import org.joinmastodon.android.ui.BetterItemAnimator;
-import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 
 import me.grishka.appkit.FragmentStackActivity;
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.PaginatedList;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class MegalodonLoginFragment extends InstanceCatalogFragment {
+public class MoshidonLoginFragment extends InstanceCatalogFragment {
 	private View headerView;
 
-	public MegalodonLoginFragment() {
-		super(R.layout.fragment_megalodon_welcome, 1);
+	public MoshidonLoginFragment() {
+		super(R.layout.fragment_moshidon_welcome, 1);
 	}
 
 	@Override
@@ -63,9 +55,9 @@ public class MegalodonLoginFragment extends InstanceCatalogFragment {
 		dataLoaded();
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 
 		if (!canGoBack()) {
 			ImageView toolbarLogo=new ImageView(getActivity());
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
index 4ad938f33..fef941c29 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
@@ -23,7 +23,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.onboarding.MegalodonLoginFragment;
+import org.joinmastodon.android.fragments.onboarding.MoshidonLoginFragment;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
@@ -77,7 +77,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 		holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
 		holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
 		adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{
-			Nav.go(activity, MegalodonLoginFragment.class, null);
+			Nav.go(activity, MoshidonLoginFragment.class, null);
 			dismiss();
 		}));
 
diff --git a/mastodon/src/main/res/layout/fragment_megalodon_welcome.xml b/mastodon/src/main/res/layout/fragment_moshidon_welcome.xml
similarity index 100%
rename from mastodon/src/main/res/layout/fragment_megalodon_welcome.xml
rename to mastodon/src/main/res/layout/fragment_moshidon_welcome.xml

From 56e8476d2e882ac7104289ae1df77fa879118125 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 13 Dec 2022 12:39:29 -0300
Subject: [PATCH 34/35] Rebranding the welcome screen

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

diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 4692f5da1..a9ef04eeb 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -58,7 +58,7 @@
   <string name="sk_language_name">%s (%s)</string>
   <string name="sk_clear_recent_languages">Clear recent languages</string>
   <string name="sk_confirm_clear_recent_languages">Are you sure you want to clear your recently used languages?</string>
-  <string name="sk_welcome_title">Welcome!</string>
-  <string name="sk_welcome_text">The shark salutes you! To get started, please enter your home instance’s domain name below.</string>
+  <string name="sk_welcome_title">Welcome to Moshidon!</string>
+  <string name="sk_welcome_text">To get started, please enter your home instance’s domain name below.</string>
   <string name="sk_example_domain">example.social</string>
 </resources>

From 2bb4616e40df56e13e369aadddcbbe354eed3fb1 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 13 Dec 2022 14:10:10 -0300
Subject: [PATCH 35/35] Rebranding the strings. Useful command: "find values*
 -type f -exec sed -i 's/Megalodon/Moshidon/g' {} \;"

---
 mastodon/src/main/res/values-ca-rES/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-de-rDE/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-es-rES/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-it-rIT/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-ko-rKR/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-my/strings_sk.xml     |  8 ++++----
 mastodon/src/main/res/values-nl-rNL/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-pl-rPL/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-pt-rBR/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-pt-rPT/strings_sk.xml |  2 +-
 mastodon/src/main/res/values-ru-rRU/strings_sk.xml |  4 ++--
 mastodon/src/main/res/values-sv-rSE/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-uk-rUA/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-zh-rCN/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values/strings_sk.xml        |  4 ++--
 17 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/mastodon/src/main/res/values-ca-rES/strings_sk.xml b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
index 4697d86af..76ba8eefa 100644
--- a/mastodon/src/main/res/values-ca-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
@@ -11,11 +11,11 @@
     <string name="sk_settings_load_new_posts">Carrega automàticament les publicacions noves</string>
     <string name="sk_federated_timeline">Federació</string>
     <string name="sk_federated_timeline_info_banner">Aquestes són les publicacions més recents de gent de la teua federació.</string>
-    <string name="sk_update_ready">Megalodon %s s\'ha baixat i està preparat per a instal·lar-se.</string>
+    <string name="sk_update_ready">Moshidon %s s\'ha baixat i està preparat per a instal·lar-se.</string>
     <string name="sk_accept_follow_request">Accepta la sol·licitud</string>
     <string name="sk_disable_marquee">Desactiva el desplaçament de text a les barres de títol</string>
     <string name="sk_user_post_notifications_on">Notificacions activades per a publicacions de: %s</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pin_post">Fixa al perfil</string>
     <string name="sk_confirm_pin_post_title">Fixar al perfil</string>
     <string name="sk_confirm_delete_and_redraft">Segur que vols eliminar i tornar a escriure aquesta publicació\?</string>
@@ -25,10 +25,10 @@
     <string name="sk_visibility_unlisted">No llistat</string>
     <string name="sk_settings_show_boosts">Mostra els impulsos</string>
     <string name="sk_settings_show_interaction_counts">Mostra el recompte d\'interaccions</string>
-    <string name="sk_settings_app_version">Megalodon v. %1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v. %1$s (%2$d)</string>
     <string name="sk_user_post_notifications_off">Notificacions desactivades per a publicacions de: %s</string>
     <string name="sk_mark_media_as_sensitive">Marca el contingut com a sensible</string>
-    <string name="sk_update_available">Megalodon %s està preparat per a baixar-se.</string>
+    <string name="sk_update_available">Moshidon %s està preparat per a baixar-se.</string>
     <string name="sk_check_for_update">Comprova actualitzacions</string>
     <string name="sk_no_update_available">No hi ha cap actualització disponible</string>
     <string name="sk_list_timelines">Llistes</string>
@@ -36,7 +36,7 @@
     <string name="sk_reject_follow_request">Rebutja la sol·licitud</string>
     <string name="sk_lists_with_user">Llistes amb %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Mostra sempre els avisos de contingut</string>
-    <string name="sk_settings_contribute">Contribueix a Megalodon</string>
+    <string name="sk_settings_contribute">Contribueix a Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Mostra la línia de temps federada</string>
     <string name="sk_notification_type_status">Publicacions</string>
     <string name="sk_notify_posts">Notificacions de publicacions</string>
diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index 06ab774a7..1ec36a692 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Angeheftet</string>
     <string name="sk_delete_and_redraft">Löschen und neu erstellen</string>
     <string name="sk_confirm_delete_and_redraft_title">Beitrag löschen und neu erstellen</string>
@@ -19,14 +19,14 @@
     <string name="sk_settings_show_boosts">Geteilte Beiträge anzeigen</string>
     <string name="sk_settings_load_new_posts">Automatisch neue Beiträge laden</string>
     <string name="sk_settings_show_interaction_counts">Interaktions-Anzahlen anzeigen</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Medien als sensibel markieren</string>
     <string name="sk_user_post_notifications_on">Benachrichtigungen über Beiträge von %s aktiviert</string>
     <string name="sk_user_post_notifications_off">Benachrichtigungen über Beiträge von %s deaktiviert</string>
     <string name="sk_federated_timeline">Föderation</string>
     <string name="sk_federated_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die in der Föderation deines Servers sind.</string>
-    <string name="sk_update_available">Megalodon %s ist zum Herunterladen bereit.</string>
-    <string name="sk_update_ready">Megalodon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
+    <string name="sk_update_available">Moshidon %s ist zum Herunterladen bereit.</string>
+    <string name="sk_update_ready">Moshidon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
     <string name="sk_check_for_update">Auf Update prüfen</string>
     <string name="sk_no_update_available">Kein Update verfügbar</string>
     <string name="sk_list_timelines">Listen</string>
@@ -36,7 +36,7 @@
     <string name="sk_lists_with_user">Listen mit %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
     <string name="sk_disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
-    <string name="sk_settings_contribute">Zu Megalodon beitragen</string>
+    <string name="sk_settings_contribute">Zu Moshidon beitragen</string>
     <string name="sk_settings_show_federated_timeline">Föderierte Timeline anzeigen</string>
     <string name="sk_notify_posts">Beitrags-Benachrichtigungen</string>
     <string name="sk_settings_color_picker">Farbschema</string>
diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index 0ff95638f..45b198cb7 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -11,7 +11,7 @@
     <string name="sk_unpin_post">Desanclar del perfil</string>
     <string name="sk_confirm_unpin_post_title">Desanclar publicación del perfil</string>
     <string name="sk_confirm_unpin_post">¿Confirma que quiere desanclar esta publicación\?</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_unpinning">Desanclando publicación…</string>
     <string name="sk_image_description">Descripción de la imagen</string>
     <string name="sk_visibility_unlisted">Descatalogada</string>
@@ -24,8 +24,8 @@
     <string name="sk_user_post_notifications_off">Desactivadas las notificaciones de posts para %s</string>
     <string name="sk_federated_timeline">Federación</string>
     <string name="sk_federated_timeline_info_banner">Estas son las publicaciones más recientes de las personas de su federación.</string>
-    <string name="sk_update_available">Megalodon %s está listo para descargar.</string>
-    <string name="sk_update_ready">Megalodon %s se ha descargado y está listo para instalarse.</string>
+    <string name="sk_update_available">Moshidon %s está listo para descargar.</string>
+    <string name="sk_update_ready">Moshidon %s se ha descargado y está listo para instalarse.</string>
     <string name="sk_check_for_update">Buscar actualizaciones</string>
     <string name="sk_no_update_available">No hay actualizaciones disponibles</string>
     <string name="sk_list_timelines">Listas</string>
@@ -35,9 +35,9 @@
     <string name="sk_lists_with_user">Listas con %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Mostrar siempre advertencias de contenido</string>
     <string name="sk_disable_marquee">Desactivar desplazamiento de texto en barras del título</string>
-    <string name="sk_settings_contribute">Contribuir a Megalodon</string>
+    <string name="sk_settings_contribute">Contribuir a Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Mostrar cronología federada</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_notification_type_status">Publicaciones</string>
     <string name="sk_notify_posts">Publicar notificaciones</string>
     <string name="sk_settings_color_picker">Colores para los temas</string>
diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 4e565d3a2..bbac8ed57 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -13,12 +13,12 @@
     <string name="sk_settings_show_replies">Afficher les réponses</string>
     <string name="sk_settings_show_boosts">Afficher les boosts</string>
     <string name="sk_settings_load_new_posts">Charger automatiquement les nouveaux messages</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Marquer le média comme sensible</string>
     <string name="sk_user_post_notifications_on">Notifications de message activées pour %s</string>
     <string name="sk_user_post_notifications_off">Désactivation des notifications de message pour %s</string>
-    <string name="sk_update_available">Megalodon %s est prête à être téléchargée.</string>
-    <string name="sk_update_ready">Megalodon %s est téléchargée et prête à être installée.</string>
+    <string name="sk_update_available">Moshidon %s est prête à être téléchargée.</string>
+    <string name="sk_update_ready">Moshidon %s est téléchargée et prête à être installée.</string>
     <string name="sk_check_for_update">Vérifier les mises à jour</string>
     <string name="sk_no_update_available">Pas de mise a jour disponible</string>
     <string name="sk_list_timelines">Listes</string>
@@ -28,9 +28,9 @@
     <string name="sk_lists_with_user">Listes avec %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Toujours afficher les avertissements de contenu</string>
     <string name="sk_disable_marquee">Désactiver le défilement du texte dans les barres de titre</string>
-    <string name="sk_settings_contribute">Contribuez à Megalodon</string>
+    <string name="sk_settings_contribute">Contribuez à Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Afficher la timeline fédérée</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_delete_and_redraft">Supprimer et rééditer</string>
     <string name="sk_pin_post">Épingler au profil</string>
     <string name="sk_confirm_pin_post_title">Épingler le message au profil</string>
diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index a633217d6..8bf427815 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -12,23 +12,23 @@
     <string name="sk_settings_show_boosts">Lihat boost</string>
     <string name="sk_settings_load_new_posts">Muat kiriman baru secara otomatis</string>
     <string name="sk_settings_show_interaction_counts">Tampilkan jumlah interaksi</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_user_post_notifications_on">Nyalakan notifikasi kiriman untuk %s</string>
     <string name="sk_user_post_notifications_off">Matikan notifikasi kiriman untuk %s</string>
     <string name="sk_federated_timeline">Federasi</string>
     <string name="sk_federated_timeline_info_banner">Kiriman terbaru dari orang-orang di federasi anda.</string>
-    <string name="sk_update_available">Megalodon %s siap untuk diunduh.</string>
-    <string name="sk_update_ready">Megalodon %s telah diunduh dan siap dipasang.</string>
+    <string name="sk_update_available">Moshidon %s siap untuk diunduh.</string>
+    <string name="sk_update_ready">Moshidon %s telah diunduh dan siap dipasang.</string>
     <string name="sk_check_for_update">Periksa pembaruan</string>
     <string name="sk_no_update_available">Tidak ada pembaruan</string>
     <string name="sk_list_timelines">Daftar</string>
     <string name="sk_unpinning">Menghapus sematan kiriman…</string>
     <string name="sk_accept_follow_request">Terima permintaan pengikut</string>
     <string name="sk_reject_follow_request">Tolak permintaan pengikut</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_confirm_delete_and_redraft">Hapus dan tulis ulang kiriman ini\?</string>
     <string name="sk_confirm_unpin_post">Apakah Anda yakin untuk menghapus sematan kiriman ini\?</string>
-    <string name="sk_settings_contribute">Kontribusi ke Megalodon</string>
+    <string name="sk_settings_contribute">Kontribusi ke Moshidon</string>
     <string name="sk_pinned_posts">Disematkan</string>
     <string name="sk_pin_post">Sematkan ke profil</string>
     <string name="sk_visibility_unlisted">Tidak terdaftar</string>
diff --git a/mastodon/src/main/res/values-it-rIT/strings_sk.xml b/mastodon/src/main/res/values-it-rIT/strings_sk.xml
index 7a3645aa3..9ede4fa9b 100644
--- a/mastodon/src/main/res/values-it-rIT/strings_sk.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings_sk.xml
@@ -9,7 +9,7 @@
     <string name="sk_color_theme_blue">Blu</string>
     <string name="sk_color_theme_brown">Marrone</string>
     <string name="sk_color_theme_yellow">Giallo</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Fissati</string>
     <string name="sk_delete_and_redraft">Elimina e riscrivi</string>
     <string name="sk_user_post_notifications_on">Attivate notifiche per i post di %s</string>
@@ -32,18 +32,18 @@
     <string name="sk_settings_show_boosts">Mostra boost</string>
     <string name="sk_settings_load_new_posts">Carica automaticamente nuovi post</string>
     <string name="sk_settings_show_interaction_counts">Mostra conteggi interazioni</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Segnala media come sensibile</string>
     <string name="sk_federated_timeline">Federata</string>
     <string name="sk_federated_timeline_info_banner">Questi sono i post più recenti dalle persone nella tua federazione.</string>
-    <string name="sk_update_available">Megalodon %s è pronto da scaricare.</string>
-    <string name="sk_update_ready">Megalodon %s è scaricato e pronto da installare.</string>
+    <string name="sk_update_available">Moshidon %s è pronto da scaricare.</string>
+    <string name="sk_update_ready">Moshidon %s è scaricato e pronto da installare.</string>
     <string name="sk_check_for_update">Verifica aggiornamenti</string>
     <string name="sk_no_update_available">Non ci sono aggiornamenti disponibili</string>
     <string name="sk_list_timelines">Liste</string>
     <string name="sk_settings_always_reveal_content_warnings">Apri sempre contenuti segnalati come sensibili</string>
     <string name="sk_lists_with_user">Liste con %s</string>
-    <string name="sk_settings_contribute">Contribuisci a Megalodon</string>
+    <string name="sk_settings_contribute">Contribuisci a Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Mostra timeline federata</string>
     <string name="sk_disable_marquee">Disabilita scorrimento titoli</string>
     <string name="sk_reject_follow_request">Rifiuta richiesta di seguirti</string>
diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index 982f60566..70bac8198 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -32,10 +32,10 @@
     <string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
     <string name="sk_settings_always_reveal_content_warnings">열람주의 게시물을 항상 펼치기</string>
     <string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
-    <string name="sk_app_name">Megalodon</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
-    <string name="sk_update_available">Megalodon %s 버전을 다운로드할 수 있습니다.</string>
-    <string name="sk_update_ready">Megalodon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
+    <string name="sk_app_name">Moshidon</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_update_available">Moshidon %s 버전을 다운로드할 수 있습니다.</string>
+    <string name="sk_update_ready">Moshidon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
     <string name="sk_settings_show_federated_timeline">연합 타임라인 표시</string>
     <string name="sk_notification_type_status">게시물</string>
     <string name="sk_notify_posts">게시물 알림</string>
@@ -46,7 +46,7 @@
     <string name="sk_color_theme_blue">파란색</string>
     <string name="sk_color_theme_brown">갈색</string>
     <string name="sk_color_theme_yellow">노란색</string>
-    <string name="sk_settings_contribute">Megalodon에 기여</string>
+    <string name="sk_settings_contribute">Moshidon에 기여</string>
     <string name="sk_poll_allow_multiple">다중 선택 허용</string>
     <string name="sk_translate_post">번역하기</string>
     <string name="sk_translate_show_original">원본 보기</string>
diff --git a/mastodon/src/main/res/values-my/strings_sk.xml b/mastodon/src/main/res/values-my/strings_sk.xml
index 68b1063b4..b861fc01a 100644
--- a/mastodon/src/main/res/values-my/strings_sk.xml
+++ b/mastodon/src/main/res/values-my/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_delete_and_redraft">ဖျက်ပြီး ပြန်ရေးမည်</string>
     <string name="sk_pin_post">ပရိုဖိုင်းတွင် ပင်တွဲမည်</string>
     <string name="sk_pinning">ပင်တွဲနေသည်…</string>
@@ -10,12 +10,12 @@
     <string name="sk_image_description">ပုံတွင်ပါဝင်သော အကြောင်းအရာ</string>
     <string name="sk_visibility_unlisted">စာရင်းမလုပ်</string>
     <string name="sk_settings_show_boosts">Boost များကို ပြသမည်</string>
-    <string name="sk_settings_app_version">Megalodon - ဗားရှင်း %1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon - ဗားရှင်း %1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">ပုံ/ဗီဒီယိုအား ထိရှလွယ်သည်အဖြစ် မှတ်သားသည်</string>
     <string name="sk_user_post_notifications_off">%s အတွက် ပို့စ်နိုတီများကို ပိတ်လိုက်သည်</string>
     <string name="sk_federated_timeline">ဖက်ဒရေးရှင်း</string>
-    <string name="sk_update_available">Megalodon %s ကို ဒေါင်းလုဒ်ဆွဲလို့ရပါပြီ။</string>
-    <string name="sk_update_ready">Megalodon %s ကို ဒေါင်းလုဒ်ဆွဲပြီးပြီမလို့ အင်စတောလုပ်နိုင်ပါပြီ။</string>
+    <string name="sk_update_available">Moshidon %s ကို ဒေါင်းလုဒ်ဆွဲလို့ရပါပြီ။</string>
+    <string name="sk_update_ready">Moshidon %s ကို ဒေါင်းလုဒ်ဆွဲပြီးပြီမလို့ အင်စတောလုပ်နိုင်ပါပြီ။</string>
     <string name="sk_no_update_available">မည်သည့်အပ်ဒိတ်မျှ မရှိသေးပါ</string>
     <string name="sk_follow_requests">ဖောလိုဝါအဖြစ် တောင်းဆိုမှုများ</string>
     <string name="sk_accept_follow_request">ဖောလိုဝါအဖြစ်တောင်းဆိုမှုကို လက်ခံမည်</string>
diff --git a/mastodon/src/main/res/values-nl-rNL/strings_sk.xml b/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
index 741d9eb3b..3bbdcb532 100644
--- a/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Vastgemaakt</string>
     <string name="sk_delete_and_redraft">Verwijderen en opnieuw opstellen</string>
     <string name="sk_confirm_delete_and_redraft_title">Verwijder en stel bericht opnieuw op</string>
@@ -20,14 +20,14 @@
     <string name="sk_settings_show_boosts">Boosts weergeven</string>
     <string name="sk_settings_load_new_posts">Automatisch nieuwe berichten laden</string>
     <string name="sk_settings_show_interaction_counts">Aantal interacties weergeven</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Markeer media als gevoelig</string>
     <string name="sk_user_post_notifications_on">Berichtmeldingen aangezet voor %s</string>
     <string name="sk_user_post_notifications_off">Berichtmeldingen uitgezet voor %s</string>
     <string name="sk_federated_timeline">Federatie</string>
     <string name="sk_federated_timeline_info_banner">Dit zijn de meest recente berichten van de mensen in jouw federatie.</string>
-    <string name="sk_update_available">Megalodon %s is klaar om te downloaden.</string>
-    <string name="sk_update_ready">Megalodon %s is gedownload en klaar om te installeren.</string>
+    <string name="sk_update_available">Moshidon %s is klaar om te downloaden.</string>
+    <string name="sk_update_ready">Moshidon %s is gedownload en klaar om te installeren.</string>
     <string name="sk_check_for_update">Controleren op update</string>
     <string name="sk_no_update_available">Geen update beschikbaar</string>
     <string name="sk_list_timelines">Lijsten</string>
@@ -36,6 +36,6 @@
     <string name="sk_lists_with_user">Lijsten met %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Onthul altijd inhoudswaarschuwingen</string>
     <string name="sk_disable_marquee">Schakel scrollende tekst in titelbalken uit</string>
-    <string name="sk_settings_contribute">Bijdragen aan Megalodon</string>
+    <string name="sk_settings_contribute">Bijdragen aan Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Toon gefedereerde tijdlijn</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
index c91c33994..ecfaa6e9e 100644
--- a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
@@ -17,11 +17,11 @@
     <string name="sk_user_post_notifications_off">Wyłączono powiadomienia dla postu %s</string>
     <string name="sk_federated_timeline">Globalne</string>
     <string name="sk_federated_timeline_info_banner">To są najnowsze post ze znanej sieci fediwersum dla twojego serwera.</string>
-    <string name="sk_update_available">Megalodon %s jest dostępny do pobrania.</string>
-    <string name="sk_update_ready">Megalodon %s został pobrany i jest gotowy do instalacji.</string>
+    <string name="sk_update_available">Moshidon %s jest dostępny do pobrania.</string>
+    <string name="sk_update_ready">Moshidon %s został pobrany i jest gotowy do instalacji.</string>
     <string name="sk_check_for_update">Sprawdź dostępność aktualizacji</string>
     <string name="sk_no_update_available">Brak dostępnych aktualizacji</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Przypięte</string>
     <string name="sk_confirm_delete_and_redraft">Jesteś pewnien, że chcesz usunąć zmodyfikowany wpis\?</string>
     <string name="sk_confirm_unpin_post">Jesteś pewien, że chcesz odpiąć ten wpis\?</string>
@@ -34,9 +34,9 @@
     <string name="sk_lists_with_user">Listy z %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Zawsze odkrywaj ostrzeżenia o zawartości</string>
     <string name="sk_disable_marquee">Wyłącz tekst przewijany w paskach tytułowych</string>
-    <string name="sk_settings_contribute">Wspomóż Megalodon</string>
+    <string name="sk_settings_contribute">Wspomóż Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Pokaż globalną oś czasu</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_visibility_unlisted">Niewidoczny</string>
     <string name="sk_notification_type_status">Wpisy</string>
     <string name="sk_notify_posts">Powiadomienia wpisów</string>
diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
index f54052b1b..5a3a94513 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -7,7 +7,7 @@
     <string name="sk_confirm_pin_post_title">Fixar postagem no perfil</string>
     <string name="sk_confirm_pin_post">Você deseja fixar esta postagem em seu perfil\?</string>
     <string name="sk_pinning">Fixando postagem…</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Fixado</string>
     <string name="sk_unpin_post">Desafixar do perfil</string>
     <string name="sk_confirm_unpin_post_title">Desafixar postagem do perfil</string>
@@ -18,13 +18,13 @@
     <string name="sk_settings_show_boosts">Mostrar boosts</string>
     <string name="sk_settings_load_new_posts">Carregar novas postagens automaticamente</string>
     <string name="sk_mark_media_as_sensitive">Marcar mídia como sensível</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_lists_with_user">Listas com %s</string>
     <string name="sk_user_post_notifications_on">Ativar as notificações de postagem para %s</string>
     <string name="sk_federated_timeline">Federação</string>
     <string name="sk_federated_timeline_info_banner">Estas são as postagens mais recentes das pessoas em sua federação.</string>
-    <string name="sk_update_available">Megalodon %s está pronto para baixar.</string>
-    <string name="sk_update_ready">Megalodon %s foi baixado e está pronto para instalar.</string>
+    <string name="sk_update_available">Moshidon %s está pronto para baixar.</string>
+    <string name="sk_update_ready">Moshidon %s foi baixado e está pronto para instalar.</string>
     <string name="sk_check_for_update">Verificar se há atualizações</string>
     <string name="sk_no_update_available">Nenhuma atualização disponível</string>
     <string name="sk_list_timelines">Listas</string>
@@ -34,7 +34,7 @@
     <string name="sk_reject_follow_request">Recusar solicitação para seguir</string>
     <string name="sk_settings_always_reveal_content_warnings">Sempre revelar avisos de conteúdo</string>
     <string name="sk_disable_marquee">Desative o texto de rolagem nas barras de título</string>
-    <string name="sk_settings_contribute">Contribua para o Megalodon</string>
+    <string name="sk_settings_contribute">Contribua para o Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Mostre a linha do tempo federada</string>
     <string name="sk_visibility_unlisted">Não-listado</string>
     <string name="sk_settings_show_interaction_counts">Mostrar contagens de interação</string>
diff --git a/mastodon/src/main/res/values-pt-rPT/strings_sk.xml b/mastodon/src/main/res/values-pt-rPT/strings_sk.xml
index 6bc29aeff..b224cd185 100644
--- a/mastodon/src/main/res/values-pt-rPT/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rPT/strings_sk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Fixado</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-ru-rRU/strings_sk.xml b/mastodon/src/main/res/values-ru-rRU/strings_sk.xml
index 9566e677b..5c119d768 100644
--- a/mastodon/src/main/res/values-ru-rRU/strings_sk.xml
+++ b/mastodon/src/main/res/values-ru-rRU/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Закрепленные</string>
     <string name="sk_delete_and_redraft">Удалить и исправить</string>
     <string name="sk_confirm_delete_and_redraft_title">Удалить и исправить пост</string>
@@ -14,5 +14,5 @@
     <string name="sk_image_description">Описание изображения</string>
     <string name="sk_visibility_unlisted">Скрытый</string>
     <string name="sk_mark_media_as_sensitive">Отметить медиафайл как деликатный</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-sv-rSE/strings_sk.xml b/mastodon/src/main/res/values-sv-rSE/strings_sk.xml
index d29c6a701..501fde4c5 100644
--- a/mastodon/src/main/res/values-sv-rSE/strings_sk.xml
+++ b/mastodon/src/main/res/values-sv-rSE/strings_sk.xml
@@ -13,12 +13,12 @@
     <string name="sk_settings_show_boosts">Visa puffar</string>
     <string name="sk_settings_load_new_posts">Ladda automatiskt nya inlägg</string>
     <string name="sk_settings_show_interaction_counts">Visa antal interaktioner</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Markera media som känsligt</string>
     <string name="sk_user_post_notifications_off">Slå av inläggsnotifieringar för %s</string>
     <string name="sk_federated_timeline">Federation</string>
     <string name="sk_federated_timeline_info_banner">Dessa är de senaste inläggen av folk i din federation.</string>
-    <string name="sk_update_available">Megalodon %s är redo att ladda ner.</string>
+    <string name="sk_update_available">Moshidon %s är redo att ladda ner.</string>
     <string name="sk_check_for_update">Kolla efter uppdateringar</string>
     <string name="sk_no_update_available">Inga uppdateringar tillgängliga</string>
     <string name="sk_list_timelines">Listor</string>
@@ -28,14 +28,14 @@
     <string name="sk_lists_with_user">Listor med %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Visa alltid innehållsvarningar</string>
     <string name="sk_disable_marquee">Slå av skrollande text i titelrader</string>
-    <string name="sk_settings_contribute">Bidra till Megalodon</string>
+    <string name="sk_settings_contribute">Bidra till Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Visa federerad tidslinje</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_confirm_delete_and_redraft_title">Ta bort och skriv om inlägg</string>
     <string name="sk_confirm_delete_and_redraft">Är du säker på att du vill ta bort och skriva om detta inlägg\?</string>
     <string name="sk_confirm_pin_post_title">Nåla fast inlägg på profil</string>
     <string name="sk_confirm_pin_post">Vill du nåla fast detta inlägg på din profil\?</string>
     <string name="sk_confirm_unpin_post">Är du säker på att du vill ta bort detta inlägg\?</string>
     <string name="sk_user_post_notifications_on">Slå på inläggsnotifieringar för %s</string>
-    <string name="sk_update_ready">Megalodon %s är nerladdad och redo att installeras.</string>
+    <string name="sk_update_ready">Moshidon %s är nerladdad och redo att installeras.</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
index af0f61ac8..1d3065b7a 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -19,7 +19,7 @@
     <string name="sk_notification_type_status">Пости</string>
     <string name="sk_color_theme_pink">Рожевий</string>
     <string name="sk_confirm_clear_recent_languages">Ви впевнені, що хочете очистити нещодавно використані мови\?</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Закріплене</string>
     <string name="sk_delete_and_redraft">Видалити та переробити</string>
     <string name="sk_confirm_delete_and_redraft_title">Видалити та переробити пост</string>
@@ -37,21 +37,21 @@
     <string name="sk_settings_show_replies">Показувати відповіді</string>
     <string name="sk_settings_load_new_posts">Автоматично завантажувати нові пости</string>
     <string name="sk_settings_show_interaction_counts">Показати кількість взаємодій</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_follow_requests">Запити на підписку</string>
     <string name="sk_accept_follow_request">Прийняти запит на підписку</string>
     <string name="sk_reject_follow_request">Відхилити запит на підписку</string>
     <string name="sk_lists_with_user">Списки з %s</string>
     <string name="sk_disable_marquee">Вимкнути прокручування тексту у рядках заголовка</string>
-    <string name="sk_settings_contribute">Допомогти у розробці Megalodon</string>
+    <string name="sk_settings_contribute">Допомогти у розробці Moshidon</string>
     <string name="sk_mark_media_as_sensitive">Помітити медіа як чутливу</string>
     <string name="sk_settings_show_boosts">Показувати бусти</string>
     <string name="sk_user_post_notifications_on">Увімкнено сповіщення про пости для %s</string>
     <string name="sk_user_post_notifications_off">Вимкнено сповіщення про пости для %s</string>
     <string name="sk_federated_timeline">Федерація</string>
     <string name="sk_federated_timeline_info_banner">Це найновіші публікації людей у вашій федерації.</string>
-    <string name="sk_update_available">Megalodon %s готовий до завантаження.</string>
-    <string name="sk_update_ready">Megalodon %s завантажений й готовий до встановлення.</string>
+    <string name="sk_update_available">Moshidon %s готовий до завантаження.</string>
+    <string name="sk_update_ready">Moshidon %s завантажений й готовий до встановлення.</string>
     <string name="sk_check_for_update">Перевірити оновлення</string>
     <string name="sk_no_update_available">Немає доступних оновлень</string>
     <string name="sk_list_timelines">Списки</string>
diff --git a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
index 7ba75fa53..a6e51e998 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -16,17 +16,17 @@
     <string name="sk_visibility_unlisted">不公开</string>
     <string name="sk_federated_timeline">联邦时间轴</string>
     <string name="sk_federated_timeline_info_banner">这是在你的联邦宇宙中最新发布的嘟文。</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_settings_show_replies">显示回复</string>
     <string name="sk_settings_show_boosts">显示转发</string>
     <string name="sk_settings_load_new_posts">自动加载新嘟文</string>
     <string name="sk_settings_show_interaction_counts">显示互动次数</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">标记为敏感媒体</string>
     <string name="sk_user_post_notifications_on">为 %s启用嘟文通知</string>
     <string name="sk_user_post_notifications_off">关闭%s的嘟文通知</string>
-    <string name="sk_update_available">Megalodon %s 已经可以下载了。</string>
-    <string name="sk_update_ready">Megalodon %s 已下载，准备安装。</string>
+    <string name="sk_update_available">Moshidon %s 已经可以下载了。</string>
+    <string name="sk_update_ready">Moshidon %s 已下载，准备安装。</string>
     <string name="sk_check_for_update">检查更新</string>
     <string name="sk_no_update_available">已经是最新版本</string>
     <string name="sk_list_timelines">列表</string>
@@ -34,7 +34,7 @@
     <string name="sk_reject_follow_request">拒绝关注请求</string>
     <string name="sk_lists_with_user">%s 的列表</string>
     <string name="sk_disable_marquee">禁用标题栏的滚动文本</string>
-    <string name="sk_settings_contribute">向 Megalodon 贡献</string>
+    <string name="sk_settings_contribute">向 Moshidon 贡献</string>
     <string name="sk_settings_show_federated_timeline">显示联邦时间轴</string>
     <string name="sk_follow_requests">关注请求</string>
     <string name="sk_settings_always_reveal_content_warnings">总是显示内容警告</string>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index a9ef04eeb..2e447817b 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -19,7 +19,7 @@
   <string name="sk_settings_show_boosts">Show boosts</string>
   <string name="sk_settings_load_new_posts">Automatically load new posts</string>
   <string name="sk_settings_show_interaction_counts">Show interaction counts</string>
-  <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+  <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
   <string name="sk_mark_media_as_sensitive">Mark media as sensitive</string>
   <string name="sk_user_post_notifications_on">Turned on post notifications for %s</string>
   <string name="sk_user_post_notifications_off">Turned off post notifications for %s</string>
@@ -36,7 +36,7 @@
   <string name="sk_lists_with_user">Lists with %s</string>
   <string name="sk_settings_always_reveal_content_warnings">Always reveal content warnings</string>
   <string name="sk_disable_marquee">Disable scrolling text in title bars</string>
-  <string name="sk_settings_contribute">Contribute to Megalodon</string>
+  <string name="sk_settings_contribute">Contribute to Moshidon</string>
   <string name="sk_settings_show_federated_timeline">Show federated timeline</string>
   <string name="sk_notification_type_status">Posts</string>
   <string name="sk_notify_posts">Post notifications</string>