Merge branch 'l10n_master'

mastodon/src/main/res/values-tr-rTR/strings.xml

@@ -596,7 +596,7 @@
 		<item quantity="other">%d katılımcılar</item>
 	</plurals>
 	<plurals name="x_posts_today">
-		<item quantity="one">%,bunu gönder</item>
-		<item quantity="other">%,bunları gönder</item>
+		<item quantity="one">%,d bunu gönder</item>
+		<item quantity="other">%,d bunları gönder</item>
 	</plurals>
 </resources>

mastodon/src/main/res/values-zh-rTW/strings.xml

@@ -559,6 +559,9 @@
 	<string name="post_translated">透過 %2$s 翻譯 %1$s</string>
 	<string name="translation_show_original">顯示原文</string>
 	<string name="translation_failed">翻譯失敗。也許管理員未於此伺服器啟用翻譯功能，或此伺服器為未支援翻譯功能之舊版本 Mastodon。</string>
+	<string name="settings_privacy">隱私權及觸及</string>
+	<string name="settings_discoverable">於探索演算法中推薦個人檔案及嘟文</string>
+	<string name="settings_indexable">允許公開嘟文顯示於搜尋結果中</string>
 	<plurals name="x_participants">
 		<item quantity="other">%,d 位參與者</item>
 	</plurals>