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

Merge branch 'feature/add-federated-timeline' into fork

Browse Source
This commit is contained in:
sk
2022-05-02 21:35:14 +02:00
parent 6533163fd0 318d271127
commit eb3adf1dfd
5 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -308,10 +308,12 @@
<string name="downloading">Downloading…</string>
<string name="no_app_to_handle_action">There\'s no app to handle this action</string>
<string name="local_timeline">Community</string>
<string name="federated_timeline">Federation</string>
<string name="trending_posts_info_banner">These are the posts gaining traction in your corner of Mastodon.</string>
<string name="trending_hashtags_info_banner">These are the hashtags gaining traction in your corner of Mastodon.</string>
<string name="trending_links_info_banner">These are the news stories being shared the most in your corner of Mastodon.</string>
<string name="local_timeline_info_banner">These are the most recent posts by the people who use the same Mastodon server as you.</string>
<string name="federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
<string name="dismiss">Dismiss</string>
<string name="see_new_posts">See new posts</string>
<string name="load_missing_posts">Load missing posts</string>