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:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
#	mastodon/src/main/res/values-it-rIT/strings_sk.xml
#	metadata/de-DE/changelogs/83.txt
#	metadata/de-DE/changelogs/94.txt
#	metadata/en-US/changelogs/94.txt
#	metadata/es/changelogs/94.txt
#	metadata/fr/title.txt
#	metadata/my-MM/title.txt
#	metadata/my/short_description.txt
#	metadata/pt-PT/changelogs/59.txt
#	metadata/pt-PT/changelogs/61.txt
#	metadata/pt-PT/full_description.txt
#	metadata/pt-PT/short_description.txt
#	metadata/pt-PT/title.txt
This commit is contained in:
LucasGGamerM
2023-06-13 14:03:50 -03:00
parent e1f5c9cb63 3af7518cf4
commit e1a262ec5f
62 changed files with 944 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/res/values-hr-rHR/strings_sk.xml
View File

@@ -181,7 +181,7 @@
<string name="sk_settings_local_only_explanation">Vaša početna instanca mora podržavati isključivo-lokalno objavljivanje da bi ovo radilo. Većina modificiranih verzija Mastodona to radi, ali Mastodon ne.</string>
<string name="sk_settings_hide_interaction">Sakrij gumbe za interakciju</string>
<string name="sk_settings_hide_fab">Automatski sakrij gumb \"Nova objava\"</string>
<string name="sk_quoting_user">"Citiranje %"</string>
<string name="sk_quoting_user">Citiranje %s</string>
<string name="sk_settings_reply_visibility">Vidljivost odgovora</string>
<string name="sk_settings_reply_visibility_all">Svi odgovori</string>
<string name="sk_settings_reply_visibility_following">Odgovori onima koje pratim</string>