Merge remote-tracking branch 'megalodon_main/main'

# Conflicts: # mastodon/build.gradle # mastodon/src/main/res/layout/fragment_compose.xml
2023-10-13 11:16:10 -03:00
parent 767312f71c 83786171a7
commit 4107169c73
63 changed files with 400 additions and 55 deletions
--- a/mastodon/src/main/res/values-tr-rTR/strings.xml
+++ b/mastodon/src/main/res/values-tr-rTR/strings.xml
@@ -599,4 +599,7 @@
 		<item quantity="one">%,d bunu gönder</item>
 		<item quantity="other">%,d bunları gönder</item>
 	</plurals>
+	<!-- Screen reader description for the menu on the home timeline screen -->
+	<!-- %s is the name of the list -->
+	<!-- %s is a username -->
 </resources>