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/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	metadata/de-DE/changelogs/83.txt
#	metadata/en-US/changelogs/83.txt
This commit is contained in:
LucasGGamerM
2023-04-12 13:04:31 -03:00
parent 2cea6a9df5 6ec43a6f86
commit 64e681c227
47 changed files with 898 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/res/values-gl-rES/strings.xml
View File

@@ -285,6 +285,7 @@
<string name="follow_user">Segue a %s</string>
<string name="unfollowed_user">Deixaches de seguir a %s</string>
<string name="followed_user">Estás a seguir a %s</string>
<string name="following_user_requested">Solicitaches seguir a %s</string>
<string name="open_in_browser">Abrir nun navegador</string>
<string name="hide_boosts_from_user">Agochar promocións de @%s</string>
<string name="show_boosts_from_user">Mostrar promocións de %s</string>

9
mastodon/src/main/res/values-gl-rES/strings_sk.xml
View File

@@ -263,4 +263,13 @@
<string name="sk_followed_as">Seguida dende %s</string>
<string name="sk_settings_hide_fab">Auto-ocultar botón de redacción</string>
<string name="sk_in_reply">Respondendo</string>
<string name="sk_quoting_user">Citando a %s</string>
<string name="sk_settings_reply_visibility">Visibilidade da resposta</string>
<string name="sk_settings_reply_visibility_all">Todas as respostas</string>
<string name="sk_settings_reply_visibility_following">Respostas aos meus seguidos</string>
<string name="sk_settings_reply_visibility_self">Respostas a min</string>
<string name="sk_notification_action_replied">Resposta enviada a %s</string>
<string name="sk_reply_line_above_avatar">Liña \"en resposta a\" sobre o avatar</string>
<string name="sk_show_thread">Mostrar chío</string>
<string name="sk_compact_reblog_reply_line">Compactar liña de promoción/resposta</string>
</resources>