From ad9bb8ad58fa50aa2e07fa66ce40a5a02c8da725 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Sat, 22 Apr 2023 19:00:37 +0200
Subject: [PATCH 1/5] support glitch react notification

---
 .../android/fragments/NotificationsListFragment.java     | 4 ++--
 .../org/joinmastodon/android/model/Notification.java     | 9 ++++++---
 mastodon/src/main/res/values/strings_sk.xml              | 3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
index 5d3243864..803f8ef88 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -19,7 +19,6 @@ import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Notification;
-import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AccountCardStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
@@ -102,7 +101,8 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			case UPDATE -> getString(R.string.sk_post_edited);
 			case SIGN_UP -> getString(R.string.sk_signed_up);
 			case REPORT -> getString(R.string.sk_reported);
-			case EMOJI_REACTION -> getString(R.string.sk_reacted, n.emoji);
+			case REACTION, PLEROMA_EMOJI_REACTION ->
+					n.emojiUrl != null ? getString(R.string.sk_reacted_with, n.emoji) : getString(R.string.sk_reacted);
 		};
 		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, n.status, n.emojiUrl!=null ? HtmlParser.parseCustomEmoji(extraText, Collections.singletonList(emoji)) : extraText, n, null) : null;
 		if(n.status!=null){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java b/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java
index 264f6a54d..d9d39f5f1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Notification.java
@@ -53,12 +53,15 @@ public class Notification extends BaseModel implements DisplayItemsParent{
 		STATUS,
 		@SerializedName("update")
 		UPDATE,
+
+		@SerializedName("reaction")
+		REACTION,
+		@SerializedName("pleroma:emoji_reaction")
+		PLEROMA_EMOJI_REACTION,
 		@SerializedName("admin.sign_up")
 		SIGN_UP,
 		@SerializedName("admin.report")
-		REPORT,
-		@SerializedName("pleroma:emoji_reaction")
-		EMOJI_REACTION
+		REPORT
 	}
 
 	@Parcel
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 2d161aaa5..489cbc0a5 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -252,7 +252,8 @@
     <string name="sk_settings_glitch_mode_explanation">Enable this if your home instance runs on Glitch. Not needed for Hometown or Akkoma.</string>
     <string name="sk_signed_up">signed up</string>
     <string name="sk_reported">reported</string>
-    <string name="sk_reacted">reacted with %s</string>
+    <string name="sk_reacted_with">reacted with %s</string>
+    <string name="sk_reacted">reacted</string>
     <string name="sk_sign_ups">Users signing up</string>
     <string name="sk_new_reports">New reports</string>
     <string name="sk_settings_server_version">Server version: %s</string>

From c65d138911f17996156c234bde56292a7b237adb Mon Sep 17 00:00:00 2001
From: sk22 <sk22@mailbox.org>
Date: Sat, 22 Apr 2023 14:44:28 +0000
Subject: [PATCH 2/5] Translated using Weblate (German)

Currently translated at 100.0% (273 of 273 strings)

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

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 4d5aacb69..cba151424 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -82,8 +82,8 @@
     <string name="sk_settings_translation_availability_note_available">%s unterstützt Übersetzung!</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s scheint keine Übersetzung zu unterstützen.</string>
     <string name="sk_loading_fediverse_resource_title">Suche im Fediverse</string>
-    <string name="sk_undo_reblog">Reblog rückgängig machen</string>
-    <string name="sk_reblog_with_visibility">Rebloggen mit Sichtbarkeit</string>
+    <string name="sk_undo_reblog">Teilen rückgängig machen</string>
+    <string name="sk_reblog_with_visibility">Teilen mit Sichtbarkeit</string>
     <string name="sk_quote_post">Drüberkommentieren</string>
     <string name="sk_hashtags_you_follow">Hashtags, denen du folgst</string>
     <string name="sk_copy_link_to_post">Link zum Beitrag kopieren</string>
@@ -96,9 +96,9 @@
     <string name="sk_favorite_as">Favorit mit anderem Konto</string>
     <string name="sk_favorited_as">Favorisiert als %s</string>
     <string name="sk_already_favorited">Bereits favorisiert</string>
-    <string name="sk_reblog_as">Mit einem anderen Konto boosten</string>
-    <string name="sk_reblogged_as">Geboostet als %s</string>
-    <string name="sk_already_reblogged">Bereits geboostet</string>
+    <string name="sk_reblog_as">Mit einem anderen Konto teilen</string>
+    <string name="sk_reblogged_as">Geteilt als %s</string>
+    <string name="sk_already_reblogged">Bereits geteilt</string>
     <string name="sk_reply_as">Antworten mit anderem Konto</string>
     <string name="sk_settings_uniform_icon_for_notifications">Einheitliches Icon für alle Benachrichtigungen</string>
     <string name="sk_forward_report_to">Weiterleiten zu %s</string>
@@ -269,7 +269,7 @@
     <string name="sk_quoting_user">Zitiere %s</string>
     <string name="sk_notification_action_replied">Antwort an %s gesendet</string>
     <string name="sk_show_thread">Thread öffnen</string>
-    <string name="sk_compact_reblog_reply_line">Kompakte Geteilt/Geantwortet-Zeile</string>
+    <string name="sk_compact_reblog_reply_line">Kompakte Geteilt-/Geantwortet-Zeile</string>
     <string name="sk_reply_line_above_avatar">“Als Antwort auf”-Zeile über Profilbild</string>
     <string name="sk_settings_confirm_before_reblog">Vor dem Teilen bestätigen</string>
 </resources>
\ No newline at end of file

From d52174bd9e34a8e51720f52cbe22ecfaae50bda7 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Sat, 22 Apr 2023 15:41:06 +0000
Subject: [PATCH 3/5] Translated using Weblate (French)

Currently translated at 100.0% (273 of 273 strings)

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

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 3fd9ae09c..b40cc90b8 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -82,8 +82,8 @@
     <string name="sk_settings_translation_availability_note_unavailable">%s ne semble pas prendre en charge la traduction.</string>
     <string name="sk_clear_all_notifications_confirm">Voulez-vous vraiment supprimer toutes les notifications \?</string>
     <string name="sk_loading_fediverse_resource_title">Rechercher sur le Fediverse</string>
-    <string name="sk_reblog_with_visibility">Reposter avec la visibilité</string>
-    <string name="sk_undo_reblog">Annuler le repost</string>
+    <string name="sk_reblog_with_visibility">Booster avec la visibilité</string>
+    <string name="sk_undo_reblog">Annuler le boost</string>
     <string name="sk_quote_post">Poster à ce sujet</string>
     <string name="sk_hashtags_you_follow">Hashtags que vous suivez</string>
     <string name="sk_open_in_account">Ouvrir dans un autre compte</string>
@@ -94,13 +94,13 @@
     <string name="sk_favorite_as">Mettre en favoris avec un autre compte</string>
     <string name="sk_already_bookmarked">Déjà mis en signet</string>
     <string name="sk_already_favorited">Déjà mis en favori</string>
-    <string name="sk_reblogged_as">Reposté en tant que %s</string>
-    <string name="sk_already_reblogged">Déjà reposté</string>
+    <string name="sk_reblogged_as">Boosté en tant que %s</string>
+    <string name="sk_already_reblogged">Déjà boosté</string>
     <string name="sk_bookmarked_as">Ajouté aux signets en tant que %s</string>
     <string name="sk_favorited_as">Ajouté aux favoris en tant que %s</string>
     <string name="sk_reply_as">Répondre avec un autre compte</string>
     <string name="sk_bookmark_as">Mettre en signet avec un autre compte</string>
-    <string name="sk_reblog_as">Reposter avec un autre compte</string>
+    <string name="sk_reblog_as">Booster avec un autre compte</string>
     <string name="sk_settings_uniform_icon_for_notifications">Icône uniforme pour toutes les notifications</string>
     <string name="sk_forward_report_to">Transférer à %s</string>
     <string name="sk_unsent_posts">Messages non envoyés</string>
@@ -171,7 +171,7 @@
     <string name="sk_alt_button">ALT</string>
     <string name="sk_post_edited">édité</string>
     <string name="sk_edit_timeline">Modifier la timeline</string>
-    <string name="sk_notify_update">Modifie un article reposté</string>
+    <string name="sk_notify_update">Modifier un article boosté</string>
     <string name="sk_settings_disable_alt_text_reminder">Désactiver le rappel pour ajouter du texte alternatif</string>
     <string name="sk_notification_type_update">Messages modifiés</string>
     <string name="sk_icon_code">Code</string>
@@ -271,7 +271,7 @@
     <string name="sk_settings_reply_visibility_self">Me répond</string>
     <string name="sk_notification_action_replied">Réponse envoyée à %s</string>
     <string name="sk_show_thread">Afficher le fil</string>
-    <string name="sk_compact_reblog_reply_line">Ligne de repost/réponse compacte</string>
+    <string name="sk_compact_reblog_reply_line">Ligne boost/réponse compacte</string>
     <string name="sk_reply_line_above_avatar">Ligne \"En réponse à\" au-dessus de l\'avatar</string>
-    <string name="sk_settings_confirm_before_reblog">Confirmer avant de reposter</string>
+    <string name="sk_settings_confirm_before_reblog">Confirmer avant de booster</string>
 </resources>
\ No newline at end of file

From c986b10e1445476ba2682d54e78d7112fef85b37 Mon Sep 17 00:00:00 2001
From: Espasant3 <eloi.b.pineiro@gmail.com>
Date: Sat, 22 Apr 2023 14:56:58 +0000
Subject: [PATCH 4/5] Translated using Weblate (Galician)

Currently translated at 99.6% (272 of 273 strings)

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

diff --git a/mastodon/src/main/res/values-gl-rES/strings_sk.xml b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
index 47e008637..b36237b35 100644
--- a/mastodon/src/main/res/values-gl-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
@@ -79,8 +79,8 @@
     <string name="sk_favorite_as">Favorecer con outra conta</string>
     <string name="sk_favorited_as">Favorita con %s</string>
     <string name="sk_already_favorited">Xa foi favorecida</string>
-    <string name="sk_reblogged_as">Promovida por %s</string>
-    <string name="sk_already_reblogged">Xa foi promovida</string>
+    <string name="sk_reblogged_as">Impulsado coma %s</string>
+    <string name="sk_already_reblogged">Xa foi impulsado</string>
     <string name="sk_reply_as">Responder con outra conta</string>
     <string name="sk_settings_uniform_icon_for_notifications">Icona uniforme para tódalas notificacións</string>
     <string name="sk_enable_delete_notifications">Activar a eliminación de notificacións</string>
@@ -88,9 +88,9 @@
     <string name="sk_settings_publish_button_text_title">Personalizar o texto do botón de publicar</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s non semella ter soporte para tradución.</string>
     <string name="sk_loading_fediverse_resource_title">Buscando no Fediverso</string>
-    <string name="sk_reblog_with_visibility">Promover con visibilidade</string>
+    <string name="sk_reblog_with_visibility">Impulsar con visibilidade</string>
     <string name="sk_quote_post">Publicar acerca disto</string>
-    <string name="sk_undo_reblog">Retirar a promoción</string>
+    <string name="sk_undo_reblog">Desfacer o impulso</string>
     <string name="sk_copy_link_to_post">Copiar ligazón á publicación</string>
     <string name="sk_loading_resource_on_instance_title">Buscando en %s</string>
     <string name="sk_open_with_account">Abrir con outra conta</string>
@@ -113,7 +113,7 @@
     <string name="sk_schedule_or_draft">Programar ou borrador</string>
     <string name="sk_compose_no_schedule">Non programar</string>
     <string name="sk_compose_no_draft">Non facer borrador</string>
-    <string name="sk_reblog_as">Promover con outra conta</string>
+    <string name="sk_reblog_as">Impulsar con outra conta</string>
     <string name="sk_settings_reduce_motion">Reducir movemento nas animacións</string>
     <string name="sk_announcements">Anuncios</string>
     <string name="sk_mark_as_read">Marcar como lido</string>
@@ -225,7 +225,7 @@
     <string name="sk_icon_gavel">Mazo</string>
     <string name="sk_icon_gauge">Indicador</string>
     <string name="sk_icon_math_formula">Fórmula matemática</string>
-    <string name="sk_notify_update">Edita unha publicación promovida</string>
+    <string name="sk_notify_update">Edita unha publicación impulsada</string>
     <string name="sk_no_results">Sen resultados</string>
     <string name="sk_save_draft">Gardar borrador\?</string>
     <string name="sk_no_alt_text">Sen texto descriptivo</string>
@@ -271,5 +271,6 @@
     <string name="sk_notification_action_replied">Resposta enviada a %s</string>
     <string name="sk_reply_line_above_avatar">Liña \"en resposta a\" sobre o avatar</string>
     <string name="sk_show_thread">Mostrar chío</string>
-    <string name="sk_compact_reblog_reply_line">Compactar liña de promoción/resposta</string>
+    <string name="sk_compact_reblog_reply_line">Compactar liña de impulso/resposta</string>
+    <string name="sk_settings_confirm_before_reblog">Confirma antes de impulsar</string>
 </resources>
\ No newline at end of file

From 6dc37d6bde16a590201e5ffb6a2b3aa69f4fc65b Mon Sep 17 00:00:00 2001
From: sk22 <sk22@mailbox.org>
Date: Sat, 22 Apr 2023 17:01:35 +0000
Subject: [PATCH 5/5] Translated using Weblate (German)

Currently translated at 100.0% (275 of 275 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
---
 mastodon/src/main/res/values-de-rDE/strings_sk.xml | 2 ++
 1 file changed, 2 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 cba151424..d828668c7 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -272,4 +272,6 @@
     <string name="sk_compact_reblog_reply_line">Kompakte Geteilt-/Geantwortet-Zeile</string>
     <string name="sk_reply_line_above_avatar">“Als Antwort auf”-Zeile über Profilbild</string>
     <string name="sk_settings_confirm_before_reblog">Vor dem Teilen bestätigen</string>
+    <string name="sk_reacted">hat reagiert</string>
+    <string name="sk_reacted_with">hat mit %s reagiert</string>
 </resources>
\ No newline at end of file