owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(merging-upstream): bunch of conflicts to solve

Browse Source
This commit is contained in:
LucasGGamerM
2024-02-14 20:50:54 -03:00
parent 8dffbff97c
commit 0af8dbf09b
2000 changed files with 52238 additions and 10716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/res/values-no-rNO/strings.xml
View File

@@ -326,6 +326,7 @@
<string name="login_title">Velkommen tilbake</string>
<string name="login_subtitle">Logg inn med serveren der du opprettet kontoen din.</string>
<string name="server_url">Server link</string>
<string name="signup_random_server_explain">Vi vil velge en server basert på språket ditt hvis du fortsetter uten å gjøre et valg.</string>
<string name="server_filter_any_language">Ethvert språk</string>
<string name="server_filter_instant_signup">Direkte registrering</string>
<string name="server_filter_manual_review">Manuell gjennomgang</string>
@@ -339,9 +340,11 @@
<string name="not_accepting_new_members">Aksepterer ikke nye medlemmer</string>
<string name="category_special_interests">Spesielle interesser</string>
<string name="signup_passwords_dont_match">Passordet samsvarer ikke</string>
<string name="pick_server_for_me">Velg for meg</string>
<string name="profile_add_row">Legg til rad</string>
<string name="profile_setup">Konfigurering av profil</string>
<string name="profile_setup_subtitle">Du kan alltid fullføre dette senere i profilfanen.</string>
<string name="popular_on_mastodon">Populært på Mastodon</string>
<string name="follow_all">Følg alle</string>
<string name="server_rules_disagree">Uenig</string>
<string name="privacy_policy_explanation">TL;DR: Vi samler ikke inn eller prosesserer noe.</string>