Merge remote-tracking branch 'origin/upstream' into fork

This commit is contained in:
sk
2022-11-02 20:22:33 +01:00
47 changed files with 1170 additions and 196 deletions

View File

@@ -402,4 +402,7 @@
<!-- %s is file size -->
<string name="download_update">Download (%s)</string>
<string name="install_update">Install</string>
<string name="privacy_policy_title">Mastodon and your privacy</string>
<string name="privacy_policy_subtitle">Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server\'s privacy policy.</string>
<string name="i_agree">I Agree</string>
</resources>