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

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
This commit is contained in:
LucasGGamerM
2023-09-01 14:11:19 -03:00
parent 74db111a4f 807010893a
commit aeb0aa65a8
18 changed files with 211 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,8 +352,10 @@
<string name="sk_settings_show_labels_in_navigation_bar">Show tab labels in the navigation bar</string>
<string name="sk_settings_emoji_reactions">Enable emoji reactions</string>
<string name="sk_settings_emoji_reactions_explanation">Displays emoji reactions to posts and lets you interact with them. Some modified versions of Mastodon support this, but Mastodon doesn\'t.</string>
<string name="sk_settings_emoji_reactions_in_lists">Show emoji reactions in timelines</string>
<string name="sk_settings_emoji_reactions_in_lists_explanation">Whether emoji reactions should be displayed on timelines. If this option is off, emoji reactions will only be displayed when viewing a thread.</string>
<string name="sk_settings_show_emoji_reactions">Show emoji reactions in timelines</string>
<string name="sk_settings_show_emoji_reactions_hide_empty">Hide empty emoji reactions</string>
<string name="sk_settings_show_emoji_reactions_only_opened">Only when post is opened</string>
<string name="sk_settings_show_emoji_reactions_always">Always show add button</string>
<plurals name="sk_users_reacted_with">
<item quantity="one">One user reacted with %2$s</item>
<item quantity="other">%1$,d users reacted with %2$s</item>