Merge remote-tracking branch 'upstream/master'

This commit is contained in:
sk
2023-05-13 15:15:00 +02:00
23 changed files with 820 additions and 62 deletions

View File

@@ -445,7 +445,7 @@
<string name="show">Show</string>
<string name="hide">Hide</string>
<string name="join_default_server">Join %s</string>
<string name="pick_server">Pick my own server</string>
<string name="pick_server">Pick another server</string>
<string name="signup_or_login">or</string>
<string name="learn_more">Learn more</string>
<string name="welcome_to_mastodon">Welcome to Mastodon</string>