Revert "Updated Catalan strings"

This reverts commit 2d710cb558.

README.md

@@ -4,39 +4,90 @@
 
 > A fork of the [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.
 
-[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=download%20apk&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmastodon-android-fork%2Freleases%2Flatest&style=for-the-badge)](https://github.com/sk22/mastodon-android-fork/releases/latest/download/mastodos.apk)
+[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=download%20apk&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmastodon-android-fork%2Freleases%2Flatest&style=for-the-badge)](https://github.com/sk22/mastodos/releases/latest/download/mastodos.apk)
 
-## Changes
+---
+
+## Key features
+
+### **Unlisted posting**
+
+**Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “Local”, “Community” and “Posts”).**
+
+When posting with Unlisted visibility, your posts will still be publicly accessible in your profile. They will also be shown in people’s Home timelines, but only if they follow you or someone they follow reposted/replied to your post.
+  
+The Mastodon documentation has some more information about [Unlisted posting](https://docs.joinmastodon.org/user/posting/#unlisted) and [Public timelines](https://docs.joinmastodon.org/user/network/#timelines).
+
+### **Federated timeline**
+
+**This allows you to chronologically see all Public posts from people on all other Fediverse instances your home instance is connected to.**
+
+Despite being one of the main features of federated social media, the Federated timeline wasn’t included in the official Mastodon app – supposedly, because this conflicts with Google’s safety requirements for apps on the Play Store.
+  
+That’s one of the reasons why choosing a small, **well-moderated instance is important**. Instance admins and moderators should always make sure to ban abusive users and stop federating with instances who platform them. On well-moderated instances, the Federated timeline can be a welcoming place to meet new people!
+
+### **Image description viewer**
+
+**Allows you to quickly check whether an image or video has an alternative text attached to it.**
+
+This is important to **ensure the content you’re sharing is as accessible as possible** to people who can’t see the images and rely on software to read back the provided content descriptions. Thankfully, it’s quite common for people on the Fediverse to provide such alt texts, and hopefully things stay this way!
+
+### **Pinning posts**
+
+**This lets you can highlight important posts on your profile. A dedicated “Pinned” tab in people’s profiles shows all the posts they pinned.**
+
+On the Fediverse, it’s quite common for people to pin posts they want others to read before following them. You can pin/unpin posts yourself by clicking the `⋯` button in the top right corner of your posts.
+
+### **Bookmarks**
+
+**They allow for quickly saving posts and viewing them through the Bookmarks button on the top right of your profile.**
+
+To bookmark a post, press the button between the Favorite and Share buttons on the bottom of the post. Bookmarks are saved privately, so the post authors won’t know you saved their post – the list of bookmarked posts is only visible to you.
+
+## Installation
+
+**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Mastodos will automatically notify you about new updates inside the app.**
+
+To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/mastodos/releases/latest/download/mastodos.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/sk22/mastodos/releases) page.
+
+Mastodos makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Mastodos will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
+
+---
+
+## Detailed changes
 
 ### Features
 
