Merge remote-tracking branch 'megalodon_main/main' into m3-merger

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-ru-rRU/strings_sk.xml
#	metadata/ru/full_description.txt

mastodon/src/main/res/values-vi-rVN/strings.xml

@@ -78,7 +78,7 @@
 	<plurals name="x_votes">
 		<item quantity="other">%,d người bình chọn</item>
 	</plurals>
-	<string name="poll_closed">Kết thúc</string>
+	<string name="poll_closed">Đóng</string>
 	<string name="confirm_mute_title">Ẩn người này</string>
 	<string name="confirm_mute">Bạn muốn ẩn %s?</string>
 	<string name="do_mute">Ẩn</string>
@@ -219,7 +219,7 @@
 	<string name="add_media">Thêm media</string>
 	<string name="add_poll">Tạo bình chọn</string>
 	<string name="emoji">Emoji</string>
-	<string name="home_timeline">Bảng tin</string>
+	<string name="home_timeline">Trang chính</string>
 	<string name="my_profile">Hồ sơ của tôi</string>
 	<string name="media_viewer">Xem media</string>
 	<string name="follow_user">Theo dõi %s</string>