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/ui/displayitems/PollFooterStatusDisplayItem.java
This commit is contained in:
LucasGGamerM
2023-11-28 14:31:42 -03:00
parent ed986b11af f7dfebcbea
commit 2ef3e7eab7
39 changed files with 73 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,6 @@
<string name="sk_timeline_home">Home</string>
<string name="sk_timeline_local">Lokalno</string>
<string name="sk_timeline_federated">Federacija</string>
<string name="sk_poll_allow_multiple">Omogući više izbora</string>
<string name="sk_clear_recent_languages">Očisti listu nedavno korištenih jezika</string>
<string name="sk_app_name">Megalodon</string>
<string name="sk_pinned_posts">Prikvačeno</string>