Merge remote-tracking branch 'megalodon_weblate/main'

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/values-ca-rES/strings_sk.xml
#	mastodon/src/main/res/values-de-rDE/strings.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-gl-rES/strings_sk.xml
#	mastodon/src/main/res/values-ko-rKR/strings_sk.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values-sl-rSI/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	mastodon/src/main/res/values-zh-rCN/strings_sk.xml
#	metadata/ca/full_description.txt
#	metadata/cy/full_description.txt
#	metadata/es/changelogs/65.txt
#	metadata/es/changelogs/67.txt
#	metadata/es/full_description.txt
#	metadata/id/full_description.txt
#	metadata/ko/full_description.txt
#	metadata/pl/full_description.txt
#	metadata/sl/changelogs/65.txt
#	metadata/sl/changelogs/67.txt
#	metadata/sv/full_description.txt
#	metadata/uk/full_description.txt
#	metadata/zh-Hans/full_description.txt
This commit is contained in:
LucasGGamerM
2023-02-13 15:38:28 -03:00
96 changed files with 3410 additions and 735 deletions

View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="get_started">Kreni</string>
<string name="log_in">Loguj se</string>
<string name="next">Dalje</string>
<string name="error">Greška</string>
@@ -129,14 +128,7 @@
<string name="report_personal_title">Ne želite ovo vidjeti?</string>
<string name="report_personal_subtitle">Kada vidite nešto nepoželjno na Mastodon-u, možete blokirati odredjeni profil.</string>
<string name="back">Nazad</string>
<string name="instance_rules_title">Važna pravila</string>
<string name="instance_rules_subtitle">Pogledajte pravila koja je odredila %s administracija.</string>
<string name="signup_title">Krenimo sa postavkama na %s</string>
<string name="edit_photo">uredi</string>
<string name="display_name">vaše ime</string>
<string name="username">korisničko ime</string>
<string name="email">email</string>
<string name="password">lozinka</string>
<string name="password_note">Koristite velika slova, brojeve i oznake da bi osigurali lozinku.</string>
<string name="category_academia">Akademija</string>
<string name="category_activism">Aktivizam</string>
@@ -151,8 +143,7 @@
<string name="category_music">Muzika</string>
<string name="category_regional">Regionalno</string>
<string name="category_tech">Tehnika</string>
<string name="confirm_email_title">Zadnja stvar</string>
<string name="confirm_email_subtitle">Kliknite na link koji smo vam poslali u email-u da se verifikujete.</string>
<!-- %s is the email address -->
<string name="resend">Ponovo poslato</string>
<string name="open_email_app">Otvori email</string>
<string name="resent_email">Email za verifikaciju poslat</string>
@@ -238,7 +229,6 @@
<string name="unfollowed_user">Ne pratite %s</string>
<string name="followed_user">Sada pratite %s</string>
<string name="open_in_browser">Otvori u pregledniku</string>
<string name="signup_reason">zašto se želite pridružiti?</string>
<string name="signup_reason_note">Ovo nam pomaže prilikom odobravanja vašeg zahtjeva.</string>
<string name="clear">Briši</string>
<string name="profile_header">Slika zaglavlja</string>
@@ -255,4 +245,7 @@
<!-- %s is version like 1.2.3 -->
<!-- %s is version like 1.2.3 -->
<!-- %s is file size -->
<!-- %s is server domain -->
<!-- Shown in a progress dialog when you tap "follow all" -->
<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
</resources>