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/res/layout/fragment_compose.xml
This commit is contained in:
LucasGGamerM
2023-10-13 11:16:10 -03:00
parent 767312f71c 83786171a7
commit 4107169c73
63 changed files with 400 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/res/values-de-rDE/strings.xml
View File

@@ -584,4 +584,7 @@
<string name="time_days_ago_short">vor %d Tagen</string>
<!-- %s is the name of the post language -->
<!-- %1$s is the language, %2$s is the name of the translation service -->
<!-- Screen reader description for the menu on the home timeline screen -->
<!-- %s is the name of the list -->
<!-- %s is a username -->
</resources>

4
mastodon/src/main/res/values-de-rDE/strings_sk.xml
View File

@@ -406,4 +406,8 @@
<item quantity="other">%d Minuten</item>
</plurals>
<string name="sk_trending_links_info_banner">Über diese Nachrichten wird im Fediverse gerade gesprochen.</string>
<string name="sk_set_as_default">Als Standard setzen</string>
<string name="sk_settings_color_palette_default">Standardwert (%s)</string>
<string name="sk_settings_underlined_links">Unterstrichene Links</string>
<string name="sk_recently_used">Zuletzt verwendet</string>
</resources>