bump version

Add note on contributions and trademarks to README

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # mastodon
+open_collective: # Replace with a single Open Collective username e.g., user1
+ko_fi: xsk22
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username e.g., user1
+issuehunt: # Replace with a single IssueHunt username e.g., user1
+otechie: # Replace with a single Otechie username e.g., user1
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

README.md

@@ -1,13 +1,14 @@
-![Pink version of the Mastodon for Android launcher icon](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
+![Pink logo with pink shark](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
 
-# Mastodos
+# Megalodon
 
 > 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/mastodos/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/megalodon/releases/latest/download/megalodon.apk)
 
 ---
 
+
 ## Key features
 
 ### **Unlisted posting**
@@ -46,57 +47,81 @@ To bookmark a post, press the button between the Favorite and Share buttons on t
 
 ## 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.**
+**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Megalodon 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.
+To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/megalodon/releases/latest/download/megalodon.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/megalodon/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!
+Megalodon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon 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!
+
+### Other sources
+
+* **[Izzy's F-Droid repository](https://apt.izzysoft.de/fdroid/repo)**: https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk
 
 ---
 
+
+## Release variants
+
+All downloads can be found on the [Releases](https://github.com/sk22/megalodon/releases) page.
+
+**`megalodon.apk`**
+
+Variant with an integrated updater. If you download Megalodon from here (and not from an app store), just download the regular `megalodon.apk`.
+
+**`upstream-1234abc.apk`**
+
+This is an **unmodified version** of the official [Mastodon for Android](https://github.com/mastodon/mastodon-android) app the respective Megalodon release is based on. Should you find any bugs in Megalodon (which you will), try to see if it occurs with this variant, too. The last 7 digits of the file name are important to know which version of the official app you're using.
+
+<!-- **`megalodon-fdroid.apk`**
+
+Variant without the integrated updater. This is the variant to be published to F-Droid.org where an integrated updater is not necessary. -->
+
+---
+
+
 ## Detailed changes
 
 ### Features
 
-* [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/enable-unlisted)
+* [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/enable-unlisted)
   ([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
-* [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)
+* [Add “Federation” tab and change Discover tab order](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon: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:megalodon: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:megalodon: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:megalodon: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:megalodon: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:megalodon:feature/check-for-update-button)
+* [Add “Mark media as sensitive” option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/mark-media-as-sensitive)
+* [Add settings to hide replies and reposts from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
+* [Follow and unfollow hashtags](https://github.com/sk22/megalodon/commit/7d38f031f197aa6cefaf53e39d929538689c1e4e) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/233))
+* [Notification bell for posts](https://github.com/sk22/megalodon/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:megalodon: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:megalodon:feature/favs-list)
+* [Accept/reject follow requests](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/follow-requests)
+* [Display content warning title above text](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/cw-above-text)
+* [Add notifications tab for posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/posts-notifications-tab)
+* [Show visibility of original post when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-reply-visibility)
+* [Clickable reply/boost line above posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:clickable-boost-reply-line)
+* [Long-click to copy username from profile](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/copy-username)
+
 
 ### Behavior
 
-* [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)
+* [Make back button return to the home tab before exiting the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon: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:megalodon: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:megalodon: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:megalodon:spoiler-height-independent) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/166))
+* [Option to hide interaction numbers](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/hide-interaction-numbers)
+* [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/cw-above-text)
+* [Option to disable scrolling title bars](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/disable-marquee)
 
-### Branding
 
-* App name “Mastodos”
-* Pink primary color
-* Custom icon: Modulate upstream icon using ImageMagick
-  ```bash
-  mogrify -modulate 90,100,140 mastodon/src/main/res/mipmap-*/ic_launcher*.png
-  ```
+### Visual
+
+* [Custom extended footer redesign](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:compact-extended-footer)
+* [Improvements to the true black mode](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:true-black-improvements)
+* [Profile header tweaks](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:ui/profile-header-tweaks)
+
 
 ## Building
 
@@ -109,3 +134,7 @@ As this app is using Java 17 features, you need JDK 17 or newer to build it. Oth
 ## License
 
 This project is released under the [GPL-3 License](./LICENSE).
+
+## Links
+
+<a rel="me" href="https://floss.social/@megalodon">@megalodon​@floss.social</a>

_config.yml

@@ -1,2 +1,2 @@
-title: Mastodos
-theme: minima
+title: Megalodon
+layout: default

_layouts/default.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Megalodon</title>
+    <link rel="icon" href="mastodon/src/main/res/mipmap-mdpi/ic_launcher_round.png">
+    <link rel="me" href="https://floss.social/@mastodon">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/5.1.0/github-markdown.min.css">
+  </head>
+  <body class="markdown-body">
+    <div style="margin: 0 auto; max-width: 45rem; padding: 2rem 1rem">
+      {{ content }}  
+    </div>
+  </body>
+</html>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath "com.android.tools.build:gradle:7.1.3"
+		classpath 'com.android.tools.build:gradle:7.3.1'
 		classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files

fastlane/metadata/android/be-BY/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/be-BY/short_description.txt

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

fastlane/metadata/android/be-BY/title.txt

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

fastlane/metadata/android/de-DE/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon ist das größte dezentralisierte soziale Netzwerk im Internet. Statt einer einzigen Website ist es ein Netzwerk von Millionen von Benutzer*innen in unabhängigen Gemeinschaften, die alle miteinander interagieren können. Egal was dich interessiert, auf Mastodon kannst du interessierte Leute treffen, die darüber schreiben!
+Mastodon ist das größte dezentralisierte soziale Netzwerk im Internet. Statt einer einzigen Webseite ist es ein Netzwerk von Millionen von Benutzer*innen in unabhängigen Gemeinschaften, die alle miteinander interagieren können. Egal, was du magst, auf Mastodon kannst du begeisterte Menschen treffen, die darüber schreiben!
 
-Tritt einer Gemeinschaft bei und erstelle dein Profil. Finde und folge faszinierenden Leuten, und lies ihre Beiträge in einer werbefreien, chronologischen Zeitachse. Drücke dich mit benutzerdefinierten Emojis, Bildern, GIFs, Videos und Audio in 500-Zeichen-Beiträgen aus. Antworte auf Threads und teile Beiträge von anderen, um großartige Sachen zu verbreiten. Finde neue Accounts zum Folgen und angesagte Hashtags, um dein Netzwerk zu erweitern.
+Tritt einer Gemeinschaft bei und erstelle dein Profil. Finde und folge faszinierenden Leuten und lies ihre Beiträge in einer werbefreien, chronologischen Zeitachse. Drücke dich mit eigenen Emojis, Bildern, GIFs, Videos und Klängen in 500-Zeichen-Beiträgen aus. Antworte auf Threads und teile Beiträge von anderen, um großartige Sachen zu verbreiten. Finde neue Accounts zum Folgen und angesagte Hashtags, um dein Netzwerk zu erweitern.
 
 Mastodon wurde mit einem Schwerpunkt auf Privatsphäre und Sicherheit gebaut. Entscheide, ob du deine Beiträge mit deinen Followern, nur mit den Menschen, die du erwähnst, oder mit der ganzen Welt teilen möchtest. Mit Inhaltswarnungen kannst du Beiträge mit sensiblem oder triggerndem Inhalt ausblenden, bis du bereit bist, dich damit auseinanderzusetzen. Jede Gemeinschaft hat ihre eigenen Regeln und Moderator*innen, um die Sicherheit ihrer Mitglieder zu gewährleisten, sowie robuste Sperr- und Meldewerkzeuge, um Missbrauch vorzubeugen.
 
 Weitere Funktionen:
 
 • Dunkler Modus: Beiträge im hellen, dunklen oder schwarzen Modus lesen
-• Umfragen: Frage deine Follower nach ihrer Meinung und zähle die Stimmen
+• Umfragen: frage deine Follower nach ihrer Meinung und zähle die Stimmen
 • Entdecken: trendende Hashtags und Profile sind nur einen Fingertipp entfernt
-• Benachrichtigungen: Erhalte Benachrichtigungen über neue Follower, Antworten und geteilte Beiträge
-• Teilen: Veröffentliche auf Mastodon aus jeder beliebigen anderen App
-• Niedlichkeit: Unser Maskottchen ist ein entzückender Elefant, und du wirst ihn von Zeit zu Zeit auftauchen sehen
+• Benachrichtigungen: erhalte Benachrichtigungen über neue Follower, Antworten und geteilte Beiträge
+• Teilen: veröffentliche auf Mastodon aus jeder beliebigen anderen App
+• Niedlichkeit: unser Maskottchen ist ein entzückender Elefant und du wirst ihn von Zeit zu Zeit auftauchen sehen
 
-Mastodon ist eine eingetragene gemeinnützige Organisation, und die Entwicklung wird direkt durch deine Spenden unterstützt. Es gibt keine Werbung, keine Monetisierung und kein Venture-Capital, und wir planen, das auch so beizubehalten.
+Mastodon ist eine eingetragene gemeinnützige Organisation und die Entwicklung wird direkt durch deine Spenden unterstützt. Es gibt keine Werbung, keine Monetarisierung und kein Risikokapital und so soll es auch bleiben.

fastlane/metadata/android/en-US/full_description.txt

@@ -1,6 +1,6 @@
 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.
+Join a community and create your profile. Find and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
 
 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.
 
@@ -13,4 +13,4 @@ More features:
 • 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.
+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/ga-IE/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/ga-IE/short_description.txt

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

fastlane/metadata/android/ga-IE/title.txt

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

fastlane/metadata/android/gd-GB/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!
+’S e an lìonra sòisealta sgaoilte as motha air an eadar-lìon a th’ ann am Mastodon. Seach aon làrach-lìn a-mhàin, ’s e lìonra de mhilleanan de dhaoine ann an coimhearsnachdan neo-eisimeileach a th’ ann agus ’s urrainn dhan a h-uile duine bruidhinn ri chèile fhathast gun duilgheadas. Ge b’ e dè na rudan a tha ùidh agad annta, coinnichidh tu ri daoine a sgrìobhas mun dèidhinn air 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.
+Faigh ballrachd ann an coimhearsnachd ’s cruthaich pròifil dhut. Lorg is lean daoine inntinneach agus leugh na postaichean aca air loidhne-ama cheart gun sanasachd. Cuir thu fhèin an cèill le Emojis gnàthaichte, dealbhan, GIFs, videothan is fuaimean ann am postaichean le 500 caractar. Freagair ri snàithleanan is brosnaich postaichean le neach sam bith airson deagh rudan a cho-roinneadh. Lorg cunntasan ùra ri leantainn is tagaichean hais a’ treandadh airson an lìonra agad a leudachadh.
 
-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.
+Chaidh Mastodon a thogail leis an aire air prìobhaideachd is sàbhailteachd. Tha e an urra riut fhèin an co-roinn thu post leis an luchd-leantainn agad, leis na daoine air an doir thu iomradh a-mhàin no leis an t-saoghal mhòr. Leigidh rabhaidhean susbainte leat postaichean sa bheil susbaint fhrionasach fhalach is cha leig daoine leas coimhead air ach nuair a bhios iad deònach. Tha riaghailtean is maoir fa leth aig gach coimhearsnachd airson a buill a chumail sàbhailte agus cuidichidh innealan bacaidh is gearain le dìon o dhroch-dhìol.
 
-More features:
+Gleusan eile:
 
-• 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
+• Modh dorcha: Leugh postaichean le modh soilleir, dorcha no dubh dorcha
+• Cunntasan-bheachd: Faighnich dhen luchd-leantainn dè am beachd is faigh cunntas nam bhòt
+• Rùraich: Ruig tagaichean hais is cunntasan a’ treandadh le aon ghnogag
+• Brathan: Faigh brathan mu luchd-leantainn, freagairtean is brosnachaidhean ùra
+• Co-roinn: Postaich gu Mastodon gu dìreach o shiota co-roinnidh ann an aplacaid sam bith
+• Stampachd: ’S e ailbhean ealanta a tha san t-suaichnean againn is nochdaidh e o àm gu àm
 
-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.
+’S e bhuidheann neo-phrothaideach clàraichte a th’ ann am Mastodon a gheibh taic dhìreach o na tabhartasan agad. Chan eil sanasachd, airgeadachadh no calpa iomairte sam bith ann agus tha fainear dhuinn ’ga chumail mar sin.

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

@@ -1 +1 @@
-Decentralized social network
+Lìonra sòisealta sgaoilte

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

@@ -1,16 +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!
+Mastodon adalah jejaring sosial terdesentralisasi terbesar di internet. Daripada sebuah satu situs web, ini adalah jaringan dari jutaan pengguna dalam komunitas tersendiri yang dapat berinteraksi antar sesama, tanpa masalah. Tanpa memedulikan apa yang Anda minat, Anda dapat bertemu orang-orang yang mengirimkan apa yang mereka minat di 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.
+Bergabung sebuah komunitas dan buat profil Anda. Temukan dan ikuti orang-orang menarik dan lihat kiriman mereka dalam linimasa kronologis tanpa iklan. Ekspresikan diri Anda dengan emoji kustom, gambar, GIF, video, dan audio dalam kiriman dengan batasan 500 karakter. Balas ke utasan dan bagikan kiriman dari siapa pun ke pengikut Anda untuk membagikan hal-hal yang keren. Temukan akun baru untuk diikuti dan tagar 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.
+Mastodon dibuat dengan fokus pada privasi dan keamanan. Tentukan apakah kiriman Anda dibagikan kepada pengikut, hanya orang yang disebut, atau seluruh dunia. Peringatan konten memungkinkan Anda untuk menyembunyikan kiriman yang berisi material sensitif atau memicu sampai Anda siap untuk terlibat dengan mereka. Setiap komunitas memiliki pedoman dan moderator sendiri-sendiri untuk menjaga anggotanya aman, dan alat pemblokiran dan pelaporan yang kokoh membantu mencegah pelecehan.
 
 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
+• Mode Gelap: Baca kiriman dalam mode terang, gelap, atau gelap asli
+• Pemungutan suara: Tanya pengikut tentang opini mereka dan hitung pilihannya
+• Jelajahi: Tagar dan akun tren dengan satu ketuk
+• Pemberitahuan: Dapatkan pemberitahuan tentang pengikut, balasan, dan pembagian baru
+• Pembagian: Kirim langsung ke Mastodon dari lembar pembagian apa pun dalam aplikasi apa pun
+• Kelucuan: Maskot kami adalah seekor gajah yang lucu, dan Anda akan melihat dia muncul dari waktu ke waktu
 
-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 adalah nirlaba yang terdaftar dan pengembangan didukung secara langsung dari donasi Anda. Tanpa periklanan, tanpa monetisasi, dan tanpa kapitalisme ventura, dan kami berencana untuk tetap seperti itu.

fastlane/metadata/android/is-IS/full_description.txt

@@ -0,0 +1,30 @@
+Mastodon er stærsta ómiðstýrða samfélagsnetið á internetinu. Í staðinn fyrir að vera á inu vefsvæði, er þetta net með milljónum notenda í 
+sjálfstæðum samfélögum, sem geta óhindrað átt í samskiptum við hvern annan. Sama hvað þú ert að pæla, alltaf geturðu hitt áhugasamt fólk í gegnum 
+færslur á Mastodon!
+
+Taktu þátt í samfélagi og útbúðu notandasnið fyrir þig. Finndu og fylgstu með áhugaverðu fólki og lestu færslurnar þeirra á 
+auglýsingalausri, raðaðri tímalínu. Tjáðu þig með sérsniðnum emoji-táknum, myndum, GIF-hreyfimyndum, myndskeiðum 
+og hljóðskrám í 500-stafa færslum. Svaraðu spjallþráðum og endurbirtu færslur frá hverjum sem er til að deila 
+frábæru efni. Finndu nýja notendur til að fylgjast með og skoðaðu vinsæl myllumerki til að 
+útvíkka netið þitt.
+
+Mastodon er byggt með áherslu á gagnaleynd og öryggi. Ákveddu hvort færslunum þínum sé deilt með þeim sem fylgjast með þér, aðeins 
+fólkinu sem þú minnist á, eða allri veröldinni. Viðvaranir vegna efnis gera þér kleift að fela færslur sem innihalda 
+viðkvæmt eða eldfimt efni þangað til þú ert í stuði til að eiga við slíkt. Hvert samfélag er með sínar eigin reglur og umsjónarmenn til að passa upp á 
+öryggi meðlimanna, auk áreiðanlegra verkfæra til að útiloka aðila og 
+meðhöndla kærur, sem hjálpar til við að koma í veg fyrir misnotkun.
+
+Fleiri eiginleikar:
+
+• Dökkur hamur: Lestu færslur í ljósum, dökkum eða sönnum kolsvörtum ham
+• Kannanir: Spyrðu fylgjendur um skoðanir þeirra og teldu atkvæðin
+• Uppgötva: Vinsæl myllumerki og notendaaðgangar eru við hendina
+• Tilkynningar: Fáðu tilkynningar um nýja fylgjendur, svör og endurbirtingar
+• Deiling: Birtu beint á Mastodon frá hvaða deilingarblaði sem er í hvaða 
+forriti sem er
+• Krúttlegheit: Gæludýrið okkar er vinalegur loðfíll sem þú gætir rekist á 
+öðru hverju
+
+Mastodon er skráð óhagnaðardrifin sjálfseignarstofnun og er þróun þess 
+drifin áfram með styrkjum frá þér. Það eru engar auglýsingar, engin gjaldtaka og engir áhættufjárfestar - við 
+höfum hugsað okkur að halda því þannig.

fastlane/metadata/android/is-IS/short_description.txt

@@ -0,0 +1 @@
+Dreifstýrt samfélagsnet

fastlane/metadata/android/is-IS/title.txt

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

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

@@ -1,16 +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!
+Mastodon is het grootste gedecentraliseerde sociale netwerk op het internet. In plaats van één enkele website is het een netwerk van miljoenen gebruikers in onafhankelijke gemeenschappen die allemaal naadloos met elkaar kunnen communiceren. Waar je ook mee bezig bent, je kunt gepassioneerde mensen ontmoeten die erover berichten op 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.
+Word lid van een gemeenschap en maak je profiel aan. Vind en volg fascinerende mensen en lees hun berichten in een advertentievrije, chronologische tijdlijn. Druk jezelf uit met aangepaste emoji, afbeeldingen, GIF’s, video’s en audio in berichten van 500 karakters. Antwoord op berichten en boost iedereens berichten om geweldige dingen te delen. Vind nieuwe accounts om te volgen en hashtags om je netwerk uit te breiden.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon is gebouwd met een focus op privacy en veiligheid. Bepaal zelf of je berichten met je volgers, alleen de mensen die je noemt, of de hele wereld worden gedeeld. Inhoudswaarschuwingen laten je berichten verbergen die gevoelig of aanmatigend materiaal bevatten, totdat je er klaar voor bent om ermee ze te bekijken. Elke gemeenschap heeft haar eigen richtlijnen en moderators om haar leden veilig te houden, en robuuste blokkerings- en rapportagetools helpen misbruik te voorkomen.
 
 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
+• Donkere Modus: Berichten lezen in licht, donker of echt zwart
+• Polls: Vraag volgers om hun mening en tel de stemmen
+• Ontdekken: Trending hashtags en accounts zijn een tik weg
 • 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
+• Delen: Deel vanuit elke app direct op Mastodon
+• Schattigheid: Onze mascotte is een schattige olifant, en je zult ze van tijd tot tijd zien verschijnen
 
-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 is een geregistreerde non-profit en de ontwikkeling wordt direct ondersteund door jouw donaties. Er is geen reclame, geen geldelijk gewin en geen durfkapitaal en we zijn van plan het zo te houden.

fastlane/metadata/android/ro-RO/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon este cea mai mare rețea socială descentralizată de pe internet. În loc de un singur site, este o rețea de milioane de utilizatori din comunități independente care pot interacționa cu ceilalți, fără nici o întrerupere. Indiferent în ce te afli, poți întâlni oameni pasionați care postează despre asta pe Mastodon!
+
+Alătură-te unei comunități și creează-ți profilul. Găsește și urmărește oameni fascinanți și citește postările lor într-un calendar cronologic fără reclame. Exprimă-te cu emoji-uri personalizate, imagini, GIF-uri, videoclipuri și audio în postări de 500 de caractere. Răspunde la subiectele de discuție și impulsionează postările de la oricine pentru a împărtăși lucruri minunate. Găsește conturi noi de urmărit și haștag-uri populare pentru a-ți extinde rețeaua.
+
+Mastodon a fost construit cu accent pe confidențialitate și siguranță. Decide dacă postările tale sunt partajate cu urmăritorii tăi, doar cu cei pe care îi menționezi sau cu întreaga lume. Avertismentele de conținut vă permit să ascundeți postările care conțin materiale sensibile sau declanșatoare până când sunteți gata să le implicați. Fiecare comunitate are propriile sale orientări și proprii moderatori pentru a-și menține membrii în siguranță, iar instrumentele solide de blocare și raportare contribuie la prevenirea abuzurilor.
+
+Mai multe caracteristici:
+
+• Mod întunecat: Citește postările în modul luminos, întunecat sau negru total
+• Sondaje: Cereți celor care vă urmăresc opinia lor și numărați voturile
+• Explorează: Hașhtag-urile populare și conturile sunt la o apăsare distanță
+• Notificări: Primiți notificări despre noi urmăritori, răspunsuri și impulsionări
+• Distribuire: Postează direct pe Mastodon din orice foaie de partajare în orice aplicație
+• Drăgălășenie: Mascota noastră este un elefant adorabil, și îi veți vedea apărând din când în când
+
+Mastodon este o organizație non-profit înregistrată, iar dezvoltarea este sprijinită direct de donațiile tale. Nu există publicitate, monetizare și capital de risc, și intenționăm să păstrăm lucrurile astfel.

fastlane/metadata/android/ro-RO/short_description.txt

@@ -0,0 +1 @@
+Rețea socială descentralizată

fastlane/metadata/android/ro-RO/title.txt

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

fastlane/metadata/android/sl-SI/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon je največje decentralizirano družbeno omrežje na internetu. Namesto enega samega spletišča ga tvorijo milijoni uporabnikov v neodvisnih skupnostih, ki lahko med seboj komunicirajo brez težav. Ne glede na to, kaj vas zanima, lahko srečate predane ljudi, ki o tem objavljajo na Mastodonu!
+
+Pridružite se skupnosti in ustvarite svoj profil. Poiščite in sledite zanimivim osebam ter berite njihove objave na časovnici brez oglasov v kronološkem zaporedju. Izrazite se s čustvenčki po meri, slikami, GIF-i, videoposnetki in zvočnimi posnetki v objavah z največ 500 znaki. Odgovarjajte na niti in poobjavite objave drugih, da delite dobro z drugimi. Poiščite nove račune za sledenje ter ključnike v trendu, da razširite svoje omrežje.
+
+Mastodon je izdelan s poudarkom na zasebnosti in varnosti. Odločite se, ali se vaše objave delijo z vašimi sledilci, zgolj z omenjenimi ali s celim svetom. Opozorila o vsebini omogočajo skrivanje objav, ki vsebujejo občutljive ali netilne zadeve, vse dokler niste pripravljeni, da se z njimi spopadete. Vsak skupnost ima svoja lastna pravila in moderatorje, ki varujejo svoje člane, ter robustna orodja za blokiranje in poročanje, ki pomagajo preprečiti žalitve in kršitve človeškega dostojanstva ter pravic.
+
+Dodatne funkcionalnosti:
+
+• Temni način: objave berite v svetlem, temnem ali povsem črnem načinu;
+• Ankete: vprašajte sledilce o njihovem mnenju in preštejte njihove glasove;
+• Razišči: ključniki in računi v trendu so le en tap stran;
+• Obvestila: bodite obveščeni o novih sledenjih, odgovorih in poobjavah;
+• Skupna raba: objavljajte neposredno v Mastodon s poljubne preglednice v skupni rabi;
+• Srčkano: naša maskota je ljubek slon in videli boste, kako se sem ter tja pojavi.
+
+Mastodon je registrirana neprofitna organizacija, razvoj pa podpirajo neposredno vaše donacije. Je brez oglaševanja, monetizacije in brez rizičnega kapitala; nameravamo ga takšnega tudi obdržati.

fastlane/metadata/android/sl-SI/short_description.txt

@@ -0,0 +1 @@
+Decentralizirano družbeno omrežje

fastlane/metadata/android/sl-SI/title.txt

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

fastlane/metadata/android/uk-UA/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 — найбільша децентралізована соціальна мережа в інтернеті. Замість одного сайту це мережа мільйонів користувачів у незалежних спільнотах, які можуть взаємодіяти один з одним. Незалежно від того, чим ви займаєтеся, ви можете зустріти захоплених людей, які пишуть про це на 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.
+Приєднуйтесь до спільноти і створіть свій профіль. Знайдіть і підпишіться на цікавих людей і читайте пости у вільний від реклами стрічці. Виразіть себе за допомогою користувацьких емоджі, зображень, GIF, відео й аудіо з 500-символьними постами. Відповідайте на теми й робіть репости постів від будь-кого, щоб ділитися з ними гарними матеріалами. Знаходьте нові облікові записи, щоб підписатися і популярні хештеги для розширення вашої мережі.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon будується з акцентом на конфіденційність та безпеці. Вирішіть, чи будуть ваші пости тільки для підписників, або ті люди, з яких ви згадали, чи цілий світ. Попередження щодо вмісту дозволяють приховати публікації, що містять конфіденційний або провокаційний матеріал, доки ви не будете готові до нього. Кожна спільнота має свої правила і модераторів, щоб залишити учасників в безпеці, а також надійне блокування та інструменти для скарг, щоб запобігти зловживання.
 
-More features:
+Більше можливостей:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Темна Тема: Читайте у світлій, темній, або справжній чорній темі
+• Опитування: запитуйте думку підписникіна та підраховуйте голоси
+Досліджуйте: Популярні Хештеги й Користувачі за одним дотиком
+• Сповіщення: отримуйте сповіщення про нових підписників, відповіді та репости
+Діліться: Публікуйте безпосередньо в Mastodon з будь-якого меню "поділитися" в будь-якому додатку
+• Привабливість: Нашим талісманом є чарівний слон, і ви побачите, як він з'являється час від часу
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon є зареєстрованою некомерційною організацією і розробка підтримується безпосередньо вашими пожертвуваннями. Тут немає реклами, монетизації та венчурного капіталу, і плануємо так тримати.

fastlane/metadata/android/uk-UA/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Децентралізована соціальна мережа

get-upstream-commit.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+git rev-parse --short --verify upstream/master

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Jan 13 11:33:43 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 43
-		versionName "1.1.4+fork.43"
+		versionCode 49
+		versionName "1.1.4+fork.49"
 		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",
@@ -20,12 +20,14 @@ android {
 
 	buildTypes {
 		release {
-			minifyEnabled true
-			shrinkResources true
+//			minifyEnabled true
+//			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 		}
 		debug{
 			debuggable true
+			versionNameSuffix '-debug'
+			applicationIdSuffix '.debug'
 		}
 		appcenterPrivateBeta{
 			initWith release

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/mastodos/releases/latest")
+				.url("https://api.github.com/repos/sk22/megalodon/releases/latest")
 				.build();
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){
@@ -139,12 +139,12 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 				curForkNumber=Integer.parseInt(matcher.group(4));
 			long newVersion=((long)newMajor << 32) | ((long)newMinor << 16) | newRevision;
 			long curVersion=((long)curMajor << 32) | ((long)curMinor << 16) | curRevision;
-			if(newVersion>curVersion || newForkNumber>curForkNumber || BuildConfig.DEBUG){
+			if(newVersion>curVersion || newForkNumber>curForkNumber){
 				String version=newMajor+"."+newMinor+"."+newRevision+"+fork."+newForkNumber;
 				Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
 				for(JsonElement el:obj.getAsJsonArray("assets")){
 					JsonObject asset=el.getAsJsonObject();
-					if("application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
+					if("megalodon.apk".equals(asset.get("name")) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
 						long size=asset.get("size").getAsLong();
 						String url=asset.get("browser_download_url").getAsString();
 

mastodon/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
 	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+	<uses-permission android:name="android.permission.VIBRATE"/>
 
 	<permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
 

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

@@ -73,7 +73,7 @@ public class CacheController{
 								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
 								newMaxID=status.id;
 								for(Filter filter:filters){
-									if(filter.matches(status.getContentStatus().content))
+									if(filter.matches(status))
 										continue outer;
 								}
 								result.add(status);
@@ -146,7 +146,7 @@ public class CacheController{
 								newMaxID=ntf.id;
 								if(ntf.status!=null){
 									for(Filter filter:filters){
-										if(filter.matches(ntf.status.getContentStatus().content))
+										if(filter.matches(ntf.status))
 											continue outer;
 									}
 								}
@@ -167,7 +167,7 @@ public class CacheController{
 								callback.onSuccess(new PaginatedResponse<>(result.stream().filter(ntf->{
 									if(ntf.status!=null){
 										for(Filter filter:filters){
-											if(filter.matches(ntf.status.getContentStatus().content)){
+											if(filter.matches(ntf.status)){
 												return false;
 											}
 										}

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

@@ -11,9 +11,9 @@ public class CreateOAuthApp extends MastodonAPIRequest<Application>{
 	}
 
 	private static class Request{
-		public String clientName="Mastodos";
+		public String clientName="Megalodon";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://sk22.github.io/mastodos";
+		public String website="https://sk22.github.io/megalodon";
 	}
 }

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/HomeTimelineFragment.java

@@ -5,7 +5,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
-import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
@@ -18,7 +17,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
-import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toolbar;
 
 import com.squareup.otto.Subscribe;
@@ -42,6 +41,7 @@ import org.joinmastodon.android.utils.StatusFilterPredicate;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -56,7 +56,7 @@ import me.grishka.appkit.utils.V;
 
 public class HomeTimelineFragment extends StatusListFragment{
 	private ImageButton fab;
-	private ImageView toolbarLogo;
+	private TextView toolbarLogo;
 	private Button toolbarShowNewPostsBtn;
 	private boolean newPostsBtnShown;
 	private AnimatorSet currentNewPostsAnim;
@@ -268,7 +268,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 								if(idsBelowGap.contains(s.id))
 									break;
 								for(Filter filter:filters){
-									if(filter.matches(s.getContentStatus().content)){
+									if(filter.matches(s)){
 										continue outer;
 									}
 								}
@@ -315,10 +315,9 @@ public class HomeTimelineFragment extends StatusListFragment{
 	}
 
 	private void updateToolbarLogo(){
-		toolbarLogo=new ImageView(getActivity());
-		toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
-		toolbarLogo.setImageResource(R.drawable.logo);
-		toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+		toolbarLogo =new TextView(getActivity());
+		toolbarLogo.setText(getString(R.string.app_name).toLowerCase(Locale.getDefault()));
+		toolbarLogo.setTextAppearance(R.style.app_title);
 
 		toolbarShowNewPostsBtn=new Button(getActivity());
 		toolbarShowNewPostsBtn.setTextAppearance(R.style.m3_title_medium);

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

@@ -1,11 +1,16 @@
 package org.joinmastodon.android.fragments;
 
+import static android.content.Context.CLIPBOARD_SERVICE;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.Fragment;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
@@ -14,6 +19,8 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
@@ -31,9 +38,11 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.GlobalUserPreferences;
@@ -435,15 +444,25 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
 			}
 			ssb.append(" ");
-			Drawable lock=username.getResources().getDrawable(R.drawable.ic_fluent_lock_closed_20_filled, getActivity().getTheme()).mutate();
+			Drawable lock=username.getResources().getDrawable(R.drawable.ic_lock, getActivity().getTheme()).mutate();
 			lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight());
 			lock.setTint(username.getCurrentTextColor());
-			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BOTTOM), 0);
+			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BASELINE), 0);
 			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
 			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
 		}
+		username.setOnLongClickListener(l->{
+			ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(CLIPBOARD_SERVICE);
+			Vibrator v = (Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE);
+			ClipData clip = ClipData.newPlainText("Username", '@'+account.acct+'@'+AccountSessionManager.getInstance().getAccount(accountID).domain);
+			clipboard.setPrimaryClip(clip);
+			Toast.makeText(getActivity(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) v.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
+			else v.vibrate(50);
+			return true;
+		});
 		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 		if(TextUtils.isEmpty(parsedBio)){
 			bio.setVisibility(View.GONE);
@@ -648,7 +667,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
-		notifyButton.setContentDescription(getString(relationship.notifying ? R.string.user_post_notifications_on : R.string.user_post_notifications_off, '@'+account.username));
+		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.user_post_notifications_on : R.string.user_post_notifications_off, '@'+account.username));
 	}
 
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){

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

@@ -139,7 +139,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 					action=getString(R.string.edit_multiple_changed);
 				}
 			}
-			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" · "+date, Collections.emptyList(), 0));
+			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" · "+date, Collections.emptyList(), 0, null));
 		}
 		return items;
 	}

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

@@ -97,7 +97,7 @@ public class ThreadFragment extends StatusListFragment{
 			return statuses;
 		return statuses.stream().filter(status->{
 			for(Filter filter:filters){
-				if(filter.matches(status.getContentStatus().content))
+				if(filter.matches(status))
 					return false;
 			}
 			return true;

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

@@ -53,6 +53,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -295,6 +296,14 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private void proceedWithAuthOrSignup(Instance instance){
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
 		if(isSignup){
+			if(!instance.registrations){
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.error)
+						.setMessage(R.string.instance_signup_closed)
+						.setPositiveButton(R.string.ok, null)
+						.show();
+				return;
+			}
 			Bundle args=new Bundle();
 			args.putParcelable("instance", Parcels.wrap(instance));
 			Nav.go(getActivity(), InstanceRulesFragment.class, args);
@@ -478,7 +487,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 							instanceProgressDialog=null;
 							proceedWithAuthOrSignup(result);
 						}
-						if(domain.equals(currentSearchQuery) || currentSearchQuery.equals(redirects.get(domain)) || currentSearchQuery.equals(redirectsInverse.get(domain))){
+						if(Objects.equals(domain, currentSearchQuery) || Objects.equals(currentSearchQuery, redirects.get(domain)) || Objects.equals(currentSearchQuery, redirectsInverse.get(domain))){
 							boolean found=false;
 							for(CatalogInstance ci:filteredData){
 								if(ci.domain.equals(domain)){

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

@@ -50,6 +50,10 @@ public class Filter extends BaseModel{
 		return pattern.matcher(text).find();
 	}
 
+	public boolean matches(Status status){
+		return matches(status.getContentStatus().getStrippedText());
+	}
+
 	@Override
 	public String toString(){
 		return "Filter{"+

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

@@ -4,6 +4,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.parceler.Parcel;
 
 import java.time.Instant;
@@ -57,6 +58,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 
 	public transient boolean spoilerRevealed;
 	public transient boolean hasGapAfter;
+	private transient String strippedText;
 
 	@Override
 	public void postprocess() throws ObjectValidationException{
@@ -134,4 +136,10 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public Status getContentStatus(){
 		return reblog!=null ? reblog : this;
 	}
+
+	public String getStrippedText(){
+		if(strippedText==null)
+			strippedText=HtmlParser.strip(content);
+		return strippedText;
+	}
 }

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.SpannableStringBuilder;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
@@ -17,6 +18,8 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import java.util.List;
 
 import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 
@@ -25,14 +28,16 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	@DrawableRes
 	private int icon;
 	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
+	private View.OnClickListener handleClick;
 
-	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon){
+	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, @Nullable View.OnClickListener handleClick){
 		super(parentID, parentFragment);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
 		HtmlParser.parseCustomEmoji(ssb, emojis);
 		this.text=ssb;
 		emojiHelper.setText(ssb);
 		this.icon=icon;
+		this.handleClick=handleClick;
 	}
 
 	@Override
@@ -61,6 +66,7 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(ReblogOrReplyLineStatusDisplayItem item){
 			text.setText(item.text);
 			text.setCompoundDrawablesRelativeWithIntrinsicBounds(item.icon, 0, 0, 0);
+			if(item.handleClick!=null) text.setOnClickListener(item.handleClick);
 			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
 				UiUtils.fixCompoundDrawableTintOnAndroid6(text);
 		}

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

@@ -2,12 +2,14 @@ package org.joinmastodon.android.ui.displayitems;
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
@@ -16,6 +18,7 @@ import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.text.HtmlParser;
+import org.parceler.Parcels;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +26,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
@@ -73,11 +77,19 @@ public abstract class StatusDisplayItem{
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
 		Status statusForContent=status.getContentStatus();
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
 		if(status.reblog!=null){
-			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.user_boosted, status.account.displayName), status.account.emojis, R.drawable.ic_fluent_arrow_repeat_all_20_filled));
+			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.user_boosted, status.account.displayName), status.account.emojis, R.drawable.ic_fluent_arrow_repeat_all_20_filled, i->{
+				args.putParcelable("profileAccount", Parcels.wrap(status.account));
+				Nav.go(fragment.getActivity(), ProfileFragment.class, args);
+			}));
 		}else if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId)){
 			Account account=Objects.requireNonNull(knownAccounts.get(status.inReplyToAccountId));
-			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.in_reply_to, account.displayName), account.emojis, R.drawable.ic_fluent_arrow_reply_20_filled));
+			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.in_reply_to, account.displayName), account.emojis, R.drawable.ic_fluent_arrow_reply_20_filled, i->{
+				args.putParcelable("profileAccount", Parcels.wrap(account));
+				Nav.go(fragment.getActivity(), ProfileFragment.class, args);
+			}));
 		}
 		HeaderStatusDisplayItem header;
 		items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null));

mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java

@@ -21,9 +21,8 @@ public class StatusFilterPredicate implements Predicate<Status>{
 
 	@Override
 	public boolean test(Status status){
-		CharSequence content=status.getContentStatus().content;
 		for(Filter filter:filters){
-			if(filter.matches(content))
+			if(filter.matches(status))
 				return false;
 		}
 		return true;

mastodon/src/main/res/drawable-v24/ic_launcher_monochrome.xml

@@ -1,10 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M16.7096,17.7682C19.4819,17.4391 21.8955,15.7408 22.199,14.1888C22.6769,11.7442 22.6376,8.2231 22.6376,8.2231C22.6376,3.4504 19.4929,2.0516 19.4929,2.0516C17.9073,1.3274 15.1846,1.023 12.356,1H12.2865C9.4579,1.023 6.7369,1.3274 5.1513,2.0516C5.1513,2.0516 2.0066,3.4504 2.0066,8.2231C2.0066,8.5125 2.0051,8.8169 2.0035,9.1339C1.9991,10.0135 1.9943,10.9896 2.0199,12.0083C2.1341,16.6755 2.8805,21.2752 7.2202,22.4175C9.2213,22.944 10.9392,23.0542 12.323,22.9785C14.832,22.8403 16.2406,22.0883 16.2406,22.0883L16.1577,20.2779C16.1577,20.2779 14.3648,20.8402 12.3511,20.7717C10.356,20.7037 8.2496,20.5577 7.9269,18.1221C7.8972,17.9082 7.8823,17.6794 7.8823,17.4391C7.8823,17.4391 9.8408,17.9152 12.323,18.0283C13.8407,18.0974 15.2639,17.9399 16.7096,17.7682ZM18.8747,14.3719V8.5932C18.8747,7.4121 18.5723,6.4736 17.9648,5.7792C17.3382,5.0849 16.518,4.729 15.4997,4.729C14.3212,4.729 13.4291,5.1792 12.8392,6.0799L12.2657,7.0359L11.692,6.0799C11.1023,5.1792 10.21,4.729 9.0316,4.729C8.0134,4.729 7.193,5.0849 6.5664,5.7792C5.9589,6.4736 5.6565,7.4121 5.6565,8.5932V14.3719H7.959V8.763C7.959,7.5805 8.4594,6.9806 9.4602,6.9806C10.5665,6.9806 11.1211,7.6925 11.1211,9.1001V12.1701H13.4101V9.1001C13.4101,7.6925 13.9647,6.9806 15.071,6.9806C16.0718,6.9806 16.5722,7.5805 16.5722,8.763V14.3719H18.8747Z"
-      android:fillColor="#fff"
-      android:fillType="evenOdd"/>
+<vector android:height="108dp" android:viewportHeight="320"
+    android:viewportWidth="320" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fff" android:pathData="M166.45,143.88c-4.6,-0.61 -9.13,5 -10.12,12.53s1.93,14.12 6.53,14.72 9.13,-5 10.12,-12.53S171.05,144.48 166.45,143.88ZM166.53,164.39a3.65,3.65 0,1 1,2 -4.78A3.66,3.66 0,0 1,166.53 164.39Z"/>
+    <path android:fillColor="#fff" android:pathData="M233.41,296.2c-0.41,-7.41 -1.13,-14.84 -1.84,-22.24l-0.24,-2.52c0,-0.18 0,-0.36 -0.05,-0.54 -0.11,-1.1 -0.21,-2.19 -0.31,-3.29q-0.54,-5.83 -1,-11.72 -0.71,-8.82 -1.37,-17.7 -0.24,-3 -0.46,-5.91c-0.63,-7.89 -1.29,-15.8 -2.09,-23.68 -1.13,-11.06 -2.54,-22.09 -4.49,-33a6.62,6.62 0,0 0,-0.9 0.48c-8.37,5.44 -14.27,29.16 -17.82,37.65a1.24,1.24 0,0 1,-2.37 -0.36c-0.09,-0.92 -0.16,-1.83 -0.21,-2.75l2.78,-1.79 -2.91,-2.2c0,-0.23 0,-0.45 0,-0.68v-0.48c0,-0.26 0,-0.51 0,-0.77l2.71,-1.72 -2.58,-3c0,-0.62 0.05,-1.25 0.09,-1.87l3.57,-1 -3.19,-3.83c0.05,-0.58 0.12,-1.16 0.18,-1.74l4.77,-1.39 -4,-4.46 0.24,-1.5 5.55,-1.61 -4.54,-4c0.08,-0.4 0.17,-0.8 0.26,-1.2l5,-1.44 -3.93,-3.22c0.08,-0.34 0.15,-0.69 0.23,-1l6.51,-1.89 -4.68,-5.41c0.07,-0.25 0.14,-0.5 0.22,-0.75l5.89,-0.82 -3.72,-5.48 0.3,-0.69 5.59,1.21 -3.33,-5.65c0.18,-0.3 0.37,-0.59 0.55,-0.88l5.95,0.95 -2.68,-5 0,0c-1.39,-6.49 -6.72,-19.33 -6.72,-19.33a62.21,62.21 0,0 0,-5.78 -11.48c-9.59,-15.31 -27.16,-28.64 -44.56,-28.64a32.59,32.59 0,0 0,-7.59 0.89c-17.93,4.31 -32.31,24.52 -40.65,39.83 -9.37,17.22 -14.3,36.39 -18.8,55.34 -6.77,28.47 -10.5,57.56 -13.22,86.66 -2.25,24 -10,50.88 14.49,65.32 11.22,6.6 24.36,10.79 37.17,12.9a98,98 0,0 0,16 1.15c4.72,0 9.45,-0.22 14.16,-0.44l49.8,-2.29c0.72,0 1.46,-0.06 2.21,-0.06 4,0 8.15,0.65 10.26,3.85 0.25,-2.66 -2.08,-7 -4.86,-11.6l5.7,-1.29c0.15,-4.58 0.6,-8 2.5,-5.38 0.93,1.29 2.19,2.73 3.78,2.54 1.86,-0.23 2.65,-2.45 3,-4.3C234,319.42 234.06,307.82 233.41,296.2ZM158.81,334.39c-4.45,0.2 -9.06,0.42 -13.47,0.42a83.24,83.24 0,0 1,-13.54 -0.95c-12,-2 -23.1,-5.8 -32,-11 -5.66,-3.33 -8.42,-7.32 -9.52,-13.75 -1.25,-7.35 -0.11,-16.53 1.1,-26.24 0.45,-3.59 0.91,-7.3 1.26,-11 3.25,-34.69 7.22,-60.78 12.88,-84.59 4.38,-18.42 9,-36.24 17.39,-51.64 9.79,-18 21.37,-30.11 31,-32.42a17.66,17.66 0,0 1,4.08 -0.47c6.64,0 14.53,3.54 21.63,9.71 6.86,6 12.19,13.64 14.36,20.64 -5.36,13.5 -10.52,31.41 -12.51,44.37 -5.36,34.75 -9,99.6 -7.6,156.26Z"/>
 </vector>

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_boost.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_selected="true" android:drawable="@drawable/ic_fluent_arrow_repeat_all_24_filled"/>
 	<item android:state_enabled="true" android:drawable="@drawable/ic_fluent_arrow_repeat_all_24_regular"/>
 	<item android:drawable="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
 </selector>

mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_filled.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="M14.712 2.289L14.625 2.21c-0.392-0.31-0.964-0.285-1.327 0.078L13.22 2.376c-0.31 0.392-0.285 0.964 0.078 1.326l1.299 1.297H8.999L8.76 5.003C5.004 5.13 2 8.211 2 11.993c0 1.445 0.438 2.788 1.189 3.899C3.37 16.143 3.666 16.307 4 16.307c0.552 0 1-0.448 1-1 0-0.216-0.069-0.416-0.185-0.578L4.68 14.51C4.248 13.77 4 12.91 4 11.993c0-2.759 2.238-4.995 5-4.995h5.595l-1.297 1.297-0.078 0.087c-0.31 0.392-0.285 0.964 0.078 1.326 0.39 0.39 1.024 0.39 1.414 0l3.006-3.003 0.077-0.087c0.311-0.392 0.285-0.964-0.078-1.326l-3.005-3.003zm6.075 5.771C20.602 7.827 20.319 7.678 20 7.678c-0.552 0-1 0.448-1 1 0 0.208 0.064 0.4 0.172 0.56 0.523 0.79 0.828 1.737 0.828 2.755 0 2.76-2.238 4.996-5 4.996H9.416l1.294-1.292 0.083-0.095c0.281-0.361 0.28-0.871-0.006-1.23l-0.077-0.088-0.095-0.084c-0.362-0.28-0.873-0.278-1.232 0.006l-0.088 0.078-3.005 3.003-0.083 0.095c-0.281 0.361-0.28 0.872 0.006 1.231L6.289 18.7l3.005 3.003 0.095 0.084c0.392 0.304 0.96 0.277 1.32-0.084 0.362-0.362 0.388-0.933 0.077-1.326L10.71 20.29l-1.304-1.303h5.596l0.24-0.003C18.996 18.857 22 15.776 22 11.994c0-1.46-0.448-2.816-1.213-3.937V8.06z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
+	<group android:translateX="-2" android:translateY="-1">
+		<path android:pathData="M10 2c1.657 0 3 1.343 3 3v1h1c1.105 0 2 0.895 2 2v7c0 1.105-0.895 2-2 2H6c-1.105 0-2-0.895-2-2V8c0-1.105 0.895-2 2-2h1V5c0-1.657 1.343-3 3-3zm0 8.5c-0.552 0-1 0.448-1 1s0.448 1 1 1 1-0.448 1-1-0.448-1-1-1zM10 4C9.448 4 9 4.448 9 5v1h2V5c0-0.552-0.448-1-1-1z" android:fillColor="@color/fluent_default_icon_tint"/>
+	</group>
+</vector>

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

@@ -1,10 +1,10 @@
-<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="M16.7096,17.7682C19.4819,17.4391 21.8955,15.7408 22.199,14.1888C22.6769,11.7442 22.6376,8.2231 22.6376,8.2231C22.6376,3.4504 19.4929,2.0516 19.4929,2.0516C17.9073,1.3274 15.1846,1.023 12.356,1H12.2865C9.4579,1.023 6.7369,1.3274 5.1513,2.0516C5.1513,2.0516 2.0066,3.4504 2.0066,8.2231C2.0066,8.5125 2.0051,8.8169 2.0035,9.1339C1.9991,10.0135 1.9943,10.9896 2.0199,12.0083C2.1341,16.6755 2.8805,21.2752 7.2202,22.4175C9.2213,22.944 10.9392,23.0542 12.323,22.9785C14.832,22.8403 16.2406,22.0883 16.2406,22.0883L16.1577,20.2779C16.1577,20.2779 14.3648,20.8402 12.3511,20.7717C10.356,20.7037 8.2496,20.5577 7.9269,18.1221C7.8972,17.9082 7.8823,17.6794 7.8823,17.4391C7.8823,17.4391 9.8408,17.9152 12.323,18.0283C13.8407,18.0974 15.2639,17.9399 16.7096,17.7682ZM18.8747,14.3719V8.5932C18.8747,7.4121 18.5723,6.4736 17.9648,5.7792C17.3382,5.0849 16.518,4.729 15.4997,4.729C14.3212,4.729 13.4291,5.1792 12.8392,6.0799L12.2657,7.0359L11.692,6.0799C11.1023,5.1792 10.21,4.729 9.0316,4.729C8.0134,4.729 7.193,5.0849 6.5664,5.7792C5.9589,6.4736 5.6565,7.4121 5.6565,8.5932V14.3719H7.959V8.763C7.959,7.5805 8.4594,6.9806 9.4602,6.9806C10.5665,6.9806 11.1211,7.6925 11.1211,9.1001V12.1701H13.4101V9.1001C13.4101,7.6925 13.9647,6.9806 15.071,6.9806C16.0718,6.9806 16.5722,7.5805 16.5722,8.763V14.3719H18.8747Z"
-      android:fillColor="#fff"
-      android:fillType="evenOdd"/>
+<vector android:height="24dp" android:viewportHeight="320"
+    android:viewportWidth="320" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:rotation="90" android:translateX="304" android:translateY="16" android:scaleX=".9" android:scaleY=".9">
+        <clip-path android:pathData="M0,0 0,320 320,320 320,0">
+            <path android:fillColor="#fff" android:pathData="M331.17,455.15c-0.9,-16.19 -2.47,-32.4 -4,-48.56 -0.18,-1.83 -0.35,-3.66 -0.53,-5.49 0,-0.4 -0.07,-0.79 -0.11,-1.19 -0.23,-2.39 -0.45,-4.79 -0.67,-7.18q-1.17,-12.75 -2.2,-25.6c-1,-12.83 -2,-25.72 -3,-38.63q-0.5,-6.45 -1,-12.91c-1.36,-17.23 -2.81,-34.48 -4.56,-51.69 -2.47,-24.15 -5.54,-48.22 -9.8,-72a13.13,13.13 0,0 0,-2 1c-18.27,11.86 -31.15,63.65 -38.89,82.19a2.7,2.7 0,0 1,-5.18 -0.79c-0.53,-5.37 -0.76,-10.78 -0.77,-16.2v-1.05a303.5,303.5 0,0 1,7.59 -65.79c4.46,-19.78 9.28,-44 23.15,-59.59 0.23,-0.26 1.83,-1.9 1.83,-1.9 -3,-14.17 -14.66,-42.19 -14.67,-42.2a136.07,136.07 0,0 0,-12.61 -25.07C242.82,29.09 204.46,0 166.47,0a70.43,70.43 0,0 0,-16.56 1.94c-39.17,9.42 -70.55,53.52 -88.75,87C40.69,126.5 29.93,168.34 20.1,209.72 5.32,271.87 -2.82,335.37 -8.77,398.91 -13.67,451.32 -30.7,510 22.87,541.51c24.5,14.41 53.18,23.56 81.15,28.16a213.92,213.92 0,0 0,34.86 2.51c10.31,0 20.64,-0.47 30.93,-0.95l108.72,-5c1.57,-0.07 3.2,-0.12 4.83,-0.12 8.69,0 17.78,1.42 22.39,8.4 0.55,-5.81 -4.53,-15.25 -10.6,-25.33l12.44,-2.81c0.31,-10 1.32,-17.53 5.46,-11.76 2,2.84 4.78,6 8.24,5.55 4.06,-0.49 5.79,-5.35 6.52,-9.37C332.36,505.83 332.59,480.52 331.17,455.15ZM168.3,538.52c-9.72,0.45 -19.77,0.91 -29.42,0.91a180.1,180.1 0,0 1,-29.54 -2.07C83.06,533 58.9,524.71 39.48,513.28c-12.37,-7.27 -18.39,-16 -20.79,-30 -2.74,-16 -0.24,-36.07 2.41,-57.29 1,-7.83 2,-15.93 2.74,-24C30.92,326.23 39.59,269.28 52,217.29c9.57,-40.22 19.67,-79.12 38,-112.74 21.38,-39.27 46.67,-65.73 67.64,-70.77a37.8,37.8 0,0 1,8.91 -1c14.5,0 31.71,7.73 47.22,21.2C228.67,67 240.3,83.72 245,99c-11.69,29.46 -22.95,68.57 -27.31,96.85C206,271.74 198.13,413.31 201.13,537Z"/>
+            <path android:fillColor="#fff" android:pathData="M177.15,182.12a30.01,18.34 97.5,1 0,7.83 -59.51a30.01,18.34 97.5,1 0,-7.83 59.51z"/>
+            <path android:fillColor="#fff" android:pathData="M0,320 320,320 288,288 32,288"/>
+        </clip-path>
+    </group>
 </vector>

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_reblog_or_reply_line.xml

@@ -2,15 +2,16 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="-6dp"
-	android:paddingLeft="16dp"
-	android:paddingRight="16dp"
-	android:paddingTop="16dp">
+	android:layout_marginBottom="-12dp">
 
 	<TextView
 		android:id="@+id/text"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:paddingHorizontal="16dp"
+		android:paddingTop="16dp"
+		android:paddingBottom="6dp"
+		android:background="?android:selectableItemBackground"
 		android:textAppearance="@style/m3_title_small"
 		android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_filled"
 		android:drawableTint="?android:textColorSecondary"

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

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

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

@@ -28,10 +28,10 @@
 					<org.joinmastodon.android.ui.views.CoverImageView
 						android:id="@+id/cover"
 						android:layout_width="match_parent"
-						android:layout_height="229dp"
-						android:background="#808080"
+						android:layout_height="200dp"
+						android:background="?profileHeaderBackground"
 						android:contentDescription="@string/profile_header"
-						android:scaleType="centerCrop"/>
+						android:scaleType="centerCrop" />
 
 					<TextView
 						android:id="@+id/follows_you"
@@ -54,8 +54,8 @@
 
 					<FrameLayout
 						android:id="@+id/avatar_border"
-						android:layout_width="102dp"
-						android:layout_height="102dp"
+						android:layout_width="112dp"
+						android:layout_height="112dp"
 						android:layout_below="@id/cover"
 						android:layout_alignParentStart="true"
 						android:layout_marginTop="-40dp"
@@ -65,8 +65,8 @@
 
 						<ImageView
 							android:id="@+id/avatar"
-							android:layout_width="98dp"
-							android:layout_height="98dp"
+							android:layout_width="108dp"
+							android:layout_height="108dp"
 							android:layout_gravity="center"
 							android:scaleType="centerCrop"
 							android:contentDescription="@string/profile_picture"
@@ -234,22 +234,27 @@
 						android:layout_below="@id/avatar_border"
 						android:layout_alignParentStart="true"
 						android:layout_marginStart="16dp"
-						android:layout_marginTop="12dp"
+						android:layout_marginTop="17dp"
+						android:layout_marginBottom="0.4dp"
 						android:layout_toStartOf="@id/profile_action_btn_wrap"
-						android:textAppearance="@style/m3_headline_small"
 						android:textAlignment="viewStart"
+						android:textAppearance="@style/m3_headline_small"
 						tools:text="Eugen" />
 
+
 					<TextView
 						android:id="@+id/username"
-						android:layout_width="match_parent"
+						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
+						android:layout_marginTop="2dp"
 						android:layout_below="@id/name"
-						android:layout_marginStart="16dp"
-						android:layout_toStartOf="@id/profile_action_btn_wrap"
+						android:paddingHorizontal="16dp"
+						android:paddingTop="2dp"
+						android:paddingBottom="4dp"
+						android:background="?android:selectableItemBackground"
 						android:textAppearance="@style/m3_title_medium"
 						android:textColor="?android:textColorSecondary"
-						tools:text="\@Gargron"/>
+						tools:text="\@Gargron" />
 
 					<org.joinmastodon.android.ui.views.LinkedTextView
 						android:id="@+id/bio"
@@ -257,7 +262,7 @@
 						android:layout_height="wrap_content"
 						android:layout_below="@id/username"
 						android:layout_marginLeft="16dp"
-						android:layout_marginTop="8dp"
+						android:layout_marginTop="4dp"
 						android:layout_marginRight="16dp"
 						android:textAppearance="@style/m3_body_large"
 						android:textSize="16sp"

mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,9 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome>
-        <layer-list>
-            <item android:drawable="@drawable/ic_launcher_monochrome" android:gravity="center"/>
-        </layer-list>
-    </monochrome>
 </adaptive-icon>

mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,9 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome>
-        <layer-list>
-            <item android:drawable="@drawable/ic_launcher_monochrome" android:gravity="center"/>
-        </layer-list>
-    </monochrome>
 </adaptive-icon>

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

@@ -101,8 +101,8 @@
 	</plurals>
 	<plurals name="x_days">
 		<item quantity="zero">أقل من يوم</item>
-		<item quantity="one">يُومٌ واحِد</item>
-		<item quantity="two">يَومان اِثنان</item>
+		<item quantity="one">يومٌ واحِد</item>
+		<item quantity="two">يَومان</item>
 		<item quantity="few">%d أيام</item>
 		<item quantity="many">%d يومًا</item>
 		<item quantity="other">%d يوم</item>
@@ -464,4 +464,5 @@
 	<string name="privacy_policy_title">ماستدون وخصوصيتك</string>
 	<string name="privacy_policy_subtitle">على الرغم من أن تطبيق ماستدون لا يجمع أي بيانات، فإن الخادم الذي قمت بالتسجيل من خلاله قد تكون له سياسة مختلفة. خذ دقيقة للمراجعة والموافقة على سياسة خصوصية التطبيق ماستدون وسياسة الخصوصية للخادم الخاص بك.</string>
 	<string name="i_agree">أنا مُوافِق</string>
+	<string name="empty_list">هذه القائمة فارغة</string>
 </resources>

mastodon/src/main/res/values-be-rBY/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-bn-rBD/strings.xml

@@ -1,5 +1,43 @@
 <?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 -->

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Començar</string>
-	<string name="log_in">Iniciar sessió</string>
+	<string name="get_started">Comença</string>
+	<string name="log_in">Inicia sessió</string>
 	<string name="next">Següent</string>
 	<string name="loading_instance">Obtenint informació sobre la instància…</string>
 	<string name="error">Error</string>
@@ -12,21 +12,21 @@
 	<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_followed_you">t\'ha seguit</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>
-	<string name="time_hours">%dh</string>
-	<string name="time_days">%dd</string>
-	<string name="share_toot_title">Compartir</string>
-	<string name="settings">Paràmetres</string>
-	<string name="publish">Publicar</string>
-	<string name="discard_draft">Descartar l\'esborrany?</string>
-	<string name="discard">Descartar</string>
-	<string name="cancel">Cancel·lar</string>
+	<string name="time_seconds">%d s</string>
+	<string name="time_minutes">%d min</string>
+	<string name="time_hours">%d h</string>
+	<string name="time_days">%d d</string>
+	<string name="share_toot_title">Comparteix</string>
+	<string name="settings">Configuració</string>
+	<string name="publish">Publica</string>
+	<string name="discard_draft">Voleu descartar l\'esborrany?</string>
+	<string name="discard">Descarta</string>
+	<string name="cancel">Cancel·la</string>
 	<plurals name="followers">
 		<item quantity="one">seguidor</item>
 		<item quantity="other">seguidors</item>
@@ -40,21 +40,21 @@
 		<item quantity="other">publicacions</item>
 	</plurals>
 	<string name="posts">Publicacions</string>
-	<string name="posts_and_replies">Publicacions i respostes</string>
+	<string name="posts_and_replies">Amb respostes</string>
 	<string name="media">Multimèdia</string>
 	<string name="profile_about">Quant a</string>
-	<string name="button_follow">Seguir</string>
+	<string name="button_follow">Segueix</string>
 	<string name="button_following">Seguint</string>
-	<string name="edit_profile">Editar el perfil</string>
-	<string name="mention_user">Esmentar %s</string>
-	<string name="share_user">Compartir %s</string>
-	<string name="mute_user">Silenciar %s</string>
+	<string name="edit_profile">Edita el perfil</string>
+	<string name="mention_user">Menciona %s</string>
+	<string name="share_user">Comparteix %s</string>
+	<string name="mute_user">Silencia %s</string>
 	<string name="unmute_user">Deixar de silenciar %s</string>
-	<string name="block_user">Blocar %s</string>
-	<string name="unblock_user">Desbloquejar %s</string>
-	<string name="report_user">Informar sobre %s</string>
-	<string name="block_domain">Blocar %s</string>
-	<string name="unblock_domain">Desbloquejar %s</string>
+	<string name="block_user">Bloca %s</string>
+	<string name="unblock_user">Desbloca %s</string>
+	<string name="report_user">Denuncia %s</string>
+	<string name="block_domain">Bloca %s</string>
+	<string name="unblock_domain">Desbloca %s</string>
 	<plurals name="x_posts">
 		<item quantity="one">%,d entrada</item>
 		<item quantity="other">%,d publicacions</item>
@@ -107,28 +107,28 @@
 	<string name="confirm_unmute_title">Deixar de silenciar el compte</string>
 	<string name="confirm_unmute">Confirma per deixar de silenciar %s</string>
 	<string name="do_unmute">Deixar de silenciar</string>
-	<string name="confirm_block_title">Blocar el compte</string>
-	<string name="confirm_block_domain_title">Blocar el domini</string>
+	<string name="confirm_block_title">Bloca el compte</string>
+	<string name="confirm_block_domain_title">Bloca el domini</string>
 	<string name="confirm_block">Confirma per blocar %s</string>
-	<string name="do_block">Blocar</string>
-	<string name="confirm_unblock_title">Desbloquejar el compte</string>
-	<string name="confirm_unblock_domain_title">Desbloquejar domini</string>
+	<string name="do_block">Bloca</string>
+	<string name="confirm_unblock_title">Desbloca el compte</string>
+	<string name="confirm_unblock_domain_title">Desbloca el domini</string>
 	<string name="confirm_unblock">Confirma per desbloquejar %s</string>
-	<string name="do_unblock">Desbloquejar</string>
+	<string name="do_unblock">Desbloca</string>
 	<string name="button_muted">Silenciat</string>
 	<string name="button_blocked">Blocat</string>
-	<string name="action_vote">Votar</string>
-	<string name="tap_to_reveal">Prem per a mostrar</string>
-	<string name="delete">Suprimeix</string>
+	<string name="action_vote">Vota</string>
+	<string name="tap_to_reveal">Toca per a mostrar</string>
+	<string name="delete">Elimina</string>
 	<string name="confirm_delete_title">Eliminar publicació</string>
-	<string name="confirm_delete">Estàs segur que vols suprimir aquesta publicació?</string>
-	<string name="deleting">Esborrant…</string>
+	<string name="confirm_delete">Segur que vols eliminar la publicació?</string>
+	<string name="deleting">S\'està eliminant…</string>
 	<string name="notification_channel_audio_player">Reproducció d\'àudio</string>
-	<string name="play">Reproduir</string>
-	<string name="pause">Pausar</string>
-	<string name="log_out">Tancar la sessió</string>
-	<string name="add_account">Afegir compte</string>
-	<string name="search_hint">Cercar</string>
+	<string name="play">Reprodueix</string>
+	<string name="pause">Pausa</string>
+	<string name="log_out">Tanca la sessió</string>
+	<string name="add_account">Afegeix un compte</string>
+	<string name="search_hint">Cerca</string>
 	<string name="hashtags">Etiquetes</string>
 	<string name="news">Notícies</string>
 	<string name="for_you">Per a tu</string>
@@ -142,19 +142,19 @@
 		<item quantity="one">S\'ha comentat %d cop</item>
 		<item quantity="other">S\'ha comentat %d cops</item>
 	</plurals>
-	<string name="report_title">Informar sobre %s</string>
+	<string name="report_title">Denuncia %s</string>
 	<string name="report_choose_reason">Quin és el problema amb aquesta publicació?</string>
 	<string name="report_choose_reason_account">Quin és el problema amb %s?</string>
 	<string name="report_choose_reason_subtitle">Selecciona la millor coincidència</string>
 	<string name="report_reason_personal">No m\'agrada</string>
-	<string name="report_reason_personal_subtitle">No és una cosa que vulguis veure</string>
+	<string name="report_reason_personal_subtitle">No és una cosa que vulgui veure</string>
 	<string name="report_reason_spam">És contingut brossa</string>
-	<string name="report_reason_spam_subtitle">Enllaços maliciosos, implicació falsa o respostes repetitives</string>
+	<string name="report_reason_spam_subtitle">Enllaços maliciosos, interacció falsa o respostes repetitives</string>
 	<string name="report_reason_violation">Infringeix les normes del servidor</string>
 	<string name="report_reason_violation_subtitle">Ets conscient que incompleix normes específiques</string>
 	<string name="report_reason_other">És una altra cosa</string>
 	<string name="report_reason_other_subtitle">El problema no encaixa en altres categories</string>
-	<string name="report_choose_rule">Quines normes s\'estan violant?</string>
+	<string name="report_choose_rule">Quines normes s\'estan infringint?</string>
 	<string name="report_choose_rule_subtitle">Selecciona totes les aplicables</string>
 	<string name="report_choose_posts">Hi ha entrades que sostinguin aquest informe?</string>
 	<string name="report_choose_posts_subtitle">Selecciona tots els aplicables</string>
@@ -197,38 +197,38 @@
 	<string name="category_tech">Tecnologia</string>
 	<string name="confirm_email_title">Una última cosa</string>
 	<string name="confirm_email_subtitle">Toca l\'enllaç del correu electrònic que t\'hem enviat per a confirmar el teu compte.</string>
-	<string name="resend">Reenviar</string>
-	<string name="open_email_app">Obrir l\'aplicació de correu</string>
+	<string name="resend">Reenvia</string>
+	<string name="open_email_app">Obre l\'aplicació de correu</string>
 	<string name="resent_email">S’ha enviat el correu electrònic de confirmació</string>
 	<string name="compose_hint">Escriu o enganxa el que tinguis al cap</string>
 	<string name="content_warning">Avís de contingut</string>
-	<string name="add_image_description">Afegir una descripció a la imatge…</string>
+	<string name="add_image_description">Afegeix una descripció de la imatge…</string>
 	<string name="retry_upload">Torna a provar de pujar</string>
-	<string name="edit_image">Editar imatge</string>
-	<string name="save">Desar</string>
-	<string name="add_alt_text">Afegir text alternatiu</string>
+	<string name="edit_image">Edita la imatge</string>
+	<string name="save">Desa</string>
+	<string name="add_alt_text">Afegeix text alternatiu</string>
 	<string name="alt_text_subtitle">El text alternatiu descriu les teves fotos per a persones amb poca visió o sense visió. Intenta incloure només prou detalls per entendre el context.</string>
 	<string name="alt_text_hint">per exemple: Un gos mirant al voltant de manera sospitosa amb ulls estrets a la càmera.</string>
 	<string name="visibility_public">Públic</string>
 	<string name="visibility_followers_only">Només seguidors</string>
-	<string name="visibility_private">Només les persones que menciono</string>
+	<string name="visibility_private">Només gent mencionada</string>
 	<string name="search_all">Tots</string>
 	<string name="search_people">Persones</string>
 	<string name="recent_searches">Cerques recents</string>
-	<string name="step_x_of_n">Etapa %1$d de %2$d</string>
-	<string name="skip">Ometre</string>
-	<string name="notification_type_follow">Nous seguidors</string>
-	<string name="notification_type_favorite">Preferits</string>
+	<string name="step_x_of_n">Pas %1$d de %2$d</string>
+	<string name="skip">Omet</string>
+	<string name="notification_type_follow">Seguidors nous</string>
+	<string name="notification_type_favorite">Favorits</string>
 	<string name="notification_type_reblog">Impulsos</string>
 	<string name="notification_type_mention">Mencions</string>
 	<string name="notification_type_poll">Enquestes</string>
-	<string name="choose_account">Seleccionar compte</string>
+	<string name="choose_account">Selecciona un compte</string>
 	<string name="err_not_logged_in">Si us plau, inicia sessió primer a Mastodon</string>
 	<plurals name="cant_add_more_than_x_attachments">
 		<item quantity="one">No pots afegir més de %d fitxer multimèdia</item>
 		<item quantity="other">No pots afegir més de %d fitxers multimèdia</item>
 	</plurals>
-	<string name="media_attachment_unsupported_type">El fitxer %s és d\'un tipus no compatible</string>
+	<string name="media_attachment_unsupported_type">El tipus de fitxer %s no és compatible</string>
 	<string name="media_attachment_too_big">El fitxer %1$s supera el límit de mida de %2$s MB</string>
 	<string name="settings_theme">Aspecte visual</string>
 	<string name="theme_auto">Automàtic</string>
@@ -249,69 +249,69 @@
 	<string name="notify_reblog">Impulsa la meva publicació</string>
 	<string name="notify_mention">Em menciona</string>
 	<string name="settings_boring">La zona avorrida</string>
-	<string name="settings_account">Paràmetres del compte</string>
-	<string name="settings_contribute">Contribuir a Mastodon</string>
-	<string name="settings_tos">Termes del servei</string>
+	<string name="settings_account">Configuració del compte</string>
+	<string name="settings_contribute">Contribueix a Mastodon</string>
+	<string name="settings_tos">Condicions de servei</string>
 	<string name="settings_privacy_policy">Política de privadesa</string>
 	<string name="settings_spicy">La zona picant</string>
 	<string name="settings_clear_cache">Esborra la memòria cau multimèdia</string>
 	<string name="settings_app_version">Mastodon per a Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">S\'ha esborrat la memòria cau multimèdia</string>
-	<string name="confirm_log_out">Estàs segur que vols tancar la sessió?</string>
+	<string name="confirm_log_out">Segur que vols tancar la sessió?</string>
 	<string name="sensitive_content">Contingut sensible</string>
-	<string name="sensitive_content_explain">L\'autor va marcar aquest mitjà com a sensible. Toca per revelar.</string>
-	<string name="media_hidden">Toca per revelar</string>
-	<string name="avatar_description">Vés al perfil de %s</string>
+	<string name="sensitive_content_explain">L\'autor va marcar aquest mitjà com a sensible. Toca per a mostrar-lo.</string>
+	<string name="media_hidden">Toca per a mostrar</string>
+	<string name="avatar_description">Vés al perfil de: %s</string>
 	<string name="more_options">Més opcions</string>
-	<string name="reveal_content">Revelar contingut</string>
-	<string name="hide_content">Amagar el contingut</string>
+	<string name="reveal_content">Mostra el contingut</string>
+	<string name="hide_content">Amaga el contingut</string>
 	<string name="new_post">Nova publicació</string>
-	<string name="button_reply">Respondre</string>
-	<string name="button_reblog">Impulsar</string>
-	<string name="button_favorite">Marcar com a preferit</string>
-	<string name="button_share">Compartir</string>
+	<string name="button_reply">Respon</string>
+	<string name="button_reblog">Impulsa</string>
+	<string name="button_favorite">Favorit</string>
+	<string name="button_share">Comparteix</string>
 	<string name="media_no_description">Multimèdia sense descripció</string>
-	<string name="add_media">Afegir contingut multimèdia</string>
-	<string name="add_poll">Afegir una enquesta</string>
-	<string name="emoji">Emoji</string>
+	<string name="add_media">Afegeix multimèdia</string>
+	<string name="add_poll">Afegeix una enquesta</string>
+	<string name="emoji">Emojis</string>
 	<string name="post_visibility">Visibilitat de la publicació</string>
 	<string name="home_timeline">Línia de temps principal</string>
 	<string name="my_profile">El meu perfil</string>
-	<string name="media_viewer">Visualitzador de multimèdia</string>
-	<string name="follow_user">Seguir %s</string>
+	<string name="media_viewer">Visor multimèdia</string>
+	<string name="follow_user">Segueix %s</string>
 	<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="open_in_browser">Obre al navegador</string>
+	<string name="hide_boosts_from_user">Amaga els impulsos de %s</string>
+	<string name="show_boosts_from_user">Mostra els impulsos de %s</string>
 	<string name="signup_reason">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>
+	<string name="clear">Esborra</string>
 	<string name="profile_header">Imatge de capçalera</string>
-	<string name="profile_picture">Imatge del perfil</string>
-	<string name="reorder">Reordenar</string>
-	<string name="download">Descarregar</string>
+	<string name="profile_picture">Foto del perfil</string>
+	<string name="reorder">Reordena</string>
+	<string name="download">Baixa</string>
 	<string name="permission_required">Es requereix permís</string>
 	<string name="storage_permission_to_download">L\'aplicació necessita accedir al vostre emmagatzematge per desar aquest fitxer.</string>
-	<string name="open_settings">Obrir els paràmetres</string>
+	<string name="open_settings">Obre la configuració</string>
 	<string name="error_saving_file">Error en desar el fitxer</string>
 	<string name="file_saved">Fitxer desat</string>
-	<string name="downloading">Descarregant…</string>
+	<string name="downloading">S\'està baixant…</string>
 	<string name="no_app_to_handle_action">No hi ha cap aplicació que gestioni aquesta acció</string>
 	<string name="local_timeline">Comunitat</string>
 	<string name="trending_posts_info_banner">Aquestes son les publicacions que criden l\'atenció en el teu racó de Mastodon.</string>
 	<string name="trending_hashtags_info_banner">Aquests són els hashtags que criden l\'atenció en el teu racó de Mastodon.</string>
 	<string name="trending_links_info_banner">Aquestes són les notícies que més es comparteixen en el teu racó de Mastodon.</string>
 	<string name="local_timeline_info_banner">Aquestes són les publicacions més recents de les persones que utilitzen el mateix servidor Mastodon que tu.</string>
-	<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="dismiss">Ignora</string>
+	<string name="see_new_posts">Publicacions noves</string>
+	<string name="load_missing_posts">Carrega les publicacions faltants</string>
+	<string name="follow_back">Segueix</string>
 	<string name="button_follow_pending">Pendent</string>
-	<string name="follows_you">Te segueix</string>
+	<string name="follows_you">Et 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>
+	<string name="log_out_account">Tanca la sessió %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 seguidor</item>
@@ -325,31 +325,43 @@
 		<item quantity="one">%,d favorit</item>
 		<item quantity="other">%,d favorits</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d impuls</item>
+		<item quantity="other">%,d impulsos</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s través de %2$s</string>
 	<string name="time_now">ara</string>
 	<string name="post_info_reblogs">Impulsos</string>
-	<string name="post_info_favorites">Preferits</string>
+	<string name="post_info_favorites">Favorits</string>
 	<string name="edit_history">Editar l’historial</string>
 	<string name="last_edit_at_x">Darrera edició: %s</string>
 	<string name="time_just_now">ara mateix</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="one">fa %d segon</item>
+		<item quantity="other">fa %d segons</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="one">fa %d minut</item>
+		<item quantity="other">fa %d minuts</item>
+	</plurals>
 	<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_spoiler_removed">Avís de contingut eliminat</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_poll_removed">Enquesta eliminada</string>
+	<string name="edit_media_added">Multimèdia afegida</string>
+	<string name="edit_media_removed">Multimèdia eliminada</string>
+	<string name="edit_media_reordered">Multimèdia reordenada</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="discard_changes">Voleu descartar els canvis?</string>
+	<string name="upload_failed">Ha fallat la pujada</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>
@@ -359,13 +371,18 @@
 	<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>
+	<string name="update_available">Mastodon per a Android %s està preparat per a baixar-se.</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>
+	<string name="update_ready">Mastodon per a Android %s s\'ha baixat 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="download_update">Baixa (%s)</string>
+	<string name="install_update">Instal·la</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">Hi estic d\'acord</string>
+	<string name="i_agree">D’acord</string>
+	<!-- Missing strings -->
+	<string name="bookmarks">Marcadors</string>
+	<string name="pinned_posts">Fixat</string>
+	<string name="empty_list">Aquesta llista està buida</string>
+	<string name="instance_signup_closed">Aquest servidor no accepta nous registres.</string>
 </resources>

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

@@ -9,13 +9,13 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Příprava na ověřování…</string>
 	<string name="finishing_auth">Dokončení ověřování…</string>
-	<string name="user_boosted">%s boostnul</string>
+	<string name="user_boosted">Uživatel %s boostnul</string>
 	<string name="in_reply_to">V odpovědi na %s</string>
 	<string name="notifications">Upozornění</string>
 	<string name="user_followed_you">vás sleduje</string>
-	<string name="user_sent_follow_request">vám poslal žádost o sledování</string>
-	<string name="user_favorited">si oblíbil váš příspěvek</string>
-	<string name="notification_boosted">boostnul váš příspěvek</string>
+	<string name="user_sent_follow_request">vám poslal(a) žádost o sledování</string>
+	<string name="user_favorited">si oblíbil(a) váš příspěvek</string>
+	<string name="notification_boosted">boostnul(a) váš příspěvek</string>
 	<string name="poll_ended">anketa skončila</string>
 	<string name="time_seconds">%d s</string>
 	<string name="time_minutes">%d m</string>
@@ -37,7 +37,7 @@
 		<item quantity="one">sledovaní</item>
 		<item quantity="few">sledování</item>
 		<item quantity="many">sledování</item>
-		<item quantity="other">sledování</item>
+		<item quantity="other">sledovaných</item>
 	</plurals>
 	<plurals name="posts">
 		<item quantity="one">příspěvek</item>
@@ -422,4 +422,5 @@
 	<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>
+	<string name="empty_list">Tento seznam je prázdný</string>
 </resources>

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

@@ -51,8 +51,8 @@
 	<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="block_user">%s sperren</string>
+	<string name="unblock_user">%s nicht mehr sperren</string>
 	<string name="report_user">%s melden</string>
 	<string name="block_domain">%s sperren</string>
 	<string name="unblock_domain">%s nicht mehr sperren</string>
@@ -109,7 +109,7 @@
 	<string name="confirm_unmute">Bestätigen, um %s nicht mehr stummzuschalten</string>
 	<string name="do_unmute">Nicht mehr stummschalten</string>
 	<string name="confirm_block_title">Konto sperren</string>
-	<string name="confirm_block_domain_title">Domain blockieren</string>
+	<string name="confirm_block_domain_title">Domain sperren</string>
 	<string name="confirm_block">Bestätigen, um %s zu blockieren</string>
 	<string name="do_block">Ja, blockieren</string>
 	<string name="confirm_unblock_title">Konto nicht mehr sperren</string>
@@ -182,7 +182,7 @@
 	<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>
 	<string name="back">Zurück</string>
-	<string name="instance_catalog_title">Mastodon besteht aus Benutzern auf verschiedenen Servern.</string>
+	<string name="instance_catalog_title">Mastodon wird von Benutzer*innen auf verschiedenen Servern gestaltet.</string>
 	<string name="instance_catalog_subtitle">Wähle einen Server basierend auf deinen Interessen oder deiner Region – oder einfach einen allgemeinen. Du kannst trotzdem mit jedem interagieren, egal auf welchem Server.</string>
 	<string name="search_communities">Server suchen oder Adresse eingeben</string>
 	<string name="instance_rules_title">Einige Grundregeln</string>
@@ -190,7 +190,7 @@
 	<string name="signup_title">Okay, lass uns mit %s anfangen</string>
 	<string name="edit_photo">bearbeiten</string>
 	<string name="display_name">Anzeigename</string>
-	<string name="username">Nutzername</string>
+	<string name="username">Kontoname</string>
 	<string name="email">E-Mail</string>
 	<string name="password">Passwort</string>
 	<string name="password_note">Verwende Großbuchstaben, Sonderzeichen und Zahlen, um deine Passwortstärke zu erhöhen.</string>
@@ -199,7 +199,7 @@
 	<string name="category_all">Alle</string>
 	<string name="category_art">Kunst</string>
 	<string name="category_food">Essen</string>
-	<string name="category_furry">Furries</string>
+	<string name="category_furry">Flausch</string>
 	<string name="category_games">Spiele</string>
 	<string name="category_general">Allgemein</string>
 	<string name="category_journalism">Journalismus</string>
@@ -241,8 +241,8 @@
 	<string name="choose_account">Konto auswählen</string>
 	<string name="err_not_logged_in">Bitte zuerst in Mastodon anmelden</string>
 	<plurals name="cant_add_more_than_x_attachments">
-		<item quantity="one">Du kannst nicht mehr als %d Medien-Datei anhängen</item>
-		<item quantity="other">Du kannst nicht mehr als %d Medien-Dateien anhängen</item>
+		<item quantity="one">Du kannst nicht mehr als %d Mediendatei anhängen</item>
+		<item quantity="other">Du kannst nicht mehr als %d Mediendateien anhängen</item>
 	</plurals>
 	<string name="media_attachment_unsupported_type">Datei %s wird nicht unterstützt</string>
 	<string name="media_attachment_too_big">Datei %1$s übersteigt die Größengrenze von %2$s MB</string>
@@ -261,7 +261,7 @@
 	<string name="settings_notifications">Benachrichtigungen</string>
 	<string name="notify_me_when">Benachrichtige mich, wenn</string>
 	<string name="notify_anyone">irgendjemand</string>
-	<string name="notify_follower">ein Follower von mir</string>
+	<string name="notify_follower">ein Follower</string>
 	<string name="notify_followed">jemand, dem ich folge,</string>
 	<string name="notify_none">niemand</string>
 	<string name="notify_favorites">meinen Beitrag favorisiert</string>
@@ -275,7 +275,7 @@
 	<string name="settings_privacy_policy">Datenschutzbestimmungen</string>
 	<string name="settings_spicy">Gefährliches</string>
 	<string name="settings_clear_cache">Medienpuffer leeren</string>
-	<string name="settings_app_version">Mastodos v%1$s (%2$d)</string>
+	<string name="settings_app_version">Megalodon v%1$s (%2$d)</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">Inhaltswarnung</string>
@@ -302,14 +302,14 @@
 	<string name="follow_user">%s folgen</string>
 	<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="open_in_browser">Im Browser öffnen</string>
 	<string name="hide_boosts_from_user">Geteilte Beiträge von %s ausblenden</string>
 	<string name="show_boosts_from_user">Geteilte Beiträge von %s anzeigen</string>
 	<string name="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>
-	<string name="signup_reason_note">Dies wird uns dabei helfen, deine Anmeldungsanfrage besser zu verarbeiten.</string>
-	<string name="clear">Löschen</string>
+	<string name="signup_reason_note">Das erleichtert uns die Prüfung deiner Anmeldung.</string>
+	<string name="clear">Leeren</string>
 	<string name="profile_header">Kopfbild</string>
 	<string name="profile_picture">Profilbild</string>
 	<string name="reorder">Neu sortieren</string>
@@ -360,7 +360,7 @@
 	<string name="post_info_favorites">Favoriten</string>
 	<string name="edit_history">Verlauf bearbeiten</string>
 	<string name="last_edit_at_x">Letzte Bearbeitung: %s</string>
-	<string name="time_just_now">gerade eben</string>
+	<string name="time_just_now">gerade jetzt</string>
 	<plurals name="x_seconds_ago">
 		<item quantity="one">vor %d Sekunde</item>
 		<item quantity="other">vor %d Sekunden</item>
@@ -396,11 +396,11 @@
 	<string name="upload_error_connection_lost">Dein Gerät hat gerade keinen Zugang zum Internet</string>
 	<string name="upload_processing">Wird verarbeitet…</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_available">Mastodos %s ist zum Herunterladen bereit.</string>
+	<string name="update_available">Megalodon %s ist zum Herunterladen bereit.</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_ready">Mastodos %s wurde heruntergeladen und ist bereit zum Installieren.</string>
+	<string name="update_ready">Megalodon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
 	<!-- %s is file size -->
-	<string name="download_update">Download (%s)</string>
+	<string name="download_update">(%s) herunterladen</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>
@@ -411,8 +411,11 @@
 	<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="privacy_policy_subtitle">Obwohl die Megalodon-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>
+	<string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
+	<string name="empty_list">Diese Liste ist leer</string>
+	<string name="instance_signup_closed">Dieser Server akzeptiert keine neuen Registrierungen.</string>
 </resources>

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

@@ -205,6 +205,7 @@
 	<string name="search_all">Denak</string>
 	<string name="search_people">Jendea</string>
 	<string name="recent_searches">Azken bilaketak</string>
+	<string name="step_x_of_n">%1$d pausua %2$d -(e)tik</string>
 	<string name="skip">Saltatu</string>
 	<string name="notification_type_follow">Jarraitzaile berriak</string>
 	<string name="notification_type_favorite">Gogokoak</string>
@@ -244,6 +245,7 @@
 	<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="avatar_description">Joan %s-ren profilera</string>
 	<string name="more_options">Aukera gehiago</string>
 	<string name="reveal_content">Erakutsi edukia</string>
 	<string name="hide_content">Ezkutatu edukia</string>
@@ -284,6 +286,7 @@
 	<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="local_timeline_info_banner">Hauek dira zure Mastodon zerbitzari bera erabiltzen duten pertsonen bidalketa berrienak.</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>
@@ -292,7 +295,9 @@
 	<string name="follows_you">Jarraitzen zaitu</string>
 	<string name="manually_approves_followers">Jarraitzaileak eskuz onartu</string>
 	<string name="current_account">Oraingo kontua</string>
+	<string name="log_out_account">Itxi saioa %s</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<string name="timestamp_via_app">%1$s %2$s -en bidez</string>
 	<string name="time_now">orain</string>
 	<string name="post_info_reblogs">Bultzadak</string>
 	<string name="post_info_favorites">Gogokoak</string>
@@ -310,6 +315,7 @@
 	<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_media_reordered">Media berrordenatuta</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>
@@ -320,6 +326,7 @@
 	<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_time_remaining">%s geratzen da</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 -->
@@ -331,4 +338,6 @@
 	<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>
+	<string name="empty_list">Zerrenda hau hutsik dago</string>
+	<string name="instance_signup_closed">Zerbitzari honek ez ditu izen-emate berriak onartzen.</string>
 </resources>

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

@@ -380,4 +380,6 @@
 	<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>
+	<string name="empty_list">Cette liste est vide</string>
+	<string name="instance_signup_closed">Ce serveur n\'accepte pas les nouvelles inscriptions.</string>
 </resources>

mastodon/src/main/res/values-ga-rIE/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-gd-rGB/strings.xml

@@ -1,7 +1,426 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="get_started">Dèan toiseach-tòiseachaidh</string>
+	<string name="log_in">Clàraich a-steach</string>
+	<string name="next">Air adhart</string>
+	<string name="loading_instance">A’ faighinn fiosrachadh an ionstans…</string>
+	<string name="error">Mearachd</string>
+	<string name="not_a_mastodon_instance">Chan eil coltas ionstans Mhastodon air %s.</string>
+	<string name="ok">Ceart ma-thà</string>
+	<string name="preparing_auth">Ag ullachadh an dearbhaidh…</string>
+	<string name="finishing_auth">A’ crìochnachadh an dearbhaidh…</string>
+	<string name="user_boosted">’Ga bhrosnachadh le %s</string>
+	<string name="in_reply_to">A’ freagairt dha %s</string>
+	<string name="notifications">Brathan</string>
+	<string name="user_followed_you">– ’s iad ’gad leantainn a-nis</string>
+	<string name="user_sent_follow_request">– ’s iad air iarrtas leantainn a chur thugad</string>
+	<string name="user_favorited">– ’s iad air am post agad a chur ris na h-annsachdan aca</string>
+	<string name="notification_boosted">– ’s iad air am post agad a bhrosnachadh</string>
+	<string name="poll_ended">Thàinig cunntas-bheachd gu crìoch</string>
+	<string name="time_seconds">%dd</string>
+	<string name="time_minutes">%dm</string>
+	<string name="time_hours">%du</string>
+	<string name="time_days">%dl</string>
+	<string name="share_toot_title">Co-roinn</string>
+	<string name="settings">Roghainnean</string>
+	<string name="publish">Foillsich</string>
+	<string name="discard_draft">An tilg thu air falbh an dreachd?</string>
+	<string name="discard">Tilg air falbh</string>
+	<string name="cancel">Sguir dheth</string>
+	<plurals name="followers">
+		<item quantity="one">neach-leantainn</item>
+		<item quantity="two">luchd-leantainn</item>
+		<item quantity="few">luchd-leantainn</item>
+		<item quantity="other">luchd-leantainn</item>
+	</plurals>
+	<plurals name="following">
+		<item quantity="one">’ga leantainn</item>
+		<item quantity="two">’ga leantainn</item>
+		<item quantity="few">’ga leantainn</item>
+		<item quantity="other">’ga leantainn</item>
+	</plurals>
+	<plurals name="posts">
+		<item quantity="one">phost</item>
+		<item quantity="two">phost</item>
+		<item quantity="few">postaichean</item>
+		<item quantity="other">post</item>
+	</plurals>
+	<string name="posts">Postaichean</string>
+	<string name="posts_and_replies">Postaichean ’s freagairtean</string>
+	<string name="media">Meadhanan</string>
+	<string name="profile_about">Mu dhèidhinn</string>
+	<string name="button_follow">Lean</string>
+	<string name="button_following">A’ leantainn</string>
+	<string name="edit_profile">Deasaich a’ phròifil</string>
+	<string name="mention_user">Thoir iomradh air %s</string>
+	<string name="share_user">Co-roinn %s</string>
+	<string name="mute_user">Mùch %s</string>
+	<string name="unmute_user">Dì-mhùch %s</string>
+	<string name="block_user">Bac %s</string>
+	<string name="unblock_user">Dì-bhac %s</string>
+	<string name="report_user">Dèan gearan mu %s</string>
+	<string name="block_domain">Bac %s</string>
+	<string name="unblock_domain">Dì-bhac %s</string>
+	<plurals name="x_posts">
+		<item quantity="one">%,d phost</item>
+		<item quantity="two">%,d phost</item>
+		<item quantity="few">%,d postaichean</item>
+		<item quantity="other">%,d post</item>
+	</plurals>
+	<string name="profile_joined">Air ballrachd fhaighinn</string>
+	<string name="done">Deiseil</string>
+	<string name="loading">’Ga luchdadh…</string>
+	<string name="field_label">Leubail</string>
+	<string name="field_content">Susbaint</string>
+	<string name="saving">’Ga shàbhaladh…</string>
+	<string name="post_from_user">Post le %s</string>
+	<string name="poll_option_hint">Roghainn %d</string>
+	<plurals name="x_minutes">
+		<item quantity="one">%d mhionaid</item>
+		<item quantity="two">%d mhionaid</item>
+		<item quantity="few">%d mionaidean</item>
+		<item quantity="other">%d mionaid</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="one">%d uair a thìde</item>
+		<item quantity="two">%d uair a thìde</item>
+		<item quantity="few">%d uairean a thìde</item>
+		<item quantity="other">%d uair a thìde</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="one">%d latha</item>
+		<item quantity="two">%d latha</item>
+		<item quantity="few">%d làithean</item>
+		<item quantity="other">%d latha</item>
+	</plurals>
+	<string name="compose_poll_duration">Faid: %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="one">%d diog air fhàgail</item>
+		<item quantity="two">%d dhiog air fhàgail</item>
+		<item quantity="few">%d diogan air fhàgail</item>
+		<item quantity="other">%d diog air fhàgail</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="one">%d mhionaid air fhàgail</item>
+		<item quantity="two">%d mhionaid air fhàgail</item>
+		<item quantity="few">%d mionaidean air fhàgail</item>
+		<item quantity="other">%d mionaid air fhàgail</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="one">%d uair a thìde air fhàgail</item>
+		<item quantity="two">%d uair a thìde air fhàgail</item>
+		<item quantity="few">%d uairean a thìde air fhàgail</item>
+		<item quantity="other">%d uair a thìde air fhàgail</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="one">%d latha air fhàgail</item>
+		<item quantity="two">%d latha air fhàgail</item>
+		<item quantity="few">%d làithean air fhàgail</item>
+		<item quantity="other">%d latha air fhàgail</item>
+	</plurals>
+	<plurals name="x_voters">
+		<item quantity="one">%,d bhòt</item>
+		<item quantity="two">%,d bhòt</item>
+		<item quantity="few">%,d bhòtaichean</item>
+		<item quantity="other">%,d bhòt</item>
+	</plurals>
+	<string name="poll_closed">Dùinte</string>
+	<string name="confirm_mute_title">Mùch an cunntas</string>
+	<string name="confirm_mute">Dearbh mùchadh %s</string>
+	<string name="do_mute">Mùch</string>
+	<string name="confirm_unmute_title">Dì-mhùch an cunntas</string>
+	<string name="confirm_unmute">Dearbh dì-mhùchadh %s</string>
+	<string name="do_unmute">Dì-mhùch</string>
+	<string name="confirm_block_title">Bac an cunntas</string>
+	<string name="confirm_block_domain_title">Bac an àrainn</string>
+	<string name="confirm_block">Dearbh bacadh %s</string>
+	<string name="do_block">Bac</string>
+	<string name="confirm_unblock_title">Dì-bhac an cunntas</string>
+	<string name="confirm_unblock_domain_title">Dì-bhac an àrainn</string>
+	<string name="confirm_unblock">Dearbh dì-bhacadh %s</string>
+	<string name="do_unblock">Dì-bhac</string>
+	<string name="button_muted">’Ga mhùchadh</string>
+	<string name="button_blocked">’Ga bhacadh</string>
+	<string name="action_vote">Cuir bhòt</string>
+	<string name="tap_to_reveal">Thoir gnogag gus a shealltainn</string>
+	<string name="delete">Sguab às</string>
+	<string name="confirm_delete_title">Sguab às am post</string>
+	<string name="confirm_delete">A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às?</string>
+	<string name="deleting">\'Ga sguabadh às…</string>
+	<string name="notification_channel_audio_player">Cluich fuaime</string>
+	<string name="play">Cluich</string>
+	<string name="pause">Cuir ’na stad</string>
+	<string name="log_out">Clàraich a-mach</string>
+	<string name="add_account">Cuir cunntas ris</string>
+	<string name="search_hint">Lorg</string>
+	<string name="hashtags">Tagaichean hais</string>
+	<string name="news">Naidheachdan</string>
+	<string name="for_you">Dhut-sa</string>
+	<string name="all_notifications">Na h-uile</string>
+	<string name="mentions">Iomraidhean</string>
+	<plurals name="x_people_talking">
+		<item quantity="one">Tha %d neach a’ bruidhinn</item>
+		<item quantity="two">Tha %d daoine a’ bruidhinn</item>
+		<item quantity="few">Tha %d daoine a’ bruidhinn</item>
+		<item quantity="other">Tha %d daoine a’ bruidhinn</item>
+	</plurals>
+	<plurals name="discussed_x_times">
+		<item quantity="one">Chaidh a dheasbad %d turas</item>
+		<item quantity="two">Chaidh a dheasbad %d thuras</item>
+		<item quantity="few">Chaidh a dheasbad %d tursan</item>
+		<item quantity="other">Chaidh a dheasbad %d turas</item>
+	</plurals>
+	<string name="report_title">Dèan gearan mu %s</string>
+	<string name="report_choose_reason">Dè tha ceàrr leis a’ phost seo?</string>
+	<string name="report_choose_reason_account">Dè tha ceàrr le %s?</string>
+	<string name="report_choose_reason_subtitle">Tagh a’ mhaids as fheàrr</string>
+	<string name="report_reason_personal">Cha toigh leam e</string>
+	<string name="report_reason_personal_subtitle">Chan eil thu airson seo fhaicinn</string>
+	<string name="report_reason_spam">’S e spama a th’ ann</string>
+	<string name="report_reason_spam_subtitle">Ceanglaichean droch-rùnach, conaltradh fuadain no an dearbh fhreagairt a-rithist ’s a-rithist</string>
+	<string name="report_reason_violation">Tha e a’ briseadh riaghailtean an fhrithealaiche</string>
+	<string name="report_reason_violation_subtitle">Mhothaich thu gu bheil e a’ briseadh riaghailtean sònraichte</string>
+	<string name="report_reason_other">Adhbhar eile</string>
+	<string name="report_reason_other_subtitle">Chan eil na roinnean-seòrsa eile iomchaidh dhan chùis</string>
+	<string name="report_choose_rule">Dè na riaghailtean a tha ’gam briseadh?</string>
+	<string name="report_choose_rule_subtitle">Tagh a h-uile gin a tha iomchaidh</string>
+	<string name="report_choose_posts">A bheil postaichean sam bith ann a tha ’nam fianais dhan ghearan seo?</string>
+	<string name="report_choose_posts_subtitle">Tagh a h-uile gin a tha iomchaidh</string>
+	<string name="report_comment_title">A bheil rud sam bith eile a bu toigh leat innse dhuinn?</string>
+	<string name="report_comment_hint">Beachdan a bharrachd</string>
+	<string name="sending_report">A’ cur a-null a’ ghearain…</string>
+	<string name="report_sent_title">Mòran taing airson a’ ghearain, bheir sinn sùil air.</string>
+	<string name="report_sent_subtitle">Fhad ’s a bhios sinn a’ toirt sùil air, seo nas urrainn dhut dèanamh an aghaidh %s.</string>
+	<string name="unfollow_user">Na lean %s tuilleadh</string>
+	<string name="unfollow">Na lean tuilleadh</string>
+	<string name="mute_user_explain">Chan fhaic thu na postaichean aca is dè a bhrosnaich iad air inbhir na dachaigh agad tuilleadh. Cha bhi fios aca gun do mhùch thu iad.</string>
+	<string name="block_user_explain">Chan urrainn dhaibh ’gad leantainn is chan fhaic iad na postaichean agad tuilleadh ach chì iad gun deach am bacadh.</string>
+	<string name="report_personal_title">Nach eil thu airson seo fhaicinn?</string>
+	<string name="report_personal_subtitle">Nuair a chì thu rudeigin nach toigh leat air Mastodon, ’s urrainn dhut an neach a chumail fad air falbh uat.</string>
+	<string name="back">Air ais</string>
+	<string name="instance_catalog_title">Tha cleachdaichean Mhastodon air iomadh frithealaiche eadar-dhealaichte.</string>
+	<string name="instance_catalog_subtitle">Tagh frithealaiche stèidhichte air d’ ùidhean, air far a bheil thu no fear coitcheann. ’S urrainn dhut conaltradh leis a h-uile duine fhathast ge b’ e am frithealaiche.</string>
+	<string name="search_communities">Lorg frithealaiche no cuir a-steach URL</string>
+	<string name="instance_rules_title">Riaghailtean bunasach</string>
+	<string name="instance_rules_subtitle">Gabh mionaid a’ toirt uil air na riaghailtean a shuidhich ’s a dh’èignicheas rianairean %s.</string>
+	<string name="signup_title">Suidhicheamaid %s dhut</string>
+	<string name="edit_photo">deasaich</string>
+	<string name="display_name">ainm-taisbeanaidh</string>
+	<string name="username">ainm-cleachdaiche</string>
+	<string name="email">post-d</string>
+	<string name="password">facal-faire</string>
+	<string name="password_note">Gabh a-steach litrichean mòra, caractaran sònraichte agus àireamhan airson am facal-faire agad a dhèanamh nas treasa.</string>
+	<string name="category_academia">Sgoilearachd</string>
+	<string name="category_activism">Iomairteachd</string>
+	<string name="category_all">Na h-uile</string>
+	<string name="category_art">Na h-ealain</string>
+	<string name="category_food">Biadh</string>
+	<string name="category_furry">Furry</string>
+	<string name="category_games">Geamannan</string>
+	<string name="category_general">Coitcheann</string>
+	<string name="category_journalism">Naidheachdas</string>
+	<string name="category_lgbt">LGBT</string>
+	<string name="category_music">Ceòl</string>
+	<string name="category_regional">Sgìreil</string>
+	<string name="category_tech">Teicneolas</string>
+	<string name="confirm_email_title">Aon rud eile</string>
+	<string name="confirm_email_subtitle">Thoir gnogag air a’ cheangal a chuir sinn thugad air a’ phost-d airson an cunntas agad a dhearbhadh.</string>
+	<string name="resend">Cuir a-rithist</string>
+	<string name="open_email_app">Fosgail aplacaid a’ phuist-d</string>
+	<string name="resent_email">Chaidh post-d dearbhaidh a chur</string>
+	<string name="compose_hint">Sgrìobh no cuir ann na tha air d’ aire</string>
+	<string name="content_warning">Rabhadh susbainte</string>
+	<string name="add_image_description">Cuir tuairisgeul ris an dealbh…</string>
+	<string name="retry_upload">Feuch ri luchdadh suas a-rithist</string>
+	<string name="edit_image">Deasaich an dealbh</string>
+	<string name="save">Sàbhail</string>
+	<string name="add_alt_text">Cuir roghainn teacsa ris</string>
+	<string name="alt_text_subtitle">Mìnichidh an roghainn teacsa na dealbhan agad dhan fheadhainn le cion-lèirsinne. Feuch nach bi thu nas mionaidiche na dh’fheumas tu ach an tuigear an co-theacs.</string>
+	<string name="alt_text_hint">can: Cù le coltas amharasach air a’ coimhead an comhair a’ chamara.</string>
+	<string name="visibility_public">Poblach</string>
+	<string name="visibility_followers_only">Luchd-leantainn a-mhàin</string>
+	<string name="visibility_private">Daoine air an dug mi iomradh a-mhàin</string>
+	<string name="search_all">Na h-uile</string>
+	<string name="search_people">Daoine</string>
+	<string name="recent_searches">Na lorg thu o chionn goirid</string>
+	<string name="step_x_of_n">Ceum %1$d à %2$d</string>
+	<string name="skip">Leum thairis air</string>
+	<string name="notification_type_follow">Luchd-leantainn ùr</string>
+	<string name="notification_type_favorite">Annsachdan</string>
+	<string name="notification_type_reblog">Brosnachaidhean</string>
+	<string name="notification_type_mention">Iomraidhean</string>
+	<string name="notification_type_poll">Cunntasan-bheachd</string>
+	<string name="choose_account">Tagh cunntas</string>
+	<string name="err_not_logged_in">Clàraich a-steach do Mhastodon an toiseach</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Chan urrainn dhut còrr is %d cheanglachan meadhain a chur ris</item>
+		<item quantity="two">Chan urrainn dhut còrr is %d cheanglachan meadhain a chur ris</item>
+		<item quantity="few">Chan urrainn dhut còrr is %d ceanglachain meadhain a chur ris</item>
+		<item quantity="other">Chan urrainn dhut còrr is %d ceanglachan meadhain a chur ris</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Cha chuir sinn taic ri seòrsa an fhaidhle %s</string>
+	<string name="media_attachment_too_big">Tha am faidhle %1$s nas motha na a’ chrìoch de %2$s MB</string>
+	<string name="settings_theme">Ùrlar</string>
+	<string name="theme_auto">Fèin-obrachail</string>
+	<string name="theme_light">Soilleir</string>
+	<string name="theme_dark">Dorcha</string>
+	<string name="theme_true_black">Modh dubh dorcha</string>
+	<string name="settings_behavior">Giùlan</string>
+	<string name="settings_gif">Cluich beothachadh nan avataran ’s nan emoji</string>
+	<string name="settings_custom_tabs">Cleachd am brabhsair am broinn na h-aplacaid</string>
+	<string name="settings_notifications">Brathan</string>
+	<string name="notify_me_when">Cuir brath thugam nuair</string>
+	<string name="notify_anyone">a bhios duine sam bith</string>
+	<string name="notify_follower">a bhios neach-leantainn</string>
+	<string name="notify_followed">a bhios cuideigin a leanas mi</string>
+	<string name="notify_none">nach bi duine sam bith</string>
+	<string name="notify_favorites">air post uam a chur ris na h-annsachdan</string>
+	<string name="notify_follow">air mo leantainn</string>
+	<string name="notify_reblog">air post uam a bhrosnachadh</string>
+	<string name="notify_mention">air iomradh a thoirt orm</string>
+	<string name="settings_boring">An earrann ràsanach</string>
+	<string name="settings_account">Roghainnean a’ chunntais</string>
+	<string name="settings_contribute">Cuidich le leasachadh Mastodon</string>
+	<string name="settings_tos">Teirmichean na seirbheise</string>
+	<string name="settings_privacy_policy">Poileasaidh prìobhaideachd</string>
+	<string name="settings_spicy">An earrann inntinneach</string>
+	<string name="settings_clear_cache">Falamhaich tasgadan nam meadhanan</string>
+	<string name="settings_app_version">Mastodon airson Android v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Chaidh tasgadan nam meadhanan fhalamhachadh</string>
+	<string name="confirm_log_out">A bheil thu cinnteach gu bheil thu airson clàradh a-mach?</string>
+	<string name="sensitive_content">Susbaint fhrionasach</string>
+	<string name="sensitive_content_explain">Chuir an t-ùghdar comharra ris a’ mheadhan seo gu bheil e frionasach. Thoir gnogag gus a shealltainn.</string>
+	<string name="media_hidden">Thoir gnogag gus a shealltainn</string>
+	<string name="avatar_description">Tadhail air a’ phròifil aig %s</string>
+	<string name="more_options">Barrachd roghainnean</string>
+	<string name="reveal_content">Nochd an t-susbaint</string>
+	<string name="hide_content">Falaich an t-susbaint</string>
+	<string name="new_post">Post ùr</string>
+	<string name="button_reply">Freagair</string>
+	<string name="button_reblog">Brosnaich</string>
+	<string name="button_favorite">Cuir ris na h-annsachdan</string>
+	<string name="button_share">Co-roinn</string>
+	<string name="media_no_description">Meadhan gun tuairisgeul</string>
+	<string name="add_media">Cuir meadhan ris</string>
+	<string name="add_poll">Cuir cunntas-bheachd ris</string>
+	<string name="emoji">Emoji</string>
+	<string name="post_visibility">Faicsinneachd a’ phuist</string>
+	<string name="home_timeline">Loidhne-ama na dachaighe</string>
+	<string name="my_profile">A’ phròifil agam</string>
+	<string name="media_viewer">Sealladair nam meadhanan</string>
+	<string name="follow_user">Lean %s</string>
+	<string name="unfollowed_user">Chan eil thu a’ leantainn %s tuilleadh</string>
+	<string name="followed_user">Tha thu a’ leantainn %s a-nis</string>
+	<string name="open_in_browser">Fosgail sa bhrabhsair</string>
+	<string name="hide_boosts_from_user">Falaich na brosnachaidhean o %s</string>
+	<string name="show_boosts_from_user">Seall na brosnachaidhean o %s</string>
+	<string name="signup_reason">carson a bu mhiann leat ballrachd fhaighinn?</string>
+	<string name="signup_reason_note">Bidh e nas fhasa dhuinn lèirmheas a dhèanamh air d’ iarrtas.</string>
+	<string name="clear">Falamhaich</string>
+	<string name="profile_header">Dealbh a’ bhanna-chinn</string>
+	<string name="profile_picture">Dealbh na pròifil</string>
+	<string name="reorder">Atharraich an t-òrdugh</string>
+	<string name="download">Luchdaich a-nuas</string>
+	<string name="permission_required">Tha feum air cead</string>
+	<string name="storage_permission_to_download">Feumaidh an aplacaid inntrigeadh dhan stòras agad airson am faidhle seo a shàbhaladh.</string>
+	<string name="open_settings">Fosgail na roghainnean</string>
+	<string name="error_saving_file">Mearachd a’ sàbhaladh an fhaidhle</string>
+	<string name="file_saved">Chaidh am faidhle a shàbhaladh</string>
+	<string name="downloading">’Ga luchdadh a-nuas…</string>
+	<string name="no_app_to_handle_action">Chan eil aplacaid ann a làimhsicheas an gnìomh seo</string>
+	<string name="local_timeline">Coimhearsnachd</string>
+	<string name="trending_posts_info_banner">Seo na postaichean fèillmhor ’nad cheàrnaidh de Mhastodon.</string>
+	<string name="trending_hashtags_info_banner">Seo na tagaichean hais fèillmhor ’nad cheàrnaidh de Mhastodon.</string>
+	<string name="trending_links_info_banner">Seo na naidheachdan a tha ’gan co-roinneadh as trice ’nad cheàrnaidh de Mhastodon.</string>
+	<string name="local_timeline_info_banner">Seo na postaichean as ùire leis na daoine a chleachdas an t-aon fhrithealaiche Mastodon ’s a tha thu fhèin.</string>
+	<string name="dismiss">Leig seachad</string>
+	<string name="see_new_posts">Seall na postaichean ùra</string>
+	<string name="load_missing_posts">Luchdaich postaichean a dhìth</string>
+	<string name="follow_back">Lean air ais</string>
+	<string name="button_follow_pending">Ri dhèiligeadh</string>
+	<string name="follows_you">’Gad leantainn</string>
+	<string name="manually_approves_followers">Ag aontachadh ri luchd-leantainn ùra a làimh</string>
+	<string name="current_account">Cunntas làithreach</string>
+	<string name="log_out_account">Clàraich a-mach %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 neach-leantainn</item>
+		<item quantity="two">%,d luchd-leantainn</item>
+		<item quantity="few">%,d luchd-leantainn</item>
+		<item quantity="other">%,d luchd-leantainn</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%,d ’ga leantainn</item>
+		<item quantity="two">%,d ’ga leantainn</item>
+		<item quantity="few">%,d ’ga leantainn</item>
+		<item quantity="other">%,d ’ga leantainn</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d annsachd</item>
+		<item quantity="two">%,d annsachd</item>
+		<item quantity="few">%,d annsachdan</item>
+		<item quantity="other">%,d annsachd</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d bhrosnachadh</item>
+		<item quantity="two">%,d bhrosnachadh</item>
+		<item quantity="few">%,d brosnachaidhean</item>
+		<item quantity="other">%,d brosnachadh</item>
+	</plurals>
+	<string name="timestamp_via_app">%1$s slighe %2$s</string>
+	<string name="time_now">an-dràsta</string>
+	<string name="post_info_reblogs">Brosnachaidhean</string>
+	<string name="post_info_favorites">Annsachdan</string>
+	<string name="edit_history">Eachdraidh nan deasachaidhean</string>
+	<string name="last_edit_at_x">An deasachadh mu dheireadh %s</string>
+	<string name="time_just_now">an-dràsta fhèin</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="one">%d diog air ais</item>
+		<item quantity="two">%d dhiog air ais</item>
+		<item quantity="few">%d diogan air ais</item>
+		<item quantity="other">%d diog air ais</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="one">%d mhionaid air ais</item>
+		<item quantity="two">%d mhionaid air ais</item>
+		<item quantity="few">%d mionaidean air ais</item>
+		<item quantity="other">%d mionaid air ais</item>
+	</plurals>
+	<string name="edited_timestamp">air a dheasachadh %s</string>
+	<string name="edit_original_post">Am post tùsail</string>
+	<string name="edit_text_edited">Chaidh an teacsa a dheasachadh</string>
+	<string name="edit_spoiler_added">Chaidh rabhadh susbainte a chur ris</string>
+	<string name="edit_spoiler_edited">Chaidh an rabhadh susbainte a dheasachadh</string>
+	<string name="edit_spoiler_removed">Chaidh an rabhadh susbainte a thoirt air falbh</string>
+	<string name="edit_poll_added">Chaidh cunntas-bheachd a chur ris</string>
+	<string name="edit_poll_edited">Chaidh an cunntas-bheachd a dheasachadh</string>
+	<string name="edit_poll_removed">Chaidh an cunntas-bheachd a thoirt air falbh</string>
+	<string name="edit_media_added">Chaidh meadhan a chur ris</string>
+	<string name="edit_media_removed">Chaidh meadhan a thoirt air falbh</string>
+	<string name="edit_media_reordered">Chaidh òrdugh ùr a chur ris na meadhanan</string>
+	<string name="edit_marked_sensitive">Chaidh comharradh gu bheil e frionasach</string>
+	<string name="edit_marked_not_sensitive">Chaidh comharradh nach eil e frionasach</string>
+	<string name="edit_multiple_changed">Chaidh am post a dheasachadh</string>
+	<string name="edit">Deasaich</string>
+	<string name="discard_changes">A bheil thu airson na h-atharraichean a thilgeil air falbh?</string>
+	<string name="upload_failed">Dh’fhàillig leis an luchdadh suas</string>
+	<string name="file_size_bytes">%d baidht</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="file_upload_progress">%1$s à %2$s</string>
+	<string name="file_upload_time_remaining">%s air fhàgail</string>
+	<string name="upload_error_connection_lost">Chaill an t-uidheam agad an ceangal ris an eadar-lìon</string>
+	<string name="upload_processing">’Ga phròiseasadh…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Tha Mastodon airson Android %s deiseil ri luchdadh a-nuas.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Chaidh Mastodon airson Android %s a luchdadh a-nuas is tha e deiseil ri stàladh.</string>
 	<!-- %s is file size -->
+	<string name="download_update">Luchdaich a-nuas (%s)</string>
+	<string name="install_update">Stàlaich</string>
+	<string name="privacy_policy_title">Mastodon is do phrìobhaideachd</string>
+	<string name="privacy_policy_subtitle">Ged nach cruinnich aplacaid Mastodon fhèin dàta sam bith, dh’fhaoidte gu bheil poileasaidh eadar-dhealaichte aig an fhrithealaiche leis a chlàraicheas tu. Gabh mionaid a’ toirt sùil air ’s ag aontachadh ri poileasaidh prìobhaideachd aplacaid Mastodon agus poileasaidh prìobhaideachd an fhrithealaiche agad.</string>
+	<string name="i_agree">Gabhaidh mi ris</string>
+	<string name="empty_list">Tha an liosta seo falamh</string>
 </resources>

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

@@ -3,8 +3,362 @@
 	<string name="get_started">Mulai</string>
 	<string name="log_in">Masuk</string>
 	<string name="next">Selanjutnya</string>
+	<string name="loading_instance">Mendapatkan info instansi…</string>
+	<string name="error">Kesalahan</string>
+	<string name="not_a_mastodon_instance">%s sepertinya bukan instansi Mastodon.</string>
+	<string name="ok">Oke</string>
+	<string name="preparing_auth">Menyiapkan untuk otentikasi…</string>
+	<string name="finishing_auth">Menyelesaikan otentikasi…</string>
+	<string name="user_boosted">%s membagikan</string>
+	<string name="in_reply_to">Membalas ke %s</string>
+	<string name="notifications">Notifikasi</string>
+	<string name="user_followed_you">mengikuti Anda</string>
+	<string name="user_sent_follow_request">mengirim Anda permintaan pengikut</string>
+	<string name="user_favorited">memfavorit kiriman Anda</string>
+	<string name="notification_boosted">membagikan kiriman Anda</string>
+	<string name="poll_ended">pemungutan suara berakhir</string>
+	<string name="time_seconds">%dd</string>
+	<string name="time_minutes">%dm</string>
+	<string name="time_hours">%dj</string>
+	<string name="time_days">%dh</string>
+	<string name="share_toot_title">Bagikan</string>
+	<string name="settings">Pengaturan</string>
+	<string name="publish">Terbitkan</string>
+	<string name="discard_draft">Buang draf?</string>
+	<string name="discard">Buang</string>
+	<string name="cancel">Batal</string>
+	<plurals name="followers">
+		<item quantity="other">pengikut</item>
+	</plurals>
+	<plurals name="following">
+		<item quantity="other">mengikuti</item>
+	</plurals>
+	<plurals name="posts">
+		<item quantity="other">kiriman</item>
+	</plurals>
+	<string name="posts">Kiriman</string>
+	<string name="posts_and_replies">Kiriman dan Balasan</string>
+	<string name="media">Media</string>
+	<string name="profile_about">Tentang</string>
+	<string name="button_follow">Ikuti</string>
+	<string name="button_following">Mengikuti</string>
+	<string name="edit_profile">Sunting Profil</string>
+	<string name="mention_user">Sebutkan %s</string>
+	<string name="share_user">Bagikan %s</string>
+	<string name="mute_user">Bisukan %s</string>
+	<string name="unmute_user">Berhenti membisukan %s</string>
+	<string name="block_user">Blokir %s</string>
+	<string name="unblock_user">Berhenti memblokir %s</string>
+	<string name="report_user">Laporkan %s</string>
+	<string name="block_domain">Blokir %s</string>
+	<string name="unblock_domain">Berhenti memblokir %s</string>
+	<plurals name="x_posts">
+		<item quantity="other">%,d kiriman</item>
+	</plurals>
+	<string name="profile_joined">Bergabung</string>
+	<string name="done">Selesai</string>
+	<string name="loading">Memuat…</string>
+	<string name="field_label">Label</string>
+	<string name="field_content">Konten</string>
+	<string name="saving">Menyimpan…</string>
+	<string name="post_from_user">Kiriman dari %s</string>
+	<string name="poll_option_hint">Opsi %d</string>
+	<plurals name="x_minutes">
+		<item quantity="other">%d menit</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="other">%d jam</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="other">%d hari</item>
+	</plurals>
+	<string name="compose_poll_duration">Durasi: %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="other">Tersisa %d detik</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="other">Tersisa %d menit</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="other">Tersisa %d jam</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="other">Tersisa %d hari</item>
+	</plurals>
+	<plurals name="x_voters">
+		<item quantity="other">%,d pemilih</item>
+	</plurals>
+	<string name="poll_closed">Ditutup</string>
+	<string name="confirm_mute_title">Bisukan Akun</string>
+	<string name="confirm_mute">Konfirmasi membisukan %s</string>
+	<string name="do_mute">Bisukan</string>
+	<string name="confirm_unmute_title">Berhenti Membisukan Akun</string>
+	<string name="confirm_unmute">Konfirmasi berhenti membisukan %s</string>
+	<string name="do_unmute">Berhenti membisukan</string>
+	<string name="confirm_block_title">Blokir Akun</string>
+	<string name="confirm_block_domain_title">Blokir Domain</string>
+	<string name="confirm_block">Konfirmasi memblokir %s</string>
+	<string name="do_block">Blokir</string>
+	<string name="confirm_unblock_title">Berhenti Memblokir Akun</string>
+	<string name="confirm_unblock_domain_title">Berhenti Blokir Domain</string>
+	<string name="confirm_unblock">Konfirmasi berhenti memblokir %s</string>
+	<string name="do_unblock">Berhenti memblokir</string>
+	<string name="button_muted">Dibisukan</string>
+	<string name="button_blocked">Diblokir</string>
+	<string name="action_vote">Pilih</string>
+	<string name="tap_to_reveal">Ketuk untuk melihat</string>
+	<string name="delete">Hapus</string>
+	<string name="confirm_delete_title">Hapus Kiriman</string>
+	<string name="confirm_delete">Apakah Anda yakin untuk menghapus kiriman ini?</string>
+	<string name="deleting">Menghapus…</string>
+	<string name="notification_channel_audio_player">Pemutaran audio</string>
+	<string name="play">Putar</string>
+	<string name="pause">Jeda</string>
+	<string name="log_out">Keluar</string>
+	<string name="add_account">Tambahkan akun</string>
+	<string name="search_hint">Cari</string>
+	<string name="hashtags">Tagar</string>
+	<string name="news">Berita</string>
+	<string name="for_you">Untuk Anda</string>
+	<string name="all_notifications">Semua</string>
+	<string name="mentions">Sebutan</string>
+	<plurals name="x_people_talking">
+		<item quantity="other">%d orang sedang membicarakan</item>
+	</plurals>
+	<plurals name="discussed_x_times">
+		<item quantity="other">Dibahas %d kali</item>
+	</plurals>
+	<string name="report_title">Laporkan %s</string>
+	<string name="report_choose_reason">Ada apa dengan kiriman ini?</string>
+	<string name="report_choose_reason_account">Ada apa dengan %s?</string>
+	<string name="report_choose_reason_subtitle">Pilih alasan yang cocok</string>
+	<string name="report_reason_personal">Saya tidak suka</string>
+	<string name="report_reason_personal_subtitle">Ini bukan hal yang ingin Anda lihat</string>
+	<string name="report_reason_spam">Ini spam</string>
+	<string name="report_reason_spam_subtitle">Tautan berbahaya, interaksi palsu, atau balasan berulang</string>
+	<string name="report_reason_violation">Melanggar ketentuan server</string>
+	<string name="report_reason_violation_subtitle">Anda menyadari bahwa ia melanggar ketentuan tertentu</string>
+	<string name="report_reason_other">Itu sesuatu yang lain</string>
+	<string name="report_reason_other_subtitle">Permasalahan ini tidak sesuai dengan kategori lain</string>
+	<string name="report_choose_rule">Ketentuan manakah yang dilanggar?</string>
+	<string name="report_choose_rule_subtitle">Pilih semua yang berlaku</string>
+	<string name="report_choose_posts">Adakah kiriman yang mendukung pelaporan ini?</string>
+	<string name="report_choose_posts_subtitle">Pilih semua yang berlaku</string>
+	<string name="report_comment_title">Adakah hal lain yang perlu kami ketahui?</string>
+	<string name="report_comment_hint">Komentar tambahan</string>
+	<string name="sending_report">Mengirim laporan…</string>
+	<string name="report_sent_title">Terima kasih atas pelaporan Anda, kami akan memeriksa ini lebih lanjut.</string>
+	<string name="report_sent_subtitle">Saat kami sedang meninjau ini, Anda dapat mengambil tindakan terhadap %s.</string>
+	<string name="unfollow_user">Berhenti mengikuti %s</string>
+	<string name="unfollow">Berhenti mengikuti</string>
+	<string name="mute_user_explain">Anda tidak akan melihat kiriman atau pembagian mereka dalam umpan beranda Anda. Mereka tidak akan tahu bahwa mereka telah dibisukan.</string>
+	<string name="block_user_explain">Mereka tidak akan dapat mengikuti atau melihat kiriman Anda lagi, tetapi mereka dapat melihat jika mereka telah diblokir.</string>
+	<string name="report_personal_title">Tidak ingin melihat ini?</string>
+	<string name="report_personal_subtitle">Ketika Anda melihat sesuatu yang Anda tidak suka di Mastodon, Anda dapat menghapus orang dari pengalaman Anda.</string>
+	<string name="back">Kembali</string>
+	<string name="instance_catalog_title">Mastodon dibuat oleh pengguna di server yang berbeda-beda.</string>
+	<string name="instance_catalog_subtitle">Pilih sebuah server berdasarkan minat atau wilayah Anda, atau yang umum. Anda masih dapat berkomunikasi dengan semua orang, tanpa memedulikan server yang Anda berada.</string>
+	<string name="search_communities">Cari server atau masukkan URL</string>
+	<string name="instance_rules_title">Beberapa aturan dasar</string>
+	<string name="instance_rules_subtitle">Luangkan beberapa menit untuk melihat peraturan yang ditetapkan oleh admin %s.</string>
+	<string name="signup_title">Mari kita siapkan Anda di %s</string>
+	<string name="edit_photo">sunting</string>
+	<string name="display_name">nama tampilan</string>
+	<string name="username">nama pengguna</string>
+	<string name="email">surel</string>
+	<string name="password">kata sandi</string>
+	<string name="password_note">Tambahkan huruf besar, karakter spesial, dan nomor untuk meningkatkan kekuatan kata sandi Anda.</string>
+	<string name="category_academia">Akademisi</string>
+	<string name="category_activism">Aktivisme</string>
+	<string name="category_all">Semua</string>
+	<string name="category_art">Seni</string>
+	<string name="category_food">Makanan</string>
+	<string name="category_furry">Furry</string>
+	<string name="category_games">Permainan</string>
+	<string name="category_general">Umum</string>
+	<string name="category_journalism">Jurnalisme</string>
+	<string name="category_lgbt">LGBT</string>
+	<string name="category_music">Musik</string>
+	<string name="category_regional">Regional</string>
+	<string name="category_tech">Teknologi</string>
+	<string name="confirm_email_title">Satu hal lagi</string>
+	<string name="confirm_email_subtitle">Ketuk tautan yang kami kirim ke Anda melalui surel untuk memverifikasi akun Anda.</string>
+	<string name="resend">Kirim ulang</string>
+	<string name="open_email_app">Buka aplikasi surel</string>
+	<string name="resent_email">Surel konfirmasi terkirim</string>
+	<string name="compose_hint">Ketik atau tempel apa yang Anda pikirkan</string>
+	<string name="content_warning">Peringatan konten</string>
+	<string name="add_image_description">Tambahkan deskripsi gambar…</string>
+	<string name="retry_upload">Unggah kembali</string>
+	<string name="edit_image">Sunting gambar</string>
+	<string name="save">Simpan</string>
+	<string name="add_alt_text">Tambahkan teks alternatif</string>
+	<string name="alt_text_subtitle">Teks alternatif menjelaskan foto Anda kepada orang-orang yang memiliki penglihatan rendah atau tanpa penglihatan. Coba untuk menjelaskan detail yang cukup untuk mengerti konteks.</string>
+	<string name="alt_text_hint">mis. Seekor anjing melihat sekeliling dengan curiga dengan mata menyipit ke arah kamera.</string>
+	<string name="visibility_public">Publik</string>
+	<string name="visibility_followers_only">Pengikut saja</string>
+	<string name="visibility_private">Hanya orang yang saya sebut</string>
+	<string name="search_all">Semua</string>
+	<string name="search_people">Orang</string>
+	<string name="recent_searches">Pencarian terakhir</string>
+	<string name="step_x_of_n">Langkah %1$d dari %2$d</string>
+	<string name="skip">Lewati</string>
+	<string name="notification_type_follow">Pengikut baru</string>
+	<string name="notification_type_favorite">Favorit</string>
+	<string name="notification_type_reblog">Pembagian</string>
+	<string name="notification_type_mention">Sebutan</string>
+	<string name="notification_type_poll">Pemungutan suara</string>
+	<string name="choose_account">Pilih akun</string>
+	<string name="err_not_logged_in">Mohon masuk ke Mastodon terlebih dahulu</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="other">Anda tidak dapat menambahkan lebih dari %d lampiran media</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Berkas %s merupakan jenis yang tidak diketahui</string>
+	<string name="media_attachment_too_big">Berkas %1$s melebihi batasan %2$s MB</string>
+	<string name="settings_theme">Tampilan visual</string>
+	<string name="theme_auto">Otomatis</string>
+	<string name="theme_light">Terang</string>
+	<string name="theme_dark">Gelap</string>
+	<string name="theme_true_black">Mode gelap asli</string>
+	<string name="settings_behavior">Perilaku</string>
+	<string name="settings_gif">Mainkan avatar dan emoji beranimasi</string>
+	<string name="settings_custom_tabs">Gunakan peramban dalam aplikasi</string>
+	<string name="settings_notifications">Notifikasi</string>
+	<string name="notify_me_when">Beri tahu saya ketika</string>
+	<string name="notify_anyone">siapa pun</string>
+	<string name="notify_follower">seorang pengikut</string>
+	<string name="notify_followed">siapa pun yang saya ikuti</string>
+	<string name="notify_none">tidak ada</string>
+	<string name="notify_favorites">Memfavorit kiriman saya</string>
+	<string name="notify_follow">Mengikuti saya</string>
+	<string name="notify_reblog">Membagikan kiriman saya</string>
+	<string name="notify_mention">Menyebut saya</string>
+	<string name="settings_boring">Zona membosankan</string>
+	<string name="settings_account">Pengaturan akun</string>
+	<string name="settings_contribute">Berkontribusi ke Mastodon</string>
+	<string name="settings_tos">Ketentuan layanan</string>
+	<string name="settings_privacy_policy">Kebijakan privasi</string>
+	<string name="settings_spicy">Zona pedas</string>
+	<string name="settings_clear_cache">Hapus tembolok media</string>
+	<string name="settings_app_version">Mastodon for Android v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Tembolok media dihapus</string>
+	<string name="confirm_log_out">Apakah Anda yakin ingin keluar?</string>
+	<string name="sensitive_content">Konten sensitif</string>
+	<string name="sensitive_content_explain">Pengirim telah menandai media ini sebagai sensitif. Ketuk untuk menampilkan.</string>
+	<string name="media_hidden">Ketuk untuk melihat</string>
+	<string name="avatar_description">Pergi ke profil %s</string>
+	<string name="more_options">Opsi lain</string>
+	<string name="reveal_content">Tampilkan konten</string>
+	<string name="hide_content">Sembunyikan konten</string>
+	<string name="new_post">Kiriman baru</string>
+	<string name="button_reply">Balas</string>
+	<string name="button_reblog">Bagikan ke pengikut</string>
+	<string name="button_favorite">Favorit</string>
+	<string name="button_share">Bagikan</string>
+	<string name="media_no_description">Media tanpa deskripsi</string>
+	<string name="add_media">Tambahkan media</string>
+	<string name="add_poll">Tambahkan pemungutan suara</string>
+	<string name="emoji">Emoji</string>
+	<string name="post_visibility">Keterlihatan kiriman</string>
+	<string name="home_timeline">Linimasa beranda</string>
+	<string name="my_profile">Profil saya</string>
+	<string name="media_viewer">Penampil media</string>
+	<string name="follow_user">Ikuti %s</string>
+	<string name="unfollowed_user">Berhenti mengikuti %s</string>
+	<string name="followed_user">Anda sekarang mengikuti %s</string>
+	<string name="open_in_browser">Buka di peramban</string>
+	<string name="hide_boosts_from_user">Sembunyikan pembagian dari %s</string>
+	<string name="show_boosts_from_user">Tampilkan pembagian dari %s</string>
+	<string name="signup_reason">mengapa Anda ingin bergabung?</string>
+	<string name="signup_reason_note">Ini akan membantu kami meninjau aplikasi Anda.</string>
+	<string name="clear">Hapus</string>
+	<string name="profile_header">Gambar tajuk</string>
+	<string name="profile_picture">Foto profil</string>
+	<string name="reorder">Urut ulang</string>
+	<string name="download">Unduh</string>
+	<string name="permission_required">Izin dibutuhkan</string>
+	<string name="storage_permission_to_download">Aplikasi membutuhkan akses ke penyimpanan Anda untuk menyimpan berkas ini.</string>
+	<string name="open_settings">Buka pengaturan</string>
+	<string name="error_saving_file">Kesalahan saat menyimpan berkas</string>
+	<string name="file_saved">Berkas disimpan</string>
+	<string name="downloading">Mengunduh…</string>
+	<string name="no_app_to_handle_action">Tidak ada aplikasi yang dapat menangani tindakan ini</string>
+	<string name="local_timeline">Komunitas</string>
+	<string name="trending_posts_info_banner">Ini adalah kiriman yang mendapatkan daya tarik di sudut Mastodon Anda.</string>
+	<string name="trending_hashtags_info_banner">Ini adalah tagar yang mendapatkan daya tarik di sudut Mastodon Anda.</string>
+	<string name="trending_links_info_banner">Ini adalah kisah berita yang mendapatkan daya tarik di sudut Mastodon Anda.</string>
+	<string name="local_timeline_info_banner">Ini adalah kiriman yang paling terkini oleh orang-orang yang menggunakan server Mastodon yang sama seperti Anda.</string>
+	<string name="dismiss">Abaikan</string>
+	<string name="see_new_posts">Lihat kiriman baru</string>
+	<string name="load_missing_posts">Muat kiriman yang hilang</string>
+	<string name="follow_back">Ikuti Balik</string>
+	<string name="button_follow_pending">Ditunda</string>
+	<string name="follows_you">Mengikuti Anda</string>
+	<string name="manually_approves_followers">Menerima pengikut secara manual</string>
+	<string name="current_account">Akun saat ini</string>
+	<string name="log_out_account">Keluarkan %s</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="other">%,d pengikut</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="other">%,d mengikuti</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="other">%,d favorit</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="other">%,d pembagian</item>
+	</plurals>
+	<string name="timestamp_via_app">%1$s melalui %2$s</string>
+	<string name="time_now">sekarang</string>
+	<string name="post_info_reblogs">Pembagian</string>
+	<string name="post_info_favorites">Favorit</string>
+	<string name="edit_history">Riwayat penyuntingan</string>
+	<string name="last_edit_at_x">Terakhir disunting %s</string>
+	<string name="time_just_now">sekarang</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="other">%d detik yang lalu</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="other">%d menit yang lalu</item>
+	</plurals>
+	<string name="edited_timestamp">disunting %s</string>
+	<string name="edit_original_post">Kiriman asli</string>
+	<string name="edit_text_edited">Teks disunting</string>
+	<string name="edit_spoiler_added">Peringatan konten ditambahkan</string>
+	<string name="edit_spoiler_edited">Peringatan konten disunting</string>
+	<string name="edit_spoiler_removed">Peringatan konten dihapus</string>
+	<string name="edit_poll_added">Pemungutan suara ditambahkan</string>
+	<string name="edit_poll_edited">Pemungutan suara disunting</string>
+	<string name="edit_poll_removed">Pemungutan suara dihapus</string>
+	<string name="edit_media_added">Media ditambahkan</string>
+	<string name="edit_media_removed">Media dihapus</string>
+	<string name="edit_media_reordered">Media diurut ulang</string>
+	<string name="edit_marked_sensitive">Ditandai sebagai sensitif</string>
+	<string name="edit_marked_not_sensitive">Ditandai sebagai tidak sensitif</string>
+	<string name="edit_multiple_changed">Kiriman disunting</string>
+	<string name="edit">Sunting</string>
+	<string name="discard_changes">Buang perubahan?</string>
+	<string name="upload_failed">Unggah gagal</string>
+	<string name="file_size_bytes">%d bita</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 dari %2$s</string>
+	<string name="file_upload_time_remaining">%s tersisa</string>
+	<string name="upload_error_connection_lost">Perangkat Anda kehilangan koneksi internet</string>
+	<string name="upload_processing">Memproses…</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon untuk Android %s siap untuk diunduh.</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Mastodon untuk Android %s telah diunduh dan siap untuk dipasang.</string>
 	<!-- %s is file size -->
+	<string name="download_update">Unduh (%s)</string>
+	<string name="install_update">Pasang</string>
+	<string name="privacy_policy_title">Mastodon dan privasi Anda</string>
+	<string name="privacy_policy_subtitle">Walaupun aplikasi Mastodon tidak mengumpulkan data apa pun, server yang Anda daftar di sana mungkin memiliki kebijakan yang berbeda. Luangkan beberapa menit untuk melihat dan menerima kebijakan privasi aplikasi Mastodon dan kebijakan privasi server Anda.</string>
+	<string name="i_agree">Saya Setuju</string>
+	<string name="empty_list">Daftar ini kosong</string>
+	<string name="instance_signup_closed">Server ini tidak menerima pendaftaran baru.</string>
 </resources>

mastodon/src/main/res/values-is-rIS/strings.xml

@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="get_started">Byrjum á þessu</string>
+	<string name="log_in">Skrá inn</string>
+	<string name="next">Næsta</string>
+	<string name="loading_instance">Næ í upplýsingar um netþjón…</string>
+	<string name="error">Villa</string>
+	<string name="not_a_mastodon_instance">%s lítur ekki út fyrir að vera Mastodon-tilvik.</string>
+	<string name="ok">Í lagi</string>
+	<string name="preparing_auth">Undirbý auðkenningu…</string>
+	<string name="finishing_auth">Lýk auðkenningu…</string>
+	<string name="user_boosted">%s endurbirti</string>
+	<string name="in_reply_to">Sem svar til %s</string>
+	<string name="notifications">Tilkynningar</string>
+	<string name="user_followed_you">fylgdi þér</string>
+	<string name="user_sent_follow_request">sendi þér beiðni um að fylgjast með þér</string>
+	<string name="user_favorited">setti færslu frá þér í eftirlæti</string>
+	<string name="notification_boosted">endurbirti færsluna þína</string>
+	<string name="poll_ended">könnun er lokið</string>
+	<string name="time_seconds">%ds</string>
+	<string name="time_minutes">%dm</string>
+	<string name="time_hours">%dklst</string>
+	<string name="time_days">%dd</string>
+	<string name="share_toot_title">Deila</string>
+	<string name="settings">Stillingar</string>
+	<string name="publish">Birta</string>
+	<string name="discard_draft">Henda drögum?</string>
+	<string name="discard">Henda</string>
+	<string name="cancel">Hætta við</string>
+	<plurals name="followers">
+		<item quantity="one">fylgjandi</item>
+		<item quantity="other">fylgjendur</item>
+	</plurals>
+	<plurals name="following">
+		<item quantity="one">fylgist með</item>
+		<item quantity="other">fylgjast með</item>
+	</plurals>
+	<plurals name="posts">
+		<item quantity="one">færsla</item>
+		<item quantity="other">færslur</item>
+	</plurals>
+	<string name="posts">Færslur</string>
+	<string name="posts_and_replies">Færslur og svör</string>
+	<string name="media">Gagnamiðlar</string>
+	<string name="profile_about">Um hugbúnaðinn</string>
+	<string name="button_follow">Fylgja</string>
+	<string name="button_following">Fylgist með</string>
+	<string name="edit_profile">Breyta notandasniði</string>
+	<string name="mention_user">Minnist á %s</string>
+	<string name="share_user">Deila %s</string>
+	<string name="mute_user">Þagga niður í %s</string>
+	<string name="unmute_user">Afþagga %s</string>
+	<string name="block_user">Útiloka %s</string>
+	<string name="unblock_user">Opna á %s</string>
+	<string name="report_user">Kæra %s</string>
+	<string name="block_domain">Útiloka %s</string>
+	<string name="unblock_domain">Opna á %s</string>
+	<plurals name="x_posts">
+		<item quantity="one">%,d færsla</item>
+		<item quantity="other">%,d færslur</item>
+	</plurals>
+	<string name="profile_joined">Skráði sig</string>
+	<string name="done">Lokið</string>
+	<string name="loading">Hleð inn...</string>
+	<string name="field_label">Skýring</string>
+	<string name="field_content">Efni</string>
+	<string name="saving">Vista…</string>
+	<string name="post_from_user">Færsla frá %s</string>
+	<string name="poll_option_hint">Valkostur %d</string>
+	<plurals name="x_minutes">
+		<item quantity="one">%d mínúta</item>
+		<item quantity="other">%d mínútur</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="one">%d klukkustund</item>
+		<item quantity="other">%d klukkustundir</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="one">%d dagur</item>
+		<item quantity="other">%d dagar</item>
+	</plurals>
+	<string name="compose_poll_duration">Tímalengd: %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="one">%d sekúnda eftir</item>
+		<item quantity="other">%d sekúndur eftir</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="one">%d mínúta eftir</item>
+		<item quantity="other">%d mínútur eftir</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="one">%d klukkustund eftir</item>
+		<item quantity="other">%d klukkustundir eftir</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="one">%d dagur eftir</item>
+		<item quantity="other">%d dagar eftir</item>
+	</plurals>
+	<plurals name="x_voters">
+		<item quantity="one">%,d kjósandi</item>
+		<item quantity="other">%,d kjósendur</item>
+	</plurals>
+	<string name="poll_closed">Lokið</string>
+	<string name="confirm_mute_title">Þagga niður í aðgangi</string>
+	<string name="confirm_mute">Staðfestu til að þagga niður í %s</string>
+	<string name="do_mute">Þagga niður</string>
+	<string name="confirm_unmute_title">Hætta að þagga niður í aðgangi</string>
+	<string name="confirm_unmute">Staðfestu til hætta að að þagga niður í %s</string>
+	<string name="do_unmute">Afþagga</string>
+	<string name="confirm_block_title">Útiloka notandaaðgang</string>
+	<string name="confirm_block_domain_title">Útiloka lén</string>
+	<string name="confirm_block">Staðfestu til að útiloka %s</string>
+	<string name="do_block">Útilokun</string>
+	<string name="confirm_unblock_title">Aflétta útilokun aðgangs</string>
+	<string name="confirm_unblock_domain_title">Aflétta útilokun léns</string>
+	<string name="confirm_unblock">Staðfestu til að hætta að útiloka %s</string>
+	<string name="do_unblock">Aflétta útilokun</string>
+	<string name="button_muted">Þaggað</string>
+	<string name="button_blocked">Útilokað</string>
+	<string name="action_vote">Greiða atkvæði</string>
+	<string name="tap_to_reveal">Ýttu til að birta</string>
+	<string name="delete">Eyða</string>
+	<string name="confirm_delete_title">Eyða færslu</string>
+	<string name="confirm_delete">Ertu viss um að þú viljir eyða þessari færslu?</string>
+	<string name="deleting">Eyði…</string>
+	<string name="notification_channel_audio_player">Afspilun hljóðs</string>
+	<string name="play">Spila</string>
+	<string name="pause">Gera hlé</string>
+	<string name="log_out">Skrá út</string>
+	<string name="add_account">Bæta við notandaaðgangi</string>
+	<string name="search_hint">Leita</string>
+	<string name="hashtags">Myllumerki</string>
+	<string name="news">Fréttir</string>
+	<string name="for_you">Fyrir þig</string>
+	<string name="all_notifications">Allt</string>
+	<string name="mentions">Minnst á</string>
+	<plurals name="x_people_talking">
+		<item quantity="one">%d aðili er að spjalla</item>
+		<item quantity="other">%d manns eru að spjalla</item>
+	</plurals>
+	<plurals name="discussed_x_times">
+		<item quantity="one">Rætt %d sinnum</item>
+		<item quantity="other">Rætt %d sinnum</item>
+	</plurals>
+	<string name="report_title">Kæra %s</string>
+	<string name="report_choose_reason">Hvað er athugavert við þessa færslu?</string>
+	<string name="report_choose_reason_account">Hvað er athugavert við %s?</string>
+	<string name="report_choose_reason_subtitle">Velja bestu samsvörun</string>
+	<string name="report_reason_personal">Mér líkar það ekki</string>
+	<string name="report_reason_personal_subtitle">Þetta er ekki eitthvað sem þið viljið sjá</string>
+	<string name="report_reason_spam">Þetta er ruslpóstur</string>
+	<string name="report_reason_spam_subtitle">Slæmir tenglar, fölsk samskipti eða endurtekin svör</string>
+	<string name="report_reason_violation">Það gengur þvert á reglur fyrir netþjóninn</string>
+	<string name="report_reason_violation_subtitle">Þið eruð meðvituð um að þetta brýtur sértækar reglur</string>
+	<string name="report_reason_other">Það er eitthvað annað</string>
+	<string name="report_reason_other_subtitle">Vandamálið fellur ekki í aðra flokka</string>
+	<string name="report_choose_rule">Hvaða reglur eru brotnar?</string>
+	<string name="report_choose_rule_subtitle">Veldu allt sem á við</string>
+	<string name="report_choose_posts">Eru einhverjar færslur sem styðja þessa kæru?</string>
+	<string name="report_choose_posts_subtitle">Veldu allt sem á við</string>
+	<string name="report_comment_title">Er eitthvað fleira sem við ættum að vita?</string>
+	<string name="report_comment_hint">Aðrar athugasemdir</string>
+	<string name="sending_report">Sendi skýrslu...</string>
+	<string name="report_sent_title">Takk fyrir tilkynninguna, við munum skoða málið.</string>
+	<string name="report_sent_subtitle">Á meðan við yfirförum þetta, geturðu tekið til aðgerða gegn %s.</string>
+	<string name="unfollow_user">Hætta að fylgjast með %s</string>
+	<string name="unfollow">Hætta að fylgjast með</string>
+	<string name="mute_user_explain">Þú munt ekki sjá færslur eða endurbirtingar frá viðkomandi á streyminu þínu. 
+Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</string>
+	<string name="block_user_explain">Viðkomandi mun ekki lengur geta fylgst með eða séð færslurnar þínar, en munu sjá ef viðkomandi hefur verið útilokaður.</string>
+	<string name="report_personal_title">Langar þig ekki til að sjá þetta?</string>
+	<string name="report_personal_subtitle">Þegar þú sér eitthvað á Mastodon sem þér líkar ekki, þá geturðu fjarlægt viðkomandi eintakling úr umhverfinu þínu.</string>
+	<string name="back">Til baka</string>
+	<string name="instance_catalog_title">Mastodon samanstendur af notendum á mismunandi netþjónum.</string>
+	<string name="instance_catalog_subtitle">Veldu netþjón út frá svæðinu þínu, áhugamálum, nú eða einhvern almennan. Þú getur samt spjallað við hvern sem er á Mastodon, burtséð frá á hvaða netþjóni þú ert.</string>
+	<string name="search_communities">Leitaðu að netþjónum eða settu inn slóð</string>
+	<string name="instance_rules_title">Nokkrar grunnreglur</string>
+	<string name="instance_rules_subtitle">Gefðu þér mínútu til að kynna þér reglurnar sem stjórnendur %s munu sjá um að framfylgja.</string>
+	<string name="signup_title">Komum þér í gang á %s</string>
+	<string name="edit_photo">breyta</string>
+	<string name="display_name">birtingarnafn</string>
+	<string name="username">notandanafn</string>
+	<string name="email">tölvupóstur</string>
+	<string name="password">lykilorð</string>
+	<string name="category_academia">Akademískt</string>
+	<string name="category_activism">Aðgerðasinnar</string>
+	<string name="category_all">Allt</string>
+	<string name="category_art">Listir</string>
+	<string name="category_food">Matur</string>
+	<string name="category_furry">Loðið</string>
+	<string name="category_games">Leikir</string>
+	<string name="category_general">Almennt</string>
+	<string name="category_journalism">Blaðamennska</string>
+	<string name="category_lgbt">LGBT</string>
+	<string name="category_music">Tónlist</string>
+	<string name="category_regional">Svæðisbundið</string>
+	<string name="category_tech">Tækni</string>
+	<string name="confirm_email_title">Eitt að lokum</string>
+	<string name="confirm_email_subtitle">Ýttu á tengilinn sem við sendum þér til að staðfesta tölvupóstfangið þitt.</string>
+	<string name="resend">Endursenda</string>
+	<string name="open_email_app">Opna tölvupóstforrit</string>
+	<string name="resent_email">Staðfestingartölvupóstur sendur</string>
+	<string name="compose_hint">Skrifaðu eða límdu það sem þér liggur á hjarta</string>
+	<string name="content_warning">Viðvörun vegna efnis</string>
+	<string name="add_image_description">Bættu við lýsingu á mynd…</string>
+	<string name="retry_upload">Prófa aftur að senda inn</string>
+	<string name="edit_image">Breyta mynd</string>
+	<string name="save">Vista</string>
+	<string name="add_alt_text">Bættu við ALT-texta</string>
+	<string name="visibility_public">Opinbert</string>
+	<string name="visibility_followers_only">Einungis fylgjendur</string>
+	<string name="visibility_private">Einungis fólk sem ég minnist á</string>
+	<string name="search_all">Allt</string>
+	<string name="search_people">Fólk</string>
+	<string name="recent_searches">Nýlegar leitir</string>
+	<string name="step_x_of_n">Skref %1$d af %2$d</string>
+	<string name="skip">Sleppa</string>
+	<string name="notification_type_follow">Nýir fylgjendur</string>
+	<string name="notification_type_favorite">Eftirlæti</string>
+	<string name="notification_type_reblog">Endurbirtingar</string>
+	<string name="notification_type_mention">Minnst á</string>
+	<string name="notification_type_poll">Kannanir</string>
+	<string name="choose_account">Veldu aðgang</string>
+	<string name="err_not_logged_in">Skráðu þig fyrst inn á Mastodon</string>
+	<string name="settings_theme">Útlit</string>
+	<string name="theme_auto">Sjálfvirkt</string>
+	<string name="theme_light">Ljóst</string>
+	<string name="theme_dark">Dökkt</string>
+	<string name="theme_true_black">Sannur svartur hamur</string>
+	<string name="settings_behavior">Hegðun</string>
+	<string name="settings_gif">Spila auðkennismyndir með hreyfingu</string>
+	<string name="settings_notifications">Tilkynningar</string>
+	<string name="notify_me_when">Tilkynna mér þegar</string>
+	<string name="notify_anyone">hver sem er</string>
+	<string name="notify_follower">fylgjandi</string>
+	<string name="notify_followed">einhver sem ég fylgist með</string>
+	<string name="notify_none">enginn</string>
+	<string name="notify_favorites">Setur færsluna mína í eftirlæti</string>
+	<string name="notify_follow">Fylgist með mér</string>
+	<string name="notify_reblog">Endurbirtir færsluna mína</string>
+	<string name="notify_mention">Minnist á mig</string>
+	<string name="settings_boring">Óhressa svæðið</string>
+	<string name="settings_account">Stillingar aðgangs</string>
+	<string name="settings_contribute">Leggðu Mastodon lið</string>
+	<string name="settings_tos">Þjónustuskilmálar</string>
+	<string name="settings_privacy_policy">Persónuvernd</string>
+	<string name="settings_spicy">Kryddaða svæðið</string>
+	<string name="settings_clear_cache">Hreinsa skyndiminni margmiðlunarefnis</string>
+	<string name="settings_app_version">Mastodon fyrir Android útg.%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Skyndiminni margmiðlunarefnis hreinsað</string>
+	<string name="confirm_log_out">Ertu viss um að þú viljir skrá þig út?</string>
+	<string name="sensitive_content">Viðkvæmt efni</string>
+	<string name="media_hidden">Ýttu til að birta</string>
+	<string name="avatar_description">Fara á notandasnið %s</string>
+	<string name="more_options">Fleiri valkostir</string>
+	<string name="reveal_content">Birta efni</string>
+	<string name="hide_content">Fela efni</string>
+	<string name="new_post">Ný færsla</string>
+	<string name="button_reply">Svara</string>
+	<string name="button_reblog">Endurbirta</string>
+	<string name="button_favorite">Eftirlæti</string>
+	<string name="button_share">Deila</string>
+	<string name="media_no_description">Myndefni án lýsingar</string>
+	<string name="add_media">Bæta við myndefni</string>
+	<string name="add_poll">Bæta við könnun</string>
+	<string name="emoji">Tjáningartákn</string>
+	<string name="post_visibility">Sýnileiki færslu</string>
+	<string name="home_timeline">Eigin tímalína</string>
+	<string name="my_profile">Notandasniðið mitt</string>
+	<string name="media_viewer">Skoðari fyrir myndefni</string>
+	<string name="follow_user">Fylgjast með %s</string>
+	<string name="unfollowed_user">Hætti að fylgjast með %s</string>
+	<string name="followed_user">Þú fylgist núna með %s</string>
+	<string name="open_in_browser">Opna í vafra</string>
+	<string name="hide_boosts_from_user">Fela endurbirtingar frá %s</string>
+	<string name="show_boosts_from_user">Sýna endurbirtingar frá %s</string>
+	<string name="signup_reason">hvers vegna vilt þú taka þátt?</string>
+	<string name="signup_reason_note">Þetta mun hjálpa okkur við að yfirfara umsóknina þína.</string>
+	<string name="clear">Hreinsa</string>
+	<string name="profile_header">Mynd í síðuhaus</string>
+	<string name="profile_picture">Notandamynd</string>
+	<string name="reorder">Endurraða</string>
+	<string name="download">Sækja</string>
+	<string name="permission_required">Krafist er heimildar</string>
+	<string name="open_settings">Opna stillingar</string>
+	<string name="error_saving_file">Villa við að vista skrána</string>
+	<string name="file_saved">Skrá vistuð</string>
+	<string name="downloading">Sæki…</string>
+	<string name="no_app_to_handle_action">Ekkert forrit fannst sem getur meðhöndlað þessa aðgerð</string>
+	<string name="local_timeline">Samfélag</string>
+	<string name="trending_posts_info_banner">Þetta eru færslurnar sem eru að fá aukna athygli í þínu horni á Mastodon.</string>
+	<string name="trending_hashtags_info_banner">Þetta eru myllumerkin sem eru að fá aukna athygli í þínu horni á Mastodon.</string>
+	<string name="trending_links_info_banner">Þetta eru fréttirnar sem eru að fá aukna athygli í þínu horni á Mastodon.</string>
+	<string name="dismiss">Afgreiða</string>
+	<string name="see_new_posts">Skoða nýjar færslur</string>
+	<string name="load_missing_posts">Hlaða inn færslum sem vantar</string>
+	<string name="follow_back">Fylgjast með til baka</string>
+	<string name="button_follow_pending">Í bið</string>
+	<string name="follows_you">Fylgist með þér</string>
+	<string name="manually_approves_followers">Samþykkir fylgjendur handvirkt</string>
+	<string name="current_account">Núverandi notandaaðgangur</string>
+	<string name="log_out_account">Skrá út %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 fylgjandi</item>
+		<item quantity="other">%,d fylgjendur</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%,d fylgist með</item>
+		<item quantity="other">%,d fylgjast með</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d eftirlæti</item>
+		<item quantity="other">%,d eftirlæti</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d Eendurbirting</item>
+		<item quantity="other">%,d endurbirtingar</item>
+	</plurals>
+	<string name="timestamp_via_app">%1$s með %2$s</string>
+	<string name="time_now">núna</string>
+	<string name="post_info_reblogs">Endurbirtingar</string>
+	<string name="post_info_favorites">Eftirlæti</string>
+	<string name="edit_history">Breytingaferill</string>
+	<string name="last_edit_at_x">Síðasta breyting %s</string>
+	<string name="time_just_now">rétt í þessu</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="one">fyrir %d sekúndu síðan</item>
+		<item quantity="other">fyrir %d sekúndum síðan</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="one">fyrir %d mínútu síðan</item>
+		<item quantity="other">fyrir %d mínútum síðan</item>
+	</plurals>
+	<string name="edited_timestamp">breytti %s</string>
+	<string name="edit_original_post">Upprunaleg færsla</string>
+	<string name="edit_text_edited">Texta breytt</string>
+	<string name="edit_spoiler_added">Bætt við viðvörun vegna efnis</string>
+	<string name="edit_spoiler_edited">Viðvörun vegna efnis breytt</string>
+	<string name="edit_spoiler_removed">Viðvörun vegna efnis fjarlægð</string>
+	<string name="edit_poll_added">Könnun bætt við</string>
+	<string name="edit_poll_edited">Könnun breytt</string>
+	<string name="edit_poll_removed">Könnun fjarlægð</string>
+	<string name="edit_media_added">Myndefni bætt við</string>
+	<string name="edit_media_removed">Myndefni fjarlægt</string>
+	<string name="edit_media_reordered">Myndefni endurraðað</string>
+	<string name="edit_marked_sensitive">Merkt sem viðkvæmt</string>
+	<string name="edit_marked_not_sensitive">Merkt sem ekki viðkvæmt</string>
+	<string name="edit_multiple_changed">Færslu breytt</string>
+	<string name="edit">Breyta</string>
+	<string name="discard_changes">Henda breytingum?</string>
+	<string name="upload_failed">Innsending mistókst</string>
+	<string name="file_size_bytes">%d bæti</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 af %2$s</string>
+	<string name="file_upload_time_remaining">%s eftir</string>
+	<string name="upload_error_connection_lost">Tækið þitt missti tenginguna við internetið</string>
+	<string name="upload_processing">Í vinnslu…</string>
+	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">Mastodon fyrir Android %s er tilbúið til niðurhals.</string>
+	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">Búið er að sækja Mastodon fyrir Android %s og má setja upp.</string>
+	<!-- %s is file size -->
+	<string name="download_update">Sækja (%s)</string>
+	<string name="install_update">Setja upp</string>
+	<string name="privacy_policy_title">Mastodon og friðhelgi þín</string>
+	<string name="i_agree">Ég samþykki</string>
+	<string name="empty_list">Þessi listi er tómur</string>
+	<string name="instance_signup_closed">Þessi netþjónn tekur ekki við nýjum skráningum.</string>
+</resources>

mastodon/src/main/res/values-it-rIT/strings.xml

@@ -380,4 +380,6 @@
 	<string name="privacy_policy_title">Mastodon e la tua privacy</string>
 	<string name="privacy_policy_subtitle">Sebbene l\'app Mastodon non raccolga alcun dato, il server tramite il quale ti iscrivi potrebbe avere una politica diversa. Prenditi un minuto per rivedere e accettare l\'informativa sulla privacy dell\'app Mastodon e l\'informativa sulla privacy del tuo server.</string>
 	<string name="i_agree">Accetto</string>
+	<string name="empty_list">Questo elenco è vuoto</string>
+	<string name="instance_signup_closed">Questo server non accetta nuove registrazioni.</string>
 </resources>

mastodon/src/main/res/values-ja-rJP/strings.xml

@@ -61,7 +61,7 @@
 	<string name="field_label">ラベル</string>
 	<string name="field_content">コンテンツ</string>
 	<string name="saving">保存中…</string>
-	<string name="post_from_user">%s さんの投稿</string>
+	<string name="post_from_user">%sさんの投稿</string>
 	<string name="poll_option_hint">オプション %d</string>
 	<plurals name="x_minutes">
 		<item quantity="other">%d分</item>
@@ -90,10 +90,10 @@
 	</plurals>
 	<string name="poll_closed">閉じる</string>
 	<string name="confirm_mute_title">アカウントをミュート</string>
-	<string name="confirm_mute">本当に %s さんをミュートしますか？</string>
+	<string name="confirm_mute">本当に%sさんをミュートしますか？</string>
 	<string name="do_mute">ミュート</string>
 	<string name="confirm_unmute_title">アカウントのミュートを解除</string>
-	<string name="confirm_unmute">本当に %s さんをミュート解除しますか？</string>
+	<string name="confirm_unmute">本当に%sさんをミュート解除しますか？</string>
 	<string name="do_unmute">ミュート解除</string>
 	<string name="confirm_block_title">アカウントをブロックする</string>
 	<string name="confirm_block_domain_title">このドメインをブロックする</string>
@@ -128,9 +128,9 @@
 	<plurals name="discussed_x_times">
 		<item quantity="other">%d 回ディスカッションしました</item>
 	</plurals>
-	<string name="report_title">%s さんを報告する</string>
+	<string name="report_title">%sさんを報告する</string>
 	<string name="report_choose_reason">この投稿のどこが問題ですか？</string>
-	<string name="report_choose_reason_account">%s さんのどこが問題ですか？</string>
+	<string name="report_choose_reason_account">%sさんのどこが問題ですか？</string>
 	<string name="report_choose_reason_subtitle">最も近いものを選んでください</string>
 	<string name="report_reason_personal">興味がありません</string>
 	<string name="report_reason_personal_subtitle">あなたが見たくない場合</string>
@@ -148,8 +148,8 @@
 	<string name="report_comment_hint">追加コメント</string>
 	<string name="sending_report">レポートを送信しています...</string>
 	<string name="report_sent_title">ご報告ありがとうございます、追って確認します。</string>
-	<string name="report_sent_subtitle">私たちが確認している間でも、あなたは $s さんに対して対応することができます。</string>
-	<string name="unfollow_user">フォロー解除 %s</string>
+	<string name="report_sent_subtitle">私たちが確認している間でも、あなたは%sさんに対して対応することができます。</string>
+	<string name="unfollow_user">フォロー解除%s</string>
 	<string name="unfollow">フォロー解除</string>
 	<string name="mute_user_explain">ホームに投稿やブーストは表示されなくなりますが、相手にミュートしたことは伝わりません。</string>
 	<string name="block_user_explain">相手はあなたの投稿を見ることやフォローすることは出来ません。相手はブロックされていることはわかります。</string>
@@ -263,9 +263,9 @@
 	<string name="home_timeline">ホームタイムライン</string>
 	<string name="my_profile">プロフィール</string>
 	<string name="media_viewer">メディアビューアー</string>
-	<string name="follow_user">フォロー %s</string>
-	<string name="unfollowed_user">フォロー解除 %s</string>
-	<string name="followed_user">%s さんをフォローしました</string>
+	<string name="follow_user">フォロー%s</string>
+	<string name="unfollowed_user">フォロー解除%s</string>
+	<string name="followed_user">%sさんをフォローしました</string>
 	<string name="open_in_browser">ブラウザで開く</string>
 	<string name="hide_boosts_from_user">%sさんのブーストを非表示</string>
 	<string name="show_boosts_from_user">%sさんのブーストを表示</string>
@@ -302,7 +302,7 @@
 		<item quantity="other">%,d フォロワー</item>
 	</plurals>
 	<plurals name="x_following">
-		<item quantity="other">%,d フォロー中</item>
+		<item quantity="other">%,dフォロー中</item>
 	</plurals>
 	<plurals name="x_favorites">
 		<item quantity="other">%,d お気に入り</item>
@@ -359,4 +359,5 @@
 	<string name="privacy_policy_title">Mastodonとあなたのプライバシー</string>
 	<string name="privacy_policy_subtitle">Mastodonアプリはいかなるデータも収集しませんが、サインアップするサーバーは別のポリシーを持っている場合があります。Mastodonアプリのプライバシーポリシーとサーバーのプライバシーポリシーを確認をし、同意してください。</string>
 	<string name="i_agree">同意する</string>
+	<string name="empty_list">このリストは空です。</string>
 </resources>

mastodon/src/main/res/values-kab/strings.xml

@@ -309,6 +309,7 @@
 	<string name="post_info_favorites">Imenyafen</string>
 	<string name="time_just_now">tura kan</string>
 	<string name="edit">Ẓreg</string>
+	<string name="file_upload_time_remaining">%s i d-yeqqimen</string>
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->

mastodon/src/main/res/values-ko-rKR/strings.xml

@@ -38,6 +38,7 @@
 	</plurals>
 	<string name="posts">게시물</string>
 	<string name="posts_and_replies">게시물과 답장</string>
+	<string name="pinned_posts">고정됨</string>
 	<string name="media">미디어</string>
 	<string name="profile_about">정보</string>
 	<string name="button_follow">팔로우</string>
@@ -108,9 +109,20 @@
 	<string name="action_vote">투표</string>
 	<string name="tap_to_reveal">눌러서 확인</string>
 	<string name="delete">삭제</string>
+	<string name="delete_and_redraft">삭제하고 다시 쓰기</string>
 	<string name="confirm_delete_title">게시물 삭제</string>
+	<string name="confirm_delete_and_redraft_title">게시물 삭제하고 다시 쓰기</string>
 	<string name="confirm_delete">정말로 이 게시물을 삭제하시겠습니까?</string>
+	<string name="confirm_delete_and_redraft">정말로 이 게시물을 삭제하고 다시 쓰시겠습니까?</string>
 	<string name="deleting">삭제 중…</string>
+	<string name="pin_post">고정</string>
+	<string name="confirm_pin_post_title">게시물 고정</string>
+	<string name="confirm_pin_post">정말로 이 게시물을 고정하시겠습니까?</string>
+	<string name="pinning">고정 중…</string>
+	<string name="unpin_post">고정 해제</string>
+	<string name="confirm_unpin_post_title">게시물 고정 해제</string>
+	<string name="confirm_unpin_post">정말로 이 게시물을 고정 해제하시겠습니까?</string>
+	<string name="unpinning">고정 해제 중…</string>
 	<string name="notification_channel_audio_player">오디오 재생</string>
 	<string name="play">재생</string>
 	<string name="pause">일시정지</string>
@@ -189,6 +201,7 @@
 	<string name="compose_hint">무슨 생각을 하고 있는지 입력하거나 붙여넣으세요</string>
 	<string name="content_warning">열람 주의</string>
 	<string name="add_image_description">이미지 설명 추가…</string>
+	<string name="image_description">이미지 설명</string>
 	<string name="retry_upload">업로드 재시도</string>
 	<string name="edit_image">이미지 편집</string>
 	<string name="save">저장</string>
@@ -196,6 +209,7 @@
 	<string name="alt_text_subtitle">대체 텍스트는 저시력자나 시각장애인들에게 당신의 사진을 설명합니다. 문맥을 파악할 수 있는 설명들만 넣도록 하세요.</string>
 	<string name="alt_text_hint">예시: 강아지가 의심스러운 가는 눈초리로 카메라를 쳐다보고 있습니다.</string>
 	<string name="visibility_public">공개</string>
+	<string name="visibility_unlisted">타임라인에 비표시</string>
 	<string name="visibility_followers_only">팔로워 전용</string>
 	<string name="visibility_private">멘션한 사람만</string>
 	<string name="search_all">모두</string>
@@ -221,8 +235,12 @@
 	<string name="theme_dark">어두움</string>
 	<string name="theme_true_black">진정한 검정 모드</string>
 	<string name="settings_behavior">동작</string>
+	<string name="settings_show_replies">답장 표시</string>
+	<string name="settings_show_boosts">리블로그 표시</string>
+	<string name="settings_load_new_posts">자동으로 새 포스트 불러오기</string>
 	<string name="settings_gif">아바타와 에모지의 애니메이션을 재생</string>
 	<string name="settings_custom_tabs">앱내 브라우저 사용</string>
+	<string name="settings_show_interaction_counts">상호 작용 수 표시</string>
 	<string name="settings_notifications">알림</string>
 	<string name="notify_me_when">알림을 보낼 조건</string>
 	<string name="notify_anyone">누구든</string>
@@ -255,8 +273,11 @@
 	<string name="button_reblog">리블로그</string>
 	<string name="button_favorite">좋아요</string>
 	<string name="button_share">공유</string>
+	<string name="button_bookmark">보관</string>
+	<string name="bookmarks">보관함</string>
 	<string name="media_no_description">설명이 없는 미디어</string>
 	<string name="add_media">미디어 추가</string>
+	<string name="mark_media_as_sensitive">미디어를 민감함으로 설정하기</string>
 	<string name="add_poll">투표 추가</string>
 	<string name="emoji">에모지</string>
 	<string name="post_visibility">게시물 공개범위</string>
@@ -269,6 +290,8 @@
 	<string name="open_in_browser">브라우저에서 열기</string>
 	<string name="hide_boosts_from_user">%s의 리블로그를 숨기기</string>
 	<string name="show_boosts_from_user">%s의 리블로그를 보이기</string>
+	<string name="user_post_notifications_on">%s의 게시물 알림 켜기</string>
+	<string name="user_post_notifications_off">%s의 게시물 알림 끄기</string>
 	<string name="signup_reason">가입하려는 이유가 무엇인가요?</string>
 	<string name="signup_reason_note">이 정보는 우리가 심사를 하는 데에 참고할 수 있습니다.</string>
 	<string name="clear">모두 지우기</string>
@@ -283,11 +306,13 @@
 	<string name="file_saved">파일 저장됨</string>
 	<string name="downloading">다운로드중…</string>
 	<string name="no_app_to_handle_action">이 동작을 처리할 앱이 없습니다</string>
-	<string name="local_timeline">커뮤니티</string>
+	<string name="local_timeline">로컬</string>
+	<string name="federated_timeline">연합</string>
 	<string name="trending_posts_info_banner">당신이 속한 마스토돈 서버에서 관심을 끌고 있는 게시물들입니다.</string>
 	<string name="trending_hashtags_info_banner">당신이 속한 마스토돈 서버에서 관심을 끌고 있는 해시태그들입니다.</string>
 	<string name="trending_links_info_banner">당신이 속한 마스토돈 서버에서 가장 많이 공유되고 있는 소식들입니다.</string>
 	<string name="local_timeline_info_banner">당신과 같은 마스토돈 서버에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
+	<string name="federated_timeline_info_banner">당신이 속한 연합에 존재하는 사람들이 공유한 최신 게시물들입니다.</string>
 	<string name="dismiss">지우기</string>
 	<string name="see_new_posts">새 게시물 보기</string>
 	<string name="load_missing_posts">빈 게시물 불러오기</string>
@@ -356,6 +381,19 @@
 	<!-- %s is file size -->
 	<string name="download_update">다운로드 (%s)</string>
 	<string name="install_update">설치</string>
+	<string name="check_for_update">업데이트 확인</string>
+	<string name="no_update_available">사용 가능한 업데이트 없음</string>
 	<string name="privacy_policy_title">마스토돈 및 개인정보</string>
+	<string name="privacy_policy_subtitle">마스토돈 앱은 아무런 데이터도 수집하지 않지만, 가입한 서버의 정책은 다를 수도 있습니다. 잠시 시간을 들여 마스토돈 앱과 서버의 개인정보 정책을 확인한 후 동의해 주세요.</string>
 	<string name="i_agree">동의합니다</string>
+	<string name="list_timelines">리스트</string>
+	<string name="favorited_posts">좋아요</string>
+	<string name="follow_requests">팔로우 요청</string>
+	<string name="accept_follow_request">팔로우 요청 허가</string>
+	<string name="reject_follow_request">팔로우 요청 거부</string>
+	<string name="lists_with_user">%s 님이 포함된 리스트</string>
+	<string name="settings_always_reveal_content_warnings">열람주의 툿을 항상 펼치기</string>
+	<string name="disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
+	<string name="empty_list">리스트에 아무 것도 없습니다</string>
+	<string name="instance_signup_closed">이 서버는 가입이 막혀 있는 상태입니다.</string>
 </resources>

mastodon/src/main/res/values-nl-rNL/strings.xml

@@ -378,5 +378,7 @@
 	<string name="download_update">Downloaden (%s)</string>
 	<string name="install_update">Installeren</string>
 	<string name="privacy_policy_title">Mastodon en jouw privacy</string>
+	<string name="privacy_policy_subtitle">Hoewel de Mastodon-app geen gegevens verzamelt, kan de server die je aanmeldt een ander beleid hebben. Neem even de tijd om het privacybeleid van de Mastodon-app en het privacybeleid van de server te bekijken en hiermee akkoord te gaan.</string>
 	<string name="i_agree">Ik ga akkoord</string>
+	<string name="empty_list">Deze lijst is leeg</string>
 </resources>

mastodon/src/main/res/values-pl-rPL/strings.xml

@@ -157,7 +157,7 @@
 	<string name="news">Aktualności</string>
 	<string name="for_you">Dla Ciebie</string>
 	<string name="all_notifications">Wszystkie</string>
-	<string name="mentions">Wspomienia</string>
+	<string name="mentions">Wspomnienia</string>
 	<plurals name="x_people_talking">
 		<item quantity="one">%d mówi o tym</item>
 		<item quantity="few">%d osoby mówią o tym</item>
@@ -422,4 +422,5 @@
 	<string name="privacy_policy_title">Mastodon i Twoja prywatność</string>
 	<string name="privacy_policy_subtitle">Choć aplikacja Mastodona nie zbiera żadnych danych na Twój temat, serwer na którym się rejestrujesz może działać zgodnie z inną polityką. Poświęć chwilę na przejrzenie i akceptację polityki prywatności aplikacji Mastodona oraz Twojego serwera.</string>
 	<string name="i_agree">Wyrażam zgodę</string>
+	<string name="empty_list">Lista jest pusta</string>
 </resources>

mastodon/src/main/res/values-pt-rBR/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Comece já</string>
-	<string name="log_in">Entrar</string>
+	<string name="get_started">Vamos começar</string>
+	<string name="log_in">Iniciar sessão</string>
 	<string name="next">Próximo</string>
 	<string name="loading_instance">Obtendo informações da instância…</string>
 	<string name="error">Erro</string>
@@ -380,4 +380,6 @@
 	<string name="privacy_policy_title">Mastodon e sua privacidade</string>
 	<string name="privacy_policy_subtitle">Embora o aplicativo Mastodon não colete nenhum dado, o servidor que você se inscrever pode ter uma política diferente. Dedique um minuto para revisar e aceitar a política de privacidade do aplicativo Mastodon e a política de privacidade do seu servidor.</string>
 	<string name="i_agree">Eu concordo</string>
+	<string name="empty_list">Essa lista está vazia</string>
+	<string name="instance_signup_closed">Este servidor não aceita novos registros.</string>
 </resources>

mastodon/src/main/res/values-ro-rRO/strings.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="get_started">Să începem</string>
+	<string name="log_in">Conectează-te</string>
+	<string name="next">Înainte</string>
+	<string name="loading_instance">Se obțin informațiile instanței…</string>
+	<string name="error">Eroare</string>
+	<string name="not_a_mastodon_instance">%s nu pare a fi o instanță pentru Mastodon.</string>
+	<string name="ok">OK</string>
+	<string name="preparing_auth">Se pregătește autentificarea…</string>
+	<string name="finishing_auth">Finalizare autentificare…</string>
+	<string name="user_boosted">%s au impulsionat</string>
+	<string name="in_reply_to">Ca răspuns la %s</string>
+	<string name="notifications">Notificări</string>
+	<string name="user_followed_you">te urmărește</string>
+	<string name="user_sent_follow_request">ți-a trimis o cerere de urmărire</string>
+	<string name="user_favorited">ți-a preferat postarea</string>
+	<string name="notification_boosted">a impulsionat postarea ta</string>
+	<string name="poll_ended">sondaj terminat</string>
+	<string name="time_seconds">%ds</string>
+	<string name="time_minutes">%dm</string>
+	<string name="time_hours">%do</string>
+	<string name="time_days">%dz</string>
+	<string name="share_toot_title">Distribuie</string>
+	<string name="settings">Setări</string>
+	<string name="publish">Publică</string>
+	<string name="discard_draft">Renunțați la ciornă?</string>
+	<string name="discard">Renunță</string>
+	<string name="cancel">Anulează</string>
+	<string name="posts">Postări</string>
+	<string name="posts_and_replies">Postări și răspunsuri</string>
+	<string name="media">Media</string>
+	<string name="profile_about">Despre</string>
+	<string name="button_follow">Urmărește</string>
+	<string name="button_following">Urmăriți</string>
+	<string name="edit_profile">Editare profil</string>
+	<string name="mention_user">Menționează pe %s</string>
+	<string name="share_user">Distribuie %s</string>
+	<string name="mute_user">Amuțește %s</string>
+	<string name="unmute_user">Demutizează %s</string>
+	<string name="block_user">Blochează %s</string>
+	<string name="unblock_user">Deblochează %s</string>
+	<string name="report_user">Raportează %s</string>
+	<string name="block_domain">Blochează %s</string>
+	<string name="unblock_domain">Deblochează %s</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>