Merge remote-tracking branch 'megalodon_main/main'

# Conflicts: # mastodon/build.gradle # mastodon/src/github/AndroidManifest.xml # mastodon/src/main/res/values-de-rDE/strings_sk.xml # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-eu-rES/strings_sk.xml # mastodon/src/main/res/values-ko-rKR/strings_sk.xml # mastodon/src/main/res/values-pl-rPL/strings_sk.xml # mastodon/src/main/res/values-uk-rUA/strings_sk.xml # metadata/es/changelogs/83.txt # metadata/fr/short_description.txt # metadata/gl-ES/changelogs/83.txt
2023-04-22 13:53:50 -03:00
parent fe20fe4254 63e536c66c
commit 5b391b44d3
41 changed files with 319 additions and 221 deletions
--- a/mastodon/src/main/res/values-ca-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
@@ -69,7 +69,7 @@
    <string name="sk_translated_using">Traduït amb %s</string>
    <string name="sk_post_language">Llengua: %s</string>
    <string name="sk_available_languages">Llengües disponibles</string>
-    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_language_name">%1$s (%2$s)</string>
    <string name="sk_confirm_clear_recent_languages">Segur que vols esborrar les llengües recents\?</string>
    <string name="sk_welcome_text">El tauró et saluda! Per a començar, introdueix el domini de la instància a continuació.</string>
    <string name="sk_tabs_disable_swipe">Desactiva el desplaçament entre pestanyes</string>