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

Merge branch 'feat/mutes-list'

Browse Source 
# Conflicts:
#	mastodon/src/main/res/menu/profile_own.xml
#	mastodon/src/main/res/values/strings_sk.xml
This commit is contained in:
LucasGGamerM
2023-09-17 10:09:02 -03:00
parent a6e6143157 e274cf89c0
commit 823344dfc0
7 changed files with 124 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/res/menu/profile_own.xml
View File

@@ -8,5 +8,7 @@
<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_24_regular"/>
<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_folder_open_24_regular" android:showAsAction="always"/>
<item android:id="@+id/mutes" android:title="@string/sk_mutes" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
<item android:id="@+id/blocks" android:title="@string/sk_blocks" android:icon="@drawable/ic_fluent_shield_24_regular"/>
<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
</menu>

6
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -269,7 +269,7 @@
<string name="sk_settings_show_alt_indicator">Indicator for alt texts</string>
<string name="sk_settings_show_no_alt_indicator">Indicator for missing alt texts</string>
<string name="sk_updater_enable_pre_releases">Enable pre-releases</string>
<string name="sk_settings_show_new_posts_button">“Show new posts” button</string>
<string name="sk_settings_see_new_posts_button">“See new posts” button</string>
<string name="sk_inline_local_only">local-only</string>
<string name="sk_inline_direct">mentioned-only</string>
<string name="sk_separator">·</string>
@@ -404,4 +404,8 @@
<item quantity="one">%d day</item>
<item quantity="other">%d days</item>
</plurals>
<string name="sk_muted_account">Muted accounts</string>
<string name="sk_mutes">Mutes</string>
<string name="sk_blocked_account">Blocked accounts</string>
<string name="sk_blocks">Blocks</string>
</resources>