Merge remote-tracking branch 'upstream/l10n_master'

mastodon/src/main/res/values-si-rLK/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">පටන් ගන්න</string>
 	<string name="log_in">පිවිසෙන්න</string>
 	<string name="next">ඊළඟ</string>
 	<string name="error">දෝෂයකි</string>
@@ -59,6 +58,7 @@
 	<string name="report_title">%s වාර්තාව</string>
 	<string name="report_reason_personal">මම එයට අකැමතියි</string>
 	<string name="report_reason_spam">එය අයාචිතයකි</string>
+	<!-- %s is the email address -->
 	<string name="local_timeline">ප්‍රජාව</string>
 	<string name="log_out_account">%s නික්මෙන්න</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
@@ -75,4 +75,7 @@
 	<string name="download_update">බාගන්න (%s)</string>
 	<string name="install_update">ස්ථාපනය</string>
 	<string name="i_agree">මම එකඟයි</string>
+	<!-- %s is server domain -->
+	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
 </resources>