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/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
This commit is contained in:
LucasGGamerM
2023-05-16 18:26:23 -03:00
parent c3b5bb409b a9ab9cb249
commit d403f4ef01
26 changed files with 839 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/res/values-sl-rSI/strings.xml
View File

@@ -474,7 +474,7 @@
<string name="show">Pokaži</string>
<string name="hide">Skrij</string>
<string name="join_default_server">Pridruži se %s</string>
<string name="pick_server">Izberi moj lasten strežnik</string>
<string name="pick_server">Izberi drug strežnik</string>
<string name="signup_or_login">ali</string>
<string name="learn_more">Več o tem</string>
<string name="welcome_to_mastodon">Dobrodošli na Mastodon</string>