-* [Add “Unlisted” as a post visibility option](https://github.com/sk22/mastodon-android-fork/commits/feature/enable-unlisted)
+* [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/enable-unlisted)
   ([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
-* [Add “Federation” tab and change Discover tab order](https://github.com/sk22/mastodon-android-fork/commits/feature/add-federated-timeline) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/8))
-* [Add image description button and viewer](https://github.com/sk22/mastodon-android-fork/commits/feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
-* [Implement pinning posts and displaying pinned posts](https://github.com/sk22/mastodon-android-fork/commits/feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
-* [Implement deleting and re-drafting](https://github.com/sk22/mastodon-android-fork/commits/feature/delete-redraft) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/21))
-* [Implement a bookmark button and list](https://github.com/sk22/mastodon-android-fork/commits/feature/bookmarks) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/22))
-* [Add “Check for update” button in addition to integrated update checker](https://github.com/sk22/mastodon-android-fork/commits/feature/check-for-update-button)
-* [Add “Mark media as sensitive” option](https://github.com/sk22/mastodon-android-fork/commits/feature/mark-media-as-sensitive)
-* [Add settings to hide replies and reposts from the timeline](https://github.com/sk22/mastodon-android-fork/commits/feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
-* [Follow and unfollow hashtags](https://github.com/sk22/mastodon-android-fork/commit/7d38f031f197aa6cefaf53e39d929538689c1e4e) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/233))
-* [Notification bell for posts](https://github.com/sk22/mastodon-android-fork/commit/b166ca705eb9169025ef32bbe6315b42491b57ea) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/81))
-* [Lists view (viewing only, for now)](https://github.com/sk22/mastodon-android-fork/commits/list-timeline-views) based on [@obstsalatschuessel](https://github.com/obstsalatschuessel)'s [Pull request](https://github.com/mastodon/mastodon-android/pull/286)
+* [Add “Federation” tab and change Discover tab order](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/add-federated-timeline) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/8))
+* [Add image description button and viewer](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
+* [Implement pinning posts and displaying pinned posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
+* [Implement deleting and re-drafting](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/delete-redraft) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/21))
+* [Implement a bookmark button and list](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/bookmarks) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/22))
+* [Add “Check for update” button in addition to integrated update checker](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/check-for-update-button)
+* [Add “Mark media as sensitive” option](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/mark-media-as-sensitive)
+* [Add settings to hide replies and reposts from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
+* [Follow and unfollow hashtags](https://github.com/sk22/mastodos/commit/7d38f031f197aa6cefaf53e39d929538689c1e4e) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/233))
+* [Notification bell for posts](https://github.com/sk22/mastodos/commit/b166ca705eb9169025ef32bbe6315b42491b57ea) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/81))
+* [Viewing lists and adding/removing users from lists](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:list-timeline-views) based on [@obstsalatschuessel](https://github.com/obstsalatschuessel)'s [Pull request](https://github.com/mastodon/mastodon-android/pull/286)
+* [List favorited posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/favs-list)
+* [Accept/reject follow requests](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/follow-requests)
+* [Display content warning title above text](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/cw-above-text)
+* [Add notifications tab for posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/posts-notifications-tab)
+* [Show visibility of original post when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/display-reply-visibility)
+* [Improvements to the true black mode](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:true-black-improvements)
 
 ### Behavior
 
-* [Make back button return to the home tab before exiting the app](https://github.com/sk22/mastodon-android-fork/commits/feature/back-returns-home) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/118))
-* [Always preserve content warnings when replying](https://github.com/sk22/mastodon-android-fork/commits/feature/always-preserve-cw) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/113))
-* [Display full image when adding image description](https://github.com/sk22/mastodon-android-fork/commits/feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
-* [Set spoiler height independently to content height](https://github.com/sk22/mastodon-android-fork/commits/spoiler-height-independent) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/166))
-* [Custom extended footer redesign](https://github.com/sk22/mastodon-android-fork/commits/compact-extended-footer)
-
-### Installation
-
-To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/mastodon-android-fork/releases/latest/download/mastodos.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/sk22/mastodon-android-fork/releases) page.
-
-Mastodos makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Mastodos will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
+* [Make back button return to the home tab before exiting the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/back-returns-home) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/118))
+* [Always preserve content warnings when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/always-preserve-cw) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/113))
+* [Display full image when adding image description](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
+* [Set spoiler height independently to content height](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:spoiler-height-independent) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/166))
+* [Custom extended footer redesign](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:compact-extended-footer)
+* [Option to hide interaction numbers](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:settings/hide-interaction-numbers)
+* [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/cw-above-text)
+* [Option to disable scrolling title bars](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:settings/disable-marquee)
 
 ### Branding
 

_config.yml

@@ -0,0 +1,2 @@
+title: Mastodos
+theme: minima

fastlane/metadata/android/bn-BD/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+More features:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/bn-BD/short_description.txt

@@ -0,0 +1 @@
+Decentralized social network

fastlane/metadata/android/bn-BD/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/gd-GB/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+More features:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/gd-GB/short_description.txt

@@ -0,0 +1 @@
+Decentralized social network

fastlane/metadata/android/gd-GB/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/he-IL/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+מסטודון היא הרשת החברתית המבוזרת הגדולה ביותר באינטרנט. במקום אתר אחד, מסטודון היא רשת של מיליוני משתמשים בקהילות עצמאיות שיכולות לפעול ביחד באופן חלק. לא משנה מה הקטע שלכם, אתם יכולים לפגוש אנשים שמתעניינים בו וכותבים עליו במסטודון!
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+הצטרפו לקהילה וצרו את המשתמש שלכם. גלו ועקבו אחר אנשים מרתקים וקראו את הרשומות שלהם על גבי ציר זמן כרונולוגי וללא פרסומות. הביעו את עצמכם באמצעות אמוג׳ים מעוצבים, תמונות, גיפים, סרטונים, ושמע ברשומות של עד 500 תווים. הגיבו לשרשורים ועשו ״ריבלוג״ לרשומות של כל מי שאתם רוצים כדי לשתף דברים מגניבים. מצאו חשבונות חדשים לעקוב אחריהם והאשטגים טרנדיים כדי להרחיב את רשתותיכם.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+מסטודון בנויה עם פוקוס על פרטיות ובטיחות. קבעו האם הרשומות יתפרסמו עבור העוקבים שלכם, רק האנשים שאתם מציינים, או כל העולם. אזהרות תוכן מאפשרות לכם להסתיר רשומות המכילות תוכן רגיש או שעלול להוות טריגר עד שתהיו מוכנים להתמודד איתן. לכל קהילה כללים ומנהלים משלה שמטרתם לשמור על כך שכל חבריה יהיו בטוחים, וכלי חסימה ודיווח ענפים כדי לעזור למנוע שימוש לרעה.
 
-More features:
+תכונות נוספות:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• מצב חשוך: קראו רשומות במצב בהיר, חשוך, או שחור־אמיתי
+• סקרים: שאלו את העוקבים שלכם מה דעתם וספרו את הקולות
+• לגלות: האשטגים טרנדיים וחשבונות הם רק מרחק לחיצה
+• עדכונים: קבלו עדכונים אודות עוקבים חדשים, תגובות, וריבלוגים
+• שיתוף: העלו ישירות למסטודון מכל עמוד שיתוף בכל אפליקציה
+• חמידות: הקמע שלנו הוא פיל מקסים, ואתם תראו אותם מופיעים פה ושם
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+מסטודון רשומה כארגון ללא מטרות רווח והפיתוח ממומן ישירות מתרומותכם. אין שום פרסומות, שום תרגום מובנה של הצלחה לכסף, ושום הון־סיכון, ואנחנו מתכננים לשמור על זה כך.

fastlane/metadata/android/he-IL/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+רשת חברתית מבוזרת

fastlane/metadata/android/hi-IN/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+More features:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/hi-IN/short_description.txt

@@ -0,0 +1 @@
+Decentralized social network

fastlane/metadata/android/hi-IN/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/id-ID/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon adalah jejaring sosial terdesentralisasi terbesar di internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Temukan akun-akun baru untuk diikuti dan hashtag yang sedang tren untuk memperluas jejaring Anda.
+
+Mastodon dibuat dengan fokus pada privasi dan keamanan. Tentukan apakah postingan Anda dibagikan kepada pengikut, hanya orang yang disebut, atau seluruh dunia. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+Fitur lainnya:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/id-ID/short_description.txt

@@ -0,0 +1 @@
+Jaringan sosial terdesentralisasi

fastlane/metadata/android/id-ID/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/nl-NL/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is het grootste gedecentraliseerde sociale netwerk op het internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Word lid van een community en maak je profiel aan. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Antwoord op berichten en boost iedereens berichten om geweldige dingen te delen. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+Meer mogelijkheden:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Meldingen: Krijg een melding over nieuwe volgers, reacties en boosts
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/nl-NL/short_description.txt

@@ -0,0 +1 @@
+Gedecentraliseerd sociaal netwerk

fastlane/metadata/android/nl-NL/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/pl-PL/full_description.txt

@@ -1,8 +1,8 @@
 Mastodon to największa zdecentralizowana sieć społecznościowa w Internecie. Zamiast jednej strony internetowej, jest to sieć milionów użytkowników w niezależnych społecznościach, które mogą ze sobą wchodzić w interakcje. Niezależnie od swoich zainteresowań, momżesz poznać interesujących ludzi piszących o nich na Mastodonie!
 
-Dołącz do społeczności i utwórz swój profil. Poznaj i obserwuj fascynujących ludzi i czytaj ich wpisy w chronologicznym osi czasu. Wyrażaj siebie za pomocą niestandardowych emoji, obrazów, GIFów, filmów i audio w 500-znakowych wpisach. Odpowiadaj na wątki i podawaj dalej posty od każdego, aby dzielić się wspaniałymi rzeczami. Odnajduj nowe konta do śledzenia i zyskujące popularność hashtagi, by poszerzać swoją sieć.
+Dołącz do społeczności i utwórz swój profil. Poznaj i obserwuj fascynujących ludzi i czytaj ich wpisy w chronologicznym osi czasu. Wyrażaj siebie za pomocą niestandardowych emoji, obrazów, GIFów, filmów i audio w 500-znakowych wpisach. Odpowiadaj na wątki i podawaj dalej posty od każdego, aby dzielić się wspaniałymi rzeczami. Odnajduj nowe konta do obserwowania i zyskujące popularność hashtagi, by poszerzać swoją sieć.
 
-Mastodon został zaprojektowany z myślą o prywatności i bezpieczeństwie. Decyduj, czy Twoje wpisy są udostępniane osobom śledzącym Cię, tylko wzmiankowanym, czy całemu światu. Ostrzeżenia dotyczące zawartości pozwalają ukrywać posty zawierające wrażliwe lub wyzywające materiały, dopóki nie będziesz gotów się z nimi pogodzić. Każda społeczność ma własne wytyczne i moderatorów, aby zapewniać swoim członkom bezpieczeństwo, a także solidne narzędzia blokowania i raportowania pomagające zapobiegać nadużyciom.
+Mastodon został zaprojektowany z myślą o prywatności i bezpieczeństwie. Decyduj, czy Twoje wpisy są udostępniane osobom obserwującym Cię, tylko wzmiankowanym, czy całemu światu. Ostrzeżenia dotyczące zawartości pozwalają ukrywać posty zawierające wrażliwe lub wyzywające materiały, dopóki nie będziesz gotów się z nimi pogodzić. Każda społeczność ma własne wytyczne i moderatorów, aby zapewniać swoim członkom bezpieczeństwo, a także solidne narzędzia blokowania i raportowania pomagające zapobiegać nadużyciom.
 
 Więcej funkcji:
 
@@ -13,4 +13,4 @@ Więcej funkcji:
 • Udostępnianie: Publikuj bezpośrednio na Mastodonie z menu udostępniania w dowolnej aplikacji
 • Słodycz: Nasza maskotka to uroczy słoń i zobaczysz go pojawiającego się od czasu do czasu
 
-Mastodon to zarejestrowana organizacja non-profit i rozwój jest wspierany bezpośrednio przez darowizny. Nie ma reklam, monetyzacji, ani kapitału inwestycyjnego i planujemy, by tak pozostało.
+Mastodon to zarejestrowana organizacja non-profit, a rozwój jest wspierany bezpośrednio przez darowizny. Nie ma reklam, monetyzacji, ani kapitału inwestycyjnego i planujemy, by tak pozostało.

fastlane/metadata/android/pt-BR/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodon é a maior rede social descentralizada na internet. Ao invés de ser um ‘website’, é uma rede de milhões de usuários em comunidades independentes que podem comunicar-se uma à outra, de forma transparente. Independente do que você gostar, você pode encontrar pessoas dedicadas a isso no Mastodon!
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+Junte-se a uma comunidade e crie o seu perfil. Encontre e siga pessoas fascinantes e leia seus posts em uma linha cronológica sem publicidade. Se expresse com emojis personalizados, imagens, GIFs, vídeos e áudio em publicações de 500 caracteres. Responda a tópicos e reblogue publicações de qualquer um para compartilhar coisas ótimas. Encontre contas novas para seguir e hashtags em alta para expandir sua rede.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+O Mastodon foi construído com foco em privacidade e segurança. Decida se seus posts serão compartilhados com seus seguidores, apenas com as pessoas que você menciona, ou com o mundo inteiro. Avisos de conteúdo permitem que você oculte mensagens que contenham conteúdo sensível até você estar pronto para interagir com elas. Cada comunidade tem suas próprias diretrizes e moderadores para manter seus membros seguros, e ferramentas robustas de bloqueio e denúncias ajudam a prevenir abusos.
 
-More features:
+Mais detalhes:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Modo escuro: Leia as postagens no modo claro, escuro ou preto de verdade
+• Enquetes: Peça as opiniões de seus seguidores e registre os resultados
+• Explorar: Hashtags e contas em destaque estão a um toque de distância
+• Notificações: Seja notificado sobre novos seguidores, respostas e reblogs
+• Compartilhar: Poste diretamente ao Mastodon pela página de compartilhamento de qualquer aplicativo
+• Fofura: Nossa mascote é um elefante fofinho, e você vai vê-lo por aí ocasionalmente
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon é uma instituição sem fins lucrativos e o desenvolvimento é suportado diretamente pelas suas doações. Não há publicidade, não há monetização, nem capital de risco, e planejamos manter-se assim.

fastlane/metadata/android/pt-BR/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Rede social descentralizada

fastlane/metadata/android/si-LK/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+
+Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+
+Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+
+More features:
+
+• Dark Mode: Read posts in light, dark, or true black mode
+• Polls: Ask followers for their opinion and tally the votes
+• Explore: Trending hashtags and accounts are a tap away
+• Notifications: Get notified about new follows, replies, and reblogs
+• Sharing: Post directly to Mastodon from any share sheet in any app
+• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+
+Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/si-LK/short_description.txt

@@ -0,0 +1 @@
+Decentralized social network

fastlane/metadata/android/si-LK/title.txt

@@ -0,0 +1 @@
+Mastodon

fastlane/metadata/android/sv-SE/full_description.txt

@@ -1,6 +1,6 @@
 Mastodon är det största decentraliserade sociala nätverket på internet. I stället för en enda webbplats är det ett nätverk av miljontals användare på oberoende servrar som alla kan interagera med varandra, sömlöst. Oavsett vad du är intresserad av kan du träffa passionerade personer som diskuterar ämnet på Mastodon!
 
-Gå med på en server och skapa din profil. Hitta och följ fascinerande människor och läsa deras inlägg i en annonsfri, kronologisk tidslinje. Uttryck dig med anpassade emoji, bilder, GIF:ar, videor och ljud i 500-teckensinlägg. Svara på trådar och ompostningar från vem som helst för att dela bra saker. Hitta nya konton att följa och trendande hashtaggar för att utöka ditt nätverk.
+Gå med på en server och skapa din profil. Hitta och följ fascinerande människor och läsa deras inlägg i en annonsfri, kronologisk tidslinje. Uttryck dig med anpassade emoji, bilder, GIF:ar, videor och ljud i 500-teckensinlägg. Svara på trådar och boostar från vem som helst för att dela bra saker. Hitta nya konton att följa och trendande hashtaggar för att utöka ditt nätverk.
 
 Mastodon är byggt med fokus på integritet och trygghet. Bestäm om dina inlägg delas med dina följare, bara personer du omnämner, eller hela världen. Innehållsvarningar låter dig dölja inlägg som innehåller känsligt eller triggande material tills du är redo att interagera med dem. Varje server har sina egna riktlinjer och moderatorer för att hålla sina medlemmar trygga, och robusta blockerings- och rapporteringsverktyg för att förhindra missbruk.
 
@@ -9,7 +9,7 @@ Fler funktioner:
 • Mörkt läge: Läs inlägg i ljust, mörkt eller helsvart läge
 • Omröstningar: Fråga följare om deras åsikt och sammanställ deras röster
 • Utforska: Trendande hashtaggar och konton är ett tryck bort
-• Notiser: Bli meddelad om nya följare, svar och ompostningar
+• Notiser: Bli meddelad om nya följare, svar och boostar
 • Delning: Posta direkt till Mastodon från delningsbladet i alla appar
 • Gullighet: Vår maskot är en bedårande elefant, och du kommer att se dem dyka upp då och då
 

fastlane/metadata/android/th-TH/full_description.txt

@@ -1,4 +1,4 @@
-Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ที่ใหญ่ที่สุดบนอินเทอร์เน็ต ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon!
+Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ที่ใหญ่ที่สุดบนอินเทอร์เน็ต ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon! ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon!
 
 เข้าร่วมชุมชนและสร้างโปรไฟล์ ค้นหาและติดตามผู้คนที่น่าสนใจและอ่านโพสต์ของเขาในไทม์ไลน์ที่ไร้โฆษณาและเรียงตามลำดับเวลาล้วน ๆ แสดงความรู้สึกของตัวคุณเองด้วยอีโมจิที่กำหนดเอง รูปภาพ GIF วิดีโอ และเสียงในโพสต์ 500 ตัวอักษร ตอบกลับและดันโพสต์จากคนอื่น ๆ เพื่อแชร์สิ่งดี ๆ และค้นหาบัญชีใหม่ ๆ ที่จะติดตามและแฮชแท็กที่เป็นที่นิยมเพื่อขยายเครือข่ายของคุณ
 
@@ -13,4 +13,4 @@ Mastodon สร้างขึ้นโดยเน้นความเป็
 • การแชร์: โพสต์ลง Mastodon ได้โดยตรงจากแอปอื่น ๆ ที่อยู่ในเครื่อง
 • ความน่ารัก: มาสคอตของเราเป็นช้างน่ารัก และคุณจะเห็นมันโผล่ออกมาเป็นระยะ ๆ
 
-Mastodon เป็นองค์กรไม่แสวงหาผลกำไรที่จดทะเบียนแล้ว และการพัฒนาได้รับการสนับสนุนจากเงินบริจาคของคุณโดยตรง ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป
+Mastodon เป็นองค์กรไม่แสวงหาผลกำไรที่จดทะเบียนแล้ว และการพัฒนาได้รับการสนับสนุนจากเงินบริจาคของคุณโดยตรง ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป

fastlane/metadata/android/vi-VN/full_description.txt

@@ -1,6 +1,6 @@
-Mastodon là mạng xã hội liên hợp lớn nhất trên internet. Thay vì một trang web duy nhất, nó là một mạng lưới hàng triệu người dùng trong các máy chủ độc lập, tất cả đều có thể tương tác với nhau một cách liền mạch. Bất kể bạn thích gì, bạn đều có thể gặp gỡ những người đăng tút về nó trên Mastodon!
+Mastodon là mạng xã hội liên hợp lớn nhất trên internet. Thay vì một trang web duy nhất, nó là một mạng lưới hàng triệu người trong các máy chủ độc lập, tất cả đều có thể tương tác với nhau một cách liền mạch. Bất kể bạn thích gì, bạn đều có thể gặp gỡ những người đăng tút về nó trên Mastodon!
 
-Tham gia một máy chủ và tạo trang hồ sơ của bạn. Tìm, theo dõi những người thú vị và đọc tút của họ theo trình tự thời gian, không có quảng cáo. Thể hiện bản thân bằng emoji, hình ảnh, GIF, video và âm thanh trong tút tối đa 500 ký tự. Trả lời tút và đăng lại tút từ bất kỳ ai để chia sẻ những điều tuyệt vời. Tìm những người dùng mới để theo dõi và các hashtag nổi bật để mở rộng mạng lưới của bạn.
+Tham gia một máy chủ và tạo trang hồ sơ của bạn. Tìm, theo dõi những người thú vị và đọc tút của họ theo trình tự thời gian, không có quảng cáo. Thể hiện bản thân bằng emoji, hình ảnh, GIF, video và âm thanh trong tút tối đa 500 ký tự. Trả lời tút và đăng lại tút từ bất kỳ ai để chia sẻ những điều tuyệt vời. Tìm những người mới để theo dõi và các hashtag nổi bật để mở rộng mạng lưới của bạn.
 
 Mastodon được xây dựng tập trung vào sự riêng tư và an toàn. Quyết định xem tút của bạn được chia sẻ với những người theo dõi, chỉ những người bạn nhắc đến hay cả thế giới. Nội dung ẩn cho phép bạn ẩn các tút chứa nội dung nhạy cảm hoặc chơi chữ cho đến khi bạn sẵn sàng tương tác với chúng. Mỗi máy chủ có các nguyên tắc riêng và kiểm duyệt viên riêng để giữ an toàn cho các thành viên, song song với các công cụ chặn và báo cáo mạnh mẽ giúp ngăn chặn hành vi bậy.
 

fastlane/metadata/android/zh-CN/full_description.txt

@@ -1,4 +1,4 @@
-Mastodon 是互联网上最大的去中心化社交网络。 它不是一个网站，而是由独立社区节点及其数以百万计的用户组成的网络，所有这些用户都能够无缝地相互交流。 无论你进入哪一个节点，你都可以与所有在 Mastodon 的人之间进行交流。
+Mastodon 是互联网上最大的去中心化社交网络。 它不是一个网站，而是由独立社区节点及其数以百万计的用户组成的网络，所有这些用户都能够无缝地相互交流。 无论你进入哪一个节点，你都可以与所有在 Mastodon 的人之间进行交流。 它不是一个网站，而是由独立社区节点及其数以百万计的用户组成的网络，所有这些用户都能够无缝地相互交流。 无论你进入哪一个节点，你都可以与所有在 Mastodon 的人之间进行交流。
 
 加入一个社区节点并创建你的账户。 寻找并关注感兴趣的同好，无广告地浏览他们的时间线。 用自定义表情、图像、GIF、视频和音频在 500 个字符的帖子里写下你的想法。 回复及转发其他人的帖子来共同分享美好的事物。 寻找新的账户以及热门的话题来拓展你的网络。
 
@@ -13,4 +13,4 @@ Mastodon 以隐私和安全为首要目标。 自由选择你的帖子是分享
 • 分享：从其他应用中的分享菜单中直接发布到 Mastodon
 • 吉祥物：你会不时地看到我们可爱的长毛象
 
-Mastodon 是一个注册的非营利开发项目，直接由您的捐赠支持。 没有广告，没有商业化，也没有风险资本，我们计划保持这种方式。
+Mastodon 是一个注册的非营利开发项目，直接由您的捐赠支持。 没有广告，没有商业化，也没有风险资本，我们计划保持这种方式。 没有广告，没有商业化，也没有风险资本，我们计划保持这种方式。

fastlane/metadata/android/zh-TW/full_description.txt

@@ -1,4 +1,4 @@
-Mastodon 是網際網路上最大的去中心化社交網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能在 Mastodon 上遇到充滿熱情的人們討論該話題。
+Mastodon 是網際網路上最大的去中心化社交網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能在 Mastodon 上遇到充滿熱情的人們討論該話題。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 Mastodon 以隱私與安全為要。 決定您的嘟文要與您的跟隨者分享、只與您提及的人們分享，又或是與全世界分享。 內容警告可讓您隱藏包含敏感或可能觸發強烈情緒反應的嘟文，直到您準備好與它們進行互動。 每個社群都有它們自己的指導方針與管理原來確保其成員安全，強大的封鎖與回報工具有助於防止濫用。
 
 加入社群並建立您的個人檔案。 尋找並跟隨迷人的朋友們，並在無廣告、按時間順序排列的時間軸上閱讀他們的嘟文。 在 500 個字元的嘟文中使用自訂表情符號、GIF、視訊與音訊來表達您自己。 回覆任何人的話題與轉發貼文以分享精彩內容。 尋找要跟隨的新帳號與熱門主題標籤來拓展您的網路。
 
@@ -13,4 +13,4 @@ Mastodon 以隱私與安全為要。 決定您的嘟文要與您的跟隨者分
 • 分享：從任何應用程式中的分享表中直接發表嘟文到 Mastodon 中
 • 可愛：我們的吉祥物是一隻可愛的大象，您會不時看到牠出現
 
-Mastodon 是一家註冊的非營利組織，您的捐款會直接支援開發工作。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。
+Mastodon 是一家註冊的非營利組織，您的捐款會直接支援開發工作。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 35
-		versionName "1.1.4+fork.35"
+		versionCode 45
+		versionName "1.1.4+fork.45"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "en", "ar-rSA", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES",
 				"eu-rES", "fi-rFI", "fr-rFR", "gl-rES", "hr-rHR", "hy-rAM", "it-rIT", "iw-rIL",
@@ -75,7 +75,7 @@ dependencies {
 	implementation 'me.grishka.litex:dynamicanimation:1.1.0-alpha03'
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.6'
+	implementation 'me.grishka.appkit:appkit:1.2.7'
 	implementation 'com.google.code.gson:gson:2.8.9'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'

mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java

@@ -111,7 +111,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 
 	private void actuallyCheckForUpdates(){
 		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/sk22/mastodon-android-fork/releases/latest")
+				.url("https://api.github.com/repos/sk22/mastodos/releases/latest")
 				.build();
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){

mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -10,9 +10,12 @@ public class GlobalUserPreferences{
 	public static boolean showReplies;
 	public static boolean showBoosts;
 	public static boolean loadNewPosts;
+	public static boolean showInteractionCounts;
+	public static boolean alwaysExpandContentWarnings;
+	public static boolean disableMarquee;
 	public static ThemePreference theme;
 
-	private static SharedPreferences getPrefs(){
+    private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
@@ -24,6 +27,9 @@ public class GlobalUserPreferences{
 		showReplies=prefs.getBoolean("showReplies", true);
 		showBoosts=prefs.getBoolean("showBoosts", true);
 		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
+		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
+		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
+		disableMarquee=prefs.getBoolean("disableMarquee", false);
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 	}
 
@@ -35,6 +41,9 @@ public class GlobalUserPreferences{
 				.putBoolean("showBoosts", showBoosts)
 				.putBoolean("loadNewPosts", loadNewPosts)
 				.putBoolean("trueBlackTheme", trueBlackTheme)
+				.putBoolean("showInteractionCounts", showInteractionCounts)
+				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
+				.putBoolean("disableMarquee", disableMarquee)
 				.putInt("theme", theme.ordinal())
 				.apply();
 	}

mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java

@@ -35,7 +35,7 @@ import me.grishka.appkit.utils.WorkerThread;
 
 public class CacheController{
 	private static final String TAG="CacheController";
-	private static final int DB_VERSION=2;
+	private static final int DB_VERSION=3;
 	private static final WorkerThread databaseThread=new WorkerThread("databaseThread");
 	private static final Handler uiHandler=new Handler(Looper.getMainLooper());
 
@@ -126,14 +126,15 @@ public class CacheController{
 		});
 	}
 
-	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean forceReload, Callback<PaginatedResponse<List<Notification>>> callback){
+	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<PaginatedResponse<List<Notification>>> callback){
 		cancelDelayedClose();
 		databaseThread.postRunnable(()->{
 			try{
 				List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
-					try(Cursor cursor=db.query(onlyMentions ? "notifications_mentions" : "notifications_all", new String[]{"json"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`id` DESC", count+"")){
+					String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";
+					try(Cursor cursor=db.query(table, new String[]{"json"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`id` DESC", count+"")){
 						if(cursor.getCount()==count){
 							ArrayList<Notification> result=new ArrayList<>();
 							cursor.moveToFirst();
@@ -159,7 +160,7 @@ public class CacheController{
 						Log.w(TAG, "getNotifications: corrupted notification object in database", x);
 					}
 				}
-				new GetNotifications(maxID, count, onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class))
+				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class))
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Notification> result){
@@ -173,7 +174,7 @@ public class CacheController{
 									}
 									return true;
 								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id));
-								putNotifications(result, onlyMentions, maxID==null);
+								putNotifications(result, onlyMentions, onlyPosts, maxID==null);
 							}
 
 							@Override
@@ -191,9 +192,9 @@ public class CacheController{
 		}, 0);
 	}
 
-	private void putNotifications(List<Notification> notifications, boolean onlyMentions, boolean clear){
+	private void putNotifications(List<Notification> notifications, boolean onlyMentions, boolean onlyPosts, boolean clear){
 		runOnDbThread((db)->{
-			String table=onlyMentions ? "notifications_mentions" : "notifications_all";
+			String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";
 			if(clear)
 				db.delete(table, null, null);
 			ContentValues values=new ContentValues(3);
@@ -317,6 +318,7 @@ public class CacheController{
 							`type` INTEGER NOT NULL
 						)""");
 			createRecentSearchesTable(db);
+			createPostsNotificationsTable(db);
 		}
 
 		@Override
@@ -324,6 +326,9 @@ public class CacheController{
 			if(oldVersion==1){
 				createRecentSearchesTable(db);
 			}
+			if(oldVersion==2){
+				createPostsNotificationsTable(db);
+			}
 		}
 
 		private void createRecentSearchesTable(SQLiteDatabase db){
@@ -334,6 +339,16 @@ public class CacheController{
 							`time` INTEGER NOT NULL
 						)""");
 		}
+
+		private void createPostsNotificationsTable(SQLiteDatabase db){
+			db.execSQL("""
+						CREATE TABLE `notifications_posts` (
+							`id` VARCHAR(25) NOT NULL PRIMARY KEY,
+							`json` TEXT NOT NULL,
+							`flags` INTEGER NOT NULL DEFAULT 0,
+							`type` INTEGER NOT NULL
+						)""");
+		}
 	}
 
 	@FunctionalInterface

mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java

@@ -191,15 +191,18 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	}
 
 	void onError(ErrorResponse err){
-		invokeErrorCallback(err);
+		if(!canceled)
+			invokeErrorCallback(err);
 	}
 
 	void onError(String msg, int httpStatus, Throwable exception){
-		invokeErrorCallback(new MastodonErrorResponse(msg, httpStatus, exception));
+		if(!canceled)
+			invokeErrorCallback(new MastodonErrorResponse(msg, httpStatus, exception));
 	}
 
 	void onSuccess(T resp){
-		invokeSuccessCallback(resp);
+		if(!canceled)
+			invokeSuccessCallback(resp);
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/AuthorizeFollowRequest.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Relationship;
+
+public class AuthorizeFollowRequest extends MastodonAPIRequest<Relationship>{
+    public AuthorizeFollowRequest(String id){
+        super(HttpMethod.POST, "/follow_requests/"+id+"/authorize", Relationship.class);
+        setRequestBody(new Object());
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetFavourites.java

@@ -0,0 +1,49 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.Response;
+
+public class GetFavourites extends MastodonAPIRequest<List<Status>>{
+    private String maxId;
+
+    public GetFavourites(String maxID, String minID, int limit){
+        super(HttpMethod.GET, "/favourites", new TypeToken<>(){});
+        if(maxID!=null)
+            addQueryParameter("max_id", maxID);
+        if(minID!=null)
+            addQueryParameter("min_id", minID);
+        if(limit>0)
+            addQueryParameter("limit", ""+limit);
+    }
+
+    @Override
+    public void validateAndPostprocessResponse(List<Status> respObj, Response httpResponse) throws IOException {
+        super.validateAndPostprocessResponse(respObj, httpResponse);
+        // <https://mastodon.social/api/v1/bookmarks?max_id=268962>; rel="next",
+        // <https://mastodon.social/api/v1/bookmarks?min_id=268981>; rel="prev"
+        String link=httpResponse.header("link");
+        // parsing link header by hand; using a library would be cleaner
+        // (also, the functionality should be part of the max id logics and implemented in MastodonAPIRequest)
+        if(link==null) return;
+        String maxIdEq="max_id=";
+        for(String s : link.split(",")) {
+            if(s.contains("rel=\"next\"")) {
+                int start=s.indexOf(maxIdEq)+maxIdEq.length();
+                int end=s.indexOf('>');
+                if(start<0 || start>end) return;
+                this.maxId=s.substring(start, end);
+            }
+        }
+    }
+
+    public String getMaxId() {
+        return maxId;
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetFollowRequests.java

@@ -0,0 +1,50 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowSuggestion;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.Response;
+
+public class GetFollowRequests extends MastodonAPIRequest<List<Account>>{
+	private String maxId;
+
+	public GetFollowRequests(String maxID, String minID, int limit){
+		super(HttpMethod.GET, "/follow_requests", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(minID!=null)
+			addQueryParameter("min_id", minID);
+		if(limit>0)
+			addQueryParameter("limit", ""+limit);
+	}
+
+	@Override
+	public void validateAndPostprocessResponse(List<Account> respObj, Response httpResponse) throws IOException {
+		super.validateAndPostprocessResponse(respObj, httpResponse);
+		// <https://mastodon.social/api/v1/follow_requests?max_id=268962>; rel="next",
+		// <https://mastodon.social/api/v1/follow_requests?min_id=268981>; rel="prev"
+		String link=httpResponse.header("link");
+		// parsing link header by hand; using a library would be cleaner
+		// (also, the functionality should be part of the max id logics and implemented in MastodonAPIRequest)
+		if(link==null) return;
+		String maxIdEq="max_id=";
+		for(String s : link.split(",")) {
+			if(s.contains("rel=\"next\"")) {
+				int start=s.indexOf(maxIdEq)+maxIdEq.length();
+				int end=s.indexOf('>');
+				if(start<0 || start>end) return;
+				this.maxId=s.substring(start, end);
+			}
+		}
+	}
+
+	public String getMaxId() {
+		return maxId;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/RejectFollowRequest.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Relationship;
+
+public class RejectFollowRequest extends MastodonAPIRequest<Relationship>{
+    public RejectFollowRequest(String id){
+        super(HttpMethod.POST, "/follow_requests/"+id+"/reject", Relationship.class);
+        setRequestBody(new Object());
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import java.util.List;
+
+public class AddAccountsToList extends MastodonAPIRequest<Object> {
+    public AddAccountsToList(String listId, List<String> accountIds){
+        super(HttpMethod.POST, "/lists/"+listId+"/accounts", Object.class);
+        Request req = new Request();
+        req.accountIds = accountIds;
+        setRequestBody(req);
+    }
+
+    public static class Request{
+        public List<String> accountIds;
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java

@@ -11,4 +11,7 @@ public class GetLists extends MastodonAPIRequest<List<ListTimeline>>{
     public GetLists() {
         super(HttpMethod.GET, "/lists", new TypeToken<>(){});
     }
+    public GetLists(String accountID) {
+        super(HttpMethod.GET, "/accounts/"+accountID+"/lists", new TypeToken<>(){});
+    }
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import java.util.List;
+
+public class RemoveAccountsFromList extends MastodonAPIRequest<Object> {
+    public RemoveAccountsFromList(String listId, List<String> accountIds){
+        super(HttpMethod.DELETE, "/lists/"+listId+"/accounts", Object.class);
+        Request req = new Request();
+        req.accountIds = accountIds;
+        setRequestBody(req);
+    }
+
+    public static class Request{
+        public List<String> accountIds;
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java

@@ -14,6 +14,6 @@ public class CreateOAuthApp extends MastodonAPIRequest<Application>{
 		public String clientName="Mastodos";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://github.com/sk22/mastodon-android-fork";
+		public String website="https://sk22.github.io/mastodos";
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/events/FollowRequestHandledEvent.java

@@ -0,0 +1,18 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Relationship;
+
+public class FollowRequestHandledEvent {
+	public String accountID;
+	public boolean accepted;
+	public Account account;
+	public Relationship	relationship;
+
+	public FollowRequestHandledEvent(String accountID, boolean accepted, Account account, Relationship rel){
+		this.accountID=accountID;
+		this.accepted=accepted;
+		this.account=account;
+		this.relationship=rel;
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/events/NotificationDeletedEvent.java

@@ -0,0 +1,9 @@
+package org.joinmastodon.android.events;
+
+public class NotificationDeletedEvent{
+	public final String id;
+
+	public NotificationDeletedEvent(String id){
+		this.id=id;
+  }
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java

@@ -19,6 +19,7 @@ import android.view.WindowInsets;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
@@ -81,6 +82,10 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
+		if(GlobalUserPreferences.disableMarquee){
+			setTitleMarqueeEnabled(false);
+			setSubtitleMarqueeEnabled(false);
+		}
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -13,6 +13,7 @@ import android.graphics.Outline;
 import android.graphics.PixelFormat;
 import android.graphics.RenderEffect;
 import android.graphics.Shader;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.icu.text.BreakIterator;
 import android.media.MediaMetadataRetriever;
@@ -101,6 +102,8 @@ import org.parceler.Parcels;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
 import java.net.UnknownHostException;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -196,19 +199,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private boolean attachmentsErrorShowing;
 
 	private Status editingStatus;
+	private boolean redraftStatus;
 	private boolean pollChanged;
 	private boolean creatingView;
 	private boolean ignoreSelectionChanges=false;
 	private Runnable updateUploadEtaRunnable;
 
-	public static DraftMediaAttachment redraftAttachment(Attachment att) {
-		DraftMediaAttachment draft=new DraftMediaAttachment();
-		draft.serverAttachment=att;
-		draft.description=att.description;
-		draft.uri=Uri.parse(att.url);
-		return draft;
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -222,6 +218,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		instance=AccountSessionManager.getInstance().getInstanceInfo(instanceDomain);
 		if(getArguments().containsKey("editStatus")){
 			editingStatus=Parcels.unwrap(getArguments().getParcelable("editStatus"));
+			redraftStatus=getArguments().getBoolean("redraftStatus");
 		}
 		if(instance==null){
 			Nav.finish(this);
@@ -328,18 +325,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		pollDurationView.setOnClickListener(v->showPollDurationMenu());
 
 		pollOptions.clear();
-		ArrayList<String> restoredPollOptions=(savedInstanceState!=null ? savedInstanceState : getArguments())
-				.getStringArrayList("pollOptions");
-		if(restoredPollOptions!=null){
-			if(savedInstanceState==null){
-				// restoring from arguments
-				pollDuration=getArguments().getInt("pollDuration");
-				pollDurationStr=DateUtils.formatElapsedTime(pollDuration); // getResources().getQuantityString(R.plurals.x_hours, pollDuration/3600);
-			}
+		if(savedInstanceState!=null && savedInstanceState.containsKey("pollOptions")){
 			pollBtn.setSelected(true);
 			mediaBtn.setEnabled(false);
 			pollWrap.setVisibility(View.VISIBLE);
-			for(String oldText:restoredPollOptions){
+			for(String oldText:savedInstanceState.getStringArrayList("pollOptions")){
 				DraftPollOption opt=createDraftPollOption();
 				opt.edit.setText(oldText);
 			}
@@ -353,6 +343,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				DraftPollOption opt=createDraftPollOption();
 				opt.edit.setText(eopt.title);
 			}
+			pollDuration=(int)editingStatus.poll.expiresAt.minus(System.currentTimeMillis(), ChronoUnit.MILLIS).getEpochSecond();
+			pollDurationStr=UiUtils.formatTimeLeft(getActivity(), editingStatus.poll.expiresAt);
 			updatePollOptionHints();
 			pollDurationView.setText(getString(R.string.compose_poll_duration, pollDurationStr));
 		}else{
@@ -374,13 +366,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			spoilerBtn.setSelected(true);
 		}
 
-		sensitive = editingStatus != null ? editingStatus.sensitive
-				: (savedInstanceState != null && savedInstanceState.getBoolean("sensitive", false));
-		sensitiveIcon.setSelected(sensitive);
-
-		ArrayList<Parcelable> serializedAttachments=(savedInstanceState!=null ? savedInstanceState : getArguments())
-				.getParcelableArrayList("attachments");
-		if(serializedAttachments!=null){
+		if(savedInstanceState!=null && savedInstanceState.containsKey("attachments")){
+			ArrayList<Parcelable> serializedAttachments=savedInstanceState.getParcelableArrayList("attachments");
 			for(Parcelable a:serializedAttachments){
 				DraftMediaAttachment att=Parcels.unwrap(a);
 				attachmentsView.addView(createMediaAttachmentView(att));
@@ -423,8 +410,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			outState.putInt("pollDuration", pollDuration);
 			outState.putString("pollDurationStr", pollDurationStr);
 		}
-		outState.putBoolean("hasSpoiler", hasSpoiler);
 		outState.putBoolean("sensitive", sensitive);
+		outState.putBoolean("hasSpoiler", hasSpoiler);
 		if(!attachments.isEmpty()){
 			ArrayList<Parcelable> serializedAttachments=new ArrayList<>(attachments.size());
 			for(DraftMediaAttachment att:attachments){
@@ -516,6 +503,24 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter()));
 		if(replyTo!=null){
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
+			int visibilityNameRes = switch (statusVisibility) {
+				case PUBLIC -> R.string.visibility_public;
+				case UNLISTED -> R.string.visibility_unlisted;
+				case PRIVATE -> R.string.visibility_followers_only;
+				case DIRECT -> R.string.visibility_private;
+			};
+			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
+			Drawable visibilityIcon = getActivity().getDrawable(switch(statusVisibility){
+				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
+				case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular;
+				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
+				case DIRECT -> R.drawable.ic_at_symbol;
+			});
+			visibilityIcon.setBounds(0, 0, V.dp(20), V.dp(20));
+			Drawable replyArrow = getActivity().getDrawable(R.drawable.ic_fluent_arrow_reply_20_filled);
+			replyArrow.setBounds(0, 0, V.dp(20), V.dp(20));
+			replyText.setCompoundDrawables(replyArrow, null, visibilityIcon, null);
+
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
 			if(!replyTo.account.id.equals(ownID))
@@ -540,7 +545,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					spoilerBtn.setSelected(true);
 				}
 			}
-		}else{
+		}else if (editingStatus==null || editingStatus.inReplyToId==null){
+			// TODO: remove workaround after https://github.com/mastodon/mastodon-android/issues/341 gets fixed
 			replyText.setVisibility(View.GONE);
 		}
 		if(savedInstanceState==null){
@@ -585,14 +591,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		if(editingStatus!=null){
 			updateCharCounter();
-			visibilityBtn.setEnabled(false);
+			visibilityBtn.setEnabled(redraftStatus);
 		}
 	}
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		publishButton=new Button(getActivity());
-		publishButton.setText(editingStatus==null ? R.string.publish : R.string.save);
+		publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
 		publishButton.setOnClickListener(this::onPublishClick);
 		LinearLayout wrap=new LinearLayout(getActivity());
 		wrap.setOrientation(LinearLayout.HORIZONTAL);
@@ -697,8 +703,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(!attachments.isEmpty()){
 			req.mediaIds=attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
 		}
-		if(replyTo!=null){
-			req.inReplyToId=replyTo.id;
+		if(replyTo!=null || (editingStatus != null && editingStatus.inReplyToId!=null)){
+			req.inReplyToId=editingStatus!=null ? editingStatus.inReplyToId : replyTo.id;
 		}
 		if(!pollOptions.isEmpty()){
 			req.poll=new CreateStatus.Request.Poll();
@@ -741,6 +747,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					E.post(new StatusUpdatedEvent(result));
 				}
 				Nav.finish(ComposeFragment.this);
+				if (getArguments().getBoolean("navigateToStatus", false)) {
+					Bundle args=new Bundle();
+					args.putString("account", accountID);
+					args.putParcelable("status", Parcels.wrap(result));
+					if(replyTo!=null) args.putParcelable("inReplyToAccount", Parcels.wrap(replyTo));
+					Nav.go(getActivity(), ThreadFragment.class, args);
+				}
 			}
 
 			@Override
@@ -754,7 +767,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		};
 
-		if(editingStatus!=null){
+		if(editingStatus!=null && !redraftStatus){
 			new EditStatus(req, editingStatus.id)
 					.setCallback(resCallback)
 					.exec(accountID);

mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritesListFragment.java

@@ -0,0 +1,46 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetFavourites;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class FavoritesListFragment extends StatusListFragment{
+
+    private String accountID;
+    private String lastMaxId=null;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+        accountID=getArguments().getString("account");
+        AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+        setTitle(R.string.favorited_posts);
+    }
+
+    @Override
+    protected void onShown(){
+        super.onShown();
+        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+            loadData();
+    }
+
+    @Override
+    protected void doLoadData(int offset, int count) {
+        GetFavourites b=new GetFavourites(offset>0 ? lastMaxId : null, null, count);
+        currentRequest=b.setCallback(new SimpleCallback<>(this){
+            @Override
+            public void onSuccess(List<Status> result){
+                onDataLoaded(result, b.getMaxId()!=null);
+                lastMaxId=b.getMaxId();
+            }
+        })
+                .exec(accountID);
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java

@@ -0,0 +1,344 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.graphics.Rect;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
+import org.joinmastodon.android.api.requests.accounts.GetFollowRequests;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Relationship;
+import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.ProgressBarButton;
+import org.parceler.Parcels;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.fragments.BaseRecyclerFragment;
+import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop{
+	private String accountID;
+	private Map<String, Relationship> relationships=Collections.emptyMap();
+	private GetAccountRelationships relationshipsRequest;
+	private String lastMaxId=null;
+
+	public FollowRequestsListFragment(){
+		super(20);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		accountID=getArguments().getString("account");
+		loadData();
+	}
+
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+		setTitle(R.string.follow_requests);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		if(relationshipsRequest!=null){
+			relationshipsRequest.cancel();
+			relationshipsRequest=null;
+		}
+		currentRequest=new GetFollowRequests(offset>0 ? lastMaxId : null, null, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Account> result){
+						onDataLoaded(result.stream().map(AccountWrapper::new).collect(Collectors.toList()), false);
+						loadRelationships();
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		return new AccountsAdapter();
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.addItemDecoration(new RecyclerView.ItemDecoration(){
+			@Override
+			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
+				outRect.bottom=outRect.left=outRect.right=V.dp(16);
+				if(parent.getChildAdapterPosition(view)==0)
+					outRect.top=V.dp(16);
+			}
+		});
+		((UsableRecyclerView)list).setDrawSelectorOnTop(true);
+	}
+
+	private void loadRelationships(){
+		relationships=Collections.emptyMap();
+		relationshipsRequest=new GetAccountRelationships(data.stream().map(fs->fs.account.id).collect(Collectors.toList()));
+		relationshipsRequest.setCallback(new Callback<>(){
+			@Override
+			public void onSuccess(List<Relationship> result){
+				relationshipsRequest=null;
+				relationships=result.stream().collect(Collectors.toMap(rel->rel.id, Function.identity()));
+				if(list==null)
+					return;
+				for(int i=0;i<list.getChildCount();i++){
+					RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
+					if(holder instanceof AccountViewHolder avh)
+						avh.rebind();
+				}
+			}
+
+			@Override
+			public void onError(ErrorResponse error){
+				relationshipsRequest=null;
+			}
+		}).exec(accountID);
+	}
+
+	@Override
+	public void onDestroyView(){
+		super.onDestroyView();
+		if(relationshipsRequest!=null){
+			relationshipsRequest.cancel();
+			relationshipsRequest=null;
+		}
+	}
+
+	@Override
+	public void scrollToTop(){
+		smoothScrollRecyclerViewToTop(list);
+	}
+
+	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
+
+		public AccountsAdapter(){
+			super(imgLoader);
+		}
+
+		@Override
+		public void onBindViewHolder(AccountViewHolder holder, int position){
+			holder.bind(data.get(position));
+			super.onBindViewHolder(holder, position);
+		}
+
+		@NonNull
+		@Override
+		public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new AccountViewHolder();
+		}
+
+		@Override
+		public int getItemCount(){
+			return data.size();
+		}
+
+		@Override
+		public int getImageCountForItem(int position){
+			return 2+data.get(position).emojiHelper.getImageCount();
+		}
+
+		@Override
+		public ImageLoaderRequest getImageRequest(int position, int image){
+			AccountWrapper item=data.get(position);
+			if(image==0)
+				return item.avaRequest;
+			else if(image==1)
+				return item.coverRequest;
+			else
+				return item.emojiHelper.getImageRequest(image-2);
+		}
+	}
+
+	// literally the same as AccountCardStatusDisplayItem and DiscoverAccountsFragment. code should be generalized
+	private class AccountViewHolder extends BindableViewHolder<AccountWrapper> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
+		private final ImageView cover, avatar;
+		private final TextView name, username, bio, followersCount, followingCount, postsCount, followersLabel, followingLabel, postsLabel;
+		private final ProgressBarButton actionButton, acceptButton, rejectButton;
+		private final ProgressBar actionProgress, acceptProgress, rejectProgress;
+		private final View actionWrap, acceptWrap, rejectWrap;
+
+		private Relationship relationship;
+
+		public AccountViewHolder(){
+			super(getActivity(), R.layout.item_discover_account, list);
+			cover=findViewById(R.id.cover);
+			avatar=findViewById(R.id.avatar);
+			name=findViewById(R.id.name);
+			username=findViewById(R.id.username);
+			bio=findViewById(R.id.bio);
+			followersCount=findViewById(R.id.followers_count);
+			followersLabel=findViewById(R.id.followers_label);
+			followingCount=findViewById(R.id.following_count);
+			followingLabel=findViewById(R.id.following_label);
+			postsCount=findViewById(R.id.posts_count);
+			postsLabel=findViewById(R.id.posts_label);
+			actionButton=findViewById(R.id.action_btn);
+			actionProgress=findViewById(R.id.action_progress);
+			actionWrap=findViewById(R.id.action_btn_wrap);
+			acceptButton=findViewById(R.id.accept_btn);
+			acceptProgress=findViewById(R.id.accept_progress);
+			acceptWrap=findViewById(R.id.accept_btn_wrap);
+			rejectButton=findViewById(R.id.reject_btn);
+			rejectProgress=findViewById(R.id.reject_progress);
+			rejectWrap=findViewById(R.id.reject_btn_wrap);
+
+			itemView.setOutlineProvider(OutlineProviders.roundedRect(6));
+			itemView.setClipToOutline(true);
+			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
+			avatar.setClipToOutline(true);
+			cover.setOutlineProvider(OutlineProviders.roundedRect(3));
+			cover.setClipToOutline(true);
+			actionButton.setOnClickListener(this::onActionButtonClick);
+			acceptButton.setOnClickListener(this::onFollowRequestButtonClick);
+			rejectButton.setOnClickListener(this::onFollowRequestButtonClick);
+		}
+
+		@Override
+		public void onBind(AccountWrapper item){
+			name.setText(item.parsedName);
+			username.setText('@'+item.account.acct);
+			bio.setText(item.parsedBio);
+			followersCount.setText(UiUtils.abbreviateNumber(item.account.followersCount));
+			followingCount.setText(UiUtils.abbreviateNumber(item.account.followingCount));
+			postsCount.setText(UiUtils.abbreviateNumber(item.account.statusesCount));
+			followersLabel.setText(getResources().getQuantityString(R.plurals.followers, (int)Math.min(999, item.account.followersCount)));
+			followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, item.account.followingCount)));
+			postsLabel.setText(getResources().getQuantityString(R.plurals.posts, (int)Math.min(999, item.account.statusesCount)));
+			relationship=relationships.get(item.account.id);
+			if(relationship == null || !relationship.followedBy){
+				actionWrap.setVisibility(View.GONE);
+				acceptWrap.setVisibility(View.VISIBLE);
+				rejectWrap.setVisibility(View.VISIBLE);
+			
+				// i hate that i wasn't able to do this in xml
+				acceptButton.setCompoundDrawableTintList(acceptButton.getTextColors());
+				acceptProgress.setIndeterminateTintList(acceptButton.getTextColors());
+				rejectButton.setCompoundDrawableTintList(rejectButton.getTextColors());
+				rejectProgress.setIndeterminateTintList(rejectButton.getTextColors());
+			}else if(relationship==null){
+				actionWrap.setVisibility(View.GONE);
+				acceptWrap.setVisibility(View.GONE);
+				rejectWrap.setVisibility(View.GONE);
+			}else{
+				actionWrap.setVisibility(View.VISIBLE);
+				acceptWrap.setVisibility(View.GONE);
+				rejectWrap.setVisibility(View.GONE);
+				UiUtils.setRelationshipToActionButton(relationship, actionButton);
+			}
+		}
+
+		@Override
+		public void setImage(int index, Drawable image){
+			if(index==0){
+				avatar.setImageDrawable(image);
+			}else if(index==1){
+				cover.setImageDrawable(image);
+			}else{
+				item.emojiHelper.setImageDrawable(index-2, image);
+				name.invalidate();
+				bio.invalidate();
+			}
+			if(image instanceof Animatable a && !a.isRunning())
+				a.start();
+		}
+
+		@Override
+		public void clearImage(int index){
+			setImage(index, null);
+		}
+
+		@Override
+		public void onClick(){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(item.account));
+			Nav.go(getActivity(), ProfileFragment.class, args);
+		}
+
+		private void onFollowRequestButtonClick(View v) {
+			itemView.setHasTransientState(true);
+			UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, accountID, null, v == acceptButton, relationship, rel -> {
+				itemView.setHasTransientState(false);
+				relationships.put(item.account.id, rel);
+				RecyclerView.Adapter<? extends RecyclerView.ViewHolder> adapter = getBindingAdapter();
+				if (!rel.requested && !rel.followedBy && adapter != null) {
+					data.remove(item);
+					adapter.notifyItemRemoved(getBindingAdapterPosition());
+				} else {
+					rebind();
+				}
+			});
+		}
+
+		private void onActionButtonClick(View v){
+			itemView.setHasTransientState(true);
+			UiUtils.performAccountAction(getActivity(), item.account, accountID, relationship, actionButton, this::setActionProgressVisible, rel->{
+				itemView.setHasTransientState(false);
+				relationships.put(item.account.id, rel);
+				rebind();
+			});
+		}
+
+		private void setActionProgressVisible(boolean visible){
+			actionButton.setTextVisible(!visible);
+			actionProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
+			actionButton.setClickable(!visible);
+		}
+	}
+
+	protected class AccountWrapper{
+		public Account account;
+		public ImageLoaderRequest avaRequest, coverRequest;
+		public CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
+		public CharSequence parsedName, parsedBio;
+
+		public AccountWrapper(Account account){
+			this.account=account;
+			if(!TextUtils.isEmpty(account.avatar))
+				avaRequest=new UrlImageLoaderRequest(account.avatar, V.dp(50), V.dp(50));
+			if(!TextUtils.isEmpty(account.header))
+				coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
+			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
+			if(account.emojis.isEmpty()){
+				parsedName=account.displayName;
+			}else{
+				parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
+				emojiHelper.setText(new SpannableStringBuilder(parsedName).append(parsedBio));
+			}
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java

@@ -66,8 +66,8 @@ public class HashtagTimelineFragment extends StatusListFragment{
 			new SetHashtagFollowed(hashtag, following).setCallback(new Callback<>() {
 				@Override
 				public void onSuccess(Hashtag i) {
+					if (i.following == following) Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
 					updateFollowingState(i.following);
-					Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
 				}
 
 				@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java

@@ -3,6 +3,8 @@ package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.media.MediaRouter;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
@@ -33,6 +35,14 @@ public class ListTimelineFragment extends StatusListFragment {
         listID=getArguments().getString("listID");
         listTitle=getArguments().getString("listTitle");
         setTitle(listTitle);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        // TODO: implement edit, delete
+        // inflater.inflate(R.menu.list, menu);
     }
 
     @Override
@@ -64,7 +74,6 @@ public class ListTimelineFragment extends StatusListFragment {
     private void onFabClick(View v){
         Bundle args=new Bundle();
         args.putString("account", accountID);
-        args.putString("prefilledText", listID+' ');
         Nav.go(getActivity(), ComposeFragment.class, args);
     }
 

mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java

@@ -1,29 +1,48 @@
 package org.joinmastodon.android.fragments;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
 import org.joinmastodon.android.api.requests.lists.GetLists;
-import org.joinmastodon.android.fragments.ScrollableToTop;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> implements ScrollableToTop {
     private String accountId;
+    private String profileAccountId;
+    private String profileDisplayUsername;
+    private HashMap<String, Boolean> userInListBefore = new HashMap<>();
+    private HashMap<String, Boolean> userInList = new HashMap<>();
+    private int inProgress = 0;
 
     public ListTimelinesFragment() {
         super(10);
@@ -32,16 +51,76 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        accountId=getArguments().getString("account");
+        Bundle args=getArguments();
+        accountId=args.getString("account");
+
+        if(args.containsKey("profileAccount")){
+            profileAccountId=args.getString("profileAccount");
+            profileDisplayUsername=args.getString("profileDisplayUsername");
+            setTitle(getString(R.string.lists_with_user, profileDisplayUsername));
+//            setHasOptionsMenu(true);
+        }
+    }
+
+    @Override
+    protected void onShown(){
+        super.onShown();
+        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+            loadData();
+    }
+
+//    @Override
+//    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+//        Button saveButton=new Button(getActivity());
+//        saveButton.setText(R.string.save);
+//        saveButton.setOnClickListener(this::onSaveClick);
+//        LinearLayout wrap=new LinearLayout(getActivity());
+//        wrap.setOrientation(LinearLayout.HORIZONTAL);
+//        wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+//        wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
+//        wrap.setClipToPadding(false);
+//        MenuItem item=menu.add(R.string.save);
+//        item.setActionView(wrap);
+//        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+//    }
+
+    private void saveListMembership(String listId, boolean isMember) {
+        userInList.put(listId, isMember);
+        List<String> accountIdList = Collections.singletonList(profileAccountId);
+        MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
+        req.setCallback(new SimpleCallback<>(this) {
+            @Override
+            public void onSuccess(Object o) {}
+        }).exec(accountId);
     }
 
     @Override
     protected void doLoadData(int offset, int count){
-        currentRequest=new GetLists()
+        userInListBefore.clear();
+        userInList.clear();
+        currentRequest=(profileAccountId != null ? new GetLists(profileAccountId) : new GetLists())
                 .setCallback(new SimpleCallback<>(this) {
                     @Override
-                    public void onSuccess(List<ListTimeline> result) {
-                        onDataLoaded(result, false);
+                    public void onSuccess(List<ListTimeline> lists) {
+                        for (ListTimeline l : lists) userInListBefore.put(l.id, true);
+                        userInList.putAll(userInListBefore);
+                        if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
+                        if (profileAccountId == null) return;
+
+                        currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListTimelinesFragment.this) {
+                            @Override
+                            public void onSuccess(List<ListTimeline> allLists) {
+                                List<ListTimeline> newLists = new ArrayList<>();
+                                for (ListTimeline l : allLists) {
+                                    if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);
+                                    if (!userInListBefore.containsKey(l.id)) {
+                                        userInListBefore.put(l.id, false);
+                                    }
+                                }
+                                userInList.putAll(userInListBefore);
+                                onDataLoaded(newLists, false);
+                            }
+                        }).exec(accountId);
                     }
                 })
                 .exec(accountId);
@@ -77,15 +156,28 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 
     private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
         private final TextView title;
+        private final CheckBox listToggle;
 
         public ListViewHolder(){
             super(getActivity(), R.layout.item_list_timeline, list);
             title=findViewById(R.id.title);
+            listToggle=findViewById(R.id.list_toggle);
         }
 
         @Override
         public void onBind(ListTimeline item) {
             title.setText(item.title);
+            if (profileAccountId != null) {
+                Boolean checked = userInList.get(item.id);
+                listToggle.setChecked(userInList.containsKey(item.id) && checked != null && checked);
+                listToggle.setOnClickListener(this::onClickToggle);
+            } else {
+                listToggle.setVisibility(View.GONE);
+            }
+        }
+
+        private void onClickToggle(View view) {
+            saveListMembership(item.id, listToggle.isChecked());
         }
 
         @Override

mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java

@@ -2,16 +2,22 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
 import android.app.Fragment;
-import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetFollowRequests;
+import org.joinmastodon.android.events.FollowRequestHandledEvent;
+import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -20,8 +26,15 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
+
+import com.squareup.otto.Subscribe;
+
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
-import me.grishka.appkit.fragments.ToolbarFragment;
 import me.grishka.appkit.utils.V;
 
 public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop{
@@ -31,7 +44,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
 
-	private NotificationsListFragment allNotificationsFragment, mentionsFragment;
+	private NotificationsListFragment allNotificationsFragment, mentionsFragment, postsFragment;
 
 	private String accountID;
 
@@ -42,14 +55,36 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			setRetainInstance(true);
 
 		accountID=getArguments().getString("account");
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+		E.unregister(this);
 	}
 
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
+		setHasOptionsMenu(true);
 		setTitle(R.string.notifications);
 	}
 
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.notifications, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() != R.id.follow_requests) return false;
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), FollowRequestsListFragment.class, args);
+		return true;
+	}
+
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		LinearLayout view=(LinearLayout) inflater.inflate(R.layout.fragment_notifications, container, false);
@@ -57,12 +92,13 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[2];
+		tabViews=new FrameLayout[3];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
 				case 0 -> R.id.notifications_all;
 				case 1 -> R.id.notifications_mentions;
+				case 2 -> R.id.notifications_posts;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
@@ -101,9 +137,15 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			mentionsFragment=new NotificationsListFragment();
 			mentionsFragment.setArguments(args);
 
+			args=new Bundle(args);
+			args.putBoolean("onlyPosts", true);
+			postsFragment=new NotificationsListFragment();
+			postsFragment.setArguments(args);
+
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.notifications_all, allNotificationsFragment)
 					.add(R.id.notifications_mentions, mentionsFragment)
+					.add(R.id.notifications_posts, postsFragment)
 					.commit();
 		}
 
@@ -113,6 +155,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 				tab.setText(switch(position){
 					case 0 -> R.string.all_notifications;
 					case 1 -> R.string.mentions;
+					case 2 -> R.string.posts;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -123,12 +166,30 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		return view;
 	}
 
+	public void refreshFollowRequestsBadge() {
+		new GetFollowRequests(null, null, 1).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(List<Account> accounts) {
+				getToolbar().getMenu().findItem(R.id.follow_requests).setVisible(!accounts.isEmpty());
+			}
+
+			@Override
+			public void onError(ErrorResponse errorResponse) {}
+		}).exec(accountID);
+	}
+
+	@Subscribe
+	public void onFollowRequestHandled(FollowRequestHandledEvent ev) {
+		refreshFollowRequestsBadge();
+	}
+
 	@Override
 	public void scrollToTop(){
 		getFragmentForPage(pager.getCurrentItem()).scrollToTop();
 	}
 
 	public void loadData(){
+		refreshFollowRequestsBadge();
 		if(allNotificationsFragment!=null && !allNotificationsFragment.loaded && !allNotificationsFragment.dataLoading)
 			allNotificationsFragment.loadData();
 	}
@@ -143,6 +204,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		return switch(page){
 			case 0 -> allNotificationsFragment;
 			case 1 -> mentionsFragment;
+			case 2 -> postsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
@@ -163,7 +225,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		@Override
 		public int getItemCount(){
-			return 2;
+			return 3;
 		}
 
 		@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java

@@ -9,6 +9,7 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
@@ -34,6 +35,7 @@ import me.grishka.appkit.utils.V;
 
 public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
 	private boolean onlyMentions;
+	private boolean onlyPosts;
 	private String maxID;
 
 	@Override
@@ -52,6 +54,15 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
 		onlyMentions=getArguments().getBoolean("onlyMentions", false);
+		onlyPosts=getArguments().getBoolean("onlyPosts", false);
+	}
+
+	@Override
+	public void onRefresh() {
+		super.onRefresh();
+		if (getParentFragment() instanceof NotificationsFragment notificationsFragment) {
+			notificationsFragment.refreshFollowRequestsBadge();
+		}
 	}
 
 	@Override
@@ -78,7 +89,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				items.add(0, titleItem);
 			return items;
 		}else if(titleItem!=null){
-			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this, n.account);
+			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this, n.account, n);
 			return Arrays.asList(titleItem, card);
 		}else{
 			return Collections.emptyList();
@@ -97,7 +108,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	protected void doLoadData(int offset, int count){
 		AccountSessionManager.getInstance()
 				.getAccount(accountID).getCacheController()
-				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, refreshing, new SimpleCallback<>(this){
+				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, onlyPosts, refreshing, new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(PaginatedResponse<List<Notification>> result){
 						if(getActivity()==null)
@@ -180,4 +191,28 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 	}
 
+	@Subscribe
+	public void onNotificationDeleted(NotificationDeletedEvent ev) {
+		Notification notification = getNotificationByID(ev.id);
+		if(notification==null)
+			return;
+		data.remove(notification);
+		int index=-1;
+		for(int i=0;i<displayItems.size();i++){
+			if(ev.id.equals(displayItems.get(i).parentID)){
+				index=i;
+				break;
+			}
+		}
+		if(index==-1)
+			return;
+		int lastIndex;
+		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
+			if(!displayItems.get(lastIndex).parentID.equals(ev.id))
+				break;
+		}
+		displayItems.subList(index, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+	}
+
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -531,20 +531,24 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			return;
 		inflater.inflate(R.menu.profile, menu);
 		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
+		menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.lists_with_user, account.getDisplayUsername()));
 		if(isOwnProfile){
 			for(int i=0;i<menu.size();i++){
 				MenuItem item=menu.getItem(i);
-				item.setVisible(item.getItemId()==R.id.share || item.getItemId()==R.id.bookmarks);
+				item.setVisible(item.getItemId()==R.id.share || item.getItemId()==R.id.bookmarks || item.getItemId()==R.id.manage_user_lists);
 			}
+			menu.findItem(R.id.favorites_list).setVisible(true);
 			return;
 		}
 		menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
-		if(relationship.following)
+		if(relationship.following) {
 			menu.findItem(R.id.hide_boosts).setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
-		else
+		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
+			menu.findItem(R.id.manage_user_lists).setVisible(false);
+		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
 		else
@@ -564,6 +568,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			args.putString("account", accountID);
 			args.putParcelable("profileAccount", Parcels.wrap(account));
 			Nav.go(getActivity(), BookmarksListFragment.class, args);
+		}else if(id==R.id.favorites_list) {
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(account));
+			Nav.go(getActivity(), FavoritesListFragment.class, args);
 		}else if(id==R.id.mute){
 			confirmToggleMuted();
 		}else if(id==R.id.block){
@@ -595,6 +604,12 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 					})
 					.wrapProgress(getActivity(), R.string.loading, false)
 					.exec(accountID);
+		}else if(id==R.id.manage_user_lists){
+			final Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putString("profileAccount", profileAccountID);
+			args.putString("profileDisplayUsername", account.getDisplayUsername());
+			Nav.go(getActivity(), ListTimelinesFragment.class, args);
 		}
 		return true;
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java

@@ -94,6 +94,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new HeaderItem(R.string.settings_theme));
 		items.add(themeItem=new ThemeItem());
 		items.add(new SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
+		items.add(new SwitchItem(R.string.disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
+			GlobalUserPreferences.disableMarquee=i.checked;
+			GlobalUserPreferences.save();
+		}));
 
 		items.add(new HeaderItem(R.string.settings_behavior));
 		items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{
@@ -104,6 +108,14 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.useCustomTabs=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		items.add(new SwitchItem(R.string.settings_show_interaction_counts, R.drawable.ic_fluent_number_row_24_regular, GlobalUserPreferences.showInteractionCounts, i->{
+			GlobalUserPreferences.showInteractionCounts=i.checked;
+			GlobalUserPreferences.save();
+		}));
+		items.add(new SwitchItem(R.string.settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{
+			GlobalUserPreferences.alwaysExpandContentWarnings=i.checked;
+			GlobalUserPreferences.save();
+		}));
 
 		items.add(new HeaderItem(R.string.home_timeline));
 		items.add(new SwitchItem(R.string.settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java

@@ -286,6 +286,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.lists_with_user, account.getDisplayUsername()));
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 			if(relationship.following){
 				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java

@@ -35,6 +35,8 @@ import java.util.stream.Collectors;
 
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
@@ -128,7 +130,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		}else{
 			progressVisibilityListener.onProgressVisibilityChanged(true);
 			currentRequest=new GetSearchResults(currentQuery, null, true)
-					.setCallback(new SimpleCallback<>(this){
+					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(SearchResults result){
 							ArrayList<SearchResult> results=new ArrayList<>();
@@ -148,6 +150,17 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 							unfilteredResults=results;
 							onDataLoaded(filterSearchResults(results), false);
 						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							currentRequest=null;
+							Activity a=getActivity();
+							if(a==null)
+								return;
+							error.showToast(a);
+							if(progressVisibilityListener!=null)
+								progressVisibilityListener.onProgressVisibilityChanged(false);
+						}
 					})
 					.exec(accountID);
 		}
@@ -159,12 +172,11 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 			super.updateList();
 			return;
 		}
-		imgLoader.deactivate();
 		UiUtils.updateList(prevDisplayItems, displayItems, list, adapter, (i1, i2)->i1.parentID.equals(i2.parentID) && i1.index==i2.index && i1.getType()==i2.getType());
 		boolean recent=isInRecentMode();
 		if(recent!=headerAdapter.isVisible())
 			headerAdapter.setVisible(recent);
-		imgLoader.activate();
+		imgLoader.forceUpdateImages();
 		prevDisplayItems=null;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.onboarding;
 
+import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.net.Uri;
@@ -9,6 +10,7 @@ import android.os.LocaleList;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,6 +23,7 @@ import android.widget.RadioButton;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
@@ -36,7 +39,13 @@ import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 
+import java.io.IOException;
 import java.net.IDN;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,6 +55,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import javax.xml.parsers.DocumentBuilderFactory;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
@@ -58,6 +69,9 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
+import okhttp3.Call;
+import okhttp3.Request;
+import okhttp3.Response;
 
 public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstance>{
 	private InstancesAdapter adapter;
@@ -75,9 +89,11 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private List<CatalogCategory> categories=new ArrayList<>();
 	private String loadingInstanceDomain;
 	private GetInstance loadingInstanceRequest;
+	private Call loadingInstanceRedirectRequest;
 	private HashMap<String, Instance> instancesCache=new HashMap<>();
 	private ProgressDialog instanceProgressDialog;
 	private View buttonBar;
+	private HashMap<String, String> redirects=new HashMap<>(), redirectsInverse=new HashMap<>();
 
 	private boolean isSignup;
 
@@ -271,7 +287,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		}else{
 			showProgressDialog();
 			if(!domain.equals(loadingInstanceDomain)){
-				loadInstanceInfo(domain);
+				loadInstanceInfo(domain, false);
 			}
 		}
 	}
@@ -353,7 +369,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		Instance instance=instancesCache.get(normalizeInstanceDomain(currentSearchQuery));
 		if(instance==null){
 			showProgressDialog();
-			loadInstanceInfo(currentSearchQuery);
+			loadInstanceInfo(currentSearchQuery, false);
 		}else{
 			proceedWithAuthOrSignup(instance);
 		}
@@ -363,7 +379,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private void onSearchChangedDebounced(){
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase();
 		updateFilteredList();
-		loadInstanceInfo(currentSearchQuery);
+		loadInstanceInfo(currentSearchQuery, false);
 	}
 
 	private void updateFilteredList(){
@@ -403,13 +419,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private void showProgressDialog(){
 		instanceProgressDialog=new ProgressDialog(getActivity());
 		instanceProgressDialog.setMessage(getString(R.string.loading_instance));
-		instanceProgressDialog.setOnCancelListener(dialog->{
-			if(loadingInstanceRequest!=null){
-				loadingInstanceRequest.cancel();
-				loadingInstanceRequest=null;
-				loadingInstanceDomain=null;
-			}
-		});
+		instanceProgressDialog.setOnCancelListener(dialog->cancelLoadingInstanceInfo());
 		instanceProgressDialog.show();
 	}
 
@@ -429,10 +439,12 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		}catch(IllegalArgumentException x){
 			return null;
 		}
+		if(redirects.containsKey(domain))
+			return redirects.get(domain);
 		return domain;
 	}
 
-	private void loadInstanceInfo(String _domain){
+	private void loadInstanceInfo(String _domain, boolean isFromRedirect){
 		String domain=normalizeInstanceDomain(_domain);
 		Instance cachedInstance=instancesCache.get(domain);
 		if(cachedInstance!=null){
@@ -446,10 +458,11 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 			return;
 		}
 		if(loadingInstanceDomain!=null){
-			if(loadingInstanceDomain.equals(domain))
+			if(loadingInstanceDomain.equals(domain)){
 				return;
-			else
-				loadingInstanceRequest.cancel();
+			}else{
+				cancelLoadingInstanceInfo();
+			}
 		}
 		loadingInstanceDomain=domain;
 		loadingInstanceRequest=new GetInstance();
@@ -465,7 +478,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 							instanceProgressDialog=null;
 							proceedWithAuthOrSignup(result);
 						}
-						if(domain.equals(currentSearchQuery)){
+						if(domain.equals(currentSearchQuery) || currentSearchQuery.equals(redirects.get(domain)) || currentSearchQuery.equals(redirectsInverse.get(domain))){
 							boolean found=false;
 							for(CatalogInstance ci:filteredData){
 								if(ci.domain.equals(domain)){
@@ -484,20 +497,105 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 					@Override
 					public void onError(ErrorResponse error){
 						loadingInstanceRequest=null;
-						loadingInstanceDomain=null;
-						if(instanceProgressDialog!=null){
-							instanceProgressDialog.dismiss();
-							instanceProgressDialog=null;
-							new M3AlertDialogBuilder(getActivity())
-									.setTitle(R.string.error)
-									.setMessage(getString(R.string.not_a_mastodon_instance, domain)+"\n\n"+((MastodonErrorResponse)error).error)
-									.setPositiveButton(R.string.ok, null)
-									.show();
+						if(!isFromRedirect && error instanceof MastodonErrorResponse me && me.httpStatus==404){
+							fetchDomainFromHostMetaAndMaybeRetry(domain, error);
+							return;
 						}
+						loadingInstanceDomain=null;
+						showInstanceInfoLoadError(domain, error);
 					}
 				}).execNoAuth(domain);
 	}
 
+	private void cancelLoadingInstanceInfo(){
+		if(loadingInstanceRequest!=null){
+			loadingInstanceRequest.cancel();
+			loadingInstanceRequest=null;
+		}
+		if(loadingInstanceRedirectRequest!=null){
+			loadingInstanceRedirectRequest.cancel();
+			loadingInstanceRedirectRequest=null;
+		}
+		loadingInstanceDomain=null;
+		if(instanceProgressDialog!=null){
+			instanceProgressDialog.dismiss();
+			instanceProgressDialog=null;
+		}
+	}
+
+	private void showInstanceInfoLoadError(String domain, Object error){
+		if(instanceProgressDialog!=null){
+			instanceProgressDialog.dismiss();
+			instanceProgressDialog=null;
+			String additionalInfo;
+			if(error instanceof MastodonErrorResponse me){
+				additionalInfo="\n\n"+me.error;
+			}else if(error instanceof Throwable t){
+				additionalInfo="\n\n"+t.getLocalizedMessage();
+			}else{
+				additionalInfo="";
+			}
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.error)
+					.setMessage(getString(R.string.not_a_mastodon_instance, domain)+additionalInfo)
+					.setPositiveButton(R.string.ok, null)
+					.show();
+		}
+	}
+
+	private void fetchDomainFromHostMetaAndMaybeRetry(String domain, Object origError){
+		String url="https://"+domain+"/.well-known/host-meta";
+		Request req=new Request.Builder()
+				.url(url)
+				.build();
+		loadingInstanceRedirectRequest=MastodonAPIController.getHttpClient().newCall(req);
+		loadingInstanceRedirectRequest.enqueue(new okhttp3.Callback(){
+			@Override
+			public void onFailure(@NonNull Call call, @NonNull IOException e){
+				loadingInstanceRedirectRequest=null;
+				loadingInstanceDomain=null;
+				Activity a=getActivity();
+				if(a==null)
+					return;
+				a.runOnUiThread(()->showInstanceInfoLoadError(domain, e));
+			}
+
+			@Override
+			public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{
+				loadingInstanceRedirectRequest=null;
+				loadingInstanceDomain=null;
+				Activity a=getActivity();
+				if(a==null)
+					return;
+				try(response){
+					if(!response.isSuccessful()){
+						a.runOnUiThread(()->showInstanceInfoLoadError(domain, response.code()+" "+response.message()));
+						return;
+					}
+					InputSource source=new InputSource(response.body().charStream());
+					Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(source);
+					NodeList list=doc.getElementsByTagName("Link");
+					for(int i=0;i<list.getLength();i++){
+						if(list.item(i) instanceof Element el){
+							String template=el.getAttribute("template");
+							if("lrdd".equals(el.getAttribute("rel")) && !TextUtils.isEmpty(template) && template.contains("{uri}")){
+								Uri uri=Uri.parse(template.replace("{uri}", "qwe"));
+								String redirectDomain=normalizeInstanceDomain(uri.getHost());
+								redirects.put(domain, redirectDomain);
+								redirectsInverse.put(redirectDomain, domain);
+								a.runOnUiThread(()->loadInstanceInfo(redirectDomain, true));
+								return;
+							}
+						}
+					}
+					a.runOnUiThread(()->showInstanceInfoLoadError(domain, origError));
+				}catch(Exception x){
+					a.runOnUiThread(()->showInstanceInfoLoadError(domain, x));
+				}
+			}
+		});
+	}
+
 	@Override
 	public void onApplyWindowInsets(WindowInsets insets){
 		if(Build.VERSION.SDK_INT>=27){
@@ -580,7 +678,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 			if(chosenInstance==null)
 				nextButton.setEnabled(true);
 			chosenInstance=item;
-			loadInstanceInfo(chosenInstance.domain);
+			loadInstanceInfo(chosenInstance.domain, false);
 		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java

@@ -102,7 +102,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{
 		ReportReason reason=ReportReason.valueOf(getArguments().getString("reason"));
 		ArrayList<String> statusIDs=getArguments().getStringArrayList("statusIDs");
 		ArrayList<String> ruleIDs=getArguments().getStringArrayList("ruleIDs");
-		new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), false)
+		new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), true)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Object result){

mastodon/src/main/java/org/joinmastodon/android/model/Status.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.model;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -78,7 +79,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 		if(reblog!=null)
 			reblog.postprocess();
 
-		spoilerRevealed=!sensitive;
+		spoilerRevealed=GlobalUserPreferences.alwaysExpandContentWarnings || !sensitive;
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java

@@ -15,6 +15,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.text.HtmlParser;
@@ -31,13 +32,15 @@ import me.grishka.appkit.utils.V;
 
 public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 	private final Account account;
+	private final Notification notification;
 	public ImageLoaderRequest avaRequest, coverRequest;
 	public CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
 	public CharSequence parsedName, parsedBio;
 
-	public AccountCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Account account){
+	public AccountCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Account account, Notification notification){
 		super(parentID, parentFragment);
 		this.account=account;
+		this.notification=notification;
 		if(!TextUtils.isEmpty(account.avatar))
 			avaRequest=new UrlImageLoaderRequest(account.avatar, V.dp(50), V.dp(50));
 		if(!TextUtils.isEmpty(account.header))
@@ -73,9 +76,9 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 	public static class Holder extends StatusDisplayItem.Holder<AccountCardStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final ImageView cover, avatar;
 		private final TextView name, username, bio, followersCount, followingCount, postsCount, followersLabel, followingLabel, postsLabel;
-		private final ProgressBarButton actionButton;
-		private final ProgressBar actionProgress;
-		private final View actionWrap;
+		private final ProgressBarButton actionButton, acceptButton, rejectButton;
+		private final ProgressBar actionProgress, acceptProgress, rejectProgress;
+		private final View actionWrap, acceptWrap, rejectWrap;
 
 		private Relationship relationship;
 
@@ -96,6 +99,12 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			actionButton=findViewById(R.id.action_btn);
 			actionProgress=findViewById(R.id.action_progress);
 			actionWrap=findViewById(R.id.action_btn_wrap);
+			acceptButton=findViewById(R.id.accept_btn);
+			acceptProgress=findViewById(R.id.accept_progress);
+			acceptWrap=findViewById(R.id.accept_btn_wrap);
+			rejectButton=findViewById(R.id.reject_btn);
+			rejectProgress=findViewById(R.id.reject_progress);
+			rejectWrap=findViewById(R.id.reject_btn_wrap);
 
 			View card=findViewById(R.id.card);
 			card.setOutlineProvider(OutlineProviders.roundedRect(6));
@@ -105,6 +114,8 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			cover.setOutlineProvider(OutlineProviders.roundedRect(3));
 			cover.setClipToOutline(true);
 			actionButton.setOnClickListener(this::onActionButtonClick);
+			acceptButton.setOnClickListener(this::onFollowRequestButtonClick);
+			rejectButton.setOnClickListener(this::onFollowRequestButtonClick);
 		}
 
 		@Override
@@ -119,14 +130,36 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			followingLabel.setText(item.parentFragment.getResources().getQuantityString(R.plurals.following, (int)Math.min(999, item.account.followingCount)));
 			postsLabel.setText(item.parentFragment.getResources().getQuantityString(R.plurals.posts, (int)Math.min(999, item.account.statusesCount)));
 			relationship=item.parentFragment.getRelationship(item.account.id);
-			if(relationship==null){
+			if(item.notification.type == Notification.Type.FOLLOW_REQUEST && (relationship == null || !relationship.followedBy)){
 				actionWrap.setVisibility(View.GONE);
+				acceptWrap.setVisibility(View.VISIBLE);
+				rejectWrap.setVisibility(View.VISIBLE);
+			
+				// i hate that i wasn't able to do this in xml
+				acceptButton.setCompoundDrawableTintList(acceptButton.getTextColors());
+				acceptProgress.setIndeterminateTintList(acceptButton.getTextColors());
+				rejectButton.setCompoundDrawableTintList(rejectButton.getTextColors());
+				rejectProgress.setIndeterminateTintList(rejectButton.getTextColors());
+			}else if(relationship==null){
+				actionWrap.setVisibility(View.GONE);
+				acceptWrap.setVisibility(View.GONE);
+				rejectWrap.setVisibility(View.GONE);
 			}else{
 				actionWrap.setVisibility(View.VISIBLE);
+				acceptWrap.setVisibility(View.GONE);
+				rejectWrap.setVisibility(View.GONE);
 				UiUtils.setRelationshipToActionButton(relationship, actionButton);
 			}
 		}
 
+		private void onFollowRequestButtonClick(View v) {
+			itemView.setHasTransientState(true);
+			UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, item.parentFragment.getAccountID(), item.notification.id , v == acceptButton, relationship, rel -> {
+				itemView.setHasTransientState(false);
+				item.parentFragment.putRelationship(item.account.id, rel);
+				rebind();
+			});
+		}
 
 		private void onActionButtonClick(View v){
 			itemView.setHasTransientState(true);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java

@@ -11,6 +11,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
@@ -98,7 +99,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void bindButton(TextView btn, long count){
-			if(count>0 && !item.hideCounts){
+			if(GlobalUserPreferences.showInteractionCounts && count>0 && !item.hideCounts){
 				btn.setText(DecimalFormat.getIntegerInstance().format(count));
 				btn.setCompoundDrawablePadding(V.dp(8));
 			}else{

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java

@@ -26,6 +26,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
+import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
@@ -137,10 +138,18 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			optionsMenu.setOnMenuItemClickListener(menuItem->{
 				Account account=item.user;
 				int id=menuItem.getItemId();
-				if(id==R.id.edit){
+				if(id==R.id.edit || id==R.id.delete_and_redraft) {
 					final Bundle args=new Bundle();
 					args.putString("account", item.parentFragment.getAccountID());
 					args.putParcelable("editStatus", Parcels.wrap(item.status));
+					if (id==R.id.delete_and_redraft) {
+						args.putBoolean("redraftStatus", true);
+						if (item.parentFragment instanceof ThreadFragment thread && !thread.isItemEnabled(item.status.id)) {
+							// ("enabled" = clickable; opened status is not clickable)
+							// request navigation to the re-drafted status if status is currently opened
+							args.putBoolean("navigateToStatus", true);
+						}
+					}
 					if(TextUtils.isEmpty(item.status.content) && TextUtils.isEmpty(item.status.spoilerText)){
 						Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 					}else{
@@ -150,7 +159,13 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 									public void onSuccess(GetStatusSourceText.Response result){
 										args.putString("sourceText", result.text);
 										args.putString("sourceSpoiler", result.spoilerText);
-										Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
+										if (id==R.id.delete_and_redraft) {
+											UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{
+												Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
+											}, true);
+										} else {
+											Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
+										}
 									}
 
 									@Override
@@ -163,8 +178,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					}
 				}else if(id==R.id.delete){
 					UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
-				}else if(id==R.id.delete_and_redraft) {
-					UiUtils.confirmDeleteAndRedraftPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
 				}else if(id==R.id.pin || id==R.id.unpin){
 					UiUtils.confirmPinPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, !item.status.pinned, s->{});
 				}else if(id==R.id.mute){

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ImageStatusDisplayItem.java

@@ -85,6 +85,7 @@ public abstract class ImageStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void clearImage(int index){
 			crossfadeDrawable.setCrossfadeAlpha(1f);
+			crossfadeDrawable.setImageDrawable(null);
 			didClear=true;
 		}
 

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java

@@ -3,14 +3,18 @@ package org.joinmastodon.android.ui.displayitems;
 import android.app.Activity;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
 import android.text.TextUtils;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.drawables.SpoilerStripesDrawable;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.views.LinkedTextView;
@@ -18,6 +22,7 @@ import org.joinmastodon.android.ui.views.LinkedTextView;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.MovieDrawable;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.utils.V;
 
 public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence text;
@@ -59,35 +64,58 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 	public static class Holder extends StatusDisplayItem.Holder<TextStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final LinkedTextView text;
-		private final TextView spoilerTitle;
-		private final View spoilerOverlay;
+		private final LinearLayout spoilerHeader;
+		private final TextView spoilerTitle, spoilerTitleInline;
+		private final View spoilerOverlay, borderTop, borderBottom;
+		private final Drawable backgroundColor, borderColor;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_text, parent);
 			text=findViewById(R.id.text);
 			spoilerTitle=findViewById(R.id.spoiler_title);
+			spoilerTitleInline=findViewById(R.id.spoiler_title_inline);
+			spoilerHeader=findViewById(R.id.spoiler_header);
 			spoilerOverlay=findViewById(R.id.spoiler_overlay);
+			borderTop=findViewById(R.id.border_top);
+			borderBottom=findViewById(R.id.border_bottom);
 			itemView.setOnClickListener(v->item.parentFragment.onRevealSpoilerClick(this));
+
+			TypedValue outValue=new TypedValue();
+			activity.getTheme().resolveAttribute(R.attr.colorBackgroundLight, outValue, true);
+			backgroundColor=activity.getDrawable(outValue.resourceId);
+//			activity.getTheme().resolveAttribute(R.attr.colorBackgroundLightest, outValue, true);
+//			backgroundColorInset=activity.getDrawable(outValue.resourceId);
+			activity.getTheme().resolveAttribute(R.attr.colorPollVoted, outValue, true);
+			borderColor=activity.getDrawable(outValue.resourceId);
 		}
 
 		@Override
 		public void onBind(TextStatusDisplayItem item){
 			text.setText(item.text);
 			text.setTextIsSelectable(item.textSelectable);
+			spoilerTitleInline.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
+			spoilerTitleInline.setBackground(item.inset ? null : backgroundColor);
+			spoilerTitleInline.setPadding(spoilerTitleInline.getPaddingLeft(), item.inset ? 0 : V.dp(14), spoilerTitleInline.getPaddingRight(), item.inset ? 0 : V.dp(14));
+			borderTop.setBackground(item.inset ? null : borderColor);
+			borderBottom.setBackground(item.inset ? null : borderColor);
 			if(!TextUtils.isEmpty(item.status.spoilerText)){
 				spoilerTitle.setText(item.parsedSpoilerText);
+				spoilerTitleInline.setText(item.parsedSpoilerText);
 				if(item.status.spoilerRevealed){
 					spoilerOverlay.setVisibility(View.GONE);
+					spoilerHeader.setVisibility(View.VISIBLE);
 					text.setVisibility(View.VISIBLE);
 					itemView.setClickable(false);
 				}else{
 					spoilerOverlay.setVisibility(View.VISIBLE);
+					spoilerHeader.setVisibility(View.GONE);
 					text.setVisibility(View.GONE);
 					itemView.setClickable(true);
 				}
 			}else{
 				spoilerOverlay.setVisibility(View.GONE);
+				spoilerHeader.setVisibility(View.GONE);
 				text.setVisibility(View.VISIBLE);
 				itemView.setClickable(false);
 			}

mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java

@@ -19,7 +19,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.Parcelable;
 import android.provider.OpenableColumns;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -40,11 +39,15 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountBlocked;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
+import org.joinmastodon.android.api.requests.accounts.AuthorizeFollowRequest;
+import org.joinmastodon.android.api.requests.accounts.RejectFollowRequest;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.statuses.SetStatusPinned;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.FollowRequestHandledEvent;
+import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
@@ -58,10 +61,8 @@ import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
-import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.text.SpacerSpan;
 import org.parceler.Parcels;
 
@@ -72,8 +73,6 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -87,10 +86,6 @@ import androidx.annotation.StringRes;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.gson.Gson;
-import com.google.gson.annotations.SerializedName;
-
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -403,9 +398,12 @@ public class UiUtils{
 							.exec(accountID);
 				});
 	}
-
 	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback){
-		showConfirmationAlert(activity, R.string.confirm_delete_title, R.string.confirm_delete, R.string.delete, ()->{
+		confirmDeletePost(activity, accountID, status, resultCallback, false);
+	}
+
+	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback, boolean forRedraft){
+		showConfirmationAlert(activity, forRedraft ? R.string.confirm_delete_and_redraft_title : R.string.confirm_delete_title, forRedraft ? R.string.confirm_delete_and_redraft : R.string.confirm_delete, forRedraft ? R.string.delete_and_redraft : R.string.delete, ()->{
 			new DeleteStatus(status.id)
 					.setCallback(new Callback<>(){
 						@Override
@@ -452,61 +450,6 @@ public class UiUtils{
 		);
 	}
 
-	public static void confirmDeleteAndRedraftPost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback){
-		showConfirmationAlert(activity, R.string.confirm_delete_and_redraft_title, R.string.confirm_delete_and_redraft, R.string.delete_and_redraft, ()->{
-			new DeleteStatus(status.id)
-					.setCallback(new Callback<>(){
-						@Override
-						public void onSuccess(Status result){
-							resultCallback.accept(result);
-							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().deleteStatus(status.id);
-							E.post(new StatusDeletedEvent(status.id, accountID));
-							UiUtils.redraftStatus(status, accountID, activity);
-						}
-
-						@Override
-						public void onError(ErrorResponse error){
-							error.showToast(activity);
-						}
-					})
-					.wrapProgress(activity, R.string.deleting, false)
-					.exec(accountID);
-		});
-	}
-
-	public static void redraftStatus(Status status, String accountID, Activity activity) {
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		args.putBoolean("hasDraft", true);
-		args.putString("prefilledText", HtmlParser.parse(status.content, status.emojis, status.mentions, status.tags, accountID).toString());
-		args.putString("spoilerText", status.spoilerText);
-		args.putSerializable("visibility", status.visibility);
-		if(status.poll!=null){
-			args.putInt("pollDuration", (int)status.poll.expiresAt.minus(status.createdAt.getEpochSecond(), ChronoUnit.SECONDS).getEpochSecond());
-			ArrayList<String> opts=status.poll.options.stream().map(o -> o.title).collect(Collectors.toCollection(ArrayList::new));
-			args.putStringArrayList("pollOptions", opts);
-		}
-		if(!status.mediaAttachments.isEmpty()){
-			ArrayList<Parcelable> serializedAttachments=status.mediaAttachments.stream()
-					.map(att -> Parcels.wrap(ComposeFragment.redraftAttachment(att)))
-					.collect(Collectors.toCollection(ArrayList::new));
-			args.putParcelableArrayList("attachments", serializedAttachments);
-		}
-		Callback<Status> cb=new Callback<>(){
-			@Override public void onError(ErrorResponse error) {
-				onSuccess(null);
-				error.showToast(activity);
-			}
-			@Override public void onSuccess(Status status) {
-				if (status!=null) args.putParcelable("replyTo", Parcels.wrap(status));
-				Nav.go(activity, ComposeFragment.class, args);
-			}
-		};
-
-		if(status.inReplyToId!=null) new GetStatusByID(status.inReplyToId).setCallback(cb).exec(accountID);
-		else cb.onSuccess(null);
-	}
-
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
 		setRelationshipToActionButton(relationship, button, false);
 	}
@@ -593,6 +536,40 @@ public class UiUtils{
 		}
 	}
 
+
+	public static void handleFollowRequest(Activity activity, Account account, String accountID, @Nullable String notificationID, boolean accepted, Relationship relationship, Consumer<Relationship> resultCallback) {
+		if (accepted) {
+			new AuthorizeFollowRequest(account.id).setCallback(new Callback<>() {
+				@Override
+				public void onSuccess(Relationship rel) {
+					E.post(new FollowRequestHandledEvent(accountID, true, account, rel));
+					resultCallback.accept(rel);
+				}
+
+				@Override
+				public void onError(ErrorResponse error) {
+					resultCallback.accept(relationship);
+					error.showToast(activity);
+				}
+			}).exec(accountID);
+		} else {
+			new RejectFollowRequest(account.id).setCallback(new Callback<>() {
+				@Override
+				public void onSuccess(Relationship rel) {
+					E.post(new FollowRequestHandledEvent(accountID, false, account, rel));
+					if (notificationID != null) E.post(new NotificationDeletedEvent(notificationID));
+					resultCallback.accept(rel);
+				}
+
+				@Override
+				public void onError(ErrorResponse error) {
+					resultCallback.accept(relationship);
+					error.showToast(activity);
+				}
+			}).exec(accountID);
+		}
+	}
+
 	public static <T> void updateList(List<T> oldList, List<T> newList, RecyclerView list, RecyclerView.Adapter<?> adapter, BiPredicate<T, T> areItemsSame){
 		// Save topmost item position and offset because for some reason RecyclerView would scroll the list to weird places when you insert items at the top
 		int topItem, topItemOffset;

mastodon/src/main/res/drawable/bg_popup.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="?colorBackgroundLightest"/>
+	<solid android:color="?colorBackgroundPopup"/>
 	<corners android:radius="10dp"/>
 	<padding android:top="8dp" android:bottom="8dp"/>
 </shape>

mastodon/src/main/res/drawable/ic_fluent_delete_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10 5h4c0-1.105-0.895-2-2-2s-2 0.895-2 2zM8.5 5c0-1.933 1.567-3.5 3.5-3.5s3.5 1.567 3.5 3.5h5.75C21.664 5 22 5.336 22 5.75S21.664 6.5 21.25 6.5h-1.32l-1.17 12.111C18.573 20.533 16.957 22 15.026 22H8.974c-1.931 0-3.547-1.467-3.733-3.389L4.07 6.5H2.75C2.336 6.5 2 6.164 2 5.75S2.336 5 2.75 5H8.5zm2 4.75C10.5 9.336 10.164 9 9.75 9S9 9.336 9 9.75v7.5C9 17.664 9.336 18 9.75 18s0.75-0.336 0.75-0.75v-7.5zM14.25 9C14.664 9 15 9.336 15 9.75v7.5c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75v-7.5C13.5 9.336 13.836 9 14.25 9zm-7.516 9.467C6.846 19.62 7.815 20.5 8.974 20.5h6.052c1.159 0 2.128-0.88 2.24-2.033L18.424 6.5H5.576l1.158 11.967z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_edit_20_regular.xml

@@ -1,3 +0,0 @@
-<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="M17.181 2.926c-1.152-1.212-3.076-1.236-4.259-0.054l-9.375 9.375c-0.327 0.328-0.555 0.742-0.655 1.195l-0.878 3.95c-0.037 0.167 0.014 0.34 0.134 0.462 0.121 0.12 0.296 0.171 0.462 0.134l3.927-0.873c0.467-0.104 0.895-0.339 1.234-0.678l9.358-9.358c1.141-1.14 1.164-2.983 0.052-4.153zM13.63 3.58c0.785-0.785 2.063-0.77 2.828 0.035 0.738 0.777 0.722 2-0.035 2.757L15.75 7.043l-2.793-2.792 0.671-0.671zm-1.378 1.378l2.793 2.793-7.98 7.98c-0.204 0.204-0.462 0.345-0.744 0.408L3.16 16.84l0.708-3.182c0.059-0.267 0.193-0.512 0.387-0.705l7.996-7.996z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

mastodon/src/main/res/drawable/ic_fluent_history_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="M3.5 1.997l0.09 0.008c0.204 0.037 0.365 0.198 0.402 0.402L4 2.497v2.211c1.164-1.323 2.748-2.242 4.542-2.574 4.345-0.805 8.519 2.064 9.324 6.408 0.805 4.344-2.064 8.519-6.408 9.324-4.344 0.805-8.519-2.064-9.324-6.408-0.087-0.468-0.158-1.32-0.13-1.98C2.016 9.204 2.25 8.989 2.524 9c0.277 0.012 0.49 0.245 0.48 0.52-0.025 0.58 0.04 1.358 0.113 1.756 0.705 3.8 4.357 6.311 8.159 5.607 3.8-0.705 6.311-4.357 5.607-8.159-0.705-3.8-4.357-6.311-8.159-5.607C6.885 3.458 5.3 4.502 4.258 5.995l2.74 0.002 0.09 0.008c0.233 0.042 0.41 0.246 0.41 0.492 0 0.245-0.177 0.45-0.41 0.492l-0.09 0.008H3.5L3.41 6.989C3.206 6.952 3.045 6.79 3.008 6.587L3 6.497v-4l0.008-0.09C3.045 2.203 3.206 2.042 3.41 2.005L3.5 1.997zm6 4l0.09 0.008c0.204 0.037 0.365 0.198 0.402 0.402L10 6.497V10h2l0.09 0.008c0.233 0.042 0.41 0.246 0.41 0.492 0 0.245-0.177 0.45-0.41 0.491L12 11H9.5l-0.09-0.008c-0.204-0.037-0.365-0.198-0.402-0.402L9 10.5V6.498l0.008-0.09C9.045 6.203 9.206 6.042 9.41 6.005L9.5 5.997z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_number_row_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M8.75 4c1.519 0 2.75 1.231 2.75 2.75v10.5c0 1.519-1.231 2.75-2.75 2.75h-4C3.231 20 2 18.769 2 17.25V6.75C2 5.231 3.231 4 4.75 4h4zm0 1.5h-4C4.06 5.5 3.5 6.06 3.5 6.75v10.5c0 0.69 0.56 1.25 1.25 1.25h4c0.69 0 1.25-0.56 1.25-1.25V6.75C10 6.06 9.44 5.5 8.75 5.5zM19.25 4C20.769 4 22 5.231 22 6.75v10.5c0 1.519-1.231 2.75-2.75 2.75h-4c-1.519 0-2.75-1.231-2.75-2.75V6.75C12.5 5.231 13.731 4 15.25 4h4zm0 1.5h-4C14.56 5.5 14 6.06 14 6.75v10.5c0 0.69 0.56 1.25 1.25 1.25h4c0.69 0 1.25-0.56 1.25-1.25V6.75c0-0.69-0.56-1.25-1.25-1.25zM6 9v6c0 0.414 0.336 0.75 0.75 0.75S7.5 15.414 7.5 15V9c0-0.414-0.336-0.75-0.75-0.75S6 8.586 6 9zm11.5 0.75v1.5h-1.25c-0.414 0-0.75 0.336-0.75 0.75v3c0 0.414 0.336 0.75 0.75 0.75h2c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75H17v-1.5h1.25c0.414 0 0.75-0.336 0.75-0.75V9c0-0.414-0.336-0.75-0.75-0.75h-2c-0.414 0-0.75 0.336-0.75 0.75s0.336 0.75 0.75 0.75h1.25z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_people_community_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="M8.75 3.75C8.75 2.231 7.519 1 6 1S3.25 2.231 3.25 3.75 4.481 6.5 6 6.5s2.75-1.231 2.75-2.75zm-4.5 0C4.25 2.784 5.034 2 6 2s1.75 0.784 1.75 1.75S6.966 5.5 6 5.5 4.25 4.716 4.25 3.75zM2.5 7.5h4.183c-0.164 0.31-0.286 0.646-0.358 1H2.5C2.224 8.5 2 8.724 2 9v0.5c0 1.26 1.099 2.614 3.096 2.93-0.322 0.22-0.59 0.513-0.781 0.854C2.205 12.713 1 11.087 1 9.5V9c0-0.828 0.672-1.5 1.5-1.5zm5.379 0c0.504-0.61 1.267-1 2.121-1 0.854 0 1.617 0.39 2.121 1 0.24 0.29 0.42 0.629 0.525 1 0.068 0.238 0.104 0.49 0.104 0.75 0 1.07-0.611 1.997-1.503 2.452-0.355 0.18-0.754 0.287-1.177 0.297L10 12H9.93c-0.423-0.011-0.822-0.117-1.177-0.298C7.861 11.247 7.25 10.32 7.25 9.25c0-0.26 0.036-0.512 0.104-0.75 0.104-0.371 0.285-0.71 0.525-1zm0.54 1C8.31 8.727 8.25 8.982 8.25 9.25c0 0.714 0.428 1.328 1.04 1.6C9.509 10.947 9.749 11 10 11c0.252 0 0.492-0.053 0.71-0.15 0.612-0.272 1.04-0.886 1.04-1.6 0-0.268-0.06-0.523-0.168-0.75-0.246-0.516-0.737-0.894-1.322-0.98C10.175 7.506 10.088 7.5 10 7.5c-0.088 0-0.175 0.006-0.26 0.02C9.155 7.605 8.664 7.983 8.418 8.5zm7.266 4.784c-0.19-0.341-0.459-0.634-0.781-0.853C16.9 12.114 18 10.759 18 9.5V9c0-0.276-0.224-0.5-0.5-0.5h-3.825c-0.072-0.354-0.194-0.69-0.357-1H17.5C18.328 7.5 19 8.172 19 9v0.5c0 1.587-1.206 3.212-3.315 3.784zm-1.198 0.087C14.223 13.14 13.878 13 13.5 13h-7c-0.432 0-0.821 0.183-1.095 0.475C5.154 13.743 5 14.104 5 14.5V15c0 1.971 1.86 4 5 4 3.14 0 5-2.029 5-4v-0.5c0-0.45-0.198-0.854-0.513-1.13zM6 14.5C6 14.224 6.224 14 6.5 14h7c0.276 0 0.5 0.224 0.5 0.5V15c0 1.438-1.432 3-4 3s-4-1.562-4-3v-0.5zM14 1c1.519 0 2.75 1.231 2.75 2.75S15.519 6.5 14 6.5s-2.75-1.231-2.75-2.75S12.481 1 14 1zm0 1c-0.966 0-1.75 0.784-1.75 1.75S13.034 5.5 14 5.5s1.75-0.784 1.75-1.75S14.966 2 14 2z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_text_more_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M9.75 2c0.301 0 0.573 0.18 0.69 0.457l6.972 16.431C16.951 18.345 16.267 18 15.5 18c-0.031 0-0.063 0-0.094 0.002L13.92 14.5H5.58l-2.14 5.043c-0.161 0.381-0.601 0.56-0.983 0.397-0.381-0.161-0.559-0.602-0.397-0.983l7-16.5C9.177 2.18 9.45 2 9.75 2zm3.534 11L9.75 4.67 6.216 13h7.068zM12 20.5c0 0.828-0.672 1.5-1.5 1.5S9 21.328 9 20.5 9.672 19 10.5 19s1.5 0.672 1.5 1.5zm3.5 1.5c0.828 0 1.5-0.672 1.5-1.5S16.328 19 15.5 19 14 19.672 14 20.5s0.672 1.5 1.5 1.5zm5 0c0.828 0 1.5-0.672 1.5-1.5S21.328 19 20.5 19 19 19.672 19 20.5s0.672 1.5 1.5 1.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_follow_requests_24_badged.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_fluent_person_add_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
+	<item android:width="14dp" android:height="14dp" android:gravity="top|right">
+		<shape android:shape="oval">
+			<stroke android:color="?android:colorPrimary" android:width="2dp"/>
+			<solid android:color="@color/primary_600"/>
+		</shape>
+	</item>
+</layer-list>

mastodon/src/main/res/layout-w600dp/button_bar_activation.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    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:clipToPadding="false"
+    android:elevation="3dp"
+    tools:showIn="@layout/fragment_onboarding_activation">
+
+    <Button
+        android:id="@+id/btn_back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        style="?secondaryLargeButtonStyle"
+        android:text="@string/resend" />
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/btn_next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        style="?primaryLargeButtonStyle"
+        android:text="@string/open_email_app" />
+
+</LinearLayout>

mastodon/src/main/res/layout/button_bar_activation.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/button_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorBackgroundLight"
+    android:clipToPadding="false"
+    android:elevation="3dp"
+    android:orientation="horizontal"
+    android:outlineProvider="bounds"
+    android:gravity="center_vertical"
+    tools:showIn="@layout/fragment_onboarding_activation">
+
+    <Button
+        android:id="@+id/btn_back"
+        style="?secondaryLargeButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_weight="1"
+        android:text="@string/resend" />
+
+    <Button
+        android:id="@+id/btn_next"
+        style="?primaryLargeButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="16dp"
+        android:layout_weight="1"
+        android:text="@string/open_email_app" />
+
+</LinearLayout>

mastodon/src/main/res/layout/display_item_extended_footer.xml

@@ -12,37 +12,43 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<Button
-			android:id="@+id/reblogs"
+		<LinearLayout
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center"
-			android:padding="8dp"
-			android:textSize="14sp"
-			android:minHeight="48dp"
-			android:textColor="?android:textColorSecondary"
-			android:background="@drawable/bg_text_button"
-			android:fontFamily="sans-serif"
-			android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_regular"
-			android:drawablePadding="8dp"
-			android:drawableTint="?android:textColorSecondary"
-			tools:text="4 reblogs"/>
+			android:layout_height="wrap_content">
 
-		<Button
-			android:id="@+id/favorites"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center"
-			android:padding="8dp"
-			android:textSize="14sp"
-			android:minHeight="48dp"
-			android:textColor="?android:textColorSecondary"
-			android:background="@drawable/bg_text_button"
-			android:fontFamily="sans-serif"
-			android:drawableStart="@drawable/ic_fluent_star_20_regular"
-			android:drawablePadding="8dp"
-			android:drawableTint="?android:textColorSecondary"
-			tools:text="12 favorites"/>
+			<Button
+				android:id="@+id/reblogs"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:padding="8dp"
+				android:textSize="14sp"
+				android:minHeight="48dp"
+				android:textColor="?android:textColorSecondary"
+				android:background="@drawable/bg_text_button"
+				android:fontFamily="sans-serif"
+				android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_regular"
+				android:drawablePadding="8dp"
+				android:drawableTint="?android:textColorSecondary"
+				tools:text="4 reblogs"/>
+
+			<Button
+				android:id="@+id/favorites"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:padding="8dp"
+				android:textSize="14sp"
+				android:minHeight="48dp"
+				android:textColor="?android:textColorSecondary"
+				android:background="@drawable/bg_text_button"
+				android:fontFamily="sans-serif"
+				android:drawableStart="@drawable/ic_fluent_star_20_regular"
+				android:drawablePadding="8dp"
+				android:drawableTint="?android:textColorSecondary"
+				tools:text="12 favorites"/>
+
+		</LinearLayout>
 
 		<Button
 			android:id="@+id/edit_history"
@@ -55,10 +61,10 @@
 			android:textColor="?android:textColorSecondary"
 			android:background="@drawable/bg_text_button"
 			android:fontFamily="sans-serif"
-			android:drawableStart="@drawable/ic_fluent_edit_20_regular"
+			android:drawableStart="@drawable/ic_fluent_history_20_regular"
 			android:drawablePadding="8dp"
 			android:drawableTint="?android:textColorSecondary"
-			tools:text="edited"/>
+			tools:text="Dec 12, 2021, 12:42 PM"/>
 
 	</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
 

mastodon/src/main/res/layout/display_item_header.xml

@@ -9,26 +9,29 @@
 
 	<ImageView
 		android:id="@+id/more"
-		android:layout_width="24dp"
-		android:layout_height="24dp"
+		android:layout_width="36dp"
+		android:layout_height="36dp"
 		android:layout_alignParentTop="true"
 		android:layout_alignParentEnd="true"
+		android:layout_marginTop="-6dp"
+		android:layout_marginRight="-8dp"
 		android:background="?android:selectableItemBackgroundBorderless"
-		android:scaleType="center"
-		android:tint="?android:textColorSecondary"
 		android:contentDescription="@string/more_options"
-		android:src="@drawable/ic_post_more" />
+		android:scaleType="center"
+		android:src="@drawable/ic_post_more"
+		android:tint="?android:textColorSecondary" />
 
 	<ImageView
 		android:id="@+id/visibility"
-		android:layout_width="24dp"
-		android:layout_height="20dp"
-		android:layout_alignParentEnd="true"
-		android:layout_below="@id/more"
+		android:layout_width="36dp"
+		android:layout_height="36dp"
+		android:layout_marginTop="-6dp"
+		android:layout_marginRight="6dp"
+		android:layout_toLeftOf="@id/more"
 		android:background="?android:selectableItemBackgroundBorderless"
 		android:scaleType="center"
-		android:tint="?android:textColorSecondary"
-		android:src="@drawable/ic_visibility" />
+		android:src="@drawable/ic_visibility"
+		android:tint="?android:textColorSecondary" />
 
 	<ImageView
 		android:id="@+id/avatar"
@@ -42,9 +45,9 @@
 		android:id="@+id/name_wrap"
 		android:layout_width="match_parent"
 		android:layout_height="24dp"
-		android:layout_toEndOf="@id/avatar"
-		android:layout_toStartOf="@id/more"
-		android:layout_marginEnd="8dp">
+		android:layout_marginEnd="8dp"
+		android:layout_toStartOf="@id/visibility"
+		android:layout_toEndOf="@id/avatar">
 
 		<TextView
 			android:id="@+id/name"
@@ -52,8 +55,8 @@
 			android:layout_height="24dp"
 			android:ellipsize="end"
 			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
 			android:textAlignment="viewStart"
+			android:textAppearance="@style/m3_title_medium"
 			tools:text="Eugen" />
 
 		<TextView
@@ -62,10 +65,10 @@
 			android:layout_height="24dp"
 			android:layout_marginStart="8dp"
 			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
 			android:fontFamily="sans-serif"
+			android:singleLine="true"
 			android:textAlignment="viewStart"
+			android:textAppearance="@style/m3_title_medium"
 			tools:text="boosted your cat picture" />
 
 	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
@@ -74,8 +77,9 @@
 		android:layout_width="match_parent"
 		android:layout_height="20dp"
 		android:layout_below="@id/name_wrap"
-		android:layout_toEndOf="@id/avatar"
+		android:layout_marginEnd="8dp"
 		android:layout_toStartOf="@id/visibility"
+		android:layout_toEndOf="@id/avatar"
 		android:layoutDirection="locale"
 		android:orientation="horizontal">
 
@@ -94,6 +98,7 @@
 			android:layout_height="20dp"
 			android:layout_marginLeft="4dp"
 			android:layout_marginRight="4dp"
+			android:importantForAccessibility="no"
 			android:text="·"
 			android:textAppearance="@style/m3_title_small" />
 
@@ -101,8 +106,8 @@
 			android:id="@+id/timestamp"
 			android:layout_width="wrap_content"
 			android:layout_height="20dp"
-			android:textAppearance="@style/m3_title_small"
 			android:singleLine="true"
+			android:textAppearance="@style/m3_title_small"
 			tools:text="3h" />
 
 	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>

mastodon/src/main/res/layout/display_item_text.xml

@@ -3,23 +3,62 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingLeft="16dp"
-	android:paddingRight="16dp"
 	android:paddingTop="10dp"
 	android:paddingBottom="12dp">
 
-	<org.joinmastodon.android.ui.views.LinkedTextView
-		android:id="@+id/text"
+	<LinearLayout
+		android:orientation="vertical"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:textSize="16sp"
-		android:textAppearance="@style/m3_body_large"/>
+		android:layout_height="wrap_content">
+
+		<LinearLayout
+			android:id="@+id/spoiler_header"
+			android:orientation="vertical"
+			android:layout_marginTop="6dp"
+			android:layout_marginBottom="8dp"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content">
+			<View
+				android:id="@+id/border_top"
+				android:layout_width="match_parent"
+				android:layout_height="0.5dp"
+				android:background="?attr/colorPollVoted"/>
+
+			<TextView
+				android:id="@+id/spoiler_title_inline"
+				android:paddingHorizontal="16dp"
+				android:paddingVertical="14dp"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:textAppearance="@style/m3_title_medium"
+				android:background="?colorBackgroundLight"
+				tools:text="CW title"/>
+
+			<View
+				android:id="@+id/border_bottom"
+				android:layout_width="match_parent"
+				android:layout_height="0.5dp"
+				android:background="?attr/colorPollVoted"/>
+		</LinearLayout>
+
+		<org.joinmastodon.android.ui.views.LinkedTextView
+			android:id="@+id/text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingHorizontal="16dp"
+			android:textSize="16sp"
+			android:textAppearance="@style/m3_body_large"
+			tools:text="setting up my mstdn"/>
+	</LinearLayout>
+
 
 	<LinearLayout
+		android:visibility="gone"
 		android:id="@+id/spoiler_overlay"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
+		android:paddingHorizontal="16dp"
 		android:orientation="vertical">
 
 		<TextView

mastodon/src/main/res/layout/fragment_compose.xml

@@ -40,6 +40,7 @@
 				android:layout_marginTop="16dp"
 				android:textAppearance="@style/m3_title_small"
 				android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
+				tools:drawableEnd="@drawable/ic_fluent_earth_20_regular"
 				android:drawableTint="?android:textColorSecondary"
 				android:drawablePadding="6dp"
 				android:singleLine="true"

mastodon/src/main/res/layout/fragment_onboarding_activation.xml

@@ -51,41 +51,6 @@
 
 	</ScrollView>
 
-	<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:clipToPadding="false"
-		android:elevation="3dp">
-
-		<Button
-			android:id="@+id/btn_back"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginBottom="16dp"
-			style="?secondaryLargeButtonStyle"
-			android:text="@string/resend"/>
-
-		<Space
-			android:layout_width="0dp"
-			android:layout_height="1dp"
-			android:layout_weight="1"/>
-
-		<Button
-			android:id="@+id/btn_next"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginEnd="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginBottom="16dp"
-			style="?primaryLargeButtonStyle"
-			android:text="@string/open_email_app" />
-
-	</LinearLayout>
+	<include layout="@layout/button_bar_activation" />
 
 </me.grishka.appkit.views.FragmentRootLinearLayout>

mastodon/src/main/res/layout/item_discover_account.xml

@@ -81,6 +81,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@id/bio"
+		android:paddingRight="8dp"
 		android:orientation="horizontal">
 
 		<LinearLayout
@@ -121,6 +122,7 @@
 				android:layout_height="wrap_content"
 				android:textAppearance="@style/m3_title_large"
 				tools:text="123"/>
+
 			<TextView
 				android:id="@+id/followers_label"
 				android:layout_width="wrap_content"
@@ -143,6 +145,7 @@
 				android:layout_height="wrap_content"
 				android:textAppearance="@style/m3_title_large"
 				tools:text="123"/>
+
 			<TextView
 				android:id="@+id/following_label"
 				android:layout_width="wrap_content"
@@ -156,20 +159,82 @@
 			android:layout_height="1px"
 			android:layout_weight="1"/>
 
+		<FrameLayout
+			android:id="@+id/reject_btn_wrap"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:clipToPadding="false"
+			android:paddingHorizontal="4dp"
+			android:paddingVertical="8dp"
+			android:visibility="gone">
+
+			<org.joinmastodon.android.ui.views.ProgressBarButton
+				android:id="@+id/reject_btn"
+				style="?secondaryButtonStyle"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:contentDescription="@string/reject_follow_request"
+				android:drawableStart="@drawable/ic_fluent_dismiss_24_filled"
+				android:singleLine="true" />
+
+			<ProgressBar
+				android:id="@+id/reject_progress"
+				style="?android:progressBarStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:elevation="10dp"
+				android:indeterminate="true"
+				android:outlineProvider="none"
+				android:visibility="gone" />
+		</FrameLayout>
+
+		<FrameLayout
+			android:id="@+id/accept_btn_wrap"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:clipToPadding="false"
+			android:paddingHorizontal="4dp"
+			android:paddingVertical="8dp"
+			android:visibility="gone">
+
+			<org.joinmastodon.android.ui.views.ProgressBarButton
+				android:id="@+id/accept_btn"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:contentDescription="@string/accept_follow_request"
+				android:drawableStart="@drawable/ic_fluent_checkmark_24_filled"
+				android:singleLine="true" />
+
+			<ProgressBar
+				android:id="@+id/accept_progress"
+				style="?android:progressBarStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:elevation="10dp"
+				android:indeterminate="true"
+				android:outlineProvider="none"
+				android:visibility="gone" />
+		</FrameLayout>
+
 		<FrameLayout
 			android:id="@+id/action_btn_wrap"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="8dp"
 			android:padding="8dp"
-			android:layout_marginEnd="8dp"
 			android:clipToPadding="false">
+
 			<org.joinmastodon.android.ui.views.ProgressBarButton
 				android:id="@+id/action_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:singleLine="true"
 				tools:text="@string/follow_back"/>
+
 			<ProgressBar
 				android:id="@+id/action_progress"
 				android:layout_width="wrap_content"

mastodon/src/main/res/layout/item_instance_category.xml

@@ -4,8 +4,8 @@
 	android:orientation="vertical"
 	android:layout_width="120dp"
 	android:layout_height="72dp"
-	android:paddingTop="13dp"
-	android:paddingBottom="13dp">
+	android:paddingTop="12dp"
+	android:paddingBottom="12dp">
 
 	<ImageView
 		android:id="@+id/emoji"
@@ -17,7 +17,7 @@
 	<TextView
 		android:id="@android:id/text1"
 		android:layout_width="wrap_content"
-		android:layout_height="16dp"
+		android:layout_height="18dp"
 		android:layout_gravity="center_horizontal"
 		android:textAllCaps="true"
 		android:textColor="?android:textColorPrimary"

mastodon/src/main/res/layout/item_list_timeline.xml

@@ -3,26 +3,29 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="56dp"
-    android:paddingHorizontal="16dp"
     android:orientation="horizontal"
     android:gravity="center">
 
-    <ImageView
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginEnd="16dp"
-        android:tint="?android:textColorSecondary"
-        android:src="@drawable/ic_fluent_people_community_24_regular"
-        android:importantForAccessibility="no"/>
-
     <TextView
         android:id="@+id/title"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingHorizontal="16dp"
+        android:drawableLeft="@drawable/ic_fluent_people_community_24_regular"
+        android:drawableTint="?android:textColorSecondary"
+        android:drawablePadding="16dp"
         android:textAppearance="@style/m3_title_medium"
         android:fontFamily="sans-serif"
         android:singleLine="true"
         android:ellipsize="end"
         tools:text="List"/>
 
+    <CheckBox
+        android:id="@+id/list_toggle"
+        android:clickable="false"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingRight="16dp"/>
+
 </LinearLayout>

mastodon/src/main/res/menu/list.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/edit"
+        android:title="@string/edit"
+        android:icon="@drawable/ic_fluent_edit_24_regular"
+        android:showAsAction="always"/>
+    <item
+        android:id="@+id/delete"
+        android:title="@string/delete"
+        android:icon="@drawable/ic_fluent_delete_24_regular"
+        android:showAsAction="always"/>
+</menu>

mastodon/src/main/res/menu/notifications.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/follow_requests"
+		android:icon="@drawable/ic_follow_requests_24_badged"
+		android:showAsAction="always"
+		android:title="@string/follow_requests" />
+</menu>

mastodon/src/main/res/menu/profile.xml

@@ -6,7 +6,9 @@
 	<item android:id="@+id/report" android:title="@string/report_user"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain"/>
 	<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/lists_with_user"/>
 	<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser"/>
+	<item android:id="@+id/favorites_list" android:title="@string/favorited_posts" android:visible="false"/>
 	<item
 		android:id="@+id/bookmarks"
 		android:showAsAction="always"

mastodon/src/main/res/values-ar-rSA/strings.xml

@@ -409,8 +409,25 @@
 	<string name="time_now">الآن</string>
 	<string name="post_info_reblogs">إعادات التدوين</string>
 	<string name="post_info_favorites">المفضلة</string>
+	<string name="edit_history">تاريخ التعديل</string>
 	<string name="last_edit_at_x">آخر تعديل %s</string>
 	<string name="time_just_now">للتوّ</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="zero">منذ %d ثانية</item>
+		<item quantity="one">منذ ثانية</item>
+		<item quantity="two">منذ ثانيتان</item>
+		<item quantity="few">%d ثواني</item>
+		<item quantity="many">منذ %d ثانية</item>
+		<item quantity="other">%d ثواني مضت</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="zero">الان</item>
+		<item quantity="one">منذ دقيقة</item>
+		<item quantity="two">منذ دقيقتان</item>
+		<item quantity="few">%d دقائق مضت</item>
+		<item quantity="many">منذ %d دقائق</item>
+		<item quantity="other">منذ %d دقائق</item>
+	</plurals>
 	<string name="edited_timestamp">عُدّل في %s</string>
 	<string name="edit_original_post">المنشور الأصلي</string>
 	<string name="edit_text_edited">تم تعديل النص</string>
@@ -429,10 +446,22 @@
 	<string name="edit">تعديل</string>
 	<string name="discard_changes">تجاهل التغييرات؟</string>
 	<string name="upload_failed">فشلت عملية التحميل</string>
+	<string name="file_size_bytes">%d بايت</string>
+	<string name="file_size_kb">%.2f كيلوبايت</string>
+	<string name="file_size_mb">%.2f ميغابايت</string>
+	<string name="file_size_gb">%.2f جيجابايت</string>
+	<string name="file_upload_progress">%1$s من %2$s</string>
 	<string name="file_upload_time_remaining">%s متبقية</string>
 	<string name="upload_error_connection_lost">فقد جهازك الاتصال بالإنترنت</string>
 	<string name="upload_processing">قيد المعالجة…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">ماستدون %s للأندرويد جاهز للتنزيل.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">تم تنزيل ماستدون %s للأندرويد ومستعد لتثبيته.</string>
 	<!-- %s is file size -->
+	<string name="download_update">جارٍ التنزيل (%s)</string>
+	<string name="install_update">تثبيت</string>
+	<string name="privacy_policy_title">ماستدون وخصوصيتك</string>
+	<string name="privacy_policy_subtitle">على الرغم من أن تطبيق ماستدون لا يجمع أي بيانات، فإن الخادم الذي قمت بالتسجيل من خلاله قد تكون له سياسة مختلفة. خذ دقيقة للمراجعة والموافقة على سياسة خصوصية التطبيق ماستدون وسياسة الخصوصية للخادم الخاص بك.</string>
+	<string name="i_agree">أنا مُوافِق</string>
 </resources>

mastodon/src/main/res/values-bn-rBD/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is file size -->
+</resources>

mastodon/src/main/res/values-ca-rES/strings.xml

@@ -9,10 +9,13 @@
 	<string name="ok">D\'acord</string>
 	<string name="preparing_auth">Preparant a l\'autenticació…</string>
 	<string name="finishing_auth">Finalitzant autentificació…</string>
+	<string name="user_boosted">%s ha impulsat</string>
 	<string name="in_reply_to">En resposta a %s</string>
 	<string name="notifications">Notificacions</string>
 	<string name="user_followed_you">t\'ha començat a seguir</string>
 	<string name="user_sent_follow_request">t\'ha enviat una sol·licitud de seguiment</string>
+	<string name="user_favorited">ha afavorit la teva publicació</string>
+	<string name="notification_boosted">ha impulsat la teva publicació</string>
 	<string name="poll_ended">l\'enquesta ha finalitzat</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -167,6 +170,8 @@
 	<string name="report_personal_title">No vols veure això?</string>
 	<string name="report_personal_subtitle">Quan veus alguna cosa que no t\'agrada a Mastodon, pots eliminar la persona de la vostra experiència.</string>
 	<string name="back">Enrere</string>
+	<string name="instance_catalog_title">Mastodon està format per usuaris de diferents servidors.</string>
+	<string name="instance_catalog_subtitle">Tria un servidor en funció dels teus interessos, regió o un de propòsit general. Seguiràs podent connectar amb tothom, independentment del servidor.</string>
 	<string name="search_communities">Cerca servidors o introdueix l\'URL</string>
 	<string name="instance_rules_title">Algunes normes bàsiques</string>
 	<string name="instance_rules_subtitle">Pren un minut per revisar les normes establertes i aplicades pels administradors de %s.</string>
@@ -214,6 +219,7 @@
 	<string name="skip">Ometre</string>
 	<string name="notification_type_follow">Nous seguidors</string>
 	<string name="notification_type_favorite">Preferits</string>
+	<string name="notification_type_reblog">Impulsos</string>
 	<string name="notification_type_mention">Mencions</string>
 	<string name="notification_type_poll">Enquestes</string>
 	<string name="choose_account">Seleccionar compte</string>
@@ -276,6 +282,8 @@
 	<string name="unfollowed_user">S\'ha deixat de seguir %s</string>
 	<string name="followed_user">Ara estàs seguint %s</string>
 	<string name="open_in_browser">Obrir al navegador</string>
+	<string name="hide_boosts_from_user">Amagar els impulsos de %s</string>
+	<string name="show_boosts_from_user">Mostrar els impulsos de %s</string>
 	<string name="signup_reason">per què vols unir-te?</string>
 	<string name="signup_reason_note">Això ens ajudarà a revisar la teva petició.</string>
 	<string name="clear">Netejar</string>
@@ -298,8 +306,10 @@
 	<string name="dismiss">Ometre</string>
 	<string name="see_new_posts">Veure noves publicacions</string>
 	<string name="load_missing_posts">Carregar les publicacions faltants</string>
+	<string name="follow_back">Seguir</string>
 	<string name="button_follow_pending">Pendent</string>
 	<string name="follows_you">Te segueix</string>
+	<string name="manually_approves_followers">Aprova seguidors manualment</string>
 	<string name="current_account">Compte actual</string>
 	<string name="log_out_account">Tancar sessió %s</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
@@ -317,7 +327,48 @@
 	</plurals>
 	<string name="timestamp_via_app">%1$s través de %2$s</string>
 	<string name="time_now">ara</string>
+	<string name="post_info_reblogs">Impulsos</string>
+	<string name="post_info_favorites">Preferits</string>
+	<string name="edit_history">Editar l’historial</string>
+	<string name="last_edit_at_x">Darrera edició: %s</string>
+	<string name="time_just_now">ara mateix</string>
+	<string name="edited_timestamp">editat %s</string>
+	<string name="edit_original_post">Publicació original</string>
+	<string name="edit_text_edited">Text editat</string>
+	<string name="edit_spoiler_added">Avís de contingut afegit</string>
+	<string name="edit_spoiler_edited">Avís de contingut editat</string>
+	<string name="edit_spoiler_removed">Avís de contingut suprimit</string>
+	<string name="edit_poll_added">Enquesta afegida</string>
+	<string name="edit_poll_edited">Enquesta editada</string>
+	<string name="edit_poll_removed">Enquesta suprimida</string>
+	<string name="edit_media_added">Multimèdia afegit</string>
+	<string name="edit_media_removed">Multimèdia suprimit</string>
+	<string name="edit_media_reordered">Multimèdia reordenat</string>
+	<string name="edit_marked_sensitive">Marcat com a sensible</string>
+	<string name="edit_marked_not_sensitive">Marcat com a no sensible</string>
+	<string name="edit_multiple_changed">Publicació editada</string>
+	<string name="edit">Edita</string>
+	<string name="discard_changes">Descartar els canvis?</string>
+	<string name="upload_failed">Ha fallat la càrrega</string>
+	<string name="file_size_bytes">%d bytes</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="file_upload_progress">%1$s de %2$s</string>
+	<string name="file_upload_time_remaining">%s restants</string>
+	<string name="upload_error_connection_lost">El teu dispositiu ha perdut la connexió a internet</string>
+	<string name="upload_processing">S\'està processant…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon per a Android %s està preparat per a descarregar.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Mastodon per a Android %s s\'ha descarregat i està llest per ser instal·lat.</string>
 	<!-- %s is file size -->
+	<string name="download_update">Baixada (%s)</string>
+	<string name="install_update">Instal·lar</string>
+	<string name="privacy_policy_title">Mastodon i la teva privacitat</string>
+	<string name="privacy_policy_subtitle">Tot i que l\'aplicació Mastodon no recull cap dada, el servidor mitjançant el qual et registres pot tenir una política diferent. Pren un minut per revisar i acceptar la política de privadesa de l\'aplicació Mastodon i la política de privadesa del teu servidor.</string>
+	<string name="i_agree">D\'acord</string>
+	<!-- Missing strings -->
+	<string name="bookmarks">Marcadors</string>
+	<string name="pinned_posts">Fixat</string>
 </resources>

mastodon/src/main/res/values-cs-rCZ/strings.xml

@@ -50,7 +50,7 @@
 	<string name="media">Média</string>
 	<string name="profile_about">O uživateli</string>
 	<string name="button_follow">Sledovat</string>
-	<string name="button_following">Sledovaní</string>
+	<string name="button_following">Sleduji</string>
 	<string name="edit_profile">Upravit profil</string>
 	<string name="mention_user">Zmínit @%s</string>
 	<string name="share_user">Sdílet %s</string>
@@ -403,7 +403,23 @@
 	<string name="edit_multiple_changed">Příspěvek upraven</string>
 	<string name="edit">Upravit</string>
 	<string name="discard_changes">Zrušit změny?</string>
+	<string name="upload_failed">Nahrávání se nezdařilo</string>
+	<string name="file_size_bytes">%d bajtů</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="file_upload_progress">%1$s z %2$s</string>
+	<string name="file_upload_time_remaining">Zbývá %s</string>
+	<string name="upload_error_connection_lost">Vaše zařízení ztratilo připojení k internetu</string>
+	<string name="upload_processing">Zpracovávání…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon pro Android %s je připravený ke stažení.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Mastodon pro Android %s je stažený a připravený k instalaci.</string>
 	<!-- %s is file size -->
+	<string name="download_update">Stáhnout (%s)</string>
+	<string name="install_update">Instalovat</string>
+	<string name="privacy_policy_title">Mastodon a vaše soukromí</string>
+	<string name="privacy_policy_subtitle">Ačkoliv aplikace Mastodon neshromažďuje žádná data, server, na kterém se registrujete, může mít jiné zásady. Věnujte minutu kontrole a odsouhlasení zásad soukromí aplikace Mastodon a vašeho serveru.</string>
+	<string name="i_agree">Souhlasím</string>
 </resources>

mastodon/src/main/res/values-de-rDE/strings.xml

@@ -3,19 +3,19 @@
 	<string name="get_started">Loslegen</string>
 	<string name="log_in">Anmelden</string>
 	<string name="next">Weiter</string>
-	<string name="loading_instance">Instanzinformationen werden geladen …</string>
+	<string name="loading_instance">Instanzinformationen werden geladen…</string>
 	<string name="error">Fehler</string>
 	<string name="not_a_mastodon_instance">%s scheint keine Mastodon-Instanz zu sein.</string>
 	<string name="ok">OK</string>
-	<string name="preparing_auth">Authentifizierung wird vorbereitet …</string>
-	<string name="finishing_auth">Authentifizierung abschließen …</string>
+	<string name="preparing_auth">Authentifizierung wird vorbereitet…</string>
+	<string name="finishing_auth">Authentifizierung wird abgeschlossen…</string>
 	<string name="user_boosted">%s hat diesen Beitrag geteilt</string>
-	<string name="in_reply_to">Antwort auf den Beitrag von %s</string>
+	<string name="in_reply_to">Als Antwort auf %s</string>
 	<string name="notifications">Benachrichtigungen</string>
 	<string name="user_followed_you">folgt dir jetzt</string>
 	<string name="user_sent_follow_request">hat dir eine Folgeanfrage gesendet</string>
-	<string name="user_favorited">hat deinen Beitrag favorisiert</string>
-	<string name="notification_boosted">hat deinen Beitrag geteilt</string>
+	<string name="user_favorited">favorisierte</string>
+	<string name="notification_boosted">teilte</string>
 	<string name="poll_ended">Abstimmung beendet</string>
 	<string name="time_seconds">vor %d Sekunden</string>
 	<string name="time_minutes">vor %d Minuten</string>
@@ -40,32 +40,32 @@
 		<item quantity="other">Beiträge</item>
 	</plurals>
 	<string name="posts">Beiträge</string>
-	<string name="posts_and_replies">Beiträge &amp; Antworten</string>
 	<string name="pinned_posts">Angeheftet</string>
+	<string name="posts_and_replies">Beiträge und Antworten</string>
 	<string name="media">Medien</string>
 	<string name="profile_about">Über</string>
 	<string name="button_follow">Folgen</string>
 	<string name="button_following">Folge ich</string>
 	<string name="edit_profile">Profil bearbeiten</string>
-	<string name="mention_user">%s erwähen</string>
+	<string name="mention_user">%s erwähnen</string>
 	<string name="share_user">%s teilen</string>
 	<string name="mute_user">%s stummschalten</string>
 	<string name="unmute_user">%s nicht mehr stummschalten</string>
 	<string name="block_user">%s blockieren</string>
 	<string name="unblock_user">%s nicht mehr blockieren</string>
 	<string name="report_user">%s melden</string>
-	<string name="block_domain">Domain %s blockieren</string>
-	<string name="unblock_domain">Domain %s nicht mehr blockieren</string>
+	<string name="block_domain">%s sperren</string>
+	<string name="unblock_domain">%s nicht mehr sperren</string>
 	<plurals name="x_posts">
 		<item quantity="one">%,d Beitrag</item>
 		<item quantity="other">%,d Beiträge</item>
 	</plurals>
 	<string name="profile_joined">Beigetreten</string>
 	<string name="done">Fertig</string>
-	<string name="loading">wird geladen …</string>
+	<string name="loading">Wird geladen…</string>
 	<string name="field_label">Beschriftung</string>
 	<string name="field_content">Inhalt</string>
-	<string name="saving">Speichern …</string>
+	<string name="saving">Speichern…</string>
 	<string name="post_from_user">Beitrag von %s</string>
 	<string name="poll_option_hint">%d. Auswahl</string>
 	<plurals name="x_minutes">
@@ -119,13 +119,13 @@
 	<string name="button_muted">Stummgeschaltet</string>
 	<string name="button_blocked">Blockiert</string>
 	<string name="action_vote">Abstimmen</string>
-	<string name="tap_to_reveal">Zum Anzeigen tippen</string>
+	<string name="tap_to_reveal">Tippen zum Anzeigen</string>
 	<string name="delete">Löschen</string>
 	<string name="delete_and_redraft">Löschen und neu erstellen</string>
 	<string name="confirm_delete_title">Beitrag löschen</string>
 	<string name="confirm_delete_and_redraft_title">Beitrag löschen und neu erstellen</string>
-	<string name="confirm_delete">Bist du dir sicher, dass du den Beitrag löschen möchtest?</string>
-	<string name="confirm_delete_and_redraft">Bist du dir sicher, dass du den Beitrag löschen und neu erstellen möchtest?</string>
+	<string name="confirm_delete">Bist du dir sicher, dass du diesen Beitrag löschen möchtest?</string>
+	<string name="confirm_delete_and_redraft">Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest?</string>
 	<string name="deleting">Wird gelöscht…</string>
 	<string name="pin_post">An Profil anheften</string>
 	<string name="confirm_pin_post_title">Beitrag an Profil anheften</string>
@@ -152,19 +152,19 @@
 	</plurals>
 	<plurals name="discussed_x_times">
 		<item quantity="one">%d Mal diskutiert</item>
-		<item quantity="other">%d × auf dieser Mastodon-Instanz geteilt</item>
+		<item quantity="other">%d Mal diskutiert</item>
 	</plurals>
 	<string name="report_title">%s melden</string>
 	<string name="report_choose_reason">Was stimmt mit diesem Beitrag nicht?</string>
-	<string name="report_choose_reason_account">Was ist los mit %s?</string>
-	<string name="report_choose_reason_subtitle">Wähle die bestmögliche Option aus</string>
-	<string name="report_reason_personal">Der Beitrag gefällt mir nicht</string>
+	<string name="report_choose_reason_account">Was stimmt mit %s nicht?</string>
+	<string name="report_choose_reason_subtitle">Bitte das Bestmögliche auswählen</string>
+	<string name="report_reason_personal">Das gefällt mir nicht</string>
 	<string name="report_reason_personal_subtitle">Den Inhalt kann man nicht allen zumuten</string>
 	<string name="report_reason_spam">Das ist Spam</string>
-	<string name="report_reason_spam_subtitle">Bösartige Links, gefälschtes Engagement oder wiederholte Antworten</string>
+	<string name="report_reason_spam_subtitle">Bösartige Links, vorgetäuschtes Verhalten oder wiederholtes Antworten</string>
 	<string name="report_reason_violation">Es verstößt gegen Serverregeln</string>
 	<string name="report_reason_violation_subtitle">Du weißt, welche Regeln verletzt werden</string>
-	<string name="report_reason_other">Da ist was anderes</string>
+	<string name="report_reason_other">Es ist etwas anderes</string>
 	<string name="report_reason_other_subtitle">Das Problem passt nicht in eine der Kategorien</string>
 	<string name="report_choose_rule">Welche Regeln werden verletzt?</string>
 	<string name="report_choose_rule_subtitle">Alles Zutreffende auswählen</string>
@@ -172,12 +172,12 @@
 	<string name="report_choose_posts_subtitle">Alles Zutreffende auswählen</string>
 	<string name="report_comment_title">Gibt es etwas anderes, was wir wissen sollten?</string>
 	<string name="report_comment_hint">Zusätzliche Kommentare</string>
-	<string name="sending_report">Bericht wird gesendet …</string>
+	<string name="sending_report">Bericht wird gesendet…</string>
 	<string name="report_sent_title">Vielen Dank für die Meldung, wir werden uns damit befassen.</string>
 	<string name="report_sent_subtitle">Während wir dies überprüfen, kannst du gegen %s vorgehen.</string>
 	<string name="unfollow_user">%s entfolgen</string>
 	<string name="unfollow">Entfolgen</string>
-	<string name="mute_user_explain">Du wirst die eigenen und geteilten Beiträge des Kontos nicht mehr sehen können. Dass du das Profil stummgeschaltet hast, erfährt die Person hinter dem Account aber nicht.</string>
+	<string name="mute_user_explain">Du wirst die eigenen und geteilten Beiträge des Kontos nicht mehr sehen können. Dass du das Profil stummgeschaltet hast, erfährt die Person nicht.</string>
 	<string name="block_user_explain">Du wirst die Beiträge von diesem Konto nicht sehen. Das Konto wird nicht in der Lage sein, deine Beiträge zu sehen oder dir zu folgen. Die Person hinter dem Konto wird wissen, dass du das Konto blockiert hast.</string>
 	<string name="report_personal_title">Du willst das nicht mehr sehen?</string>
 	<string name="report_personal_subtitle">Wenn du etwas auf Mastodon nicht sehen willst, kannst du den Nutzer aus deiner Erfahrung streichen.</string>
@@ -210,10 +210,10 @@
 	<string name="confirm_email_title">Eine letzte Sache noch</string>
 	<string name="confirm_email_subtitle">Schaue kurz in dein E-Mail-Postfach und tippe den Link an, den wir dir gesendet haben.</string>
 	<string name="resend">Erneut senden</string>
-	<string name="open_email_app">Öffne meine E-Mail-App</string>
+	<string name="open_email_app">E-Mail-App öffnen</string>
 	<string name="resent_email">Bestätigungs-E-Mail gesendet</string>
-	<string name="compose_hint">Was gibt\'s Neues?</string>
-	<string name="content_warning">Inhaltswarnung</string>
+	<string name="compose_hint">Eintippen oder einfügen, was dir am Herzen liegt</string>
+	<string name="content_warning">Inhaltwarnung</string>
 	<string name="add_image_description">Bildbeschreibung hinzufügen…</string>
 	<string name="retry_upload">Hochladen erneut versuchen</string>
 	<string name="image_description">Bildbeschreibung</string>
@@ -233,7 +233,7 @@
 	<string name="recent_searches">Letzte Suchanfragen</string>
 	<string name="step_x_of_n">Schritt %1$d von %2$d</string>
 	<string name="skip">Überspringen</string>
-	<string name="notification_type_follow">Neue Folgende</string>
+	<string name="notification_type_follow">Neue Follower</string>
 	<string name="notification_type_favorite">Favoriten</string>
 	<string name="notification_type_reblog">Geteilte Beiträge</string>
 	<string name="notification_type_mention">Erwähnungen</string>
@@ -245,18 +245,19 @@
 		<item quantity="other">Du kannst nicht mehr als %d Medien-Dateien anhängen</item>
 	</plurals>
 	<string name="media_attachment_unsupported_type">Datei %s wird nicht unterstützt</string>
-	<string name="media_attachment_too_big">Die Dateigröße %1$s übersteigt das Uploadlimit von %2$s MB</string>
+	<string name="media_attachment_too_big">Datei %1$s übersteigt die Größengrenze von %2$s MB</string>
 	<string name="settings_theme">Design</string>
 	<string name="theme_auto">Systembedingt</string>
 	<string name="theme_light">Hell</string>
 	<string name="theme_dark">Dunkel</string>
-	<string name="theme_true_black">AMOLED-Modus</string>
-	<string name="settings_behavior">App-Verhalten</string>
+	<string name="theme_true_black">Echter Schwarzmodus</string>
+	<string name="settings_behavior">Verhalten</string>
+	<string name="settings_gif">Animierte GIFs, Avatare und Emojis abspielen</string>
 	<string name="settings_show_replies">Antworten anzeigen</string>
 	<string name="settings_show_boosts">Geteilte Beiträge anzeigen</string>
 	<string name="settings_load_new_posts">Automatisch neue Beiträge laden</string>
-	<string name="settings_gif">Spiele animierte GIFs, Avatare und Emojis ab</string>
 	<string name="settings_custom_tabs">In-App-Browser verwenden</string>
+	<string name="settings_show_interaction_counts">Interaktions-Anzahlen anzeigen</string>
 	<string name="settings_notifications">Benachrichtigungen</string>
 	<string name="notify_me_when">Benachrichtige mich, wenn</string>
 	<string name="notify_anyone">irgendjemand</string>
@@ -269,21 +270,21 @@
 	<string name="notify_mention">mich erwähnt</string>
 	<string name="settings_boring">Langweiliges</string>
 	<string name="settings_account">Kontoeinstellungen</string>
-	<string name="settings_contribute">Bei Mastodon unterstützen und mitmachen</string>
+	<string name="settings_contribute">Zu Mastodon beitragen</string>
 	<string name="settings_tos">Nutzungsbedingungen</string>
 	<string name="settings_privacy_policy">Datenschutzbestimmungen</string>
 	<string name="settings_spicy">Gefährliches</string>
-	<string name="settings_clear_cache">Medien-Cache leeren</string>
+	<string name="settings_clear_cache">Medienpuffer leeren</string>
 	<string name="settings_app_version">Mastodos v%1$s (%2$d)</string>
-	<string name="media_cache_cleared">Medien-Cache geleert</string>
+	<string name="media_cache_cleared">Medienpuffer geleert</string>
 	<string name="confirm_log_out">Bist du dir sicher, dass du dich abmelden möchtest?</string>
-	<string name="sensitive_content">Sensibler Inhalt</string>
-	<string name="sensitive_content_explain">Der Autor hat den Inhalt als sensiblen Inhalt markiert. Tippen zum Anzeigen.</string>
-	<string name="media_hidden">Tippen zum Öffnen</string>
+	<string name="sensitive_content">Inhaltswarnung</string>
+	<string name="sensitive_content_explain">Autor*in hat den Inhalt mit einer Inhaltswarnung versehen. Tippen zum Anzeigen.</string>
+	<string name="media_hidden">Tippen zum Anzeigen</string>
 	<string name="avatar_description">Das Profil von %s öffnen</string>
 	<string name="more_options">Mehr Optionen</string>
 	<string name="reveal_content">Inhalt anzeigen</string>
-	<string name="hide_content">Inhalt verstecken</string>
+	<string name="hide_content">Inhalt ausblenden</string>
 	<string name="new_post">Neuer Beitrag</string>
 	<string name="button_reply">Antworten</string>
 	<string name="button_reblog">Teilen</string>
@@ -302,8 +303,8 @@
 	<string name="unfollowed_user">%s entfolgt</string>
 	<string name="followed_user">Du folgst nun %s</string>
 	<string name="open_in_browser">Beitrag im Browser öffnen</string>
-	<string name="hide_boosts_from_user">Verberge geteilte Beiträge von %s</string>
-	<string name="show_boosts_from_user">Zeige geteilte Beiträge von %s</string>
+	<string name="hide_boosts_from_user">Geteilte Beiträge von %s ausblenden</string>
+	<string name="show_boosts_from_user">Geteilte Beiträge von %s anzeigen</string>
 	<string name="user_post_notifications_on">Benachrichtigungen über Beiträge von %s aktiviert</string>
 	<string name="user_post_notifications_off">Benachrichtigungen über Beiträge von %s deaktiviert</string>
 	<string name="signup_reason">Weshalb möchtest du beitreten?</string>
@@ -318,22 +319,22 @@
 	<string name="open_settings">Einstellungen öffnen</string>
 	<string name="error_saving_file">Fehler beim Speichern der Datei</string>
 	<string name="file_saved">Datei gespeichert</string>
-	<string name="downloading">wird heruntergeladen …</string>
+	<string name="downloading">Wird heruntergeladen…</string>
 	<string name="no_app_to_handle_action">Es gibt keine App, um diese Aktion auszuführen</string>
-	<string name="local_timeline">Community</string>
+	<string name="local_timeline">Lokal</string>
 	<string name="federated_timeline">Föderation</string>
 	<string name="trending_posts_info_banner">Dies sind Beiträge, die auf deinem Mastodon-Server gerade angesagt sind.</string>
-	<string name="trending_hashtags_info_banner">Dies sind Hashtags, die auf deinem Mastodon-Server gerade angesagt sind.</string>
-	<string name="trending_links_info_banner">Dies sind journalistische Nachrichten, die auf deinem Mastodon-Server gerade am häufigsten geteilt werden.</string>
-	<string name="local_timeline_info_banner">Dies sind die neuesten Beiträge der Leute, die den gleichen Mastodon-Server verwenden wie du.</string>
-	<string name="federated_timeline_info_banner">Dies sind die neusten Beiträge der Leute, die in der Föderation deines Servers sind.</string>
+	<string name="trending_hashtags_info_banner">Diese Hashtags sind auf deinem Mastodon-Server gerade angesagt.</string>
+	<string name="trending_links_info_banner">Diese journalistischen Nachrichten werden auf deinem Mastodon-Server gerade am häufigsten geteilt.</string>
+	<string name="local_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die denselben Mastodon-Server benutzen.</string>
+	<string name="federated_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die in der Föderation deines Servers sind.</string>
 	<string name="dismiss">Verwerfen</string>
 	<string name="see_new_posts">Neue Beiträge anzeigen</string>
 	<string name="load_missing_posts">Weitere Beiträge laden</string>
-	<string name="follow_back">Zurück folgen</string>
+	<string name="follow_back">Zurückfolgen</string>
 	<string name="button_follow_pending">Ausstehend</string>
 	<string name="follows_you">Folgt dir</string>
-	<string name="manually_approves_followers">Genehmigt Folgende manuell</string>
+	<string name="manually_approves_followers">Manuelles Genehmigen von Followern</string>
 	<string name="current_account">Aktuelles Konto</string>
 	<string name="log_out_account">%s abmelden</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
@@ -347,7 +348,7 @@
 	</plurals>
 	<plurals name="x_favorites">
 		<item quantity="one">%,d × favorisiert</item>
-		<item quantity="other">%,d Favoriten</item>
+		<item quantity="other">%,d × favorisiert</item>
 	</plurals>
 	<plurals name="x_reblogs">
 		<item quantity="one">%,d × geteilt</item>
@@ -380,28 +381,38 @@
 	<string name="edit_media_added">Medien hinzugefügt</string>
 	<string name="edit_media_removed">Medien entfernt</string>
 	<string name="edit_media_reordered">Medien umsortiert</string>
-	<string name="edit_marked_sensitive">Als NSFW markiert</string>
-	<string name="edit_marked_not_sensitive">Als nicht NSFW markiert</string>
+	<string name="edit_marked_sensitive">Mit Inhaltswarnung versehen</string>
+	<string name="edit_marked_not_sensitive">Ohne Inhaltswarnung</string>
 	<string name="edit_multiple_changed">Beitrag bearbeitet</string>
 	<string name="edit">Bearbeiten</string>
 	<string name="discard_changes">Änderungen verwerfen?</string>
-	<string name="upload_failed">Upload fehlgeschlagen</string>
-	<string name="file_size_bytes">%d bytes</string>
+	<string name="upload_failed">Hochladen fehlgeschlagen</string>
+	<string name="file_size_bytes">%d Bytes</string>
 	<string name="file_size_kb">%.2f KB</string>
 	<string name="file_size_mb">%.2f MB</string>
 	<string name="file_size_gb">%.2f GB</string>
 	<string name="file_upload_progress">%1$s von %2$s</string>
 	<string name="file_upload_time_remaining">%s verbleibend</string>
 	<string name="upload_error_connection_lost">Dein Gerät hat gerade keinen Zugang zum Internet</string>
-	<string name="upload_processing">wird verarbeitet …</string>
+	<string name="upload_processing">Wird verarbeitet…</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_available">Mastodos %s kann nun heruntergeladen werden.</string>
+	<string name="update_available">Mastodos %s ist zum Herunterladen bereit.</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_ready">Mastodos %s wurde heruntergeladen und kann nun installiert werden.</string>
+	<string name="update_ready">Mastodos %s wurde heruntergeladen und ist bereit zum Installieren.</string>
 	<!-- %s is file size -->
 	<string name="download_update">Download (%s)</string>
 	<string name="install_update">Installieren</string>
 	<string name="check_for_update">Auf Update prüfen</string>
 	<string name="no_update_available">Kein Update verfügbar</string>
 	<string name="list_timelines">Listen</string>
+	<string name="favorited_posts">Favorisierte Beiträge</string>
+	<string name="follow_requests">Folgeanfragen</string>
+	<string name="accept_follow_request">Folgeanfrage akzeptieren</string>
+	<string name="reject_follow_request">Folgeanfrage ablehnen</string>
+	<string name="lists_with_user">Listen mit %s</string>
+	<string name="privacy_policy_title">Mastodon und Ihre Privatsphäre</string>
+	<string name="privacy_policy_subtitle">Obwohl die Mastodon-App keine Daten sammelt, kann der Server, über den Sie sich anmelden, eine andere Richtlinie haben. Nehmen Sie sich eine Minute Zeit, um die Mastodon-Datenschutzrichtlinien und die Datenschutzrichtlinien Ihres Servers zu lesen und zu akzeptieren.</string>
+	<string name="i_agree">Ich stimme zu</string>
+	<string name="settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
+	<string name="disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
 </resources>

mastodon/src/main/res/values-es-rES/strings.xml

@@ -361,7 +361,23 @@
 	<string name="edit_multiple_changed">Publicación editada</string>
 	<string name="edit">Editar</string>
 	<string name="discard_changes">¿Descartar cambios?</string>
+	<string name="upload_failed">Subida fallida</string>
+	<string name="file_size_bytes">%d bytes</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="file_upload_progress">%1$s de %2$s</string>
+	<string name="file_upload_time_remaining">%s restantes</string>
+	<string name="upload_error_connection_lost">Tu dispositivo ha perdido la conexión a internet</string>
+	<string name="upload_processing">Procesando…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon para Android %s está listo para descargar.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Mastodon para Android %s ha sido descargado y está listo para instalar.</string>
 	<!-- %s is file size -->
+	<string name="download_update">Descargar (%s)</string>
+	<string name="install_update">Instalar</string>
+	<string name="privacy_policy_title">Mastodon y su privacidad</string>
+	<string name="privacy_policy_subtitle">Aunque la aplicación de Mastodon no recolecta ningún dato, el servidor al que se registre puede tener una política diferente. Tómese un minuto para revisar y aceptar las políticas de privacidad de la aplicación de Mastodon y las políticas de privacidad de su servidor.</string>
+	<string name="i_agree">Acepto</string>
 </resources>

mastodon/src/main/res/values-eu-rES/strings.xml

@@ -9,10 +9,13 @@
 	<string name="ok">Ados</string>
 	<string name="preparing_auth">Autentifikaziorako prestatzen…</string>
 	<string name="finishing_auth">Autentikazioa bukatzen…</string>
+	<string name="user_boosted">%s(e)k zure bidalketa bultzatu du</string>
 	<string name="in_reply_to">%s-(r)i erantzunez</string>
 	<string name="notifications">Jakinarazpenak</string>
 	<string name="user_followed_you">jarraitu zaitu</string>
 	<string name="user_sent_follow_request">jarraitzeko eskaera bidali dizu</string>
+	<string name="user_favorited">zure bidalketa gogoko du</string>
+	<string name="notification_boosted">zure bidalketa bultzatu du</string>
 	<string name="poll_ended">inkesta amaitu da</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -154,8 +157,14 @@
 	<string name="report_sent_subtitle">Hau berrikusten dugun bitartean, %s erabiltzailearen aurkako neurriak hartu ditzakezu.</string>
 	<string name="unfollow_user">%s jarraitzeari utzi</string>
 	<string name="unfollow">Utzi jarraitzeari</string>
+	<string name="mute_user_explain">Ez dituzu bere bidalketa eta birbidalketak zure hasierako jarioan ikusiko. Ez dute jakingo isilarazi dituztenik.</string>
+	<string name="block_user_explain">Ezin izango dituzte zure bidalketak jarraitu edo ikusi, baina blokeatuta dauden ikusi ahal izango dute.</string>
 	<string name="report_personal_title">Ez duzu hau ikusi nahi?</string>
+	<string name="report_personal_subtitle">Mastodonen gustuko ez duzun zerbait ikusten duzunean, zure esperientziatik atera dezakezu pertsona hori.</string>
 	<string name="back">Atzera</string>
+	<string name="instance_catalog_title">Mastodon zerbitzari desberdinetako erabiltzaileez egina dago.</string>
+	<string name="instance_catalog_subtitle">Aukeratu zerbitzari bat zure interesen, eskualdearen edo helburuen arabera. Pertsona guztiekin konektatu ahal izango duzu, zerbitzaria zein den kontuan hartu gabe.</string>
+	<string name="search_communities">Bilatu zerbitzariak edo idatzi URL-a</string>
 	<string name="instance_rules_title">Oinarrizko arau batzuk</string>
 	<string name="edit_photo">editatu</string>
 	<string name="display_name">pantaila-izena</string>
@@ -168,6 +177,7 @@
 	<string name="category_all">Denak</string>
 	<string name="category_art">Artea</string>
 	<string name="category_food">Janaria</string>
+	<string name="category_furry">Furry</string>
 	<string name="category_games">Jokoak</string>
 	<string name="category_general">Orokorra</string>
 	<string name="category_journalism">Kazetaritza</string>
@@ -187,6 +197,8 @@
 	<string name="edit_image">Editatu irudia</string>
 	<string name="save">Gorde</string>
 	<string name="add_alt_text">Gehitu ordezko testua</string>
+	<string name="alt_text_subtitle">Alt testuak zure argazkiak deskribatzen ditu ikusmen txikia edo ikuspenik ez duten pertsonentzat. Testuingurua ulertzeko behar adina xehetasun bakarrik sartu.</string>
+	<string name="alt_text_hint">adib. Txakur bat kamerari modu susmagarrian begira, begiak erdi itxita dituela.</string>
 	<string name="visibility_public">Publikoa</string>
 	<string name="visibility_followers_only">Jarraitzaileak soilik</string>
 	<string name="visibility_private">Aipatzen dudan jendea soilik</string>
@@ -196,14 +208,19 @@
 	<string name="skip">Saltatu</string>
 	<string name="notification_type_follow">Jarraitzaile berriak</string>
 	<string name="notification_type_favorite">Gogokoak</string>
+	<string name="notification_type_reblog">Bultzadak</string>
 	<string name="notification_type_mention">Aipamenak</string>
 	<string name="notification_type_poll">Inkestak</string>
 	<string name="choose_account">Aukeratu kontua</string>
 	<string name="err_not_logged_in">Mesedez, hasi saioa lehenengo Mastodonen</string>
+	<string name="settings_theme">Itxura bisuala</string>
 	<string name="theme_auto">Automatikoa</string>
 	<string name="theme_light">Argia</string>
 	<string name="theme_dark">Iluna</string>
 	<string name="theme_true_black">Benetako modu beltz iluna</string>
+	<string name="settings_behavior">Jokabidea</string>
+	<string name="settings_gif">Erreproduzitu animatutako abatarrak eta emojiak</string>
+	<string name="settings_custom_tabs">Erabili aplikazio barneko nabigatzailea</string>
 	<string name="settings_notifications">Jakinarazpenak</string>
 	<string name="notify_me_when">Noiz jakinarazi:</string>
 	<string name="notify_anyone">edozein</string>
@@ -222,8 +239,10 @@
 	<string name="settings_spicy">Eremu beroa</string>
 	<string name="settings_clear_cache">Garbitu multimediaren cachea</string>
 	<string name="settings_app_version">Mastodon Android-entzat v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Multimediaren cachea garbitua</string>
 	<string name="confirm_log_out">Ziur saioa amaitu nahi duzula?</string>
 	<string name="sensitive_content">Eduki hunkigarria</string>
+	<string name="sensitive_content_explain">Egileak multimedia hau hunkigarritzat markatu du. Sakatu erakusteko.</string>
 	<string name="media_hidden">Sakatu erakusteko</string>
 	<string name="more_options">Aukera gehiago</string>
 	<string name="reveal_content">Erakutsi edukia</string>
@@ -233,15 +252,20 @@
 	<string name="button_reblog">Bultzada</string>
 	<string name="button_favorite">Gogokoa</string>
 	<string name="button_share">Partekatu</string>
+	<string name="media_no_description">Deskribapenik gabeko multimedia</string>
 	<string name="add_media">Gehitu multimedia</string>
 	<string name="add_poll">Gehitu inkesta bat</string>
 	<string name="emoji">Emojia</string>
 	<string name="post_visibility">Bidalketaren ikusgaitasuna</string>
 	<string name="home_timeline">Hasierako denbora-lerroa</string>
 	<string name="my_profile">Nire profila</string>
+	<string name="media_viewer">Multimedia ikuskatzailea</string>
 	<string name="follow_user">Jarraitu %s</string>
 	<string name="unfollowed_user">Utzi %s jarraitzeari</string>
+	<string name="followed_user">%s jarraitzen ari zara</string>
 	<string name="open_in_browser">Ireki nabigatzailean</string>
+	<string name="hide_boosts_from_user">Ezkutatu %s(r)en bultzadak</string>
+	<string name="show_boosts_from_user">Erakutsi %s(r)en bultzadak</string>
 	<string name="signup_reason">zergatik elkartu nahi duzu?</string>
 	<string name="signup_reason_note">Honek zure eskaera berrikustean lagunduko digu.</string>
 	<string name="clear">Garbitu</string>
@@ -255,8 +279,56 @@
 	<string name="error_saving_file">Errorea fitxategia gordetzerakoan</string>
 	<string name="file_saved">Fitxategia gorde da</string>
 	<string name="downloading">Jeisten…</string>
+	<string name="no_app_to_handle_action">Ez dago ekintza hau kudeatu dezkeen aplikaziorik</string>
+	<string name="local_timeline">Komunitatea</string>
+	<string name="trending_posts_info_banner">Hauek dira zure Mastodon txokoan beraien lekua hartzen ari diren argitalpenak.</string>
+	<string name="trending_hashtags_info_banner">Hauek dira zure Mastodon txokoan beraien lekua hartzen ari diren traolak.</string>
+	<string name="trending_links_info_banner">Hauek dira zure Mastodon txokoan gehien partekatzen diren albisteak.</string>
+	<string name="dismiss">Baztertu</string>
+	<string name="see_new_posts">Ikusi bidalketa berriak</string>
+	<string name="load_missing_posts">Falta diren bidalketak kargatu</string>
+	<string name="follow_back">Jarraitu</string>
+	<string name="button_follow_pending">Zain</string>
+	<string name="follows_you">Jarraitzen zaitu</string>
+	<string name="manually_approves_followers">Jarraitzaileak eskuz onartu</string>
+	<string name="current_account">Oraingo kontua</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<string name="time_now">orain</string>
+	<string name="post_info_reblogs">Bultzadak</string>
+	<string name="post_info_favorites">Gogokoak</string>
+	<string name="edit_history">Editatu historia</string>
+	<string name="last_edit_at_x">Azken edizioa %s</string>
+	<string name="time_just_now">oraintxe</string>
+	<string name="edited_timestamp">editatua %s</string>
+	<string name="edit_original_post">Jatorrizko bidalketa</string>
+	<string name="edit_text_edited">Editatutako testua</string>
+	<string name="edit_spoiler_added">Edukiaren abisua gehitu da</string>
+	<string name="edit_spoiler_edited">Edukiaren abisua editatu da</string>
+	<string name="edit_spoiler_removed">Edukiaren abisua ezabatu da</string>
+	<string name="edit_poll_added">Inkesta gehitu da</string>
+	<string name="edit_poll_edited">Inkesta editatu da</string>
+	<string name="edit_poll_removed">Inkesta ezabatu da</string>
+	<string name="edit_media_added">Multimedia gehituta</string>
+	<string name="edit_media_removed">Multimedia ezabatuta</string>
+	<string name="edit_marked_sensitive">Hunkigarri markatua</string>
+	<string name="edit_marked_not_sensitive">Ez hunkigarri markatua</string>
+	<string name="edit_multiple_changed">Editatutako bidalketak</string>
+	<string name="edit">Editatu</string>
+	<string name="discard_changes">Baztertu aldaketak?</string>
+	<string name="upload_failed">Kargatzeak huts egin du</string>
+	<string name="file_size_bytes">%d bytes</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="upload_error_connection_lost">Zure gailuak interneterako konexioa galdu du</string>
+	<string name="upload_processing">Prozesatzen…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Androiderako Mastodon %s prest dago jeisteko.</string>
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<string name="download_update">(%s) deskargatu</string>
+	<string name="install_update">Instalatu</string>
+	<string name="privacy_policy_title">Mastodon eta zure pribatutasuna</string>
+	<string name="privacy_policy_subtitle">Mastodon aplikazioak daturik jasotzen ez duen arren, izena ematen duzun zerbitzariak beste politika bat izan dezake. Eskaini minutu bat Mastodon aplikazioaren pribatutasun politika eta zure zerbitzariaren pribatutasun politika berrikusteko eta ados zaudela ziurtatzeko.</string>
+	<string name="i_agree">Ados nago</string>
 </resources>

mastodon/src/main/res/values-fi-rFI/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="get_started">Aloita</string>
 	<string name="log_in">Kirjaudu sisään</string>
 	<string name="next">Seuraava</string>
 	<string name="error">Virhe</string>

mastodon/src/main/res/values-fr-rFR/strings.xml

@@ -23,12 +23,12 @@
 	<string name="time_days">%d j</string>
 	<string name="share_toot_title">Partager</string>
 	<string name="settings">Paramètres</string>
-	<string name="publish">Publier</string>
-	<string name="discard_draft">Abandonner le brouillon ?</string>
-	<string name="discard">Abandonner</string>
+	<string name="publish">Pouet !</string>
+	<string name="discard_draft">Supprimer le brouillon ?</string>
+	<string name="discard">Supprimer</string>
 	<string name="cancel">Annuler</string>
 	<plurals name="followers">
-		<item quantity="one">abonné·e</item>
+		<item quantity="one">abonné·e·s</item>
 		<item quantity="other">abonné·e·s</item>
 	</plurals>
 	<plurals name="following">
@@ -44,7 +44,7 @@
 	<string name="media">Médias</string>
 	<string name="profile_about">À propos</string>
 	<string name="button_follow">Suivre</string>
-	<string name="button_following">Abonné·e</string>
+	<string name="button_following">Abonné·e·s</string>
 	<string name="edit_profile">Modifier le profil</string>
 	<string name="mention_user">Mentionner %s</string>
 	<string name="share_user">Partager %s</string>
@@ -79,7 +79,7 @@
 		<item quantity="one">%d jour</item>
 		<item quantity="other">%d jours</item>
 	</plurals>
-	<string name="compose_poll_duration">Durée: %s</string>
+	<string name="compose_poll_duration">Durée : %s</string>
 	<plurals name="x_seconds_left">
 		<item quantity="one">%d seconde restante</item>
 		<item quantity="other">%d secondes restantes</item>
@@ -118,7 +118,7 @@
 	<string name="button_muted">Masqué</string>
 	<string name="button_blocked">Bloqué</string>
 	<string name="action_vote">Voter</string>
-	<string name="tap_to_reveal">Appuyer pour afficher</string>
+	<string name="tap_to_reveal">Appuyez pour révéler</string>
 	<string name="delete">Supprimer</string>
 	<string name="confirm_delete_title">Supprimer le message</string>
 	<string name="confirm_delete">Voulez-vous vraiment supprimer ce message ?</string>
@@ -143,7 +143,7 @@
 		<item quantity="other">Discuté %d fois</item>
 	</plurals>
 	<string name="report_title">Signaler %s</string>
-	<string name="report_choose_reason">Quel est le problème avec ce post ?</string>
+	<string name="report_choose_reason">Quel est le problème avec ce message ?</string>
 	<string name="report_choose_reason_account">Quel est le problème avec %s ?</string>
 	<string name="report_choose_reason_subtitle">Sélectionnez la meilleure correspondance</string>
 	<string name="report_reason_personal">Je n’aime pas ça</string>
@@ -165,12 +165,12 @@
 	<string name="report_sent_subtitle">Pendant que nous étudions votre requête, vous pouvez prendre des mesures contre %s.</string>
 	<string name="unfollow_user">Ne plus suivre %s</string>
 	<string name="unfollow">Ne plus suivre</string>
-	<string name="mute_user_explain">Vous ne verrez pas leurs messages ou leurs reblogs dans votre flux personnel. Ils ne sauront pas qu’ils ont été mis en sourdine.</string>
+	<string name="mute_user_explain">Vous ne verrez pas leurs messages ou leurs partages dans votre flux personnel. Ils ne sauront pas qu’ils ont été mis en sourdine.</string>
 	<string name="block_user_explain">Ils ne seront plus en mesure de suivre ou de voir vos messages, mais ils peuvent voir s’ils ont été bloqués.</string>
 	<string name="report_personal_title">Vous ne voulez pas voir cela ?</string>
 	<string name="report_personal_subtitle">Quand vous voyez quelque chose que vous n’aimez pas sur Mastodon, vous pouvez retirer la personne de votre expérience.</string>
 	<string name="back">Retour</string>
-	<string name="instance_catalog_title">Mastodon est composé d\'utilisateurs sur différents serveurs.</string>
+	<string name="instance_catalog_title">Mastodon est composé d’utilisateurs sur différents serveurs.</string>
 	<string name="instance_catalog_subtitle">Choisissez un serveur en fonction de vos intérêts, de votre région ou alors rejoignez un serveur général. Vous pouvez toujours vous connecter avec tout le monde, quel que soit le serveur.</string>
 	<string name="search_communities">Rechercher des serveurs ou entrer une URL</string>
 	<string name="instance_rules_title">Quelques règles de base</string>
@@ -208,7 +208,7 @@
 	<string name="save">Enregistrer</string>
 	<string name="add_alt_text">Ajouter un texte alternatif</string>
 	<string name="alt_text_subtitle">Le texte alternatif décrit vos photos pour les personnes qui ont une vision faible ou nulle. Essayez d’inclure uniquement assez de détails pour comprendre le contexte.</string>
-	<string name="alt_text_hint">p. ex. : Chien regardant autour suspectement avec les yeux fixés sur la caméra.</string>
+	<string name="alt_text_hint">p. ex. : Chien regardant autour de manière suspecte avec les yeux fixés sur la caméra.</string>
 	<string name="visibility_public">Public</string>
 	<string name="visibility_followers_only">Abonné·e·s uniquement</string>
 	<string name="visibility_private">Seulement les personnes mentionnées</string>
@@ -248,12 +248,12 @@
 	<string name="notify_follow">Me suit</string>
 	<string name="notify_reblog">Partage mon message</string>
 	<string name="notify_mention">Me mentionne</string>
-	<string name="settings_boring">La zone ennuyeuse</string>
+	<string name="settings_boring">Zone ennuyeuse</string>
 	<string name="settings_account">Paramètres du compte</string>
 	<string name="settings_contribute">Contribuer à Mastodon</string>
 	<string name="settings_tos">Conditions d’utilisation</string>
 	<string name="settings_privacy_policy">Politique de confidentialité</string>
-	<string name="settings_spicy">La zone épicée</string>
+	<string name="settings_spicy">Zone épicée</string>
 	<string name="settings_clear_cache">Vider le cache des médias</string>
 	<string name="settings_app_version">Mastodon pour Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Cache des médias vidé</string>
@@ -267,7 +267,7 @@
 	<string name="hide_content">Masquer le contenu</string>
 	<string name="new_post">Nouveau message</string>
 	<string name="button_reply">Répondre</string>
-	<string name="button_reblog">Rebloguer</string>
+	<string name="button_reblog">Partager</string>
 	<string name="button_favorite">Ajouter aux favoris</string>
 	<string name="button_share">Partager</string>
 	<string name="media_no_description">Média sans description</string>
@@ -297,7 +297,7 @@
 	<string name="error_saving_file">Erreur lors de l’enregistrement du fichier</string>
 	<string name="file_saved">Fichier enregistré</string>
 	<string name="downloading">Téléchargement…</string>
-	<string name="no_app_to_handle_action">Aucune application ne permet de gérer ce type d\'action</string>
+	<string name="no_app_to_handle_action">Aucune application ne permet de gérer ce type d’action</string>
 	<string name="local_timeline">Communauté</string>
 	<string name="trending_posts_info_banner">Ce sont les messages qui gagnent en popularité sur votre serveur Mastodon.</string>
 	<string name="trending_hashtags_info_banner">Ce sont les hashtags qui gagnent en popularité sur votre serveur Mastodon.</string>
@@ -314,7 +314,7 @@
 	<string name="log_out_account">Déconnexion %s</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<plurals name="x_followers">
-		<item quantity="one">%,d abonné·e</item>
+		<item quantity="one">%,d abonné·e·s</item>
 		<item quantity="other">%,d abonné·e·s</item>
 	</plurals>
 	<plurals name="x_following">
@@ -333,8 +333,8 @@
 	<string name="time_now">à l’instant</string>
 	<string name="post_info_reblogs">Partages</string>
 	<string name="post_info_favorites">Favoris</string>
-	<string name="edit_history">Historique des éditions</string>
-	<string name="last_edit_at_x">Dernière édition %s</string>
+	<string name="edit_history">Historique des modifications</string>
+	<string name="last_edit_at_x">Dernière modification %s</string>
 	<string name="time_just_now">à l’instant</string>
 	<plurals name="x_seconds_ago">
 		<item quantity="one">Il y a %d seconde</item>
@@ -344,22 +344,22 @@
 		<item quantity="one">Il y a %d minute</item>
 		<item quantity="other">Il y a %d minutes</item>
 	</plurals>
-	<string name="edited_timestamp">édité %s</string>
+	<string name="edited_timestamp">modifié %s</string>
 	<string name="edit_original_post">Message originel</string>
 	<string name="edit_text_edited">Texte modifié</string>
 	<string name="edit_spoiler_added">Avertissement de contenu ajouté</string>
 	<string name="edit_spoiler_edited">Avertissement de contenu modifié</string>
 	<string name="edit_spoiler_removed">Avertissement de contenu supprimé</string>
 	<string name="edit_poll_added">Sondage ajouté</string>
-	<string name="edit_poll_edited">Sondage édité</string>
+	<string name="edit_poll_edited">Sondage modifié</string>
 	<string name="edit_poll_removed">Sondage supprimé</string>
 	<string name="edit_media_added">Média ajouté</string>
 	<string name="edit_media_removed">Média supprimé</string>
 	<string name="edit_media_reordered">Média réordonné</string>
 	<string name="edit_marked_sensitive">Marqué comme sensible</string>
 	<string name="edit_marked_not_sensitive">Marqué comme non-sensible</string>
-	<string name="edit_multiple_changed">Message édité</string>
-	<string name="edit">Éditer</string>
+	<string name="edit_multiple_changed">Message modifié</string>
+	<string name="edit">Modifier</string>
 	<string name="discard_changes">Ignorer les modifications ?</string>
 	<string name="upload_failed">Échec de l’envoi</string>
 	<string name="file_size_bytes">%d octets</string>
@@ -377,4 +377,7 @@
 	<!-- %s is file size -->
 	<string name="download_update">Téléchargement (%s)</string>
 	<string name="install_update">Installer</string>
+	<string name="privacy_policy_title">Mastodon et votre vie privée</string>
+	<string name="privacy_policy_subtitle">Bien que l’application Mastodon ne collecte aucune donnée, le serveur auquel vous vous inscrivez peut avoir une politique différente. Prenez une minute pour examiner et accepter la politique de confidentialité de l’application Mastodon ainsi que celle de votre serveur.</string>
+	<string name="i_agree">J’accepte</string>
 </resources>

mastodon/src/main/res/values-gd-rGB/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is file size -->
+</resources>

mastodon/src/main/res/values-hi-rIN/strings.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="get_started">शुरू करें</string>
+	<string name="log_in">लॉग इन करें</string>
+	<string name="next">आगे</string>
+	<string name="ok">ठीक है</string>
+	<string name="preparing_auth">प्रमाणीकरण के लिए रीडायरेक्ट कर रहा है…</string>
+	<string name="notifications">सूचनाएँ</string>
+	<string name="user_followed_you">आपके साथ जुड़ा</string>
+	<string name="user_sent_follow_request">आपको एक अनुसरण अनुरोध भेजा है</string>
+	<string name="user_favorited">आपकी पोस्ट को पसंद किया</string>
+	<string name="notification_boosted">आपका पोस्ट को पुनः प्रसारित किया</string>
+	<string name="poll_ended">मतदान समाप्त</string>
+	<string name="poll_closed">बंद</string>
+	<string name="confirm_mute_title">म्यूट किए गए खाते</string>
+	<string name="do_mute">शांत करें</string>
+	<string name="confirm_unmute_title">खाता अनम्यूट करें</string>
+	<string name="confirm_unmute">%s को अनम्यूट करने की पुष्टि करें</string>
+	<string name="do_unmute">अनम्यूट करें</string>
+	<string name="confirm_block_title">अवरोधित खाते</string>
+	<string name="do_block">रोके</string>
+	<string name="confirm_unblock">%s को अनम्यूट करने की पुष्टि करें</string>
+	<string name="do_unblock">अनब्लॉक करें</string>
+	<string name="button_muted">म्यूट</string>
+	<string name="tap_to_reveal">देखने के लिए टैप करें</string>
+	<string name="delete">मिटाए</string>
+	<string name="confirm_delete_title">पोस्ट को हटाएं</string>
+	<string name="confirm_delete">क्या आप वाकई इस पोस्ट को हटाना चाहते हैं?</string>
+	<string name="deleting">डिलीट हो रहा है</string>
+	<string name="notification_channel_audio_player">संगीत प्लेबैक</string>
+	<string name="play">चलाएँ</string>
+	<string name="pause">विराम</string>
+	<string name="log_out">साइन आउट करें</string>
+	<string name="add_account">खाता जोड़ें</string>
+	<string name="search_hint">खोजें</string>
+	<string name="hashtags">हैशटैग</string>
+	<string name="news">समाचार</string>
+	<string name="for_you">आपके लिए</string>
+	<string name="all_notifications">सभी</string>
+	<string name="mentions">उल्लेख</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is file size -->
+</resources>

mastodon/src/main/res/values-in-rID/strings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="get_started">Mulai</string>
+	<string name="log_in">Masuk</string>
+	<string name="next">Selanjutnya</string>
+	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is version like 1.2.3 -->
+	<!-- %s is file size -->
+</resources>