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/api/session/AccountLocalPreferences.java
This commit is contained in:
LucasGGamerM
2023-09-01 14:11:19 -03:00
parent 74db111a4f 807010893a
commit aeb0aa65a8
18 changed files with 211 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/res/values-es-rES/strings_sk.xml
View File

@@ -373,4 +373,9 @@
<string name="sk_settings_emoji_reactions_in_lists_explanation">Las reacciones con los emoticonos deben mostrarse en las líneas de tiempo. Si esta opción está desactivada, las reacciones con los emoticonos solo se mostrarán al ver un hilo.</string>
<string name="sk_button_react">Reacciona con un emoticono</string>
<string name="sk_again_for_system_keyboard">Pulsa de nuevo para el Teclado del sistema</string>
<plurals name="sk_posts_count_label">
<item quantity="one">tema</item>
<item quantity="many">temas</item>
<item quantity="other">temas</item>
</plurals>
</resources>