Merge remote-tracking branch 'upstream/master'

This commit is contained in:
sk
2023-08-23 20:02:06 +02:00
15 changed files with 1147 additions and 126 deletions

View File

@@ -393,7 +393,7 @@
<string name="welcome_to_mastodon">Welcome to Mastodon</string>
<string name="welcome_paragraph1">Mastodon is a decentralized social network, meaning no single company controls it. Its made up of many independently-run servers, all connected together.</string>
<string name="what_are_servers">What are servers?</string>
<string name="welcome_paragraph2"><![CDATA[Every Mastodon account is hosted on a server — each with its own values, rules, & admins. No matter which one you pick, you can follow and interact with people on any server.]]></string>
<string name="welcome_paragraph2">Every Mastodon account is hosted on a server — each with its own values, rules, &amp; admins. No matter which one you pick, you can follow and interact with people on any server.</string>
<string name="opening_link">Opening link…</string>
<string name="link_not_supported">This link is not supported in the app</string>
<string name="log_out_all_accounts">Log out of all accounts</string>