From 2632c4c5bd74dd1845044646c6fe218a88bf9de6 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <k.pozniak@gmx.at>
Date: Sat, 22 May 2021 13:15:40 +0000
Subject: [PATCH 1/3] update Glide to 4.12.0

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c06dfde8..1a1d6efb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -89,7 +89,7 @@ ext.lifecycleVersion = "2.2.0"
 ext.roomVersion = '2.3.0'
 ext.retrofitVersion = '2.9.0'
 ext.okhttpVersion = '4.9.0'
-ext.glideVersion = '4.11.0'
+ext.glideVersion = '4.12.0'
 ext.daggerVersion = '2.30.1'
 ext.materialdrawerVersion = '8.2.0'
 

From f385aae3eeb3e505162965662059918dbdedc60b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E8=80=85X?= <columbidae@memail.com>
Date: Sat, 22 May 2021 13:15:40 +0000
Subject: [PATCH 2/3] Translated using Weblate (Japanese)

Currently translated at 92.1% (422 of 458 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ja/

Translated using Weblate (Japanese)

Currently translated at 91.7% (420 of 458 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ja/
---
 app/src/main/res/values-ja/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d602f37b..ec7e2a6a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -464,4 +464,7 @@
     <string name="warning_scheduling_interval">Mastodonにおける予約までの最小間隔は5分です。</string>
     <string name="notification_subscription_format">%sさんがトゥートしました</string>
     <string name="title_announcements">お知らせ</string>
+    <string name="mute_domain_warning">本当に %s のすべてをブロックするのですか？ そのドメインからのコンテンツは、公開タイムラインや通知に表示されなくなります。また、そのドメインのフォロワーは削除されます。</string>
+    <string name="status_media_audio">音声</string>
+    <string name="mute_domain_warning_dialog_ok">ドメイン全体を非表示</string>
 </resources>
\ No newline at end of file

From 5b2bb1c60ed7d6fc40f40fa411cef6a611916200 Mon Sep 17 00:00:00 2001
From: edave64 <github5815@xcvbnm.org>
Date: Sat, 22 May 2021 13:15:41 +0000
Subject: [PATCH 3/3] Translated using Weblate (German)

Currently translated at 100.0% (458 of 458 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/de/

Translated using Weblate (German)

Currently translated at 99.1% (454 of 458 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/de/
---
 app/src/main/res/values-de/strings.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9af9b790..4c6ac1b3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -294,7 +294,7 @@
     <string name="caption_blobmoji">Die Blob–Emojis aus Android 4.4–7.1</string>
     <string name="caption_twemoji">Die Standard-Emojis von Mastodon</string>
     <string name="caption_notoemoji">Die aktuellen Emojis von Google</string>
-    <string name="download_failed">Download fehlgeschlagen.</string>
+    <string name="download_failed">Download fehlgeschlagen</string>
     <string name="profile_badge_bot_text">Bot</string>
     <string name="account_moved_description">%1$s ist umgezogen auf:</string>
     <string name="reblog_private">An ursprüngliches Publikum teilen</string>
@@ -357,7 +357,7 @@
     <string name="compose_shortcut_short_label">Beitrag erstellen</string>
     <string name="pref_title_bot_overlay">Bot-Hinweis anzeigen</string>
     <string name="notification_clear_text">Bist du dir sicher, dass du alle deine Benachrichtigungen dauerhaft löschen möchtest\?</string>
-    <string name="poll_info_format">" %1$s • %2$s"</string>
+    <string name="poll_info_format"> <!-- 15 Stimmen • 1 Stunde verbleibend --> %1$s • %2$s</string>
     <plurals name="poll_info_votes">
         <item quantity="one">%s Stimme</item>
         <item quantity="other">%s Stimmen</item>
@@ -496,7 +496,7 @@
     <string name="pref_title_animate_custom_emojis">GIF-Emojis animieren</string>
     <string name="pref_title_notification_filter_subscriptions">Jemand, den ich abonniert habe, etwas Neues veröffentlicht</string>
     <string name="notification_subscription_format">%s hat gerade etwas gepostet</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
+    <string name="abbreviated_minutes_ago">%d Min.</string>
     <string name="review_notifications">Benachrichtigungen überprüfen</string>
     <string name="wellbeing_mode_notice">Informationen, die dein Wohlbefinden beeinflussen könnten, werden versteckt. Das beinhaltet
 \n
@@ -511,4 +511,10 @@
     <string name="limit_notifications">Timeline-Benachrichtigungen einschränken</string>
     <string name="action_subscribe_account">Abonnieren</string>
     <string name="action_unsubscribe_account">nicht mehr abonnieren</string>
+    <string name="abbreviated_in_minutes">in %d M.</string>
+    <string name="abbreviated_in_hours">in %d St.</string>
+    <string name="drafts_failed_loading_reply">Antwortinformationen konnten nicht geladen werden</string>
+    <string name="abbreviated_days_ago">%d T.</string>
+    <string name="abbreviated_in_years">in %d J.</string>
+    <string name="abbreviated_in_seconds">in %d Sek.</string>
 </resources>
\ No newline at end of file