owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'list-timeline-views' into fork

Browse Source
This commit is contained in:
sk
2022-11-11 03:06:55 +01:00
parent eff6cc3e17 679ede1124
commit 9283ca8878
11 changed files with 292 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/res/values/ids.xml
View File

@@ -14,6 +14,7 @@
<item name="discover_users" type="id"/>
<item name="discover_local_timeline" type="id"/>
<item name="discover_federated_timeline" type="id"/>
<item name="discover_lists" type="id"/>
<item name="notifications_all" type="id"/>
<item name="notifications_mentions" type="id"/>

1
mastodon/src/main/res/values/strings.xml
View File

@@ -413,4 +413,5 @@
<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>
<string name="list_timelines">Lists</string>
</resources>