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/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Account.java
This commit is contained in:
LucasGGamerM
2023-09-05 07:12:27 -03:00
parent 0e58b00086 2aba90f353
commit 61b20eea05
22 changed files with 215 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -374,8 +374,15 @@
<string name="sk_duration_days_3">3 days</string>
<string name="sk_duration_days_7">7 days</string>
<string name="sk_notification_mention">You were mentioned by %s</string>
<string name="sk_suicide_search_terms">Suicide</string>
<string name="sk_search_suicide_title">In case you’re in distress…</string>
<string name="sk_search_suicide_message">If you’re looking for a sign not to commit suicide, this is it. Please consider reaching out to a local suicide hotline if you’re in distress.</string>
<string name="sk_search_suicide_hotlines">Find a helpline</string>
<string name="sk_do_not_show_again">Don’t show again</string>
<string name="sk_suicide_helplines_url">https://findahelpline.com</string>
<plurals name="sk_posts_count_label">
<item quantity="one">post</item>
<item quantity="other">posts</item>
</plurals>
<string name="sk_post_contains_media">Post contains media</string>
</resources>