Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream

2023-09-29 20:59:12 +02:00
parent c261214e49 a00afd5d7f
commit 4ee229ea79
99 changed files with 1804 additions and 177 deletions
--- a/mastodon/src/main/res/values-si-rLK/strings.xml
+++ b/mastodon/src/main/res/values-si-rLK/strings.xml
@@ -75,4 +75,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>