Merge branch 'l10n_master'

fix(compose): fix photoPicker not popping up when there is less than 2 spaces available for media

fastlane/metadata/android/ar-SA/full_description.txt

@@ -2,7 +2,7 @@
 
 اِنضم إلَى مُجتَمع وأنشئ مِلَفَّكَ التَّعريفِيّ. ابحث عن أشخاص رائعين، تابعهم واقرأ منشوراتهم في خطٍّ زمني خالٍ من الإعلانات. عبِّر عَن نَفسِكَ باِستخدام رُموزٍ تَعبيرِيَّةٍ مُخصَّصَة، أو صُوَر، أو صُوَرٍ مُتحَرِّكَة، أو مَقاطِعٍ مَرئِّيَة أو مَقاطِعٍ صَوتِيَّةٍ فِي مَنشوراتٍ ذَاتُ خَمسِمائَة حَرف. رُدّ على سَلاسِلِ المَنشوراتِ، وأعِد تَدوينَ مَنشُوراتِ أيِّ شَخصٍ لِمُشارَكَةِ الأُمُورِ الرَّائِعَة. اِبحَث عَن حِساباتٍ جَديدَةٍ لِمُتابَعَتِها، وَعَن وُسُومٍ شَائِعَةٍ لِتَوسيعِ شَبَكَتِك.
 
-ماستودون مبني بتركيز على الأمان والخصوصيَّة. حدِّد ما إذا أردتَ مُشارَكَةَ مَنشُوراتِكَ مَعَ مُتابِعيك، أو الأشخاصِ الَّذينَ أشَرتَ إليهِم فَقَط أو العالَمَ بأسرِه. تتيح لك تحذيرات المحتوى إخفاء المنشورات التي تحتوي على مواد حساسة أو محفِّزَة حتى تكون مستعد للتفاعل مع محتواها. لكل مجتمع إرشاداته الخاصة ومشرفيه الخاصين للحفاظ على أمان أعضائه، كما تُساعد أدوات الحظر والإبلاغ القوية في منع إساءة الاستخدام.
+ماستدون مبني بتركيزٍ على الأمان والخصوصيَّة. حدِّد ما إذا أردتَ مُشارَكَةَ مَنشُوراتِكَ مَعَ مُتابِعيك، أو الأشخاصِ الَّذينَ أشَرتَ إليهِم فَقَط أو العالَمَ بأسرِه. تتيح لك تحذيرات المحتوى إخفاء المنشورات التي تحتوي على مواد حساسة أو محفِّزَة حتى تكون مستعد للتفاعل مع محتواها. لكل مجتمع إرشاداته الخاصة ومشرفيه الخاصين للحفاظ على أمان أعضائه، كما تُساعد أدوات الحظر والإبلاغ القوية في منع إساءة الاستخدام.
 
 مَزيدٌ مِنَ المَزايَا:
 

fastlane/metadata/android/da-DK/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon er det største decentraliserede sociale netværk på internettet. I stedet for et enkelt website, er det et netværk af millioner af brugere i uafhængige fællesskaber som alle sammen kan interagere med hinanden. Uanset hvad du interesserer dig for, kan du møde engagerede mennesker som skriver om det på Mastodon!
+Mastodon er det største decentraliserede sociale netværk på internet. Frem for ét enkelt website, er det i stedet et netværk af millioner af brugere i uafhængige fællesskaber, som alle kan interagere med hinanden. Uanset interessesfære, kan man møde engagerede personer, som skriver herom på Mastodon!
 
-Find et fællesskab og opret din profil. Find og følg fascinerende mennesker og læs deres indlæg i en reklamefri, kronologisk tidslinje. Udtryk dig selv med emojis, billeder, GIFs, videoer og lyd i indlæg på op til 500 tegn. Svar på tråde og del alt det gode ved at booste indlæg fra andre. Find nye brugere at følge og aktuelle hashtags så dit netværk udvides.
+Find et fællesskab og opret din profil. Find og følg fascinerende folk og læs deres indlæg i en reklamefri, kronologisk tidslinje. Udtryk dig selv med tilpassede emojis, billeder, GIF'er, videoer og lyd i 500-tegns indlæg. Svar på tråde og genpost indlæg fra enhver for dele alt det gode. Find nye konti at følge, og populære hashtags, for at udvide dit netværk.
 
-Mastodon er bygget med fokus på privatliv og sikkerhed. Beslut om dine indlæg skal deles med dine følgere, bare dem du nævner eller hele verden. Indholdsadvarsler giver dig mulighed for at gemme indlæg med sensitivt eller triggende indhold indtil du er klar til at læse dem. Hvert fællesskab har sine egne regler og moderatorer som holder øje og sikrer medlemmerne mod spam og trolde. De har robuste blokerings- og rapporteringsredskaber til deres rådighed.
+Mastodon er bygget med fokus på fortrolighed og sikkerhed. Afgør, hvorvidt dine indlæg skal deles med Følgere, blot dem du nævner eller hele verden. Indholdsadvarsler muliggør at skjule indlæg med sensitivt eller udløsende indhold, indtil du er klar til at læse dem. Hvert fællesskab har deres egne retningslinjer og moderatorer til at holde deres medlemmer sikre, og robuste blokerings- og anmeldelsesværktøjer hjælper med at forhindre misbrug.
 
 Flere funktioner:
 
-• Mørk Mode: Læs indlæg i lys, mørk eller ægte sort tilstand
-• Afstemninger: Spørg tilhængere om deres mening og stemme
-• Udforsk: Populære hashtags og konti er et tryk væk
-• Notifikationer: Få besked om nye følgere, svar og boosts
-• Deling: Send direkte til Mastodon fra en hvilken som app
-• Nuttethedsfaktor: Vores maskot er en yndig elefant, og du vil se dem dukke op fra tid til anden
+• Mørk tilstand: Læs indlæg i lys, mørk eller ægte sort tilstand
+• Afstemninger: Spørg Følgere om deres mening og stemme
+• Udforsk: Populære hashtags og konti er ét tryk væk
+• Notifikationer: Få besked om nye Følgere, svar og genpostninger
+• Deling: Post direkte til Mastodon fra enhver apps delingsfunktion
+• Nuttethed: Vores maskot er en yndig elefant, som du vil se dukke op fra tid til anden
 
-Mastodon er en registreret nonprofit og udvikling understøttes direkte af dine donationer. Der er ingen reklame, ingen indtægtsgenerering og ingen risikovillig kapital, og sådan forbliver det.
+Mastodon er en registreret nonprofit, hvis udvikling direkte understøttes af dine donationer. Der er ingen annoncering, ingen indtægtsgenerering og ingen risikovillig kapital, og intentionen er, at det forbliver sådan.

fastlane/metadata/android/eu-ES/full_description.txt

@@ -1,6 +1,6 @@
 Mastodon Interneteko sare sozial deszentralizatu handiena da. Webgune bakar bat izan ordez, beren artean elkarreragin dezaketen komunitate independenteetako milioika erabiltzailek osatutako sarea da. Zure interesak direnak direla ere, jende interesgarria aurkituko duzu Mastodonen!
 
-Batu komunitate batera eta sortu zure profila. Find and follow fascinating folks and read their posts in an ad-free, chronological timeline. Adierazi nahi duzuna 500 karaktereko bidalketetan emoji pertsonalizatuak, irudiak, GIFak, bideoak eta audioak erabiliz. Erantzun edozeinen hariak eta eman bultzada bidalketei edukiak partekatzeko. Bilatu jarraitzeko kontu berriak eta traolen joerak zure sarea zabaltzeko.
+Batu komunitate batera eta sortu zure profila. Bilatu eta jarraitu jende zoragarria eta irakurri beren bidalketak, publizitaterik gabeko denbora-lerro kronologikoan. Adierazi nahi duzuna 500 karaktereko bidalketetan emoji pertsonalizatuak, irudiak, GIFak, bideoak eta audioak erabiliz. Erantzun edozeinen hariak eta eman bultzada bidalketei edukiak partekatzeko. Bilatu jarraitzeko kontu berriak eta traolen joerak zure sarea zabaltzeko.
 
 Mastodon pribatutasunean eta segurtasunean arreta jarriz eraikia dago. Erabaki zure bidalketak norekin partekatu: zure jarraitzaileekin, aipatzen dituzunekin edo mundu osoarekin. Edukiaren abisuek aukera ematen dute eduki sentibera edo zuregan eragina izan dezaketen bidalketak zuk erabaki arte ezkutatzeko. Komunitate bakoitzak bere gidalerro eta moderatzaileak ditu, bertako kideak seguru mantentzeko. Baita blokeatzeko eta salatzeko tresna sendoak ere abusuak galarazteko.
 

fastlane/metadata/android/fi-FI/full_description.txt

@@ -1,6 +1,6 @@
-Mastodon on internetin suurin hajautettu sosiaalinen verkosto. Yhden verkkopalvelun sijaan, se on miljoonien itsenäisissä yhteisöissä olevien käyttäjien verkosto, jotka voivat olla vuorovaikutuksessa toistensa kanssa saumattomasti. Riippumatta siitä, mistä olet kiinnostunut, voit tavata intohimoisia ihmisiä, jotka julkaisevat aiheesta Mastodonissa!
+Mastodon on internetin suurin hajautettu sosiaalinen verkosto. Yhden verkkopalvelun sijaan, se on miljoonien itsenäisissä yhteisöissä olevien käyttäjien verkosto, jotka voivat olla vuorovaikutuksessa toistensa kanssa saumattomasti. Riippumatta siitä, mistä olet kiinnostunut, voit tavata samanmielisiä ihmisiä, jotka julkaisevat aiheesta Mastodonissa!
 
-Liity yhteisöön ja luo itsellesi tili. Find and follow fascinating folks and read their posts in an ad-free, chronological timeline. Ilmaise itseäsi mukautetuilla emojeilla, kuvilla, videoilla ja audiolla 500 merkin pituisissa julkaisuissa. Vastaa viestiketjuihin ja edelleen jaa julkaisuja keneltä tahansa, jakaaksesi hienoja juttuja. Löydä uusia tilejä seurattavaksi ja trendaavia hashtageja laajentaaksesi verkostoasi.
+Liity yhteisöön ja luo itsellesi tili. Löydä ja seuraa kiehtovia ihmisiä ja lue heidän julkaisunsa ilman mainoksia, kronologisella aikajanalla. Ilmaise itseäsi mukautetuilla emojeilla, kuvilla, videoilla ja audiolla 500 merkin pituisissa julkaisuissa. Vastaa viestiketjuihin ja edelleen jaa julkaisuja keneltä tahansa, jakaaksesi hienoja juttuja. Löydä uusia tilejä seurattavaksi ja suosittuja aihetunnisteita laajentaaksesi verkostoasi.
 
 Mastodon on rakennettu keskittyen yksityisyyteen ja turvallisuuteen. Päätä, jaetaanko julkaisusi seuraajille, vain mainitsemillesi ihmisille vai koko maailmalle. Sisältövaroitusten avulla, voit piilottaa julkaisut, jotka sisältävät arkaluontoista tai laukaisevaa materiaalia, kunnes olet valmis käsittelemään niitä. Jokaisella yhteisöllä on omat ohjeistonsa ja valvojansa, jotka pitävät jäsenensä turvassa, ja tehokkaat esto- ja ilmiantotyökalut auttavat torjumaan väärinkäytöksiä.
 
@@ -8,8 +8,8 @@ Lisää ominaisuuksia:
 
 • Tumma tila: Lue julkaisut vaaleassa, tummassa tai mustan tummassa tilassa
 • Kyselyt: Kysy seuraajilta heidän mielipidettään ja laske äänet
-• Tutustu: Trendaavat hashtagit ja tilit ovat vain napsautuksen päässä
-• Ilmoitukset: Saat ilmoituksen uusista seuraajista, vastauksista ja edelleen jaoista
+• Tutustu: Suositut aihetunnisteet ja tilit ovat vain napsautuksen päässä
+• Ilmoitukset: Saat ilmoituksen uusista seuraajista, vastauksista ja tehostuksista
 • Jakaminen: Julkaise suoraan Mastodoniin minkä tahansa sovelluksen jakovalikon kautta
 • Suloisuus: Maskottimme on ihastuttava mastodontti ja näet sen ajoittain
 

fastlane/metadata/android/th-TH/full_description.txt

@@ -1,4 +1,4 @@
-Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ที่ใหญ่ที่สุดบนอินเทอร์เน็ต ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon! ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon!
+Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ที่ใหญ่ที่สุดบนอินเทอร์เน็ต ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon!
 
 เข้าร่วมชุมชนและสร้างโปรไฟล์ ค้นหาและติดตามผู้คนที่น่าสนใจและอ่านโพสต์ของเขาในเส้นเวลาที่ไม่มีโฆษณาและเรียงตามลำดับเวลา แสดงความรู้สึกของตัวคุณเองด้วยอีโมจิที่กำหนดเอง รูปภาพ GIF วิดีโอ และเสียงในโพสต์ 500 ตัวอักษร ตอบกลับและดันโพสต์จากคนอื่น ๆ เพื่อแชร์สิ่งดี ๆ และค้นหาบัญชีใหม่ ๆ ที่จะติดตามและแฮชแท็กที่เป็นที่นิยมเพื่อขยายเครือข่ายของคุณ
 
@@ -13,4 +13,4 @@ Mastodon สร้างขึ้นโดยเน้นความเป็
 • การแชร์: โพสต์ลง Mastodon ได้โดยตรงจากแอปอื่น ๆ ที่อยู่ในเครื่อง
 • ความน่ารัก: มาสคอตของเราเป็นช้างน่ารัก และคุณจะเห็นมันโผล่ออกมาเป็นระยะ ๆ
 
-Mastodon เป็นองค์กรไม่แสวงหาผลกำไรที่จดทะเบียนแล้ว และการพัฒนาได้รับการสนับสนุนจากเงินบริจาคของคุณโดยตรง ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป
+Mastodon เป็นองค์กรไม่แสวงหาผลกำไรที่จดทะเบียนแล้ว และการพัฒนาได้รับการสนับสนุนจากเงินบริจาคของคุณโดยตรง ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 62
-		versionName "2.0.2"
+		versionCode 66
+		versionName "2.1.0"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "ur-rIN", "vi-rVN", "zh-rCN", "zh-rTW"
 	}

mastodon/src/main/java/org/joinmastodon/android/MainActivity.java

@@ -136,7 +136,7 @@ public class MainActivity extends FragmentStackActivity{
 	}
 
 	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch){
-		new GetSearchResults(q, null, true)
+		new GetSearchResults(q, null, true, null, 0, 0)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/UpdateAccountCredentialsPreferences.java

@@ -6,18 +6,19 @@ import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.StatusPrivacy;
 
 public class UpdateAccountCredentialsPreferences extends MastodonAPIRequest<Account>{
-	public UpdateAccountCredentialsPreferences(Preferences preferences, Boolean locked, Boolean discoverable){
+	public UpdateAccountCredentialsPreferences(Preferences preferences, Boolean locked, Boolean discoverable, Boolean indexable){
 		super(HttpMethod.PATCH, "/accounts/update_credentials", Account.class);
-		setRequestBody(new Request(locked, discoverable, new RequestSource(preferences.postingDefaultVisibility, preferences.postingDefaultLanguage)));
+		setRequestBody(new Request(locked, discoverable, indexable, new RequestSource(preferences.postingDefaultVisibility, preferences.postingDefaultLanguage)));
 	}
 
 	private static class Request{
-		public Boolean locked, discoverable;
+		public Boolean locked, discoverable, indexable;
 		public RequestSource source;
 
-		public Request(Boolean locked, Boolean discoverable, RequestSource source){
+		public Request(Boolean locked, Boolean discoverable, Boolean indexable, RequestSource source){
 			this.locked=locked;
 			this.discoverable=discoverable;
+			this.indexable=indexable;
 			this.source=source;
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/api/requests/filters/FilterRequest.java

@@ -6,6 +6,9 @@ import org.joinmastodon.android.model.FilterContext;
 import java.util.EnumSet;
 import java.util.List;
 
+import androidx.annotation.Keep;
+
+@Keep
 class FilterRequest{
 	public String title;
 	public EnumSet<FilterContext> context;

mastodon/src/main/java/org/joinmastodon/android/api/requests/search/GetSearchResults.java

@@ -4,13 +4,19 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.SearchResults;
 
 public class GetSearchResults extends MastodonAPIRequest<SearchResults>{
-	public GetSearchResults(String query, Type type, boolean resolve){
+	public GetSearchResults(String query, Type type, boolean resolve, String maxID, int offset, int count){
 		super(HttpMethod.GET, "/search", SearchResults.class);
 		addQueryParameter("q", query);
 		if(type!=null)
 			addQueryParameter("type", type.name().toLowerCase());
 		if(resolve)
 			addQueryParameter("resolve", "true");
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(offset>0)
+			addQueryParameter("offset", String.valueOf(offset));
+		if(count>0)
+			addQueryParameter("limit", String.valueOf(count));
 	}
 
 	public GetSearchResults limit(int limit){

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/CreateStatus.java

@@ -17,6 +17,7 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 
 	public static class Request{
 		public String status;
+		public List<MediaAttribute> mediaAttributes;
 		public List<String> mediaIds;
 		public Poll poll;
 		public String inReplyToId;
@@ -32,5 +33,17 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 			public boolean multiple;
 			public boolean hideTotals;
 		}
+
+		public static class MediaAttribute{
+			public String id;
+			public String description;
+			public String focus;
+
+			public MediaAttribute(String id, String description, String focus){
+				this.id=id;
+				this.description=description;
+				this.focus=focus;
+			}
+		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Translation;
+
+import java.util.Map;
+
+public class TranslateStatus extends MastodonAPIRequest<Translation>{
+	public TranslateStatus(String id, String lang){
+		super(HttpMethod.POST, "/statuses/"+id+"/translate", Translation.class);
+		setRequestBody(Map.of("lang", lang));
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetTag.java

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class GetTag extends MastodonAPIRequest<Hashtag>{
+	public GetTag(String tag){
+		super(HttpMethod.GET, "/tags/"+tag, Hashtag.class);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/SetTagFollowed.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class SetTagFollowed extends MastodonAPIRequest<Hashtag>{
+	public SetTagFollowed(String tag, boolean followed){
+		super(HttpMethod.POST, "/tags/"+tag+(followed ? "/follow" : "/unfollow"), Hashtag.class);
+		setRequestBody(new Object());
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java

@@ -195,7 +195,7 @@ public class AccountSession{
 
 	public void savePreferencesIfPending(){
 		if(preferencesNeedSaving){
-			new UpdateAccountCredentialsPreferences(preferences, null, null)
+			new UpdateAccountCredentialsPreferences(preferences, null, self.discoverable, !self.noindex)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Account result){
@@ -261,4 +261,8 @@ public class AccountSession{
 			return false;
 		});
 	}
+
+	public void updateAccountInfo(){
+		AccountSessionManager.getInstance().updateSessionLocalInfo(this);
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java

@@ -279,7 +279,7 @@ public class AccountSessionManager{
 		}
 	}
 
-	private void updateSessionLocalInfo(AccountSession session){
+	/*package*/ void updateSessionLocalInfo(AccountSession session){
 		new GetOwnAccount()
 				.setCallback(new Callback<>(){
 					@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java

@@ -17,13 +17,16 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
+import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.DisplayItemsParent;
 import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
@@ -33,6 +36,7 @@ import org.joinmastodon.android.ui.displayitems.PollFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.PollOptionStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.SpoilerStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
 import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
@@ -43,6 +47,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -560,6 +565,61 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		return attachmentViewsPool;
 	}
 
+	public void togglePostTranslation(Status status, String itemID){
+		switch(status.translationState){
+			case LOADING -> {
+				return;
+			}
+			case SHOWN -> {
+				status.translationState=Status.TranslationState.HIDDEN;
+			}
+			case HIDDEN -> {
+				if(status.translation!=null){
+					status.translationState=Status.TranslationState.SHOWN;
+				}else{
+					status.translationState=Status.TranslationState.LOADING;
+					new TranslateStatus(status.getContentStatus().id, Locale.getDefault().getLanguage())
+							.setCallback(new Callback<>(){
+								@Override
+								public void onSuccess(Translation result){
+									if(getActivity()==null)
+										return;
+									status.translation=result;
+									status.translationState=Status.TranslationState.SHOWN;
+									TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+									if(text!=null){
+										text.updateTranslation(true);
+										imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
+									}
+								}
+
+								@Override
+								public void onError(ErrorResponse error){
+									if(getActivity()==null)
+										return;
+									status.translationState=Status.TranslationState.HIDDEN;
+									TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+									if(text!=null){
+										text.updateTranslation(true);
+									}
+									new M3AlertDialogBuilder(getActivity())
+											.setTitle(R.string.error)
+											.setMessage(R.string.translation_failed)
+											.setPositiveButton(R.string.ok, null)
+											.show();
+								}
+							})
+							.exec(accountID);
+				}
+			}
+		}
+		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+		if(text!=null){
+			text.updateTranslation(true);
+			imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
+		}
+	}
+
 	public void rebuildAllDisplayItems(){
 		displayItems.clear();
 		for(T item:data){

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -691,6 +691,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		req.visibility=statusVisibility;
 		if(!mediaViewController.isEmpty()){
 			req.mediaIds=mediaViewController.getAttachmentIDs();
+			if(editingStatus != null){
+				req.mediaAttributes=mediaViewController.getAttachmentAttributes();
+			}
 		}
 		if(replyTo!=null){
 			req.inReplyToId=replyTo.id;
@@ -836,7 +839,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		boolean usePhotoPicker=UiUtils.isPhotoPickerAvailable();
 		if(usePhotoPicker){
 			intent=new Intent(MediaStore.ACTION_PICK_IMAGES);
-			intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, mediaViewController.getMaxAttachments()-mediaViewController.getMediaAttachmentsCount());
+			if(mediaViewController.getMaxAttachments()-mediaViewController.getMediaAttachmentsCount()>1)
+				intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, mediaViewController.getMaxAttachments()-mediaViewController.getMediaAttachmentsCount());
 		}else{
 			intent=new Intent(Intent.ACTION_GET_CONTENT);
 			intent.addCategory(Intent.CATEGORY_OPENABLE);

mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java

@@ -15,6 +15,7 @@ import org.parceler.Parcels;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import androidx.recyclerview.widget.RecyclerView;
@@ -44,7 +45,7 @@ public class FeaturedHashtagsListFragment extends BaseStatusListFragment<Hashtag
 
 	@Override
 	public void onItemClick(String id){
-		UiUtils.openHashtagTimeline(getActivity(), accountID, id);
+		UiUtils.openHashtagTimeline(getActivity(), accountID, Objects.requireNonNull(findItemOfType(id, HashtagStatusDisplayItem.class)).tag);
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java

@@ -1,24 +1,52 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.content.res.TypedArray;
 import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonErrorResponse;
+import org.joinmastodon.android.api.requests.tags.GetTag;
+import org.joinmastodon.android.api.requests.tags.SetTagFollowed;
 import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
+import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.text.SpacerSpan;
+import org.joinmastodon.android.ui.views.ProgressBarButton;
+import org.parceler.Parcels;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
 public class HashtagTimelineFragment extends StatusListFragment{
-	private String hashtag;
+	private Hashtag hashtag;
+	private String hashtagName;
 	private ImageButton fab;
+	private TextView headerTitle, headerSubtitle;
+	private ProgressBarButton followButton;
+	private ProgressBar followProgress;
+	private MenuItem followMenuItem;
+	private boolean followRequestRunning;
+	private boolean toolbarContentVisible;
 
 	public HashtagTimelineFragment(){
 		setListLayoutId(R.layout.recycler_fragment_with_fab);
@@ -27,13 +55,19 @@ public class HashtagTimelineFragment extends StatusListFragment{
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		hashtag=getArguments().getString("hashtag");
-		setTitle('#'+hashtag);
+		if(getArguments().containsKey("hashtag")){
+			hashtag=Parcels.unwrap(getArguments().getParcelable("hashtag"));
+			hashtagName=hashtag.name;
+		}else{
+			hashtagName=getArguments().getString("hashtagName");
+		}
+		setTitle('#'+hashtagName);
+		setHasOptionsMenu(true);
 	}
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetHashtagTimeline(hashtag, offset==0 ? null : getMaxID(), null, count)
+		currentRequest=new GetHashtagTimeline(hashtagName, offset==0 ? null : getMaxID(), null, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
@@ -50,17 +84,39 @@ public class HashtagTimelineFragment extends StatusListFragment{
 			loadData();
 	}
 
+	@Override
+	public void loadData(){
+		reloadTag();
+		super.loadData();
+	}
+
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		fab=view.findViewById(R.id.fab);
 		fab.setOnClickListener(this::onFabClick);
+
+		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
+			@Override
+			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
+				View topChild=recyclerView.getChildAt(0);
+				int firstChildPos=recyclerView.getChildAdapterPosition(topChild);
+				float newAlpha=firstChildPos>0 ? 1f : Math.min(1f, -topChild.getTop()/(float)headerTitle.getHeight());
+				toolbarTitleView.setAlpha(newAlpha);
+				boolean newToolbarVisibility=newAlpha>0.5f;
+				if(newToolbarVisibility!=toolbarContentVisible){
+					toolbarContentVisible=newToolbarVisibility;
+					if(followMenuItem!=null)
+						followMenuItem.setVisible(toolbarContentVisible);
+				}
+			}
+		});
 	}
 
 	private void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		args.putString("prefilledText", '#'+hashtag+' ');
+		args.putString("prefilledText", '#'+hashtagName+' ');
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
 
@@ -68,4 +124,150 @@ public class HashtagTimelineFragment extends StatusListFragment{
 	protected void onSetFabBottomInset(int inset){
 		((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(16)+inset;
 	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		View header=getActivity().getLayoutInflater().inflate(R.layout.header_hashtag_timeline, list, false);
+		headerTitle=header.findViewById(R.id.title);
+		headerSubtitle=header.findViewById(R.id.subtitle);
+		followButton=header.findViewById(R.id.profile_action_btn);
+		followProgress=header.findViewById(R.id.action_progress);
+
+		headerTitle.setText("#"+hashtagName);
+		followButton.setVisibility(View.GONE);
+		followButton.setOnClickListener(v->{
+			if(hashtag==null)
+				return;
+			setFollowed(!hashtag.following);
+		});
+		updateHeader();
+
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(header));
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	@Override
+	protected int getMainAdapterOffset(){
+		return 1;
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		followMenuItem=menu.add(getString(hashtag!=null && hashtag.following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
+		followMenuItem.setVisible(toolbarContentVisible);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if(hashtag!=null){
+			setFollowed(!hashtag.following);
+		}
+		return true;
+	}
+
+	@Override
+	protected void onUpdateToolbar(){
+		super.onUpdateToolbar();
+		toolbarTitleView.setAlpha(toolbarContentVisible ? 1f : 0f);
+		if(followMenuItem!=null)
+			followMenuItem.setVisible(toolbarContentVisible);
+	}
+
+	private void updateHeader(){
+		if(hashtag==null)
+			return;
+
+		if(hashtag.history!=null && !hashtag.history.isEmpty()){
+			int weekPosts=hashtag.history.stream().mapToInt(h->h.uses).sum();
+			int todayPosts=hashtag.history.get(0).uses;
+			int numAccounts=hashtag.history.stream().mapToInt(h->h.accounts).sum();
+			int hSpace=V.dp(8);
+			SpannableStringBuilder ssb=new SpannableStringBuilder();
+			ssb.append(getResources().getQuantityString(R.plurals.x_posts, weekPosts, weekPosts));
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append('·');
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append(getResources().getQuantityString(R.plurals.x_participants, numAccounts, numAccounts));
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append('·');
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append(getResources().getQuantityString(R.plurals.x_posts_today, todayPosts, todayPosts));
+			headerSubtitle.setText(ssb);
+		}
+
+		int styleRes;
+		followButton.setVisibility(View.VISIBLE);
+		if(hashtag.following){
+			followButton.setText(R.string.button_following);
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal;
+		}else{
+			followButton.setText(R.string.button_follow);
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		TypedArray ta=followButton.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		followButton.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=followButton.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		followButton.setTextColor(ta.getColorStateList(0));
+		followProgress.setIndeterminateTintList(ta.getColorStateList(0));
+		ta.recycle();
+
+		followButton.setTextVisible(true);
+		followProgress.setVisibility(View.GONE);
+		if(followMenuItem!=null){
+			followMenuItem.setTitle(getString(hashtag.following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
+		}
+	}
+
+	private void reloadTag(){
+		new GetTag(hashtagName)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						hashtag=result;
+						updateHeader();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+
+					}
+				})
+				.exec(accountID);
+	}
+
+	private void setFollowed(boolean followed){
+		if(followRequestRunning)
+			return;
+		followButton.setTextVisible(false);
+		followProgress.setVisibility(View.VISIBLE);
+		followRequestRunning=true;
+		new SetTagFollowed(hashtagName, followed)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						if(getActivity()==null)
+							return;
+						hashtag=result;
+						updateHeader();
+						followRequestRunning=false;
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						if(getActivity()==null)
+							return;
+						if(error instanceof MastodonErrorResponse er && "Duplicate record".equals(er.error)){
+							hashtag.following=true;
+						}else{
+							error.showToast(getActivity());
+						}
+						updateHeader();
+						followRequestRunning=false;
+					}
+				})
+				.exec(accountID);
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java

@@ -270,6 +270,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 							}else{
 								result=result.subList(0, endIndex);
 							}
+							AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.HOME);
 							List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
 							targetList.clear();
 							List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
@@ -279,7 +280,6 @@ public class HomeTimelineFragment extends StatusListFragment{
 								targetList.addAll(buildDisplayItems(s));
 								insertedPosts.add(s);
 							}
-							AccountSessionManager.get(accountID).filterStatuses(insertedPosts, FilterContext.HOME);
 							if(targetList.isEmpty()){
 								// oops. We didn't add new posts, but at least we know there are none.
 								adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java

@@ -93,7 +93,7 @@ public class ProfileFeaturedFragment extends BaseStatusListFragment<SearchResult
 				args.putParcelable("profileAccount", Parcels.wrap(res.account));
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			}
-			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name);
+			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 			case STATUS -> {
 				Status status=res.status.getContentStatus();
 				Bundle args=new Bundle();

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -245,15 +245,23 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		tabbar.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurfaceVariant), UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary));
 		tabbar.setTabTextSize(V.dp(14));
-		tabLayoutMediator=new TabLayoutMediator(tabbar, pager, new TabLayoutMediator.TabConfigurationStrategy(){
+		tabLayoutMediator=new TabLayoutMediator(tabbar, pager, (tab, position)->tab.setText(switch(position){
+			case 0 -> R.string.profile_featured;
+			case 1 -> R.string.profile_timeline;
+			case 2 -> R.string.profile_about;
+			default -> throw new IllegalStateException();
+		}));
+		tabbar.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener(){
 			@Override
-			public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){
-				tab.setText(switch(position){
-					case 0 -> R.string.profile_featured;
-					case 1 -> R.string.profile_timeline;
-					case 2 -> R.string.profile_about;
-					default -> throw new IllegalStateException();
-				});
+			public void onTabSelected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabUnselected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabReselected(TabLayout.Tab tab){
+				if(getFragmentForPage(tab.getPosition()) instanceof ScrollableToTop stt)
+					stt.scrollToTop();
 			}
 		});
 

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/ComposeAccountSearchFragment.java

@@ -47,7 +47,7 @@ public class ComposeAccountSearchFragment extends BaseAccountListFragment{
 	@Override
 	protected void doLoadData(int offset, int count){
 		refreshing=true;
-		currentRequest=new GetSearchResults(currentQuery, GetSearchResults.Type.ACCOUNTS, false)
+		currentRequest=new GetSearchResults(currentQuery, GetSearchResults.Type.ACCOUNTS, false, null, 0, 0)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(SearchResults result){

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java

@@ -3,7 +3,6 @@ package org.joinmastodon.android.fragments.discover;
 import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
 import org.joinmastodon.android.R;
@@ -20,7 +19,6 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
@@ -28,13 +26,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.utils.V;
 
 public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 	private String currentQuery;
@@ -94,7 +91,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 				args.putParcelable("profileAccount", Parcels.wrap(res.account));
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			}
-			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name);
+			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 			case STATUS -> {
 				Status status=res.status.getContentStatus();
 				Bundle args=new Bundle();
@@ -110,7 +107,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 	}
 
 	@Override
-	protected void doLoadData(int offset, int count){
+	protected void doLoadData(int _offset, int count){
 		GetSearchResults.Type type;
 		if(currentFilter.size()==1){
 			type=switch(currentFilter.iterator().next()){
@@ -125,7 +122,21 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 			dataLoaded();
 			return;
 		}
-		currentRequest=new GetSearchResults(currentQuery, type, true)
+		String maxID=null;
+		// TODO server-side bug
+		/*int offset=0;
+		if(_offset>0){
+			if(type==GetSearchResults.Type.STATUSES){
+				if(!preloadedData.isEmpty())
+					maxID=preloadedData.get(preloadedData.size()-1).status.id;
+				else if(!data.isEmpty())
+					maxID=data.get(data.size()-1).status.id;
+			}else{
+				offset=_offset;
+			}
+		}*/
+		int offset=_offset;
+		currentRequest=new GetSearchResults(currentQuery, type, type==null, maxID, offset, type==null ? 0 : count)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){
@@ -139,12 +150,15 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 								results.add(new SearchResult(tag));
 						}
 						if(result.statuses!=null){
-							for(Status status:result.statuses)
-								results.add(new SearchResult(status));
+							Set<String> alreadyLoadedStatuses=data.stream().filter(r->r.type==SearchResult.Type.STATUS).map(r->r.status.id).collect(Collectors.toSet());
+							for(Status status:result.statuses){
+								if(!alreadyLoadedStatuses.contains(status.id))
+									results.add(new SearchResult(status));
+							}
 						}
 						prevDisplayItems=new ArrayList<>(displayItems);
 						unfilteredResults=results;
-						onDataLoaded(filterSearchResults(results), false);
+						onDataLoaded(filterSearchResults(results), type!=null && !results.isEmpty());
 					}
 
 					@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java

@@ -43,9 +43,7 @@ import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
 import org.joinmastodon.android.ui.viewholders.SimpleListItemViewHolder;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -121,7 +119,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 				recentsHeader.setVisible(!data.isEmpty());
 			});
 		}else{
-			currentRequest=new GetSearchResults(currentQuery, null, false)
+			currentRequest=new GetSearchResults(currentQuery, null, false, null, 0, 0)
 					.limit(2)
 					.setCallback(new SimpleCallback<>(this){
 						@Override
@@ -377,7 +375,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void openHashtag(SearchResult res){
-		UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name);
+		UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 		AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putRecentSearch(res);
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java

@@ -105,7 +105,7 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 
 		@Override
 		public void onClick(){
-			UiUtils.openHashtagTimeline(getActivity(), accountID, item.name);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, item);
 		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java

@@ -271,7 +271,7 @@ public class SignupFragment extends ToolbarFragment{
 						@Override
 						public void tail(Node node, int depth){
 							if(node instanceof Element){
-								ssb.setSpan(new LinkSpan("", SignupFragment.this::onGoBackLinkClick, LinkSpan.Type.CUSTOM, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+								ssb.setSpan(new LinkSpan("", SignupFragment.this::onGoBackLinkClick, LinkSpan.Type.CUSTOM, null, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 								ssb.setSpan(new TypefaceSpan("sans-serif-medium"), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 							}
 						}

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java

@@ -100,7 +100,6 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 			selectedIDs.remove(id);
 		else
 			selectedIDs.add(id);
-		btn.setEnabled(!selectedIDs.isEmpty());
 		CheckableHeaderStatusDisplayItem.Holder holder=findHolderOfType(id, CheckableHeaderStatusDisplayItem.Holder.class);
 		if(holder!=null)
 			holder.rebind();
@@ -110,7 +109,6 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		btn=view.findViewById(R.id.btn_next);
-		btn.setEnabled(!selectedIDs.isEmpty());
 		btn.setOnClickListener(this::onButtonClick);
 		buttonBar=view.findViewById(R.id.button_bar);
 

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java

@@ -52,6 +52,7 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 		onDataLoaded(List.of(
 				new ListItem<>(R.string.settings_behavior, 0, R.drawable.ic_settings_24px, this::onBehaviorClick),
 				new ListItem<>(R.string.settings_display, 0, R.drawable.ic_style_24px, this::onDisplayClick),
+				new ListItem<>(R.string.settings_privacy, 0, R.drawable.ic_privacy_tip_24px, this::onPrivacyClick),
 				new ListItem<>(R.string.settings_filters, 0, R.drawable.ic_filter_alt_24px, this::onFiltersClick),
 				new ListItem<>(R.string.settings_notifications, 0, R.drawable.ic_notifications_24px, this::onNotificationsClick),
 				new ListItem<>(AccountSessionManager.get(accountID).domain, getString(R.string.settings_server_explanation), R.drawable.ic_dns_24px, this::onServerClick),
@@ -63,7 +64,9 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 			data.add(0, new ListItem<>("Debug settings", null, R.drawable.ic_settings_24px, ()->Nav.go(getActivity(), SettingsDebugFragment.class, makeFragmentArgs()), null, 0, true));
 		}
 
-		AccountSessionManager.get(accountID).reloadPreferences(null);
+		AccountSession session=AccountSessionManager.get(accountID);
+		session.reloadPreferences(null);
+		session.updateAccountInfo();
 		E.register(this);
 	}
 
@@ -127,6 +130,10 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 		Nav.go(getActivity(), SettingsDisplayFragment.class, makeFragmentArgs());
 	}
 
+	private void onPrivacyClick(){
+		Nav.go(getActivity(), SettingsPrivacyFragment.class, makeFragmentArgs());
+	}
+
 	private void onFiltersClick(){
 		Nav.go(getActivity(), SettingsFiltersFragment.class, makeFragmentArgs());
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsPrivacyFragment.java

@@ -0,0 +1,39 @@
+package org.joinmastodon.android.fragments.settings;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+
+import java.util.List;
+
+public class SettingsPrivacyFragment extends BaseSettingsFragment<Void>{
+	private CheckableListItem<Void> discoverableItem, indexableItem;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.settings_privacy);
+		Account self=AccountSessionManager.get(accountID).self;
+		onDataLoaded(List.of(
+			discoverableItem=new CheckableListItem<>(R.string.settings_discoverable, 0, CheckableListItem.Style.SWITCH, self.discoverable, R.drawable.ic_thumbs_up_down_24px, ()->toggleCheckableItem(discoverableItem)),
+			indexableItem=new CheckableListItem<>(R.string.settings_indexable, 0, CheckableListItem.Style.SWITCH, self.indexable, R.drawable.ic_search_24px, ()->toggleCheckableItem(indexableItem))
+		));
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){}
+
+	@Override
+	public void onPause(){
+		super.onPause();
+		Account self=AccountSessionManager.get(accountID).self;
+		if(self.discoverable!=discoverableItem.checked || self.indexable!=indexableItem.checked){
+			self.discoverable=discoverableItem.checked;
+			self.indexable=indexableItem.checked;
+			AccountSessionManager.get(accountID).savePreferencesLater();
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/model/Account.java

@@ -132,6 +132,9 @@ public class Account extends BaseModel{
 	 * When a timed mute will expire, if applicable.
 	 */
 	public Instant muteExpiresAt;
+	public boolean noindex;
+	public boolean indexable;
+	public boolean hideCollections;
 
 
 	@Override
@@ -191,6 +194,9 @@ public class Account extends BaseModel{
 				", source="+source+
 				", suspended="+suspended+
 				", muteExpiresAt="+muteExpiresAt+
+				", noindex="+noindex+
+				", indexable="+indexable+
+				", hideCollections="+hideCollections+
 				'}';
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/model/Hashtag.java

@@ -13,6 +13,7 @@ public class Hashtag extends BaseModel implements DisplayItemsParent{
 	public String url;
 	public List<History> history;
 	public int statusesCount;
+	public boolean following;
 
 	@Override
 	public String toString(){
@@ -21,6 +22,7 @@ public class Hashtag extends BaseModel implements DisplayItemsParent{
 				", url='"+url+'\''+
 				", history="+history+
 				", statusesCount="+statusesCount+
+				", following="+following+
 				'}';
 	}
 

mastodon/src/main/java/org/joinmastodon/android/model/Status.java

@@ -1,5 +1,7 @@
 package org.joinmastodon.android.model;
 
+import android.text.TextUtils;
+
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -8,6 +10,8 @@ import org.parceler.Parcel;
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
 
 import androidx.annotation.NonNull;
 
@@ -61,6 +65,8 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public transient boolean spoilerRevealed;
 	public transient boolean hasGapAfter;
 	private transient String strippedText;
+	public transient TranslationState translationState=TranslationState.HIDDEN;
+	public transient Translation translation;
 
 	public Status(){}
 
@@ -161,6 +167,18 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public Status clone(){
 		Status copy=(Status) super.clone();
 		copy.spoilerRevealed=false;
+		copy.translationState=TranslationState.HIDDEN;
 		return copy;
 	}
+
+	public boolean isEligibleForTranslation(){
+		return !TextUtils.isEmpty(content) && !TextUtils.isEmpty(language) && !Objects.equals(Locale.getDefault().getLanguage(), language)
+				&& (visibility==StatusPrivacy.PUBLIC || visibility==StatusPrivacy.UNLISTED);
+	}
+
+	public enum TranslationState{
+		HIDDEN,
+		SHOWN,
+		LOADING
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/model/Translation.java

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.model;
+
+import org.joinmastodon.android.api.AllFieldsAreRequired;
+
+@AllFieldsAreRequired
+public class Translation extends BaseModel{
+	public String content;
+	public String detectedSourceLanguage;
+	public String provider;
+}

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java

@@ -41,6 +41,7 @@ import org.parceler.Parcels;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 import androidx.annotation.LayoutRes;
 import me.grishka.appkit.Nav;
@@ -195,6 +196,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(item.status, !item.status.bookmarked);
 				}else if(id==R.id.share){
 					UiUtils.openSystemShareSheet(activity, item.status.url);
+				}else if(id==R.id.translate){
+					item.parentFragment.togglePostTranslation(item.status, item.parentID);
 				}
 				return true;
 			});
@@ -285,6 +288,15 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			Account account=item.user;
 			Menu menu=optionsMenu.getMenu();
 			boolean isOwnPost=AccountSessionManager.getInstance().isSelf(item.parentFragment.getAccountID(), account);
+			boolean canTranslate=item.status!=null && item.status.getContentStatus().isEligibleForTranslation();
+			MenuItem translate=menu.findItem(R.id.translate);
+			translate.setVisible(canTranslate);
+			if(canTranslate){
+				if(item.status.translationState==Status.TranslationState.SHOWN)
+					translate.setTitle(R.string.translation_show_original);
+				else
+					translate.setTitle(item.parentFragment.getString(R.string.translate_post, Locale.forLanguageTag(item.status.getContentStatus().language).getDisplayLanguage()));
+			}
 			menu.findItem(R.id.edit).setVisible(item.status!=null && isOwnPost);
 			menu.findItem(R.id.delete).setVisible(item.status!=null && isOwnPost);
 			menu.findItem(R.id.open_in_browser).setVisible(item.status!=null);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java

@@ -3,15 +3,24 @@ package org.joinmastodon.android.ui.displayitems;
 import android.app.Activity;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
+import android.text.SpannableStringBuilder;
+import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewStub;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 
+import java.util.Locale;
+
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.MovieDrawable;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -20,6 +29,8 @@ import me.grishka.appkit.utils.V;
 public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence text;
 	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
+	private CharSequence translatedText;
+	private CustomEmojiHelper translationEmojiHelper=new CustomEmojiHelper();
 	public boolean textSelectable;
 	public boolean reduceTopPadding;
 	public final Status status;
@@ -38,30 +49,54 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 	@Override
 	public int getImageCount(){
-		return emojiHelper.getImageCount();
+		return getCurrentEmojiHelper().getImageCount();
 	}
 
 	@Override
 	public ImageLoaderRequest getImageRequest(int index){
-		return emojiHelper.getImageRequest(index);
+		return getCurrentEmojiHelper().getImageRequest(index);
+	}
+
+	public void setTranslatedText(String text){
+		Status statusForContent=status.getContentStatus();
+		translatedText=HtmlParser.parse(text, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, parentFragment.getAccountID());
+		translationEmojiHelper.setText(translatedText);
+	}
+
+	private CustomEmojiHelper getCurrentEmojiHelper(){
+		return status.translationState==Status.TranslationState.SHOWN ? translationEmojiHelper : emojiHelper;
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<TextStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final LinkedTextView text;
+		private final ViewStub translationFooterStub;
+		private View translationFooter;
+		private TextView translationInfo;
+		private Button translationShowOriginal;
+		private ProgressBar translationProgress;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_text, parent);
 			text=findViewById(R.id.text);
+			translationFooterStub=findViewById(R.id.translation_info);
 		}
 
 		@Override
 		public void onBind(TextStatusDisplayItem item){
-			text.setText(item.text);
+			if(item.status.translationState==Status.TranslationState.SHOWN){
+				if(item.translatedText==null){
+					item.setTranslatedText(item.status.translation.content);
+				}
+				text.setText(item.translatedText);
+			}else{
+				text.setText(item.text);
+			}
 			text.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
 			itemView.setClickable(false);
 			text.setPadding(text.getPaddingLeft(), item.reduceTopPadding ? V.dp(8) : V.dp(16), text.getPaddingRight(), text.getPaddingBottom());
 			text.setTextColor(UiUtils.getThemeColor(text.getContext(), item.inset ? R.attr.colorM3OnSurfaceVariant : R.attr.colorM3OnSurface));
+			updateTranslation(false);
 		}
 
 		@Override
@@ -84,5 +119,43 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 		private CustomEmojiHelper getEmojiHelper(){
 			return item.emojiHelper;
 		}
+
+		public void updateTranslation(boolean updateText){
+			if(item.status==null)
+				return;
+			if(item.status.translationState==Status.TranslationState.HIDDEN){
+				if(translationFooter!=null)
+					translationFooter.setVisibility(View.GONE);
+				if(updateText){
+					text.setText(item.text);
+				}
+			}else{
+				if(translationFooter==null){
+					translationFooter=translationFooterStub.inflate();
+					translationInfo=findViewById(R.id.translation_info_text);
+					translationShowOriginal=findViewById(R.id.translation_show_original);
+					translationProgress=findViewById(R.id.translation_progress);
+					translationShowOriginal.setOnClickListener(v->item.parentFragment.togglePostTranslation(item.status, item.parentID));
+				}else{
+					translationFooter.setVisibility(View.VISIBLE);
+				}
+				if(item.status.translationState==Status.TranslationState.SHOWN){
+					translationProgress.setVisibility(View.GONE);
+					translationInfo.setVisibility(View.VISIBLE);
+					translationShowOriginal.setVisibility(View.VISIBLE);
+					translationInfo.setText(translationInfo.getContext().getString(R.string.post_translated, Locale.forLanguageTag(item.status.translation.detectedSourceLanguage).getDisplayLanguage(), item.status.translation.provider));
+					if(updateText){
+						if(item.translatedText==null){
+							item.setTranslatedText(item.status.translation.content);
+						}
+						text.setText(item.translatedText);
+					}
+				}else{ // LOADING
+					translationProgress.setVisibility(View.VISIBLE);
+					translationInfo.setVisibility(View.INVISIBLE);
+					translationShowOriginal.setVisibility(View.INVISIBLE);
+				}
+			}
+		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java

@@ -859,6 +859,8 @@ public class PhotoViewer implements ZoomPanView.Listener{
 
 		@Override
 		public void onVideoSizeChanged(MediaPlayer mp, int width, int height){
+			if(width<=0 || height<=0)
+				return;
 			FrameLayout.LayoutParams params=(FrameLayout.LayoutParams) wrap.getLayoutParams();
 			params.width=width;
 			params.height=height;

mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java

@@ -84,6 +84,7 @@ public class HtmlParser{
 		Map<String, String> idsByUrl=mentions.stream().collect(Collectors.toMap(m->m.url, m->m.id));
 		// Hashtags in remote posts have remote URLs, these have local URLs so they don't match.
 //		Map<String, String> tagsByUrl=tags.stream().collect(Collectors.toMap(t->t.url, t->t.name));
+		Map<String, Hashtag> tagsByTag=tags.stream().collect(Collectors.toMap(t->t.name.toLowerCase(), Function.identity()));
 
 		final SpannableStringBuilder ssb=new SpannableStringBuilder();
 		Jsoup.parseBodyFragment(source).body().traverse(new NodeVisitor(){
@@ -96,6 +97,7 @@ public class HtmlParser{
 				}else if(node instanceof Element el){
 					switch(el.nodeName()){
 						case "a" -> {
+							Object linkObject=null;
 							String href=el.attr("href");
 							LinkSpan.Type linkType;
 							if(el.hasClass("hashtag")){
@@ -103,6 +105,7 @@ public class HtmlParser{
 								if(text.startsWith("#")){
 									linkType=LinkSpan.Type.HASHTAG;
 									href=text.substring(1);
+									linkObject=tagsByTag.get(text.substring(1).toLowerCase());
 								}else{
 									linkType=LinkSpan.Type.URL;
 								}
@@ -117,7 +120,7 @@ public class HtmlParser{
 							}else{
 								linkType=LinkSpan.Type.URL;
 							}
-							openSpans.add(new SpanInfo(new LinkSpan(href, null, linkType, accountID), ssb.length(), el));
+							openSpans.add(new SpanInfo(new LinkSpan(href, null, linkType, accountID, linkObject), ssb.length(), el));
 						}
 						case "br" -> ssb.append('\n');
 						case "span" -> {
@@ -213,7 +216,7 @@ public class HtmlParser{
 			String url=matcher.group(3);
 			if(TextUtils.isEmpty(matcher.group(4)))
 				url="http://"+url;
-			ssb.setSpan(new LinkSpan(url, null, LinkSpan.Type.URL, null), matcher.start(3), matcher.end(3), 0);
+			ssb.setSpan(new LinkSpan(url, null, LinkSpan.Type.URL, null, null), matcher.start(3), matcher.end(3), 0);
 		}while(matcher.find()); // Find more URLs
 		return ssb;
 	}

mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.text.TextPaint;
 import android.text.style.CharacterStyle;
 
+import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 public class LinkSpan extends CharacterStyle {
@@ -13,12 +14,14 @@ public class LinkSpan extends CharacterStyle {
 	private String link;
 	private Type type;
 	private String accountID;
+	private Object linkObject;
 
-	public LinkSpan(String link, OnLinkClickListener listener, Type type, String accountID){
+	public LinkSpan(String link, OnLinkClickListener listener, Type type, String accountID, Object linkObject){
 		this.listener=listener;
 		this.link=link;
 		this.type=type;
 		this.accountID=accountID;
+		this.linkObject=linkObject;
 	}
 
 	public int getColor(){
@@ -35,7 +38,12 @@ public class LinkSpan extends CharacterStyle {
 		switch(getType()){
 			case URL -> UiUtils.openURL(context, accountID, link);
 			case MENTION -> UiUtils.openProfileByID(context, accountID, link);
-			case HASHTAG -> UiUtils.openHashtagTimeline(context, accountID, link);
+			case HASHTAG -> {
+				if(linkObject instanceof Hashtag ht)
+					UiUtils.openHashtagTimeline(context, accountID, ht);
+				else
+					UiUtils.openHashtagTimeline(context, accountID, link);
+			}
 			case CUSTOM -> listener.onLinkClick(this);
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java

@@ -61,6 +61,7 @@ import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Emoji;
+import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -342,10 +343,17 @@ public class UiUtils{
 		Nav.go((Activity)context, ProfileFragment.class, args);
 	}
 
+	public static void openHashtagTimeline(Context context, String accountID, Hashtag hashtag){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putParcelable("hashtag", Parcels.wrap(hashtag));
+		Nav.go((Activity)context, HashtagTimelineFragment.class, args);
+	}
+
 	public static void openHashtagTimeline(Context context, String accountID, String hashtag){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		args.putString("hashtag", hashtag);
+		args.putString("hashtagName", hashtag);
 		Nav.go((Activity)context, HashtagTimelineFragment.class, args);
 	}
 

mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java

@@ -15,15 +15,12 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.viewmodel.AccountViewModel;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.OutlineProviders;
-import org.joinmastodon.android.ui.text.HtmlParser;
-import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.FilterChipView;
@@ -96,6 +93,24 @@ public class ComposeAutocompleteViewController{
 					outRect.right=V.dp(8);
 			}
 		});
+		// Set empty adapter to prevent NPEs
+		list.setAdapter(new RecyclerView.Adapter<>(){
+			@NonNull
+			@Override
+			public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+				throw new UnsupportedOperationException();
+			}
+
+			@Override
+			public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position){
+
+			}
+
+			@Override
+			public int getItemCount(){
+				return 0;
+			}
+		});
 		contentView.addView(list, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
 		emptyButton=new FilterChipView(activity);
@@ -222,11 +237,13 @@ public class ComposeAutocompleteViewController{
 	}
 
 	private void doSearchUsers(){
-		currentRequest=new GetSearchResults(lastText, GetSearchResults.Type.ACCOUNTS, false)
+		currentRequest=new GetSearchResults(lastText, GetSearchResults.Type.ACCOUNTS, false, null, 0, 0)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){
 						currentRequest=null;
+						if(mode!=Mode.USERS)
+							return;
 						List<AccountViewModel> oldList=users;
 						users=result.accounts.stream().map(a->new AccountViewModel(a, accountID)).collect(Collectors.toList());
 						if(isLoading){
@@ -256,7 +273,7 @@ public class ComposeAutocompleteViewController{
 	}
 
 	private void doSearchHashtags(){
-		currentRequest=new GetSearchResults(lastText, GetSearchResults.Type.HASHTAGS, false)
+		currentRequest=new GetSearchResults(lastText, GetSearchResults.Type.HASHTAGS, false, null, 0, 0)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){

mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java

@@ -27,10 +27,14 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.ProgressListener;
+import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.GetAttachmentByID;
 import org.joinmastodon.android.api.requests.statuses.UpdateAttachment;
 import org.joinmastodon.android.api.requests.statuses.UploadAttachment;
@@ -47,8 +51,11 @@ import org.parceler.Parcel;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -540,6 +547,14 @@ public class ComposeMediaViewController{
 	public List<String> getAttachmentIDs(){
 		return attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
 	}
+
+	public List<CreateStatus.Request.MediaAttribute> getAttachmentAttributes(){
+		List<CreateStatus.Request.MediaAttribute> mediaAttributes = new ArrayList<>();
+		for (DraftMediaAttachment att:attachments){
+			 mediaAttributes.add(new CreateStatus.Request.MediaAttribute(att.serverAttachment.id, att.description, null));
+		}
+		return mediaAttributes;
+	}
 	
 	public boolean isEmpty(){
 		return attachments.isEmpty();
@@ -582,7 +597,7 @@ public class ComposeMediaViewController{
 	public void saveAltTextsBeforePublishing(Runnable onSuccess, Consumer<ErrorResponse> onError){
 		ArrayList<UpdateAttachment> updateAltTextRequests=new ArrayList<>();
 		for(DraftMediaAttachment att:attachments){
-			if(!att.descriptionSaved){
+			if(!att.descriptionSaved && (fragment.editingStatus==null || !fragment.editingStatus.mediaAttachments.contains(att.serverAttachment))){
 				UpdateAttachment req=new UpdateAttachment(att.serverAttachment.id, att.description);
 				req.setCallback(new Callback<>(){
 							@Override

mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java

@@ -74,9 +74,9 @@ public class ComposePollViewController{
 		pollWrap=view.findViewById(R.id.poll_wrap);
 
 		Instance instance=fragment.instance;
-		if(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxOptions>0)
+		if(instance!=null && instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxOptions>0)
 			maxPollOptions=instance.configuration.polls.maxOptions;
-		if(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxCharactersPerOption>0)
+		if(instance!=null && instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxCharactersPerOption>0)
 			maxPollOptionLength=instance.configuration.polls.maxCharactersPerOption;
 
 		pollOptionsView=pollWrap.findViewById(R.id.poll_options);

mastodon/src/main/res/drawable/ic_privacy_tip_24px.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,17H13V11H11ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q8.525,21.125 6.263,18.012Q4,14.9 4,11.1V5L12,2L20,5V11.1Q20,14.9 17.738,18.012Q15.475,21.125 12,22ZM12,19.9Q14.6,19.075 16.3,16.6Q18,14.125 18,11.1V6.375L12,4.125L6,6.375V11.1Q6,14.125 7.7,16.6Q9.4,19.075 12,19.9ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Z"/>
+</vector>

mastodon/src/main/res/drawable/ic_thumbs_up_down_24px.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M2,14Q1.175,14 0.588,13.412Q0,12.825 0,12V6Q0,5.7 0.125,5.425Q0.25,5.15 0.45,4.95L5.4,0L6.15,0.75Q6.3,0.9 6.4,1.137Q6.5,1.375 6.5,1.6V1.8L5.8,5H11Q11.425,5 11.713,5.287Q12,5.575 12,6V7.25Q12,7.4 11.975,7.537Q11.95,7.675 11.9,7.8L9.65,13.1Q9.475,13.525 9.088,13.762Q8.7,14 8.25,14ZM7.95,12 L10,7.15V7Q10,7 10,7Q10,7 10,7H3.35L3.95,4.3L2,6.2V12Q2,12 2,12Q2,12 2,12ZM18.6,24 L17.85,23.25Q17.7,23.1 17.6,22.863Q17.5,22.625 17.5,22.4V22.2L18.2,19H13Q12.575,19 12.288,18.712Q12,18.425 12,18V16.75Q12,16.6 12.025,16.462Q12.05,16.325 12.1,16.2L14.35,10.9Q14.55,10.475 14.925,10.238Q15.3,10 15.75,10H22Q22.825,10 23.413,10.587Q24,11.175 24,12V18Q24,18.3 23.888,18.562Q23.775,18.825 23.55,19.05ZM16.05,12 L14,16.85V17Q14,17 14,17Q14,17 14,17H20.65L20.05,19.7L22,17.8V12Q22,12 22,12Q22,12 22,12ZM2,12V6.2V7Q2,7 2,7Q2,7 2,7V7.15V12Q2,12 2,12Q2,12 2,12ZM22,12V17.8V17Q22,17 22,17Q22,17 22,17V16.85V12Q22,12 22,12Q22,12 22,12Z"/>
+</vector>

mastodon/src/main/res/layout/display_item_text.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
 
 	<org.joinmastodon.android.ui.views.LinkedTextView
 		android:id="@+id/text"
@@ -16,4 +17,10 @@
 		android:paddingBottom="8dp"
 		android:textAppearance="@style/m3_body_large"/>
 
-</FrameLayout>
+	<ViewStub
+		android:id="@+id/translation_info"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout="@layout/footer_text_translation"/>
+
+</LinearLayout>

mastodon/src/main/res/layout/footer_text_translation.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<ProgressBar
+		android:id="@+id/translation_progress"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:layout_gravity="center"
+		style="?android:progressBarStyleSmall"/>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingHorizontal="16dp"
+		android:paddingVertical="8dp"
+		android:clipToPadding="false"
+		android:baselineAligned="false"
+		android:gravity="center_vertical">
+
+		<TextView
+			android:id="@+id/translation_info_text"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:textAppearance="@style/m3_body_small"
+			android:textColor="?colorM3Secondary"
+			tools:text="Translated from Japanese using DeepL.com"/>
+
+		<Button
+			android:id="@+id/translation_show_original"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			style="@style/Widget.Mastodon.M3.Button.Text"
+			android:paddingHorizontal="8dp"
+			android:layout_marginEnd="-8dp"
+			android:text="@string/translation_show_original"/>
+	</LinearLayout>
+</FrameLayout>

mastodon/src/main/res/layout/header_hashtag_timeline.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingHorizontal="16dp"
+	android:paddingBottom="8dp">
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_toStartOf="@id/follow_btn_wrap"
+		android:layout_marginEnd="8dp"
+		android:textAppearance="@style/m3_headline_small"
+		android:textColor="?colorM3OnSurface"
+		android:maxLines="4"
+		android:ellipsize="end"
+		android:minHeight="36dp"
+		android:gravity="center_vertical"
+		tools:text="#CatsOfMastodonButLong"/>
+
+	<FrameLayout
+		android:id="@+id/follow_btn_wrap"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignTop="@id/title"
+		android:layout_alignBottom="@id/title"
+		android:layout_alignParentEnd="true">
+
+		<org.joinmastodon.android.ui.views.ProgressBarButton
+			android:id="@+id/profile_action_btn"
+			android:layout_width="wrap_content"
+			android:layout_height="36dp"
+			android:layout_gravity="center"
+			style="@style/Widget.Mastodon.M3.Button.Filled"
+			android:paddingHorizontal="16dp"
+			tools:text="@string/button_follow" />
+
+		<ProgressBar
+			android:id="@+id/action_progress"
+			style="?android:progressBarStyleSmall"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:elevation="10dp"
+			android:indeterminate="true"
+			android:outlineProvider="none"
+			android:visibility="gone" />
+	</FrameLayout>
+
+	<TextView
+		android:id="@+id/subtitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/title"
+		android:layout_marginTop="8dp"
+		android:textAppearance="@style/m3_label_large"
+		android:textColor="?colorM3OnSurfaceVariant"
+		tools:text="123 posts"/>
+
+</RelativeLayout>

mastodon/src/main/res/menu/post.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<group android:id="@+id/menu_group1">
-		<!-- TODO translate -->
+		<item android:id="@+id/translate" android:title="@string/translate_post"/>
 		<item android:id="@+id/bookmark" android:title="@string/add_bookmark"/>
 		<item android:id="@+id/share" android:title="@string/button_share"/>
 		<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser"/>

mastodon/src/main/res/values-ar-rSA/strings.xml

@@ -4,11 +4,18 @@
 	<string name="next">التالي</string>
 	<string name="loading_instance">جارٍ جلب معلومات الخادم…</string>
 	<string name="error">خطأ</string>
+	<string name="not_a_mastodon_instance">لا يبدو أنّ %s كخادم ماستدون.</string>
 	<string name="ok">حسنًا</string>
 	<string name="preparing_auth">جَارٍ الإعدَادُ لِلمُصادَقَة…</string>
 	<string name="finishing_auth">يُنهي المصادقة…</string>
+	<string name="user_boosted">قام %s بإعادة نشر</string>
 	<string name="in_reply_to">ردًا على %s</string>
 	<string name="notifications">الإشعارات</string>
+	<string name="user_followed_you">%s بَدَأ بِمُتابَعَتِك</string>
+	<string name="user_sent_follow_request">%s أرسَلَ طَلَبًا لِمُتابَعَتِك</string>
+	<string name="user_favorited">%s أعجَبه منشورك</string>
+	<string name="notification_boosted">قام %s بإعادة نشر منشورك</string>
+	<string name="poll_ended">الاطلاع على نتائج استطلاع الرأي الذي صوّت فيه</string>
 	<string name="share_toot_title">شارك</string>
 	<string name="settings">الإعدادات</string>
 	<string name="publish">انشر</string>
@@ -37,7 +44,8 @@
 	<string name="profile_about">حَول</string>
 	<string name="button_follow">تابِع</string>
 	<string name="button_following">مُتابَع</string>
-	<string name="edit_profile">حرّر الملف الشخصي</string>
+	<string name="edit_profile">تعديل الملف الشخصي</string>
+	<string name="share_user">شارك الصفحة الشخصية</string>
 	<string name="mute_user">كَتمُ %s</string>
 	<string name="unmute_user">إلغاء الكَتم عن @%s</string>
 	<string name="block_user">حَظرُ %s</string>
@@ -117,8 +125,16 @@
 		<item quantity="many">تبقى %d يومًا</item>
 		<item quantity="other">تبقى %d يوم</item>
 	</plurals>
-	<string name="poll_closed">انتهى</string>
-	<string name="confirm_mute_title">اكتم الحساب</string>
+	<plurals name="x_votes">
+		<item quantity="zero">%,d صوت</item>
+		<item quantity="one">%,d صوت واحد</item>
+		<item quantity="two">صوتين</item>
+		<item quantity="few">%,d أصوات</item>
+		<item quantity="many">%,d صوتا</item>
+		<item quantity="other">%,d صوتا</item>
+	</plurals>
+	<string name="poll_closed">مغلق</string>
+	<string name="confirm_mute_title">كتم الحساب</string>
 	<string name="confirm_mute">أكّد كتم %s</string>
 	<string name="do_mute">اكتم</string>
 	<string name="confirm_unmute_title">ارفع الكتم عن الحساب</string>
@@ -135,17 +151,20 @@
 	<string name="button_blocked">محجوب</string>
 	<string name="action_vote">صَوّت</string>
 	<string name="delete">احذف</string>
+	<string name="confirm_delete_title">احذف المنشور</string>
 	<string name="confirm_delete">أمتأكد من حذف هذا المنشور؟</string>
 	<string name="deleting">يحذف…</string>
 	<string name="notification_channel_audio_player">تشغيل الصوت</string>
 	<string name="play">شغّل</string>
 	<string name="pause">ألبث</string>
+	<string name="log_out">الخروج</string>
 	<string name="add_account">أضف حساباً</string>
 	<string name="search_hint">ابحث</string>
 	<string name="hashtags">وُسُوم</string>
 	<string name="news">الأخبار</string>
 	<string name="for_you">لأجلك</string>
-	<string name="mentions">الذِكر</string>
+	<string name="all_notifications">كلها</string>
+	<string name="mentions">الإشارات</string>
 	<plurals name="x_people_talking">
 		<item quantity="zero">لا أحد يتحدث</item>
 		<item quantity="one">شخص واحد يتحدث</item>
@@ -155,11 +174,16 @@
 		<item quantity="other">%d شخص يتحدثون</item>
 	</plurals>
 	<string name="report_title">بلّغ عن %s</string>
+	<string name="report_choose_reason">ما المُشكِلَةُ فِي هَذَا المَنشُور؟</string>
+	<string name="report_choose_reason_account">ما المُشكِلَة مَعَ %s؟</string>
 	<string name="report_choose_reason_subtitle">اختر أفضل تطابق</string>
+	<string name="report_reason_personal">لا يعجبني</string>
 	<string name="report_reason_personal_subtitle">ألا ترغب برؤيته</string>
+	<string name="report_reason_spam">إنه غير مرغوب فيه</string>
 	<string name="report_reason_spam_subtitle">روابط خبيثة أو تفاعل كاذب أو ردود متكررة</string>
 	<string name="report_reason_violation">ينتهك قواعد الخادم</string>
-	<string name="report_reason_violation_subtitle">تعلم أنه ينتهك قواعد محددة</string>
+	<string name="report_reason_violation_subtitle">أنت مُدرك لانتهاكه قواعد مُحَدَّدَة</string>
+	<string name="report_reason_other">إنَّهُ شَيءٌ آخَر</string>
 	<string name="report_reason_other_subtitle">لا تندرج هذه المشكلة ضمن فئات أخرى</string>
 	<string name="report_choose_rule">ما هي القواعد المنتهكة؟</string>
 	<string name="report_choose_rule_subtitle">اختر كل ما ينطبق</string>
@@ -168,8 +192,14 @@
 	<string name="report_comment_title">هل لديك شيء آخر لتخبرنا به؟</string>
 	<string name="report_comment_hint">تعليقات إضافية</string>
 	<string name="sending_report">يرسل البلاغ…</string>
+	<string name="report_sent_title">شُكرًا لَكَ على الإبلاغ، سَوفَ نتحرى عن الأمر.</string>
+	<string name="report_sent_subtitle">في أثناء مراجعتنا للبلاغ، يمكنك اتخاذ إجراء ضد %s:</string>
 	<string name="unfollow_user">ألغ متابعة %s</string>
 	<string name="unfollow">ألغ المتابعة</string>
+	<string name="mute_user_explain">لن ترى مشاركاتهم. لكن لا يزال بإمكانهم متابعتك ورؤية مشاركاتك ولن يعرفوا أنه تم كتم صوتها.</string>
+	<string name="block_user_explain">لن ترى مشاركاتهم. ولن يتمكنوا من رؤية مشاركاتك أو متابعتك. سيكونون قادرين على معرفة أنهم محظورون.</string>
+	<string name="report_personal_title">لا تريد أن ترى هذا؟</string>
+	<string name="report_personal_subtitle">فيما يلي خياراتك للتحكم بما يُعرَض عليك في ماستدون:</string>
 	<string name="back">العودة</string>
 	<string name="search_communities">اسم الخادم أو عنوان URL</string>
 	<string name="instance_rules_title">قواعد الخادم</string>
@@ -196,23 +226,39 @@
 	<string name="category_tech">تقني</string>
 	<string name="confirm_email_title">تحقق من صندوق الوارد الخاص بك</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">اضغط على الرابط الذي أرسلناه إليك للتحقق من %s. سننتظر هنا.</string>
+	<string name="confirm_email_didnt_get">ألم تحصل على رابط؟</string>
 	<string name="resend">أعد الإرسال</string>
 	<string name="open_email_app">افتح تطبيق البريد الإلكتروني</string>
 	<string name="resent_email">أُرسلت رسالة التأكيد</string>
+	<string name="compose_hint">عَبِّر عَمَّ يَجُولُ فِي ذِهنِك</string>
 	<string name="content_warning">تحذير من المحتوى</string>
 	<string name="save">احفظ</string>
 	<string name="add_alt_text">أضف نصًا بديلًا</string>
 	<string name="visibility_public">علني</string>
 	<string name="visibility_followers_only">للمُتابِعينَ فقط</string>
+	<string name="visibility_private">للمشار إليهم فقط</string>
+	<string name="recent_searches">الحديثة</string>
 	<string name="skip">تخطى</string>
 	<string name="notification_type_follow">متابعُون جُدُد</string>
 	<string name="notification_type_favorite">المفضلة</string>
-	<string name="notification_type_mention">الذِكر</string>
+	<string name="notification_type_reblog">المعاد نشرها</string>
+	<string name="notification_type_mention">الإشارات</string>
 	<string name="notification_type_poll">استطلاع رأي</string>
 	<string name="choose_account">اختر حسابًا</string>
 	<string name="err_not_logged_in">يرجى تسجيل الدخول إلى حساب ماستدون أولًا</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="zero">لا يمكن إرفاق أكثر من ملف واحد</item>
+		<item quantity="one">لا يمكن إرفاق أكثر من ملف واحد</item>
+		<item quantity="two">لا يمكنك إرفاق أكثر من %d ملفين</item>
+		<item quantity="few">لا يمكن إرفاق أكثر من %d ملفات</item>
+		<item quantity="many">لا يمكن إرفاق أكثر من %d ملفات</item>
+		<item quantity="other">لا يمكن إرفاق أكثر من %d ملف</item>
+	</plurals>
 	<string name="media_attachment_unsupported_type">نوع الملف %s غير مدعوم</string>
 	<string name="media_attachment_too_big">الملف %1$s يتجاوز حدّ %2$s مب</string>
+	<string name="settings_theme">المظهر</string>
+	<string name="theme_auto">استخدام مظهر الجهاز</string>
 	<string name="theme_light">فاتح</string>
 	<string name="theme_dark">داكن</string>
 	<string name="settings_behavior">السلوك</string>
@@ -225,9 +271,13 @@
 	<string name="settings_clear_cache">امسح التخزين المؤقت للوسائط</string>
 	<string name="settings_app_version">تطبيق ماستدون لأندرويد نسخة %1$s (%2$d)</string>
 	<string name="media_cache_cleared">مُسح التخزين المؤقت للوسائط</string>
+	<string name="confirm_log_out">تسجيل الخروج من %s؟</string>
+	<string name="sensitive_content_explain">وصف المؤلف هذه الوسائط بأنها حساسة.</string>
+	<string name="avatar_description">انتقل إلى الصفحة الشخصية لـ %s</string>
 	<string name="more_options">مزيد من الخيارات</string>
 	<string name="new_post">منشور جديد</string>
 	<string name="button_reply">ردّ</string>
+	<string name="button_reblog">إعادة النشر</string>
 	<string name="button_favorite">فضّل</string>
 	<string name="button_share">شارك</string>
 	<string name="media_no_description">وسائط بدون وصف</string>
@@ -239,7 +289,11 @@
 	<string name="media_viewer">عارض الوسائط</string>
 	<string name="follow_user">تابع %s</string>
 	<string name="unfollowed_user">ألغ متابعة %s</string>
+	<string name="followed_user">أنت تتابع الآن %s</string>
+	<string name="following_user_requested">طَلَبَ %s مُتابَعتك</string>
 	<string name="open_in_browser">افتح في المتصفح</string>
+	<string name="hide_boosts_from_user">أخفِ المعاد نشرها مِن %s</string>
+	<string name="show_boosts_from_user">أظهر ما أعاد %s نشرَه</string>
 	<string name="signup_reason">لماذا تريد الانضمام؟</string>
 	<string name="signup_reason_note">هذا سوف يساعدنا في مراجعة تطبيقك.</string>
 	<string name="clear">امسح</string>
@@ -253,7 +307,13 @@
 	<string name="error_saving_file">خطأ أثناء حفظ الملف</string>
 	<string name="file_saved">حُفظ الملف</string>
 	<string name="downloading">ينزّل…</string>
+	<string name="no_app_to_handle_action">لا يوجد تطبيق لمعالجة هذا الإجراء</string>
+	<string name="local_timeline">المحلي</string>
+	<string name="trending_posts_info_banner">هذه هي المشاركات التي تكتسب شعبية عبر ماستدون.</string>
+	<string name="trending_links_info_banner">هذه هي القصص الإخبارية التي يُتحدّث عنها على ماستدون.</string>
 	<!-- %s is the server domain -->
+	<string name="local_timeline_info_banner">هذه هي جميع المشاركات من جميع المستخدمين في الخادم الخاص بك (%s).</string>
+	<string name="recommended_accounts_info_banner">قد تعجبك هذه الحسابات استنادا إلى حسابات أخرى تتابعها.</string>
 	<string name="see_new_posts">استعرض المنشورات الجديدة</string>
 	<string name="load_missing_posts">حمّل المَنشورات المَفقودَة</string>
 	<string name="follow_back">رُدّ المتابعة</string>
@@ -285,6 +345,14 @@
 		<item quantity="many">%,d تفضيلًا</item>
 		<item quantity="other">%,d تفضيل</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="zero">لم يُعد نشره</item>
+		<item quantity="one">إعادة نشر واحدة</item>
+		<item quantity="two">أعيد نشره مرّتان</item>
+		<item quantity="few">أعيد نشره %,d مرات</item>
+		<item quantity="many">أعيد نشره %,d مرات</item>
+		<item quantity="other">أعيد نشره %,d مرات</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s عبر %2$s</string>
 	<string name="time_now">الآن</string>
 	<string name="edit_history">تاريخ التعديل</string>
@@ -294,7 +362,7 @@
 		<item quantity="zero">منذ %d ثانية</item>
 		<item quantity="one">منذ ثانية</item>
 		<item quantity="two">منذ ثانيتان</item>
-		<item quantity="few">%d ثواني</item>
+		<item quantity="few">%d ثوانٍ</item>
 		<item quantity="many">منذ %d ثانية</item>
 		<item quantity="other">%d ثواني مضت</item>
 	</plurals>
@@ -347,6 +415,7 @@
 	<string name="login_title">مرحبا بك مجددًا</string>
 	<string name="login_subtitle">قم بتسجيل الدخول باستخدام الخادم حيث قمتَ بإنشاء حسابك فيه.</string>
 	<string name="server_url">رابط الخادم</string>
+	<string name="signup_random_server_explain">سوف نختار خادماً بناءً على لغتك إذا قمت بالمتابعة دون إجراء إختيار.</string>
 	<string name="server_filter_any_language">أي لغة</string>
 	<string name="server_filter_instant_signup">تسجيل فوري</string>
 	<string name="server_filter_manual_review">مراجعة يدوية</string>
@@ -359,6 +428,7 @@
 	<string name="server_filter_region_oceania">أوقيانوسيا</string>
 	<string name="not_accepting_new_members">لا يقبل  استقبال أعضاء جدد</string>
 	<string name="category_special_interests">المصالح الخاصة</string>
+	<string name="signup_passwords_dont_match">كلمات المرور غير متطابقة</string>
 	<string name="pick_server_for_me">اختر لي</string>
 	<string name="profile_add_row">إضافة صف</string>
 	<string name="profile_setup">إعداد الملف الشخصي</string>
@@ -367,21 +437,279 @@
 	<string name="popular_on_mastodon">مشهور على ماستدون</string>
 	<string name="follow_all">اتبع الكل</string>
 	<string name="server_rules_disagree">لا أوافق</string>
+	<string name="privacy_policy_explanation">بالمختصر: نحن لا نجمع أو نعالج أي شيء.</string>
 	<!-- %s is server domain -->
 	<string name="server_policy_disagree">لا أوافق %s</string>
 	<string name="profile_bio">نبذة عنك</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<string name="sending_follows">متابعة المستخدمين…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s لا يسمح بالاشتراكات من %2$s. جرب خادما واحدا أو &lt;a&gt;اختر خادما مختلفا&lt;/a&gt;.</string>
+	<string name="spoiler_show">إظهاره على أي حال</string>
+	<string name="spoiler_hide">إعادة الإخفاء</string>
+	<string name="poll_multiple_choice">اختر واحدا أو أكثر</string>
+	<string name="save_changes">حفظ التغييرات</string>
+	<string name="profile_featured">المميزة</string>
+	<string name="profile_timeline">الخيط</string>
+	<string name="view_all">عرض الكل</string>
+	<string name="profile_endorsed_accounts">الحسابات</string>
+	<string name="verified_link">رابط متحقق منه</string>
+	<string name="show">إظهار</string>
+	<string name="hide">إخفاء</string>
+	<string name="join_default_server">الانضمام إلى %s</string>
+	<string name="pick_server">اختر خادما آخر</string>
+	<string name="signup_or_login">أو</string>
+	<string name="learn_more">تعلم المزيد</string>
+	<string name="welcome_to_mastodon">أهلًا بك على ماستدون</string>
+	<string name="welcome_paragraph1">ماستدون شبكة اجتماعية لامركزية، بمعنى أنه ليس هناك شركة واحدة تتحكم فيها. وهي تتألف من العديد من الخوادم التي تدار بشكل مستقل، وجميعها متصلة معا.</string>
+	<string name="what_are_servers">ما هي الخوادم؟</string>
+	<string name="welcome_paragraph2">تتم استضافة كل حساب ماستدون على خادم - ولكل خادم قيمه وقواعده ومسؤوليه الخاصين. مهما اخترت أي خادم، يمكنك متابعة الأشخاص والتفاعل معهم على أي خادم آخر.</string>
+	<string name="opening_link">رابط الافتتاح…</string>
+	<string name="link_not_supported">هذا الرابط غير مدعوم في التطبيق</string>
+	<string name="log_out_all_accounts">تسجيل الخروج من جميع الحسابات</string>
+	<string name="confirm_log_out_all_accounts">أتريد تسجيل الخروج من جميع الحسابات؟</string>
+	<string name="retry">حاول مجددًا</string>
+	<string name="post_failed">أخفق في الإرسال</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">صورة %s</string>
+	<string name="attachment_description_video">فيديو %s</string>
+	<string name="attachment_description_audio">مقطع صوتي %s</string>
+	<string name="attachment_description_unknown">ملف %s</string>
+	<string name="attachment_type_image">صورة</string>
+	<string name="attachment_type_video">فيديو</string>
+	<string name="attachment_type_audio">مقطع صوتي</string>
+	<string name="attachment_type_gif">GIF</string>
+	<string name="attachment_type_unknown">ملف</string>
+	<string name="attachment_x_percent_uploaded">%d%% تم الرفع</string>
+	<string name="add_poll_option">إضافة خيار للاستطلاع</string>
+	<string name="poll_length">مدة الاستطلاع</string>
+	<string name="poll_style">النوع</string>
+	<string name="compose_poll_single_choice">اختر واحدا</string>
+	<string name="compose_poll_multiple_choice">خيارات متعددة</string>
+	<string name="delete_poll_option">حذف خيار من الاستطلاع</string>
+	<string name="poll_style_title">نمط الاستطلاع</string>
+	<string name="alt_text">نص بديل</string>
+	<string name="help">المساعدة</string>
+	<string name="what_is_alt_text">ما هو النص البديل؟</string>
+	<string name="alt_text_help">يوفر النص البديل أوصافا للصور للأشخاص الذين يعانون من إعاقات بصرية أو اتصالات ذات نطاق ترددي منخفض أو أولئك الذين يبحثون عن سياق إضافي.\n\nيمكنك تحسين إمكانية الوصول والفهم للجميع من خلال كتابة نص بديل واضح وموجز وموضوعي.\n\n التقاط العناصر المهمة\n<ul><li>تلخيص النص في الصور</li>\n<li>استخدام بنية الجملة العادية</li>\n<li>تجنب المعلومات الزائدة</li>\n<li>التركيز على الاتجاهات والنتائج الرئيسية في العناصر المرئية المعقدة (مثل الرسوم البيانية أو الخرائط)</li><li></li></ul></string>
+	<string name="edit_post">تعديل المنشور</string>
+	<string name="no_verified_link">لم يتم التحقق من الرابط</string>
+	<string name="compose_autocomplete_emoji_empty">تصفح الرموز التعبيرية</string>
+	<string name="compose_autocomplete_users_empty">العثور على الأشخاص الذين تبحث عنهم</string>
+	<string name="no_search_results">تعذر العثور على أي نتائج لمصطلحات البحث هذه</string>
+	<string name="language">اللغة</string>
+	<string name="language_default">الافتراضية</string>
+	<string name="language_system">النظام</string>
+	<string name="language_detecting">اكتشاف اللغة</string>
+	<string name="language_cant_detect">تعذر اكتشاف اللغة</string>
+	<string name="language_detected">الكشف عن</string>
+	<string name="media_hidden">وسائط مخفية</string>
+	<string name="post_hidden">منشور مخفي</string>
+	<string name="report_title_post">الإبلاغ عن المنشور</string>
+	<string name="forward_report_explanation">الحساب من خادم آخر. هل تودّ إرسال نسخة مجهولة المصدر من هذا التقرير هناك أيضا؟</string>
 	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">تحويله إلى %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">تم الإبلاغ عنه</string>
+	<string name="report_unfollow_explanation">لعدم رؤية مشاركاتهم في خلاصة ملخصك بعد الآن، ألغِ متابعتهم.</string>
+	<string name="muted_user">كتم %s</string>
+	<string name="report_sent_already_blocked">لقد حظرت هذا المستخدم من قبل، لذلك لا يوجد شيء آخر عليك القيام به خلال مراجعة بلاغك.</string>
+	<string name="report_personal_already_blocked">لقد قمت بالفعل بحظر هذا المستخدم، لذلك لا يوجد شيء آخر عليك القيام به.\n\nشكرا للمساعدة في الحفاظ على ماستدون مكانا آمنا للجميع!</string>
+	<string name="blocked_user">حظر %s</string>
+	<string name="mark_all_notifications_read">اعتبار الكل كمقروء</string>
+	<string name="settings_display">الشاشة</string>
+	<string name="settings_filters">عوامل التصفية</string>
+	<string name="settings_server_explanation">نظرة عامة وقواعد ومشرفين</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">عن %s</string>
+	<string name="default_post_language">اللغة الافتراضية للمنشور</string>
+	<string name="settings_alt_text_reminders">إضافة تذكير بالنصوص البديلة</string>
+	<string name="settings_confirm_unfollow">السؤال قبل إلغاء متابعة شخص ما</string>
+	<string name="settings_confirm_boost">اسأل قبل إعادة النشر</string>
+	<string name="settings_confirm_delete_post">السؤال قبل حذف المشاركات</string>
+	<string name="pause_all_notifications">إيقاف الكل</string>
+	<string name="pause_notifications_off">إيقاف</string>
+	<string name="notifications_policy_anyone">أيا كان</string>
+	<string name="notifications_policy_followed">الأشخاص الذين تتابعهم</string>
+	<string name="notifications_policy_follower">الأشخاص الذين تتابعهم</string>
+	<string name="notifications_policy_no_one">لا أحد</string>
+	<string name="settings_notifications_policy">تلقي الإشعارات من</string>
+	<string name="notification_type_mentions_and_replies">الإشارات والردود</string>
+	<string name="pause_all_notifications_title">إيقاف جميع الإشعارات مؤقتًا</string>
+	<plurals name="x_weeks">
+		<item quantity="zero">%d أسبوع</item>
+		<item quantity="one">أسبوع واحد</item>
+		<item quantity="two">أسبوعان</item>
+		<item quantity="few">%d أسابيع</item>
+		<item quantity="many">%d أسبوعًا</item>
+		<item quantity="other">%d أسابيع</item>
+	</plurals>
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
+	<string name="date_at_time">%1$s في %2$s</string>
+	<string name="today">اليوم</string>
+	<string name="yesterday">أمس</string>
+	<string name="tomorrow">غدًا</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_ends">ينتهي %s</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">سيتم استئناف الإشعارات %s.</string>
+	<string name="resume_notifications_now">استأنف الآن</string>
+	<string name="open_system_notification_settings">الانتقال إلى إعدادات الإشعارات</string>
+	<string name="about_server">عن</string>
+	<string name="server_rules">القواعد</string>
+	<string name="server_administrator">المدير</string>
+	<string name="send_email_to_server_admin">للاتصال بالمدير</string>
+	<string name="notifications_disabled_in_system">شغل الإشعارات من إعدادات جهازك لرؤية التحديثات من أي مكان.</string>
+	<string name="settings_even_more">المزيد من الإعدادات</string>
+	<string name="settings_show_cws">إظهار تحذيرات المحتوى</string>
+	<string name="settings_hide_sensitive_media">فلرتة الوسائط التي تم وضع علامة عليها على أنها حساسة</string>
+	<string name="settings_show_interaction_counts">عدد التفاعل مع المنشورات</string>
+	<string name="settings_show_emoji_in_names">رموز تعبيرية مخصصة في أسماء العرض</string>
+	<plurals name="in_x_seconds">
+		<item quantity="zero">في %d ثانية</item>
+		<item quantity="one">في ثانية واحدة</item>
+		<item quantity="two">في ثانيتين</item>
+		<item quantity="few">في %d ثوانٍ</item>
+		<item quantity="many">في %d ثانية</item>
+		<item quantity="other">في %d ثوان</item>
+	</plurals>
+	<plurals name="in_x_minutes">
+		<item quantity="zero">في %d دقيقة</item>
+		<item quantity="one">في دقيقة واحدة</item>
+		<item quantity="two">في دقيقتين</item>
+		<item quantity="few">في %d دقائق</item>
+		<item quantity="many">في %d دقيقة</item>
+		<item quantity="other">في %d دقائق</item>
+	</plurals>
+	<plurals name="in_x_hours">
+		<item quantity="zero">في %d ساعة</item>
+		<item quantity="one">خلال ساعة واحدة</item>
+		<item quantity="two">خلال ساعتان</item>
+		<item quantity="few">خلال %d ساعات</item>
+		<item quantity="many">خلال %d ساعة</item>
+		<item quantity="other">خلال %d ساعات</item>
+	</plurals>
+	<plurals name="x_hours_ago">
+		<item quantity="zero">منذ %d ساعات</item>
+		<item quantity="one">منذ ساعة واحدة</item>
+		<item quantity="two">منذ ساعتان</item>
+		<item quantity="few">منذ %d ساعات</item>
+		<item quantity="many">منذ %d ساعة</item>
+		<item quantity="other">منذ %d ساعات</item>
+	</plurals>
+	<string name="alt_text_reminder_title">تفتقد الوسائط إلى نص بديل</string>
+	<plurals name="alt_text_reminder_x_images">
+		<item quantity="zero">%s من صورك يفتقر إلى نص بديل. أتردد النشر على أي حال؟</item>
+		<item quantity="one">%s من صورك يفتقر إلى نص بديل. أتردد النشر على أي حال؟</item>
+		<item quantity="two">%s من صورك يفتقر إلى نص بديل. أتردد النشر على أي حال؟</item>
+		<item quantity="few">%s من صورك يفتقر إلى نص بديل. أتردد النشر على أي حال؟</item>
+		<item quantity="many">%s من صورك يفتقر إلى نص بديل. أتردد النشر على أي حال؟</item>
+		<item quantity="other">%s من صورك يفتقر إلى نص بديل. أتردد النشر على أي حال؟</item>
+	</plurals>
+	<plurals name="alt_text_reminder_x_attachments">
+		<item quantity="zero">%s من مرفقات الوسائط الخاصة بك يفتقر لنص بديل. نشر على أي حال؟</item>
+		<item quantity="one">%s من مرفقات الوسائط الخاصة بك يفتقر لنص بديل. نشر على أي حال؟</item>
+		<item quantity="two">%s من مرفقات الوسائط الخاصة بك يفتقر لنص بديل. نشر على أي حال؟</item>
+		<item quantity="few">%s من مرفقات الوسائط الخاصة بك يفتقر لنص بديل. نشر على أي حال؟</item>
+		<item quantity="many">%s من مرفقات الوسائط الخاصة بك يفتقر لنص بديل. نشر على أي حال؟</item>
+		<item quantity="other">%s من مرفقات الوسائط الخاصة بك يفتقر لنص بديل. نشر على أي حال؟</item>
+	</plurals>
+	<string name="count_one">واحد</string>
+	<string name="count_two">اثنان</string>
+	<string name="count_three">ثلاثة</string>
+	<string name="count_four">أربعة</string>
+	<string name="alt_text_reminder_post_anyway">مَنشور</string>
 	<!-- %s is the username -->
+	<string name="unfollow_confirmation">أتريد إلغاء متابعة %s؟</string>
+	<string name="filter_active">نشِط</string>
+	<string name="filter_inactive">خامل</string>
+	<string name="settings_add_filter">إضافة عامل تصفية</string>
+	<string name="settings_edit_filter">تعديل عامل التصفية</string>
+	<string name="settings_filter_duration">المدة</string>
+	<string name="settings_filter_muted_words">الكلمات المحظورة</string>
+	<string name="settings_filter_context">كتم الصوت من</string>
+	<string name="settings_filter_show_cw">عرض مع تحذير المحتوى</string>
+	<string name="settings_filter_show_cw_explanation">الاستمرار في عرض المشاركات التي تطابق هذا الفلتر، ولكن خلف تحذير حول المحتوى</string>
+	<string name="settings_delete_filter">حذف عامل التصفية</string>
+	<string name="filter_duration_forever">إلى الأبد</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="settings_filter_ends">ينتهي %s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="zero">%d كلمة أو عبارة مكتومة</item>
+		<item quantity="one">%d كلمة أو عبارة مكتومة</item>
+		<item quantity="two">%d كلمتان أو عبارتان مكتومتان</item>
+		<item quantity="few">%d كلمة أو عبارة مكتومة</item>
+		<item quantity="many">%d كلمة أو عبارة مكتومة</item>
+		<item quantity="other">%d كلمة أو عبارة مكتومة</item>
+	</plurals>
+	<string name="selection_2_options">%1$s و %2$s</string>
+	<string name="selection_3_options">%1$s و %2$s و %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s, و %3$d والمزيد</string>
+	<string name="filter_context_home_lists">الخيط الزمني الرئيسي والقوائم</string>
+	<string name="filter_context_notifications">الإشعارات</string>
+	<string name="filter_context_public_timelines">الخيوط الزمنية العامة</string>
+	<string name="filter_context_threads_replies">سلاسل المحادثات والردود</string>
+	<string name="filter_context_profiles">الصفحات التعريفية</string>
+	<string name="settings_filter_title">العنوان</string>
+	<string name="settings_delete_filter_title">حذف عامل التصفية \"%s\"؟</string>
+	<string name="settings_delete_filter_confirmation">سيتم حذف هذا الفلتر من حسابك على جميع الأجهزة.</string>
+	<string name="add_muted_word">إضافة كلمة مكتومة</string>
+	<string name="edit_muted_word">تحرير كلمة مكتومة</string>
+	<string name="add">إضافة</string>
+	<string name="filter_word_or_phrase">كلمة أو عبارة</string>
+	<string name="filter_add_word_help">الكلمات غير حساسة لحالة الأحرف وتتطابق مع الكلمات الكاملة فقط.\n\nإذا قمت بتصفية الكلمة الرئيسية \"Apple\" ، فستخفي المشاركات التي تحتوي على \"apple\" أو \"aPpLe\" ولكن ليس \"pineapple.\"</string>
+	<string name="settings_delete_filter_word">حذف الكلمة \"%s\"؟</string>
+	<string name="enter_selection_mode">اختر</string>
+	<string name="select_all">اختيار الكل</string>
+	<string name="settings_filter_duration_title">مدة التصفية</string>
+	<string name="filter_duration_custom">مخصص</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="zero">حذف %d كلمات؟</item>
+		<item quantity="one">حذف كلمة واحدة؟</item>
+		<item quantity="two">حذف كلمتان؟</item>
+		<item quantity="few">حذف %d كلمات؟</item>
+		<item quantity="many">حذف %d كلمة؟</item>
+		<item quantity="other">حذف %d كلمات؟</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="zero">تم تحديد %d</item>
+		<item quantity="one">تم تحديد %d</item>
+		<item quantity="two">%d تم تحديدها</item>
+		<item quantity="few">%d تم تحديدها</item>
+		<item quantity="many">%d تم تحديدها</item>
+		<item quantity="other">%d تم تحديدها</item>
+	</plurals>
+	<string name="required_form_field_blank">لا يمكن أن يكون فارغاً</string>
+	<string name="filter_word_already_in_list">موجود بالفعل في القائمة</string>
+	<string name="app_update_ready">تحديث التطبيق جاهز</string>
+	<string name="app_update_version">الإصدار %s</string>
+	<string name="downloading_update">جارٍ التنزيل (%d%%)</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">تطابق عامل التصفية \"%s\"</string>
+	<string name="search_mastodon">البحث في ماستدون</string>
+	<string name="clear_all">امسح الكل</string>
+	<string name="search_open_url">فتح الرابط التشعبي في ماستدون</string>
+	<string name="posts_matching_hashtag">منشورات تحتوي على “%s”</string>
+	<string name="search_go_to_account">الانتقال إلى %s</string>
+	<string name="posts_matching_string">منشورات تحتوي على “%s”</string>
+	<string name="accounts_matching_string">أشخاص لديهم \"%s\"</string>
 	<!-- Shown in the post header. Please keep it short -->
+	<string name="time_seconds_ago_short">مُنذُ %dثا</string>
+	<string name="time_minutes_ago_short">مُنذُ %dد</string>
+	<string name="time_hours_ago_short">مُنذُ %dسا</string>
+	<string name="time_days_ago_short">مُنذُ %d أيام</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">تُرجِم مِن %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">مُترجَم مِن %1$s باستخدام %2$s</string>
+	<string name="translation_show_original">إظهار الأصل</string>
+	<string name="translation_failed">فشِلَت الترجَمة. قد لم يتمكّن مدير الخادم من تفعيل الترجمات على هذا الخادم أو أنّ هذا الخادم يُشغِّل نسخة قديمة من ماستدون حيث الترجمات غير مدعومة بعد.</string>
+	<plurals name="x_participants">
+		<item quantity="zero">لا مُشارِك</item>
+		<item quantity="one">مشارِك واحد</item>
+		<item quantity="two">مشاركَيْنِ</item>
+		<item quantity="few">مشاركين</item>
+		<item quantity="many">مُشارِكًا</item>
+		<item quantity="other">مُشارك</item>
+	</plurals>
 </resources>

mastodon/src/main/res/values-be-rBY/strings.xml

@@ -404,7 +404,6 @@
 	<string name="welcome_to_mastodon">Вітаем у Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon - гэта дэцэнтралізаваная сацыяльная сетка, што азначае, што ні адна кампанія не кантралюе яе. Яна складаецца з мноства незалежна працуючых сервераў, злучаных разам.</string>
 	<string name="what_are_servers">Што такое серверы?</string>
-	<string name="welcome_paragraph2"><![CDATA[Кожны акаўнт Mastodon размяшчаецца на серверы - кожны са сваімі каштоўнасцямі, правіламі і адміністратарамі. Незалежна ад таго, які сервер вы вылучыце, вы можаце сачыць і ўзаемадзейнічаць з людзьмі на любым серверы.]]></string>
 	<string name="retry">Паўтарыць</string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<string name="attachment_type_video">Відэа</string>
@@ -528,4 +527,6 @@
 	<string name="time_minutes_ago_short">%d хв таму</string>
 	<string name="time_hours_ago_short">%d г таму</string>
 	<string name="time_days_ago_short">%d дз таму</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-bn-rBD/strings.xml

@@ -2,6 +2,7 @@
 <resources>
 	<string name="log_in">লগ ইন করুন</string>
 	<string name="next">এরপর</string>
+	<string name="loading_instance">সার্ভারের তথ্য পুনরূদ্ধার করা হচ্ছে…</string>
 	<string name="error">কোনো ত্রুটি ঘটেছে</string>
 	<string name="ok">ঠিক আছে</string>
 	<string name="preparing_auth">প্রমাণীকরণের জন্য প্রস্তুত হচ্ছে...</string>
@@ -65,6 +66,10 @@
 		<item quantity="one">%d দিন বাকি</item>
 		<item quantity="other">%d দিন বাকি</item>
 	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%,d ভোট</item>
+		<item quantity="other">%,d ভোট</item>
+	</plurals>
 	<string name="poll_closed">বন্ধ</string>
 	<string name="confirm_mute_title">অ্যাকাউন্টটি মিউট করুন</string>
 	<string name="do_mute">মিউট করুন</string>
@@ -123,6 +128,8 @@
 	<string name="category_tech">তথ্য-প্রযুক্তি</string>
 	<string name="confirm_email_title">আপনার ইনবক্স দেখুন</string>
 	<!-- %s is the email address -->
+	<string name="open_email_app">ই-মেইল অ্যাপ খুলুন</string>
+	<string name="resent_email">নিশ্চিতকরনের ই-মেইল পাঠানো হয়েছে</string>
 	<string name="visibility_followers_only">ফলোয়ারদের জন্য</string>
 	<string name="notification_type_follow">নতুন ফলোয়াররা</string>
 	<string name="err_not_logged_in">Mastodon-এ প্রথমে লগ ইন করুন</string>
@@ -181,7 +188,6 @@
 	<string name="welcome_to_mastodon">Mastodon - এ আপনাকে স্বাগত জানাই</string>
 	<string name="welcome_paragraph1">Mastodon হল একটি বিকেন্দ্রীভূত সামাজিক নেটওয়ার্ক, যার মানে কোনো একক কোম্পানি এটিকে নিয়ন্ত্রণ করে না। এটি অনেকগুলি স্বাধীনভাবে চালিত সার্ভারের সমন্বয়ে গঠিত, যেখানে সব সার্ভারগুলি একসাথে সংযুক্ত৷</string>
 	<string name="what_are_servers">সার্ভার কি?</string>
-	<string name="welcome_paragraph2"><![CDATA[প্রতিটি Mastodon অ্যাকাউন্টকে একটি সার্ভারে হোস্ট করা হয় — প্রত্যেকটির নিজস্ব মান, নিয়ম এবং প্রশাসক (অ্যাডমিন) রয়েছে। আপনি যে কোনো সার্ভারই বেছে নিন না কেন তা বিবেচ্য নয়, আপনি যেকোনো সার্ভারের লোকেদের সাথে যোগাযোগ করতে এবং তাদের ফলো করতে পারেন।]]></string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<!-- %s is the server domain -->
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
@@ -193,4 +199,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-bs-rBA/strings.xml

@@ -182,4 +182,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-ca-rES/strings.xml

@@ -293,4 +293,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-cs-rCZ/strings.xml

@@ -425,7 +425,6 @@
 	<string name="welcome_to_mastodon">Vítejte na Mastodonu</string>
 	<string name="welcome_paragraph1">Mastodon je decentralizovaná sociální síť, což znamená, že ji neovládá žádná jednotlivá společnost. Skládá se z mnoha nezávisle spravovaných serverů, všechny jsou propojeny dohromady.</string>
 	<string name="what_are_servers">Co jsou to servery?</string>
-	<string name="welcome_paragraph2"><![CDATA[Každý účet Mastodon je hostován na serveru - každý s vlastními hodnotami, pravidly a správci. Bez ohledu na to, který si vyberete, můžete sledovat a komunikovat s lidmi na jakémkoliv serveru.]]></string>
 	<string name="opening_link">Odkaz se otevírá…</string>
 	<string name="link_not_supported">Tento odkaz není v aplikaci podporovaný</string>
 	<string name="log_out_all_accounts">Odhlásit se ze všech účtů</string>
@@ -640,4 +639,6 @@
 	<string name="time_minutes_ago_short">Před %dm</string>
 	<string name="time_hours_ago_short">Před %dh</string>
 	<string name="time_days_ago_short">Před %dd</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-da-rDK/strings.xml

@@ -4,24 +4,24 @@
 	<string name="next">Næste</string>
 	<string name="loading_instance">Henter serverinfo…</string>
 	<string name="error">Fejl</string>
-	<string name="not_a_mastodon_instance">%s er vist ikke en Mastodon-server.</string>
-	<string name="ok">Ok</string>
+	<string name="not_a_mastodon_instance">%s lader ikke til at være en Mastodon-server.</string>
+	<string name="ok">OK</string>
 	<string name="preparing_auth">Forbereder godkendelse…</string>
 	<string name="finishing_auth">Afslutter godkendelse…</string>
 	<string name="user_boosted">%s fremhævede</string>
 	<string name="in_reply_to">Som svar til %s</string>
-	<string name="notifications">Meddelelser</string>
+	<string name="notifications">Notifikationer</string>
 	<string name="user_followed_you">%s begyndte at følge dig</string>
 	<string name="user_sent_follow_request">%s har sendt dig en følgeanmodning</string>
 	<string name="user_favorited">%s favoritmarkerede dit indlæg</string>
 	<string name="notification_boosted">%s boostede dit indlæg</string>
-	<string name="poll_ended">Se resultaterne af en afstemning, som du har deltaget i</string>
+	<string name="poll_ended">Se resultaterne af en afstemning, hvori du deltog</string>
 	<string name="share_toot_title">Del</string>
 	<string name="settings">Indstillinger</string>
-	<string name="publish">Offentliggør</string>
+	<string name="publish">Publicér</string>
 	<string name="discard_draft">Kassér kladde?</string>
 	<string name="discard">Kassér</string>
-	<string name="cancel">Fortryd</string>
+	<string name="cancel">Afbryd</string>
 	<plurals name="followers">
 		<item quantity="one">følger</item>
 		<item quantity="other">følgere</item>
@@ -38,13 +38,13 @@
 	<string name="button_following">Følger</string>
 	<string name="edit_profile">Redigér profil</string>
 	<string name="share_user">Del profil</string>
-	<string name="mute_user">Skjul %s (mute)</string>
-	<string name="unmute_user">Vis %s igen (unmute)</string>
-	<string name="block_user">Bloker %s</string>
-	<string name="unblock_user">Fjern blokering af %s</string>
-	<string name="report_user">Indberet %s</string>
-	<string name="block_domain">Bloker %s</string>
-	<string name="unblock_domain">Fjern blokering af %s</string>
+	<string name="mute_user">Gør tavs %s</string>
+	<string name="unmute_user">Vis %s igen</string>
+	<string name="block_user">Blokér %s</string>
+	<string name="unblock_user">Afblokér %s</string>
+	<string name="report_user">Anmeld %s</string>
+	<string name="block_domain">Blokér %s</string>
+	<string name="unblock_domain">Afblokér %s</string>
 	<plurals name="x_posts">
 		<item quantity="one">%,d indlæg</item>
 		<item quantity="other">%,d indlæg</item>
@@ -52,7 +52,7 @@
 	<string name="profile_joined">Tilmeldt</string>
 	<string name="done">Udført</string>
 	<string name="loading">Indlæser…</string>
-	<string name="field_label">Mærkat</string>
+	<string name="field_label">Etiket</string>
 	<string name="field_content">Indhold</string>
 	<string name="saving">Gemmer…</string>
 	<string name="post_from_user">Indlæg fra %s</string>
@@ -85,30 +85,34 @@
 		<item quantity="one">%d dag tilbage</item>
 		<item quantity="other">%d dage tilbage</item>
 	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%,d stemme</item>
+		<item quantity="other">%,d stemmer</item>
+	</plurals>
 	<string name="poll_closed">Lukket</string>
-	<string name="confirm_mute_title">Skjul konto</string>
-	<string name="confirm_mute">Bekræft at du vil skjule %s</string>
-	<string name="do_mute">Skjul (mute)</string>
-	<string name="confirm_unmute_title">Vis bruger igen (unmute)</string>
-	<string name="confirm_unmute">Bekræft at du vil se %s igen</string>
-	<string name="do_unmute">Vis igen (unmute)</string>
-	<string name="confirm_block_title">Bloker bruger</string>
-	<string name="confirm_block_domain_title">Bloker domæne</string>
-	<string name="confirm_block">Bekræft at du vil blokere %s</string>
-	<string name="do_block">Bloker</string>
-	<string name="confirm_unblock_title">Fjern blokering af bruger</string>
-	<string name="confirm_unblock_domain_title">Fjern blokering af domæne</string>
-	<string name="confirm_unblock">Bekræft at du vil fjerne blokering af %s</string>
-	<string name="do_unblock">Fjern blokering</string>
+	<string name="confirm_mute_title">Tavsgør konto</string>
+	<string name="confirm_mute">Bekræft tavsgørelse af %s</string>
+	<string name="do_mute">Tavsgør</string>
+	<string name="confirm_unmute_title">Vis konto igen</string>
+	<string name="confirm_unmute">Bekræft, at %s ikke længere er tavsgjort</string>
+	<string name="do_unmute">Ophæv tavsgørelse</string>
+	<string name="confirm_block_title">Blokér konto</string>
+	<string name="confirm_block_domain_title">Blokér domæne</string>
+	<string name="confirm_block">Bekræft blokering af %s</string>
+	<string name="do_block">Blokér</string>
+	<string name="confirm_unblock_title">Afblokér konto</string>
+	<string name="confirm_unblock_domain_title">Afblokér domæne</string>
+	<string name="confirm_unblock">Bekræft afblokeringen af %s</string>
+	<string name="do_unblock">Afblokér</string>
 	<string name="button_blocked">Blokeret</string>
 	<string name="action_vote">Stem</string>
 	<string name="delete">Slet</string>
 	<string name="confirm_delete_title">Slet indlæg</string>
-	<string name="confirm_delete">Er du sikker på, at du vil slette dette indlæg?</string>
+	<string name="confirm_delete">Sikker på, at dette indlæg skal slettes?</string>
 	<string name="deleting">Sletter…</string>
-	<string name="notification_channel_audio_player">Afspilning af lyd</string>
+	<string name="notification_channel_audio_player">Lydafspilning</string>
 	<string name="play">Afspil</string>
-	<string name="pause">Sæt på pause</string>
+	<string name="pause">Pausér</string>
 	<string name="log_out">Log ud</string>
 	<string name="add_account">Tilføj konto</string>
 	<string name="search_hint">Søg</string>
@@ -118,47 +122,47 @@
 	<string name="all_notifications">Alt</string>
 	<string name="mentions">Omtaler</string>
 	<plurals name="x_people_talking">
-		<item quantity="one">%d person deltager</item>
-		<item quantity="other">%d personer deltager</item>
+		<item quantity="one">%d person taler</item>
+		<item quantity="other">%d personer taler</item>
 	</plurals>
-	<string name="report_title">Indberet %s</string>
+	<string name="report_title">Anmeld %s</string>
 	<string name="report_choose_reason">Hvad er der galt med dette indlæg?</string>
 	<string name="report_choose_reason_account">Hvad er der galt med %s?</string>
-	<string name="report_choose_reason_subtitle">Vælg en passende grund</string>
-	<string name="report_reason_personal">Jeg bryder mig ikke om det</string>
+	<string name="report_choose_reason_subtitle">Vælg bedste match</string>
+	<string name="report_reason_personal">Bryder mig ikke om det</string>
 	<string name="report_reason_personal_subtitle">Det er ikke noget, man ønsker at se</string>
 	<string name="report_reason_spam">Det er spam</string>
-	<string name="report_reason_spam_subtitle">Ondsindede links, falske interaktioner, eller gentagne svar</string>
-	<string name="report_reason_violation">Det overtræder serverreglerne</string>
-	<string name="report_reason_violation_subtitle">Du kender til specifikke regler som det er i strid med</string>
-	<string name="report_reason_other">Det er noget andet</string>
-	<string name="report_reason_other_subtitle">Problemet passer ikke ind i andre kategorier</string>
+	<string name="report_reason_spam_subtitle">Ondsindede links, falske interaktioner eller gentagne svar</string>
+	<string name="report_reason_violation">Det overtræder serverregler</string>
+	<string name="report_reason_violation_subtitle">Du er bekendt med, at det overtræder bestemte regler</string>
+	<string name="report_reason_other">Drejer sig om noget andet</string>
+	<string name="report_reason_other_subtitle">Ingen kategori modsvarer problematikken</string>
 	<string name="report_choose_rule">Hvilke regler overtrædes?</string>
 	<string name="report_choose_rule_subtitle">Vælg alle relevante</string>
-	<string name="report_choose_posts">Er der indlæg, som kan bekræfte denne anmeldelse?</string>
+	<string name="report_choose_posts">Er der indlæg, som understøtter denne anmeldelse?</string>
 	<string name="report_choose_posts_subtitle">Vælg alle relevante</string>
 	<string name="report_comment_title">Er der andet, vi bør vide?</string>
 	<string name="report_comment_hint">Yderligere kommentarer</string>
-	<string name="sending_report">Sender rapport…</string>
-	<string name="report_sent_title">Tak for anmeldelsen. Den vil blive undersøgt nærmere.</string>
-	<string name="report_sent_subtitle">Mens vi gennemgår anmeldelsen, kan du selv skride til handling mod %s:</string>
+	<string name="sending_report">Indsender rapport…</string>
+	<string name="report_sent_title">Tak for anmeldelsen. Vi vil se nærmere på dette.</string>
+	<string name="report_sent_subtitle">Mens vi gennemgår anmeldelsen, kan du tage skridt mod %s:</string>
 	<string name="unfollow_user">Følg ikke længere %s</string>
 	<string name="unfollow">Følg ikke længere</string>
-	<string name="mute_user_explain">Du vil ikke se vedkommendes indlæg. Vedkommende kan stadig se dine indlæg og følge dig. Vedkommende vil ikke kunne se, at de er blevet skjult.</string>
-	<string name="block_user_explain">Du vil ikke se vedkommendes indlæg. Vedkommende vil ikke kunne se dine indlæg eller følge dig. Vedkommende vil kunne se, at de er blokeret.</string>
-	<string name="report_personal_title">Ønsker du ikke at se det her?</string>
+	<string name="mute_user_explain">Du vil ikke se indlæg fra vedkommende, der dog stadig kan se dine indlæg og følge dig, men ikke være bekendt med tavsgørelsen.</string>
+	<string name="block_user_explain">Du vil ikke se indlæg fra vedkommende, der hverken kan se dine indlæg eller følge dig, men vil være bekendt med blokeringen.</string>
+	<string name="report_personal_title">Ønsker du ikke at se dette?</string>
 	<string name="report_personal_subtitle">Her er mulighederne for at styre, hvad du ser på Mastodon:</string>
-	<string name="back">Tilbage</string>
-	<string name="search_communities">Server-navn eller URL</string>
+	<string name="back">Retur</string>
+	<string name="search_communities">Servernavn eller -URL</string>
 	<string name="instance_rules_title">Serverregler</string>
-	<string name="instance_rules_subtitle">Ved at fortsætte accepterer du at følge følgende regler, der er vedtaget og håndhævet af %ss moderatorer.</string>
+	<string name="instance_rules_subtitle">Ved at fortsætte accepterer du at overholde flg. regler, som angivet og håndhævet af %s moderatorerne.</string>
 	<string name="signup_title">Opret konto</string>
 	<string name="display_name">Navn</string>
 	<string name="username">Brugernavn</string>
-	<string name="email">Email</string>
+	<string name="email">E-mail</string>
 	<string name="password">Adgangskode</string>
 	<string name="confirm_password">Bekræft adgangskode</string>
-	<string name="password_note">Inkluder store bogstaver, specialtegn og tal for at gøre din adgangskode stærkere.</string>
+	<string name="password_note">Benyt majuskler, specialtegn og tal for at øge adgangskodens styrke.</string>
 	<string name="category_academia">Forskning og højere uddannelser</string>
 	<string name="category_activism">Aktivisme</string>
 	<string name="category_all">Alt</string>
@@ -174,51 +178,55 @@
 	<string name="category_tech">Teknologi</string>
 	<string name="confirm_email_title">Tjek din indbakke</string>
 	<!-- %s is the email address -->
-	<string name="confirm_email_subtitle">Tryk på det tilsendte link for at bekræfte %s. Vi venter til du kommer tilbage.</string>
-	<string name="confirm_email_didnt_get">Har du ikke modtaget et link?</string>
+	<string name="confirm_email_subtitle">Tryk på det modtage link for at bekræfte %s. Vi venter her så længe.</string>
+	<string name="confirm_email_didnt_get">Modtog intet link?</string>
 	<string name="resend">Send igen</string>
-	<string name="open_email_app">Åben email-app</string>
-	<string name="resent_email">Bekræftelses-email sendt</string>
-	<string name="compose_hint">Skriv eller indsæt hvad du har på hjerte</string>
+	<string name="open_email_app">Åbn e-mail app</string>
+	<string name="resent_email">Bekræftelsesmail sendt</string>
+	<string name="compose_hint">Angiv eller indsæt, hvad du tænker på</string>
 	<string name="content_warning">Indholdsadvarsel</string>
 	<string name="save">Gem</string>
 	<string name="add_alt_text">Tilføj alternativ tekst</string>
 	<string name="visibility_public">Offentlig</string>
-	<string name="visibility_followers_only">Kun følgere</string>
+	<string name="visibility_followers_only">Kun Følgere</string>
 	<string name="visibility_private">Kun nævnte personer</string>
 	<string name="recent_searches">Nylige</string>
-	<string name="skip">Spring over</string>
-	<string name="notification_type_follow">Nye følgere</string>
+	<string name="skip">Overspring</string>
+	<string name="notification_type_follow">Nye Følgere</string>
 	<string name="notification_type_favorite">Favoritmarkeringer</string>
 	<string name="notification_type_reblog">Fremhævninger</string>
 	<string name="notification_type_mention">Omtaler</string>
 	<string name="notification_type_poll">Afstemninger</string>
 	<string name="choose_account">Vælg konto</string>
-	<string name="err_not_logged_in">Log venligst ind på Mastodon først</string>
-	<string name="media_attachment_unsupported_type">Filen %s er af en type der ikke understøttes</string>
-	<string name="media_attachment_too_big">Størrelsen på filen %1$s overskrider grænsen på %2$s MB</string>
+	<string name="err_not_logged_in">Log ind på Mastodon først</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Maks. %d medievedhæftning kan tilføjes</item>
+		<item quantity="other">Maks. %d medievedhæftninger kan tilføjes</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Filen %s er af en uunderstøttet type</string>
+	<string name="media_attachment_too_big">Filen %1$s overskrider begrænsningen på %2$s MB</string>
 	<string name="settings_theme">Udseende</string>
 	<string name="theme_auto">Brug enhedens indstillinger for udseende</string>
 	<string name="theme_light">Lys</string>
 	<string name="theme_dark">Mørk</string>
-	<string name="settings_behavior">Opførsel</string>
-	<string name="settings_gif">Spil animerede avatarer og emoji</string>
+	<string name="settings_behavior">Adfærd</string>
+	<string name="settings_gif">Afspil animerede avatarer og emojier</string>
 	<string name="settings_custom_tabs">Benyt in-app browser</string>
-	<string name="settings_notifications">Meddelelser</string>
+	<string name="settings_notifications">Notifikationer</string>
 	<string name="settings_contribute">Bidrag til Mastodon</string>
-	<string name="settings_tos">Vilkår og Betingelser</string>
-	<string name="settings_privacy_policy">Privatlivspolitik</string>
+	<string name="settings_tos">Tjenestevilkår</string>
+	<string name="settings_privacy_policy">Fortrolighedspolitik</string>
 	<string name="settings_clear_cache">Ryd mediecache</string>
 	<string name="settings_app_version">Mastodon til Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Mediecache ryddet</string>
 	<string name="confirm_log_out">Log ud af %s?</string>
-	<string name="sensitive_content_explain">Forfatteren markerede dette medie som følsomt.</string>
+	<string name="sensitive_content_explain">Forfatteren markerede dette medie som sensitivt.</string>
 	<string name="avatar_description">Gå til %ss profil</string>
 	<string name="more_options">Flere muligheder</string>
 	<string name="new_post">Nyt indlæg</string>
 	<string name="button_reply">Svar</string>
 	<string name="button_reblog">Fremhæv</string>
-	<string name="button_favorite">Favorit</string>
+	<string name="button_favorite">Gør til favorit</string>
 	<string name="button_share">Del</string>
 	<string name="media_no_description">Medier uden beskrivelse</string>
 	<string name="add_media">Tilføj medier</string>
@@ -239,7 +247,7 @@
 	<string name="clear">Ryd</string>
 	<string name="profile_header">Overskriftsbillede</string>
 	<string name="profile_picture">Profilbillede</string>
-	<string name="reorder">Omarranger</string>
+	<string name="reorder">Omarrangér</string>
 	<string name="download">Download</string>
 	<string name="permission_required">Tilladelse kræves</string>
 	<string name="storage_permission_to_download">Appen skal have adgang til din lagerplads for at gemme denne fil.</string>
@@ -247,11 +255,13 @@
 	<string name="error_saving_file">Fejl under lagring af fil</string>
 	<string name="file_saved">Fil gemt</string>
 	<string name="downloading">Downloader…</string>
-	<string name="no_app_to_handle_action">Der er ingen app til at udføre denne handling</string>
+	<string name="no_app_to_handle_action">Ingen app til at håndtere denne handling</string>
 	<string name="local_timeline">Lokalt</string>
-	<string name="trending_posts_info_banner">Her er de indlæg, der tiltrækker sig opmærksomhed på tværs af Mastodon.</string>
+	<string name="trending_posts_info_banner">Her er de indlæg, som vinder indpas på tværs af Mastodon.</string>
 	<string name="trending_links_info_banner">Her er de nyheder, der bliver talt om på Mastodon.</string>
 	<!-- %s is the server domain -->
+	<string name="local_timeline_info_banner">Disse er alle indlæg fra alle brugere på din server (%s).</string>
+	<string name="recommended_accounts_info_banner">Baseret på andre, du følger, vil du måske synes om disse konti.</string>
 	<string name="see_new_posts">Se nye indlæg</string>
 	<string name="load_missing_posts">Indlæs manglende indlæg</string>
 	<string name="follow_back">Følg Tilbage</string>
@@ -272,14 +282,14 @@
 		<item quantity="other">%,d favoritmarkeringer</item>
 	</plurals>
 	<plurals name="x_reblogs">
-		<item quantity="one">%,d indlæg</item>
-		<item quantity="other">%,d indlæg</item>
+		<item quantity="one">%,d fremhævning</item>
+		<item quantity="other">%,d fremhævninger</item>
 	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nu</string>
 	<string name="edit_history">Rediger historik</string>
 	<string name="last_edit_at_x">Senest ændret: %s</string>
-	<string name="time_just_now">lige nu</string>
+	<string name="time_just_now">netop nu</string>
 	<plurals name="x_seconds_ago">
 		<item quantity="one">%d sekund siden</item>
 		<item quantity="other">%d sekunder siden</item>
@@ -288,11 +298,11 @@
 		<item quantity="one">%d minut siden</item>
 		<item quantity="other">%d minutter siden</item>
 	</plurals>
-	<string name="edited_timestamp">redigerede %s</string>
+	<string name="edited_timestamp">redigeret %s</string>
 	<string name="edit_original_post">Oprindeligt indlæg</string>
 	<string name="edit_text_edited">Tekst redigeret</string>
 	<string name="edit_spoiler_added">Indholdsadvarsel tilføjet</string>
-	<string name="edit_spoiler_edited">Indholdsadvarsel tilføjet</string>
+	<string name="edit_spoiler_edited">Indholdsadvarsel redigeret</string>
 	<string name="edit_spoiler_removed">Indholdsadvarsel fjernet</string>
 	<string name="edit_poll_added">Afstemning tilføjet</string>
 	<string name="edit_poll_edited">Afstemning redigeret</string>
@@ -300,11 +310,11 @@
 	<string name="edit_media_added">Medier tilføjet</string>
 	<string name="edit_media_removed">Medier fjernet</string>
 	<string name="edit_media_reordered">Medie omarrangeret</string>
-	<string name="edit_marked_sensitive">Marker som følsom</string>
-	<string name="edit_marked_not_sensitive">Markeret ikke følsom</string>
+	<string name="edit_marked_sensitive">Markeret sensitivt</string>
+	<string name="edit_marked_not_sensitive">Markeret ikke-sensitivt</string>
 	<string name="edit_multiple_changed">Indlæg redigeret</string>
-	<string name="edit">Rediger</string>
-	<string name="discard_changes">Fortryd ændringer?</string>
+	<string name="edit">Redigér</string>
+	<string name="discard_changes">Kassér ændringer?</string>
 	<string name="upload_failed">Upload mislykkedes</string>
 	<string name="file_size_bytes">%d bytes</string>
 	<string name="file_size_kb">%.2f KB</string>
@@ -315,20 +325,21 @@
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
 	<string name="download_update">Download (%s)</string>
-	<string name="install_update">Installer</string>
-	<string name="privacy_policy_title">Dit privatliv</string>
-	<string name="privacy_policy_subtitle">Selvom Mastodon-appen ikke indsamler data, kan den server du tilmelder dig gennem, have en anden politik.\n\nHvis du er uenig i politikken for %s, kan du gå tilbage og vælge en anden server.</string>
+	<string name="install_update">Installér</string>
+	<string name="privacy_policy_title">Din fortrolighed</string>
+	<string name="privacy_policy_subtitle">Selvom Mastodon-appen ikke indsamler data, kan serveren, via hvilken man tilmelder sig, have en anden politik.\n\nEr man uenig i politikken for %s, kan man gå tilbage og vælge en anden server.</string>
 	<string name="i_agree">Jeg accepterer</string>
 	<string name="empty_list">Denne liste er tom</string>
-	<string name="instance_signup_closed">Denne server er ikke åben for nye tilmeldinger.</string>
+	<string name="instance_signup_closed">Denne server accepterer ikke nye tilmeldinger.</string>
 	<string name="text_copied">Kopieret til udklipsholderen</string>
 	<string name="add_bookmark">Bogmærk</string>
 	<string name="remove_bookmark">Fjern bogmærke</string>
 	<string name="bookmarks">Bogmærker</string>
 	<string name="your_favorites">Dine Favoritter</string>
 	<string name="login_title">Velkommen tilbage</string>
-	<string name="login_subtitle">Log ind med serveren hvor du oprettede din bruger.</string>
+	<string name="login_subtitle">Log ind med serveren, på hvilken din konto blev oprettet.</string>
 	<string name="server_url">Server-URL</string>
+	<string name="signup_random_server_explain">En server baseret på dit sprog vælges, hvis du fortsætter uden selv at vælge.</string>
 	<string name="server_filter_any_language">Hvilket som helst sprog</string>
 	<string name="server_filter_instant_signup">Øjeblikkelig tilmelding</string>
 	<string name="server_filter_manual_review">Manuel evaluering</string>
@@ -341,6 +352,7 @@
 	<string name="server_filter_region_oceania">Oceania</string>
 	<string name="not_accepting_new_members">Ikke åben for nye medlemmer</string>
 	<string name="category_special_interests">Særlige Interesser</string>
+	<string name="signup_passwords_dont_match">Adgangskoder matcher ikke</string>
 	<string name="pick_server_for_me">Vælg for mig</string>
 	<string name="profile_add_row">Tilføj række</string>
 	<string name="profile_setup">Profilopsætning</string>
@@ -349,12 +361,14 @@
 	<string name="popular_on_mastodon">Populært på Mastodon</string>
 	<string name="follow_all">Følg alle</string>
 	<string name="server_rules_disagree">Ikke enig</string>
+	<string name="privacy_policy_explanation">TL;DR: Vi indsamler eller behandler ikke noget.</string>
 	<!-- %s is server domain -->
 	<string name="server_policy_disagree">Uenig med %s</string>
 	<string name="profile_bio">Biografi</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<string name="sending_follows">Følger brugere …</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s tillader ikke tilmeldinger fra %2$s. Prøv en anden eller &lt;a&gt;vælg en anden server&lt;/a&gt;.</string>
 	<string name="spoiler_show">Vis alligevel</string>
 	<string name="spoiler_hide">Genskjul</string>
 	<string name="poll_multiple_choice">Vælg en eller flere</string>
@@ -367,21 +381,128 @@
 	<string name="show">Vis</string>
 	<string name="hide">Skjul</string>
 	<string name="join_default_server">Tilmeld dig %s</string>
+	<string name="pick_server">Vælg en anden server</string>
 	<string name="signup_or_login">eller</string>
 	<string name="learn_more">Få mere at vide</string>
 	<string name="welcome_to_mastodon">Velkommen til Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon er et decentraliseret socialt netværk, hvilket betyder at ingen enkelt virksomhed styrer det. Det består af mange uafhængige servere, alle forbundet sammen.</string>
 	<string name="what_are_servers">Hvad er servere?</string>
-	<string name="welcome_paragraph2"><![CDATA[Alle Mastodon-konti har plads på en server. Hver server har sine egne værdier, regler og administratorer. Ligegyldigt hvilken server du vælger, kan du følge og interagere med folk på alle andre servere.]]></string>
+	<string name="opening_link">Åbner link…</string>
+	<string name="link_not_supported">Linket er ikke understøttet i appen</string>
+	<string name="log_out_all_accounts">Log ud af alle konti</string>
+	<string name="confirm_log_out_all_accounts">Log ud af alle konti?</string>
+	<string name="retry">Forsøg igen</string>
+	<string name="post_failed">Mislykkedes at indsende indlæg</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">%s billede</string>
+	<string name="attachment_description_video">%s video</string>
+	<string name="attachment_description_audio">%s lyd</string>
+	<string name="attachment_description_unknown">%s fil</string>
+	<string name="attachment_type_image">Billede</string>
+	<string name="attachment_type_video">Video</string>
+	<string name="attachment_type_audio">Lyd</string>
+	<string name="attachment_type_gif">GIF</string>
+	<string name="attachment_type_unknown">Fil</string>
+	<string name="attachment_x_percent_uploaded">%d%% uploadet</string>
+	<string name="add_poll_option">Tilføj afstemningsmulighed</string>
+	<string name="poll_length">Afstemningslængde</string>
+	<string name="poll_style">Stil</string>
+	<string name="compose_poll_single_choice">Vælg én</string>
+	<string name="compose_poll_multiple_choice">Multivalg</string>
+	<string name="delete_poll_option">Slet afstemningsvalg</string>
+	<string name="poll_style_title">Afstemningsstil</string>
+	<string name="alt_text">Alt text</string>
+	<string name="help">Hjælp</string>
+	<string name="what_is_alt_text">Hvad er alt tekst?</string>
+	<string name="alt_text_help">Alt tekst vil sige billedbeskrivelser til personer med synshandikap, forbindelser med lav båndbredde eller dem, som søger ekstra kontekst.\n\nMan kan forbedre tilgængelighed og forståelse for alle ved at skrive klar, kortfattet og objektiv alt-tekst.\n\n<ul><li>Fang vigtige elementer</li>\n<li>Opsummér tekst i billeder</li>\n<li>Brug regulær sætningsstruktur</li>\n<li>Undgå overflødig information</li>\n<li>Fokus på tendenser og vigtige fund i kompleks grafik (såsom diagrammer/kort)</li></ul></string>
+	<string name="edit_post">Redigere opslag</string>
+	<string name="no_verified_link">Intet bekræftet link</string>
+	<string name="compose_autocomplete_emoji_empty">Gennemse emoji</string>
+	<string name="compose_autocomplete_users_empty">Find den, man leder efter</string>
+	<string name="no_search_results">Ingen resultater for disse søgeord</string>
+	<string name="language">Sprog</string>
+	<string name="language_default">Standard</string>
+	<string name="language_system">System</string>
+	<string name="language_detecting">Detektere sprog</string>
+	<string name="language_cant_detect">Kan ikke detektere sprog</string>
+	<string name="language_detected">Detekteret</string>
+	<string name="media_hidden">Medie skjult</string>
+	<string name="post_hidden">Indlæg skjult</string>
+	<string name="report_title_post">Anmeld indlæg</string>
+	<string name="forward_report_explanation">Kontoen er fra en anden server. Send også en anonymiseret kopi af anmeldelsen dertil?</string>
 	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">Videresend til %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Anmeldt</string>
+	<string name="report_unfollow_explanation">For ikke længere at se vedkommendes indlæg i hjemmefeedet, ophør med at følge.</string>
+	<string name="muted_user">Tavsgjorde %s</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="count_three">Tre</string>
+	<string name="count_four">Fire</string>
+	<string name="alt_text_reminder_post_anyway">Indlæg</string>
 	<!-- %s is the username -->
+	<string name="unfollow_confirmation">Følg ikke længere %s?</string>
+	<string name="filter_active">Aktiv</string>
+	<string name="filter_inactive">Inaktiv</string>
+	<string name="settings_add_filter">Tilføj filter</string>
+	<string name="settings_edit_filter">Redigér filter</string>
+	<string name="settings_filter_duration">Varighed</string>
+	<string name="settings_filter_muted_words">Tavsgjorte (skjulte) ord</string>
+	<string name="settings_filter_context">Tavsgør fra</string>
+	<string name="settings_filter_show_cw">Vis med indholdsadvarsel</string>
+	<string name="settings_filter_show_cw_explanation">Viser stadig indlæg matchende dette filter, men bag en indholdsadvarsel</string>
+	<string name="settings_delete_filter">Slet filter</string>
+	<string name="filter_duration_forever">For evigt</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="settings_filter_ends">Slutter %s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="one">%d tavsgjort (skjult) ord/sætning</item>
+		<item quantity="other">%d tavsgjorte (skjulte) ord/sætninger</item>
+	</plurals>
+	<string name="selection_2_options">%1$s og %2$s</string>
+	<string name="selection_3_options">%1$s, %2$s og %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s og %3$d flere</string>
+	<string name="filter_context_home_lists">Hjem og lister</string>
+	<string name="filter_context_notifications">Notifikationer</string>
+	<string name="filter_context_public_timelines">Offentlige tidslinjer</string>
+	<string name="filter_context_threads_replies">Tråde og svar</string>
+	<string name="filter_context_profiles">Profiler</string>
+	<string name="settings_filter_title">Titel</string>
+	<string name="settings_delete_filter_title">Slet filter “%s”?</string>
+	<string name="settings_delete_filter_confirmation">Dette filter slettes fra din konto på alle enheder.</string>
+	<string name="add_muted_word">Tilføj tavsgjort (skjult) ord</string>
+	<string name="edit_muted_word">Redigér tavsgjort (skjult) ord</string>
+	<string name="add">Tilføj</string>
+	<string name="filter_word_or_phrase">Ord/sætning</string>
+	<string name="filter_add_word_help">Ord er versalfølsomme og matcher kun fulde ord.\n\nFiltreres nøgleordet “Apple,” vil det skjule indlæg indeholdende “apple” eller “aPpLe”, men ikke “pineapple”.</string>
+	<string name="settings_delete_filter_word">Slet ordet “%s”?</string>
+	<string name="enter_selection_mode">Vælg</string>
+	<string name="select_all">Vælg alle</string>
+	<string name="settings_filter_duration_title">Filtervarighed</string>
+	<string name="filter_duration_custom">Tilpasset</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="one">Slet %d ord?</item>
+		<item quantity="other">Slet %d ord?</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="one">%d valgt</item>
+		<item quantity="other">%d valgt</item>
+	</plurals>
+	<string name="required_form_field_blank">Obligatorisk felt</string>
+	<string name="filter_word_already_in_list">Allerede på listen</string>
+	<string name="app_update_ready">App-opdatering klar</string>
+	<string name="app_update_version">Version %s</string>
+	<string name="downloading_update">Downloader (%d%%)</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">Matcher filter “%s”</string>
+	<string name="search_mastodon">Søg i Mastodon</string>
+	<string name="clear_all">Ryd alle</string>
+	<string name="search_open_url">Åbn URL i Mastodon</string>
+	<string name="posts_matching_hashtag">Indlæg med “%s”</string>
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-de-rDE/strings.xml

@@ -43,8 +43,8 @@
 	<string name="block_user">%s sperren</string>
 	<string name="unblock_user">%s entsperren</string>
 	<string name="report_user">%s melden</string>
-	<string name="block_domain">%s sperren</string>
-	<string name="unblock_domain">%s nicht mehr sperren</string>
+	<string name="block_domain">%s blockieren</string>
+	<string name="unblock_domain">%s nicht mehr blockieren</string>
 	<plurals name="x_posts">
 		<item quantity="one">%,d Beitrag</item>
 		<item quantity="other">%,d Beiträge</item>
@@ -98,12 +98,12 @@
 	<string name="do_unmute">Nicht mehr stummschalten</string>
 	<string name="confirm_block_title">Konto sperren</string>
 	<string name="confirm_block_domain_title">Domain sperren</string>
-	<string name="confirm_block">Bestätigen, um %s zu sperren</string>
+	<string name="confirm_block">Bestätigen, um %s zu blockieren</string>
 	<string name="do_block">Sperren</string>
 	<string name="confirm_unblock_title">Konto nicht mehr sperren</string>
 	<string name="confirm_unblock_domain_title">Domain nicht mehr blockieren</string>
-	<string name="confirm_unblock">Bestätigen, um Sperre von %s aufzuheben</string>
-	<string name="do_unblock">Sperre aufheben</string>
+	<string name="confirm_unblock">Bestätigen, um %s nicht mehr zu blockieren</string>
+	<string name="do_unblock">Nicht mehr blockieren</string>
 	<string name="button_blocked">Blockiert</string>
 	<string name="action_vote">Abstimmen</string>
 	<string name="delete">Löschen</string>
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Willkommen auf Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon ist ein dezentrales, soziales Netzwerk. Das bedeutet, dass es nicht von einem einzigen Unternehmen kontrolliert wird. Das Netzwerk besteht aus unabhängig voneinander betriebenen Servern, die miteinander verbunden sind.</string>
 	<string name="what_are_servers">Was sind Server?</string>
-	<string name="welcome_paragraph2"><![CDATA[Jedes Mastodon-Konto wird auf einem Server gehostet. Jeder Server hat dabei seine eigenen Werte, Regeln und Administrator*innen. Aber egal, für welchen Server Du Dich entscheidest: Du kannst mit Leuten von anderen Servern interagieren und ihnen folgen.]]></string>
 	<string name="opening_link">Link wird geöffnet…</string>
 	<string name="link_not_supported">Dieser Link wird in der App nicht unterstützt</string>
 	<string name="log_out_all_accounts">Von allen Konten abmelden</string>
@@ -582,4 +581,6 @@
 	<string name="time_minutes_ago_short">vor %d Minuten</string>
 	<string name="time_hours_ago_short">vor %d Stunden</string>
 	<string name="time_days_ago_short">vor %d Tagen</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-el-rGR/strings.xml

@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Καλώς ήρθες στο Mastodon</string>
 	<string name="welcome_paragraph1">Το Mastodon είναι ένα αποκεντρωμένο κοινωνικό δίκτυο που σημαίνει ότι καμία εταιρεία δεν το ελέγχει. Αποτελείται από πολλούς ανεξάρτητους διακομιστές, όλοι συνδεδεμένοι μαζί.</string>
 	<string name="what_are_servers">Τι είναι οι διακομιστές;</string>
-	<string name="welcome_paragraph2"><![CDATA[Κάθε λογαριασμός Mastodon φιλοξενείται σε ένα διακομιστή - ο καθένας με τις δικές του αξίες, κανόνες και διαχειριστές. Ανεξάρτητα από το ποιον μπορεί να επιλέξεις, μπορείς να ακολουθήσεις και να αλληλεπιδράσεις με άτομα από οποιονδήποτε διακομιστή.]]></string>
 	<string name="opening_link">Άνοιγμα συνδέσμου…</string>
 	<string name="link_not_supported">Αυτός ο σύνδεσμος δεν υποστηρίζεται στην εφαρμογή</string>
 	<string name="log_out_all_accounts">Αποσύνδεση από όλους τους λογαριασμούς</string>
@@ -582,4 +581,6 @@
 	<string name="time_minutes_ago_short">%dλ πριν</string>
 	<string name="time_hours_ago_short">%dώ πριν</string>
 	<string name="time_days_ago_short">%dημ πριν</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-es-rES/strings.xml

@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Bienvenido/da a Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon es una red social descentralizada, lo que significa que no la controla una sola compañía. Está formada por muchos servidores independientes, todos juntos conectados.</string>
 	<string name="what_are_servers">¿Qué son los servidores?</string>
-	<string name="welcome_paragraph2"><![CDATA[Cada cuenta de Mastodon está alojada en un servidor — cada uno con sus propios valores, reglas y administradores. No importa cual elijas, puede seguir e interactuar con personas en cualquier servidor.]]></string>
 	<string name="opening_link">Abriendo enlace…</string>
 	<string name="link_not_supported">Este enlace no es compatible con la aplicación</string>
 	<string name="log_out_all_accounts">Cerrar sesión en todas las cuentas</string>
@@ -574,4 +573,6 @@
 	<string name="time_minutes_ago_short">hace %dm</string>
 	<string name="time_hours_ago_short">hace %dh</string>
 	<string name="time_days_ago_short">hace %dd</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-eu-rES/strings.xml

@@ -4,11 +4,17 @@
 	<string name="next">Hurrengoa</string>
 	<string name="loading_instance">Zerbitzariaren informazioa berreskuratzen…</string>
 	<string name="error">Errorea</string>
+	<string name="not_a_mastodon_instance">%s(e)k ez dirudi Mastodon instantzia bat denik.</string>
 	<string name="ok">Ados</string>
 	<string name="preparing_auth">Autentifikaziorako prestatzen…</string>
 	<string name="finishing_auth">Autentikazioa bukatzen…</string>
+	<string name="user_boosted">%s(e)k bultzatu du</string>
 	<string name="in_reply_to">%s-(r)i erantzunez</string>
 	<string name="notifications">Jakinarazpenak</string>
+	<string name="user_followed_you">%s(e)k jarraitu zaitu</string>
+	<string name="user_sent_follow_request">%s-(e)k jarraitzeko eskaera bidali dizu</string>
+	<string name="user_favorited">%s(e)k zure bidalketa gogoko du</string>
+	<string name="notification_boosted">%s(e)k zure bidalketa bultzatu du</string>
 	<string name="share_toot_title">Partekatu</string>
 	<string name="settings">Ezarpenak</string>
 	<string name="publish">Argitaratu</string>
@@ -30,6 +36,7 @@
 	<string name="button_follow">Jarraitu</string>
 	<string name="button_following">Jarraitzen</string>
 	<string name="edit_profile">Editatu profila</string>
+	<string name="share_user">Partekatu profila</string>
 	<string name="mute_user">Mututu %s</string>
 	<string name="unmute_user">Desmututu %s</string>
 	<string name="block_user">Blokeatu %s</string>
@@ -95,27 +102,35 @@
 	<string name="button_blocked">Blokeatuta</string>
 	<string name="action_vote">Bozkatu</string>
 	<string name="delete">Ezabatu</string>
+	<string name="confirm_delete_title">Ezabatu bidalketa</string>
 	<string name="confirm_delete">Ziur bidalketa hau ezabatu nahi duzula?</string>
 	<string name="deleting">Ezabatzen…</string>
 	<string name="notification_channel_audio_player">Audioa erreproduzitzen</string>
 	<string name="play">Jo</string>
 	<string name="pause">Pausatu</string>
+	<string name="log_out">Itxi saioa</string>
 	<string name="add_account">Gehitu kontua</string>
 	<string name="search_hint">Bilatu</string>
 	<string name="hashtags">Traolak</string>
 	<string name="news">Berriak</string>
 	<string name="for_you">Zuretzat</string>
+	<string name="all_notifications">Dena</string>
 	<string name="mentions">Aipamenak</string>
 	<plurals name="x_people_talking">
 		<item quantity="one">Pertsona %d hizketan</item>
 		<item quantity="other">%d pertsona hizketan</item>
 	</plurals>
 	<string name="report_title">Salatu %s</string>
+	<string name="report_choose_reason">Zer du txarra argitalpen honek?</string>
+	<string name="report_choose_reason_account">Zer du txarra %s?</string>
 	<string name="report_choose_reason_subtitle">Aukeratu egokiena</string>
+	<string name="report_reason_personal">Ez dut gustukoa</string>
 	<string name="report_reason_personal_subtitle">Ikusi nahi ez dudan zerbait da</string>
+	<string name="report_reason_spam">Spama da</string>
 	<string name="report_reason_spam_subtitle">Esteka maltzurrak, gezurrezko elkarrekintzak edo erantzun errepikakorrak</string>
 	<string name="report_reason_violation">Zerbitzariaren arauak hausten ditu</string>
 	<string name="report_reason_violation_subtitle">Arau zehatzak urratzen dituela badakizu</string>
+	<string name="report_reason_other">Beste zerbait da</string>
 	<string name="report_reason_other_subtitle">Arazoa ezin da beste kategorietan sailkatu</string>
 	<string name="report_choose_rule">Ze arau hautsi ditu?</string>
 	<string name="report_choose_rule_subtitle">Hautatu dagozkion guztiak</string>
@@ -124,8 +139,11 @@
 	<string name="report_comment_title">Beste zerbait jakin beharko genuke?</string>
 	<string name="report_comment_hint">Iruzkin gehigarriak</string>
 	<string name="sending_report">Txostena bidaltzen…</string>
+	<string name="report_sent_title">Mila esker salaketagatik, berrikusiko dugu.</string>
 	<string name="unfollow_user">%s jarraitzeari utzi</string>
 	<string name="unfollow">Utzi jarraitzeari</string>
+	<string name="report_personal_title">Ez duzu hau ikusi nahi?</string>
+	<string name="report_personal_subtitle">Hemen dituzu Mastodonen ikusiko duzuna kontrolatzeko aukerak:</string>
 	<string name="back">Atzera</string>
 	<string name="search_communities">Zerbitzari izena edo URLa</string>
 	<string name="instance_rules_title">Zerbitzariaren arauak</string>
@@ -151,23 +169,34 @@
 	<string name="category_tech">Teknologia</string>
 	<string name="confirm_email_title">Egiaztatu zure sarrerako ontzia</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_didnt_get">Ez duzu estekarik jaso?</string>
 	<string name="resend">Berbidali</string>
 	<string name="open_email_app">Ireki eposta aplikazioa</string>
 	<string name="resent_email">Berretzi eposta bidaltzea</string>
+	<string name="compose_hint">Idatzi edo itsatsi buruan duzuna</string>
 	<string name="content_warning">Edukiaren abisua</string>
 	<string name="save">Gorde</string>
 	<string name="add_alt_text">Gehitu ordezko testua</string>
 	<string name="visibility_public">Publikoa</string>
 	<string name="visibility_followers_only">Jarraitzaileak soilik</string>
+	<string name="visibility_private">Aipatzen dudan jendea soilik</string>
+	<string name="recent_searches">Azkenaldikoak</string>
 	<string name="skip">Saltatu</string>
 	<string name="notification_type_follow">Jarraitzaile berriak</string>
 	<string name="notification_type_favorite">Gogokoak</string>
+	<string name="notification_type_reblog">Bultzadak</string>
 	<string name="notification_type_mention">Aipamenak</string>
 	<string name="notification_type_poll">Inkestak</string>
 	<string name="choose_account">Aukeratu kontua</string>
 	<string name="err_not_logged_in">Mesedez, hasi saioa lehenengo Mastodonen</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Ezin duzu multimedia fitxategi %d baino gehiago gehitu</item>
+		<item quantity="other">Ezin dituzu %d baino multimedia fitxategi gehiago gehitu</item>
+	</plurals>
 	<string name="media_attachment_unsupported_type">%s fitxategi mota ez da bateragarria</string>
 	<string name="media_attachment_too_big">%1$s fitxategiak %2$s MB-eko tamainaren muga gainditzen du</string>
+	<string name="settings_theme">Itxura</string>
+	<string name="theme_auto">Erabili sistemaren diseinua</string>
 	<string name="theme_light">Argia</string>
 	<string name="theme_dark">Iluna</string>
 	<string name="settings_behavior">Jokabidea</string>
@@ -180,9 +209,13 @@
 	<string name="settings_clear_cache">Garbitu multimediaren cachea</string>
 	<string name="settings_app_version">Mastodon Android-entzat v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Multimediaren cachea garbitua</string>
+	<string name="confirm_log_out">Itxi saioa %s?</string>
+	<string name="sensitive_content_explain">Egileak multimedia hau hunkigarritzat markatu du.</string>
+	<string name="avatar_description">Joan %s-(r)en profilera</string>
 	<string name="more_options">Aukera gehiago</string>
 	<string name="new_post">Bidalketa berria</string>
 	<string name="button_reply">Erantzun</string>
+	<string name="button_reblog">Bultzada</string>
 	<string name="button_favorite">Gogokoa</string>
 	<string name="button_share">Partekatu</string>
 	<string name="media_no_description">Deskribapenik gabeko multimedia</string>
@@ -194,6 +227,7 @@
 	<string name="media_viewer">Multimedia ikuskatzailea</string>
 	<string name="follow_user">Jarraitu %s</string>
 	<string name="unfollowed_user">Utzi %s jarraitzeari</string>
+	<string name="followed_user">%s jarraitzen ari zara</string>
 	<string name="open_in_browser">Ireki nabigatzailean</string>
 	<string name="signup_reason">Zergatik elkartu nahi duzu?</string>
 	<string name="signup_reason_note">Honek zure eskaera berrikustean lagunduko digu.</string>
@@ -208,6 +242,9 @@
 	<string name="error_saving_file">Errorea fitxategia gordetzerakoan</string>
 	<string name="file_saved">Fitxategia gorde da</string>
 	<string name="downloading">Jeisten…</string>
+	<string name="no_app_to_handle_action">Ez dago ekintza hau kudeatu dezkeen aplikaziorik</string>
+	<string name="local_timeline">Lokala</string>
+	<string name="trending_posts_info_banner">Hauek dira zure Mastodon txokoan beraien lekua hartzen ari diren argitalpenak.</string>
 	<!-- %s is the server domain -->
 	<string name="see_new_posts">Ikusi bidalketa berriak</string>
 	<string name="load_missing_posts">Falta diren bidalketak kargatu</string>
@@ -290,22 +327,120 @@
 	<string name="server_filter_region_asia">Asia</string>
 	<string name="server_filter_region_oceania">Ozeania</string>
 	<string name="not_accepting_new_members">Ez da kide berririk onartzen</string>
+	<string name="signup_passwords_dont_match">Pasahitzak ez datoz bat</string>
+	<string name="pick_server_for_me">Aukeratu niretzat</string>
 	<string name="profile_add_row">Gehitu errenkada</string>
+	<string name="popular_on_mastodon">Mastodonen pil-pilean</string>
 	<string name="follow_all">Jarraitu denak</string>
 	<string name="server_rules_disagree">Ez ados</string>
 	<!-- %s is server domain -->
 	<string name="profile_bio">Biografia</string>
 	<!-- 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. -->
+	<string name="spoiler_show">Erakutsi hala ere</string>
+	<string name="poll_multiple_choice">Aukeratu bat edo gehiago</string>
+	<string name="save_changes">Gorde aldaketak</string>
+	<string name="profile_featured">Nabarmenak</string>
+	<string name="profile_timeline">Denbora-lerroa</string>
+	<string name="view_all">Ikusi guztia</string>
+	<string name="profile_endorsed_accounts">Kontuak</string>
+	<string name="show">Erakutsi</string>
+	<string name="hide">Ezkutatu</string>
+	<string name="pick_server">Aukeratu beste zerbitzari bat</string>
+	<string name="signup_or_login">edo</string>
+	<string name="learn_more">Ikasi gehiago</string>
+	<string name="welcome_to_mastodon">Ongi etorri Mastodon-era</string>
+	<string name="what_are_servers">Zer dira zerbitzariak?</string>
+	<string name="opening_link">Lotura irekitzen…</string>
+	<string name="retry">Berriro saiatu</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_type_image">Irudia</string>
+	<string name="attachment_type_video">Bideoa</string>
+	<string name="attachment_type_audio">Audioa</string>
+	<string name="attachment_type_gif">GIF-a</string>
+	<string name="attachment_type_unknown">Fitxategia</string>
+	<string name="add_poll_option">Gehitu inkesta aukera</string>
+	<string name="poll_style">Estiloa</string>
+	<string name="compose_poll_single_choice">Aukeratu bat</string>
+	<string name="compose_poll_multiple_choice">Aukera anitza</string>
+	<string name="delete_poll_option">Ezabatu inkesta aukera</string>
+	<string name="help">Laguntza</string>
+	<string name="edit_post">Editatu argitalpena</string>
+	<string name="compose_autocomplete_emoji_empty">Esploratu emojiak</string>
+	<string name="language">Hizkuntza</string>
+	<string name="language_default">Lehenetsia</string>
+	<string name="language_system">Sistema</string>
+	<string name="language_detecting">Hizkuntza detektatzen</string>
+	<string name="language_cant_detect">Ezin da hizkuntza detektatu</string>
+	<string name="language_detected">Detektatuta</string>
+	<string name="media_hidden">Multimedia ezkutatua</string>
 	<!-- %s is the server domain -->
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Salatua</string>
+	<string name="muted_user">Mututu %s</string>
+	<string name="blocked_user">Blokeatu %s</string>
+	<string name="mark_all_notifications_read">Markatu denak irakurrita bezala</string>
+	<string name="settings_display">Bistaratzea</string>
+	<string name="settings_filters">Iragazkiak</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">%s(r)i buruz</string>
+	<string name="pause_all_notifications">Pausatu denak</string>
+	<string name="pause_notifications_off">Itzali</string>
+	<string name="notifications_policy_anyone">Edozein</string>
+	<string name="notifications_policy_followed">Zu jarraitzen zaituzten pertsonak</string>
+	<string name="notifications_policy_follower">Zuk jarraitzen dituzun pertsonak</string>
+	<string name="notifications_policy_no_one">Bat ere ez</string>
+	<string name="pause_all_notifications_title">Pausatu jakinarazpen guztiak</string>
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
+	<string name="today">gaur</string>
+	<string name="yesterday">atzo</string>
+	<string name="tomorrow">bihar</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="about_server">Honi buruz</string>
+	<string name="server_rules">Arauak</string>
+	<string name="server_administrator">Administratzailea</string>
+	<string name="settings_show_cws">Erakutsi eduki abisuak</string>
+	<plurals name="in_x_hours">
+		<item quantity="one">Ordu %d barru</item>
+		<item quantity="other">%d ordu barru</item>
+	</plurals>
+	<string name="count_one">Bat</string>
+	<string name="count_two">Bi</string>
+	<string name="count_three">Hiru</string>
+	<string name="count_four">Lau</string>
+	<string name="alt_text_reminder_post_anyway">Bidalketa</string>
 	<!-- %s is the username -->
+	<string name="unfollow_confirmation">%s jarraitzeari utzi?</string>
+	<string name="filter_active">Aktiboa</string>
+	<string name="filter_inactive">Ez aktiboa</string>
+	<string name="settings_add_filter">Gehitu iragazkia</string>
+	<string name="settings_edit_filter">Editatu iragazkia</string>
+	<string name="settings_filter_duration">Iraupena</string>
+	<string name="settings_filter_muted_words">Mutututako hitzak</string>
+	<string name="settings_filter_show_cw">Erakutsi eduki abisuarekin</string>
+	<string name="settings_delete_filter">Ezabatu iragazkia</string>
+	<string name="filter_duration_forever">Betirakoa</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="selection_2_options">%1$s eta %2$s</string>
+	<string name="selection_3_options">%1$s, %2$s, eta %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s, eta beste %3$d</string>
+	<string name="filter_context_notifications">Jakinarazpenak</string>
+	<string name="filter_context_public_timelines">Denbora-lerro publikoak</string>
+	<string name="filter_context_profiles">Profilak</string>
+	<string name="settings_filter_title">Izenburua</string>
+	<string name="settings_delete_filter_title">Ezabatu \"%s\" iragazkia”?</string>
+	<string name="add">Gehitu</string>
+	<string name="enter_selection_mode">Hautatu</string>
+	<string name="select_all">Hautatu dena</string>
+	<string name="filter_duration_custom">Pertsonalizatua</string>
+	<string name="required_form_field_blank">Ezin da hutsik egon</string>
+	<string name="app_update_version">Bertsioa: %s</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="search_mastodon">Bilatu Mastodonen</string>
+	<string name="clear_all">Garbitu dena</string>
+	<string name="search_open_url">Ireki URLa Mastodonen</string>
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-fa-rIR/strings.xml

@@ -387,7 +387,7 @@
 	<string name="welcome_to_mastodon">به ماستودون خوش آمدید</string>
 	<string name="welcome_paragraph1">ماستودون یک شبکه اجتماعی غیر متمرکز است،به این معنی که هیچ شرکتی آن را کنترل نمی کند. این از بسیاری از کارسازهای مستقل تشکیل شده است که همه به هم متصل هستند.</string>
 	<string name="what_are_servers">کارساز شما کجاست؟</string>
-	<string name="welcome_paragraph2"><![CDATA[هر حساب ماستودون بر روی یک سرور میزبانی می شود — هر کدام با مقادیر، قوانین و مدیران خاص خود. مهم نیست کدام یک را انتخاب می کنید، می توانید افراد را در هر کارسازی دنبال کنید و با آنها تعامل داشته باشید.]]></string>
+	<string name="welcome_paragraph2">هر حساب ماستودون بر روی یک سرور میزبانی می شود — هر کدام با مقادیر، قوانین، &amp; مدیران خاص خود. مهم نیست کدام یک را انتخاب می کنید، می توانید افراد را در هر کارسازی دنبال کنید و با آنها تعامل داشته باشید.</string>
 	<string name="opening_link">باز کردن پیوند…</string>
 	<string name="link_not_supported">این پیوند در کاره پشتیبانی نمی شود</string>
 	<string name="log_out_all_accounts">از همه حساب‌ها خارج شوید</string>
@@ -582,4 +582,18 @@
 	<string name="time_minutes_ago_short">%d؜دقيقه پيش</string>
 	<string name="time_hours_ago_short">%dساعت پيش</string>
 	<string name="time_days_ago_short">%dروز پیش</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">ترجمه از %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">ترجمه از %1$s با %2$s</string>
+	<string name="translation_show_original">نمایش اصلی</string>
+	<string name="translation_failed">ترجمه ناموفق بود. شاید مدیر ترجمه‌ها را در این کارساز فعال نکرده باشد یا این کارساز نسخه قدیمی ماستودون را اجرا می کند که در آن ترجمه‌ها هنوز پشتیبانی نمی شوند.</string>
+	<plurals name="x_participants">
+		<item quantity="one">%,d شرکت کننده</item>
+		<item quantity="other">%,d شرکت‌کننده</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d فرسته امروز</item>
+		<item quantity="other">%,d فرسته امروز</item>
+	</plurals>
 </resources>

mastodon/src/main/res/values-fi-rFI/strings.xml

@@ -2,13 +2,167 @@
 <resources>
 	<string name="log_in">Kirjaudu sisään</string>
 	<string name="next">Seuraava</string>
+	<string name="loading_instance">Haetaan palvelimen tietoja…</string>
 	<string name="error">Virhe</string>
+	<string name="not_a_mastodon_instance">%s ei näytä olevan Mastodonin palvelin.</string>
+	<string name="ok">OK</string>
+	<string name="preparing_auth">Valmistellaan todennusta…</string>
+	<string name="finishing_auth">Viimeistellään todennusta…</string>
+	<string name="user_boosted">%s tehosti</string>
+	<string name="in_reply_to">Vastauksessa %s</string>
+	<string name="notifications">Ilmoitukset</string>
+	<string name="user_followed_you">%s seurasi sinua</string>
+	<string name="user_sent_follow_request">%s lähetti sinulle seurauspyynnön</string>
+	<string name="user_favorited">%s tykkäsi julkaisustasi</string>
+	<string name="notification_boosted">%s tehosti viestiäsi</string>
+	<string name="poll_ended">Katso tulokset äänestyksestä johon osallistuit</string>
 	<string name="share_toot_title">Jaa</string>
 	<string name="settings">Asetukset</string>
+	<string name="publish">Julkaise</string>
+	<string name="discard_draft">Hylkää luonnos?</string>
+	<string name="discard">Hylkää</string>
+	<string name="cancel">Kumoa</string>
+	<plurals name="followers">
+		<item quantity="one">seuraaja</item>
+		<item quantity="other">seuraajat</item>
+	</plurals>
+	<plurals name="following">
+		<item quantity="one">seurataan</item>
+		<item quantity="other">seurataan</item>
+	</plurals>
+	<string name="posts">Viestit</string>
+	<string name="posts_and_replies">Viestit ja vastaukset</string>
+	<string name="media">Media</string>
+	<string name="profile_about">Tietoja</string>
+	<string name="button_follow">Seuraa</string>
+	<string name="button_following">Seurataan</string>
 	<string name="edit_profile">Muokkaa profiilia</string>
+	<string name="share_user">Jaa profiili</string>
+	<string name="mute_user">Mykistä %s</string>
+	<string name="unmute_user">Poista mykistys tililtä %s</string>
+	<string name="block_user">Estä %s</string>
+	<string name="unblock_user">Poista käyttäjän %s esto</string>
+	<string name="report_user">Raportoi %s</string>
+	<string name="block_domain">Estä %s</string>
+	<string name="unblock_domain">Poista käyttäjän %s esto</string>
+	<plurals name="x_posts">
+		<item quantity="one">%,d julkaisu</item>
+		<item quantity="other">%,d julkaisua</item>
+	</plurals>
+	<string name="profile_joined">Liittynyt</string>
 	<string name="done">Valmis</string>
+	<string name="loading">Ladataan…</string>
+	<string name="field_label">Nimi</string>
+	<string name="field_content">Sisältö</string>
 	<string name="saving">Tallennetaan…</string>
+	<string name="post_from_user">Julkaisu tililtä %s</string>
+	<string name="poll_option_hint">Vaihtoehto %d</string>
+	<plurals name="x_minutes">
+		<item quantity="one">%d minuutti</item>
+		<item quantity="other">%d minuuttia</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="one">%d tunti</item>
+		<item quantity="other">%d tuntia</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="one">%d päivä</item>
+		<item quantity="other">%d päivää</item>
+	</plurals>
+	<plurals name="x_seconds_left">
+		<item quantity="one">%d sekunti jäljellä</item>
+		<item quantity="other">%d sekunttia jäljellä</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="one">%d minuutti jäljellä</item>
+		<item quantity="other">%d minuuttia jäljellä</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="one">%d tunti jäljellä</item>
+		<item quantity="other">%d tuntia jäljellä</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="one">%d päivä jäljellä</item>
+		<item quantity="other">%d päivää jäljellä</item>
+	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%d ääni</item>
+		<item quantity="other">%d ääntä</item>
+	</plurals>
+	<string name="poll_closed">Suljettu</string>
+	<string name="confirm_mute_title">Mykistä tili</string>
+	<string name="confirm_mute">Vahvista käyttäjän %s mykistys</string>
+	<string name="do_mute">Mykistä</string>
+	<string name="confirm_unmute_title">Poista tilin mykistys</string>
+	<string name="confirm_unmute">Vahvista, että haluat poistaa mykistyksen tililtä %s</string>
+	<string name="do_unmute">Poista mykistys</string>
+	<string name="confirm_block_title">Estä tili</string>
+	<string name="confirm_block_domain_title">Estä verkkotunnus</string>
+	<string name="confirm_block">Vahvista käyttäjän %s esto</string>
+	<string name="do_block">Estä</string>
+	<string name="confirm_unblock_title">Poista tilin esto</string>
+	<string name="confirm_unblock_domain_title">Poista verkkotunnuksen esto</string>
+	<string name="confirm_unblock">Vahvista, että haluat poistaa tilin %s eston</string>
+	<string name="do_unblock">Poista esto</string>
+	<string name="button_blocked">Estetty</string>
+	<string name="action_vote">Äänestä</string>
+	<string name="delete">Poista</string>
+	<string name="confirm_delete_title">Poista julkaisu</string>
+	<string name="confirm_delete">Haluatko varmasti poistaa tämän julkaisun?</string>
+	<string name="deleting">Poistetaan…</string>
+	<string name="notification_channel_audio_player">Äänen toisto</string>
+	<string name="play">Toista</string>
+	<string name="pause">Tauko</string>
+	<string name="log_out">Kirjaudu ulos</string>
+	<string name="add_account">Lisää tili</string>
+	<string name="search_hint">Haku</string>
+	<string name="hashtags">Aihetunnisteet</string>
+	<string name="news">Uutiset</string>
+	<string name="for_you">Sinulle</string>
+	<string name="all_notifications">Kaikki</string>
+	<string name="mentions">Maininnat</string>
+	<plurals name="x_people_talking">
+		<item quantity="one">%d henkilö puhuu</item>
+		<item quantity="other">%d henkilöä puhuu</item>
+	</plurals>
+	<string name="report_title">Raportoi %s</string>
+	<string name="report_choose_reason">Mikä on väärin tässä julkaisussa?</string>
+	<string name="report_choose_reason_account">Mikä on vialla käyttäjässä %s?</string>
+	<string name="report_choose_reason_subtitle">Valitse se, mikä sopii parhaiten</string>
+	<string name="report_reason_personal">En pidä siitä</string>
+	<string name="report_reason_personal_subtitle">Tätä ei halua nähdä</string>
+	<string name="report_reason_spam">Se on roskapostia</string>
+	<string name="report_reason_spam_subtitle">Haitalliset linkit, väärennetyt sitoutumiset tai toistuvat vastaukset</string>
+	<string name="report_reason_violation">Se rikkoo palvelimen sääntöjä</string>
+	<string name="report_reason_violation_subtitle">Tiedät, että se rikkoo tiettyjä sääntöjä</string>
+	<string name="report_reason_other">Jotain muuta</string>
+	<string name="report_reason_other_subtitle">Ongelma ei sovi muihin kategorioihin</string>
+	<string name="report_choose_rule">Mitä sääntöjä rikotaan?</string>
+	<string name="report_choose_rule_subtitle">Valitse kaikki sopivat</string>
+	<string name="report_choose_posts">Onko julkaisuja, jotka tukevat tätä raporttia?</string>
+	<string name="report_choose_posts_subtitle">Valitse kaikki sopivat</string>
+	<string name="report_comment_title">Olisiko jotain muuta, mitä meidän pitäisi tietää?</string>
+	<string name="report_comment_hint">Lisäkommentit</string>
+	<string name="sending_report">Lähetetään raporttia…</string>
+	<string name="report_sent_title">Kiitos raportista, tutkimme asiaa.</string>
+	<string name="report_sent_subtitle">Sillä välin kun tarkistamme tätä, voit ryhtyä toimenpiteisiin käyttäjää @%s vastaan:</string>
+	<string name="unfollow_user">Lopeta käyttäjän %s seuraaminen</string>
+	<string name="unfollow">Lopeta seuraaminen</string>
+	<string name="mute_user_explain">Et näe hänen viestejään. Hän voi silti seurata sinua ja nähdä viestisi. Hän ei tiedä, että on mykistetty.</string>
+	<string name="block_user_explain">Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkevät, että olet estänyt hänet.</string>
+	<string name="report_personal_title">Etkö halua nähdä tätä?</string>
+	<string name="report_personal_subtitle">Tässä on vaihtoehtosi hallita näkemääsi Mastodonissa:</string>
 	<string name="back">Takaisin</string>
+	<string name="search_communities">Palvelimen nimi tai URL-osoite</string>
+	<string name="instance_rules_title">Palvelimen säännöt</string>
+	<string name="instance_rules_subtitle">Jatkamalla sitoudut noudattamaan seuraavia sääntöjä, jotka %s moderaattorit ovat asettaneet ja valvoneet.</string>
+	<string name="signup_title">Luo tili</string>
+	<string name="display_name">Nimi</string>
+	<string name="username">Käyttäjätunnus</string>
+	<string name="email">Sähköposti</string>
+	<string name="password">Salasana</string>
+	<string name="confirm_password">Vahvista salasana</string>
+	<string name="password_note">Sisällytä suuraakkoset, erikoismerkit, ja numerot, jotta voit lisätä salasanan voimaa.</string>
 	<string name="category_academia">Akateeminen</string>
 	<string name="category_activism">Aktivismi</string>
 	<string name="category_all">Kaikki</string>
@@ -22,39 +176,424 @@
 	<string name="category_music">Musiikki</string>
 	<string name="category_regional">Alueellinen</string>
 	<string name="category_tech">Teknologia</string>
+	<string name="confirm_email_title">Tarkista sähköpostisi</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Napauta lähettämäämme linkkiä vahvistaaksesi tunnuksen %s. Odotamme täällä.</string>
+	<string name="confirm_email_didnt_get">Etkö saanut linkkiä?</string>
+	<string name="resend">Lähetä uudelleen</string>
+	<string name="open_email_app">Avaa sähköpostiohjelma</string>
+	<string name="resent_email">Vahvistusviesti lähetetty</string>
+	<string name="compose_hint">Kirjoita tai liitä mitä mietit</string>
+	<string name="content_warning">Sisältövaroitus</string>
 	<string name="save">Tallenna</string>
+	<string name="add_alt_text">Lisää selitys</string>
+	<string name="visibility_public">Julkinen</string>
+	<string name="visibility_followers_only">Vain seuraajat</string>
+	<string name="visibility_private">Vain mainitsemani tilit</string>
+	<string name="recent_searches">Viimeisimmät</string>
+	<string name="skip">Ohita</string>
+	<string name="notification_type_follow">Uudet seuraajat</string>
+	<string name="notification_type_favorite">Suosikit</string>
+	<string name="notification_type_reblog">Tehostukset</string>
+	<string name="notification_type_mention">Maininnat</string>
+	<string name="notification_type_poll">Kyselyt</string>
+	<string name="choose_account">Valitse tili</string>
+	<string name="err_not_logged_in">Kirjaudu ensin Mastodoniin</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Et voi lisätä enempää kuin %d medialiitteen</item>
+		<item quantity="other">Et voi lisätä enempää kuin %d medialiitettä</item>
+	</plurals>
+	<string name="media_attachment_unsupported_type">Tiedosto %s on tyyppiä jota ei tueta</string>
+	<string name="media_attachment_too_big">Tiedosto %1$s ylittää %2$s MB kokorajan</string>
+	<string name="settings_theme">Ulkoasu</string>
+	<string name="theme_auto">Käytä laitteen ulkoasua</string>
 	<string name="theme_light">Vaalea</string>
 	<string name="theme_dark">Tumma</string>
+	<string name="settings_behavior">Toiminnot</string>
+	<string name="settings_gif">Toista animoidut käyttäjäkuvat ja emojit</string>
+	<string name="settings_custom_tabs">Käytä sovelluksen sisäistä selainta</string>
+	<string name="settings_notifications">Ilmoitukset</string>
+	<string name="settings_contribute">Osallistu Mastodoniin</string>
+	<string name="settings_tos">Käyttöehdot</string>
+	<string name="settings_privacy_policy">Tietosuojakäytäntö</string>
+	<string name="settings_clear_cache">Tyhjennä median välimuisti</string>
+	<string name="settings_app_version">Mastodon Android v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Median välimuisti tyhjennetty</string>
+	<string name="confirm_log_out">Kirjaudu ulos %s?</string>
+	<string name="sensitive_content_explain">Kirjoittaja merkitsi tämän median arkaluontoiseksi.</string>
+	<string name="avatar_description">Avaa profiili %s</string>
+	<string name="more_options">Lisää asetuksia</string>
+	<string name="new_post">Uusi julkaisu</string>
 	<string name="button_reply">Vastaa</string>
+	<string name="button_reblog">Tehosta</string>
+	<string name="button_favorite">Suosikki</string>
 	<string name="button_share">Jaa</string>
+	<string name="media_no_description">Kuva ilma kuvausta</string>
+	<string name="add_media">Lisää mediatiedosto</string>
+	<string name="add_poll">Lisää kysely</string>
 	<string name="emoji">Emoji</string>
+	<string name="home_timeline">Kotiaikajana</string>
+	<string name="my_profile">Oma profiili</string>
+	<string name="media_viewer">Median katselin</string>
 	<string name="follow_user">Follow %s</string>
+	<string name="unfollowed_user">Käyttäjän %s seuraaminen lopetettu</string>
+	<string name="followed_user">Seuraat nyt käyttäjää %s</string>
+	<string name="following_user_requested">Käyttäjän %s seuraamista pyydetty</string>
 	<string name="open_in_browser">Avaa selaimessa</string>
+	<string name="hide_boosts_from_user">Piilota käyttäjän @%s tehostukset</string>
+	<string name="show_boosts_from_user">Näytä tehostukset käyttäjältä @%s</string>
+	<string name="signup_reason">Miksi haluat liittyä?</string>
+	<string name="signup_reason_note">Tämä auttaa meitä arvioimaan hakemustasi.</string>
 	<string name="clear">Tyhjennä</string>
+	<string name="profile_header">Otsikon kuva</string>
 	<string name="profile_picture">Profiilikuva</string>
+	<string name="reorder">Järjestä uudelleen</string>
 	<string name="download">Lataa</string>
+	<string name="permission_required">Käyttöoikeus vaaditaan</string>
+	<string name="storage_permission_to_download">Sovellus tarvitsee pääsyn tallennustilaan, jotta voit tallentaa tämän tiedoston.</string>
 	<string name="open_settings">Avaa asetukset</string>
+	<string name="error_saving_file">Virhe tallennettaessa tiedostoa</string>
 	<string name="file_saved">Tiedosto tallennettu</string>
 	<string name="downloading">Ladataan…</string>
+	<string name="no_app_to_handle_action">Tätä toimintoa käsittelevää sovellusta ei ole</string>
+	<string name="local_timeline">Paikallinen</string>
+	<string name="trending_posts_info_banner">Nämä julkaisut ovat saamassa vetoa eri puolilla Mastodonia.</string>
+	<string name="trending_links_info_banner">Näistä uutisista puhutaan Mastodonissa.</string>
 	<!-- %s is the server domain -->
+	<string name="local_timeline_info_banner">Nämä ovat viestit kaikilta palvelimesi (%s) käyttäjiltä.</string>
+	<string name="recommended_accounts_info_banner">Muiden seuraamiesi perusteella saattaisit pitää näistä tileistä.</string>
+	<string name="see_new_posts">Uusia julkaisuja</string>
+	<string name="load_missing_posts">Lataa puuttuvat julkaisut</string>
 	<string name="follow_back">Seuraa takaisin</string>
+	<string name="button_follow_pending">Pyydetty</string>
+	<string name="follows_you">Seuraa sinua</string>
+	<string name="manually_approves_followers">Hyväksyy seuraajat käsin</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="one">%d seuraaja</item>
+		<item quantity="other">%d seuraajaa</item>
+	</plurals>
+	<plurals name="x_following">
+		<item quantity="one">%d seurattu</item>
+		<item quantity="other">%d seurattua</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d suosikki</item>
+		<item quantity="other">%,d suosikkia</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d tehostus</item>
+		<item quantity="other">%,d tehostusta</item>
+	</plurals>
+	<string name="timestamp_via_app">%1$s sovelluksella %2$s</string>
+	<string name="time_now">nyt</string>
+	<string name="edit_history">Muokkaushistoria</string>
+	<string name="last_edit_at_x">Muokattiin viimeksi %s</string>
+	<string name="time_just_now">juuri nyt</string>
+	<plurals name="x_seconds_ago">
+		<item quantity="one">%d sekunti sitten</item>
+		<item quantity="other">%d sekuntia sitten</item>
+	</plurals>
+	<plurals name="x_minutes_ago">
+		<item quantity="one">%d minuutti sitten</item>
+		<item quantity="other">%d minuuttia sitten</item>
+	</plurals>
+	<string name="edited_timestamp">muokattu %s</string>
+	<string name="edit_original_post">Alkuperäinen viesti</string>
+	<string name="edit_text_edited">Tekstiä muokattu</string>
+	<string name="edit_spoiler_added">Sisältövaroitus</string>
+	<string name="edit_spoiler_edited">Sisältövaroitus muokattu</string>
+	<string name="edit_spoiler_removed">Sisältövaroitus poistettu</string>
+	<string name="edit_poll_added">Kysely lisätty</string>
+	<string name="edit_poll_edited">Kyselyä muokattu</string>
+	<string name="edit_poll_removed">Kysely poistettu</string>
+	<string name="edit_media_added">Mediatiedosto lisätty</string>
+	<string name="edit_media_removed">Mediatiedosto poistettu</string>
+	<string name="edit_media_reordered">Mediatiedostoja järjestetty</string>
+	<string name="edit_marked_sensitive">Merkitty arkaluontoiseksi</string>
+	<string name="edit_marked_not_sensitive">Merkitty ei arkaluontoiseksi</string>
+	<string name="edit_multiple_changed">Julkaisu muokattu</string>
+	<string name="edit">Muokkaa</string>
+	<string name="discard_changes">Hylätäänkö muutokset?</string>
+	<string name="upload_failed">Lataus epäonnistui</string>
+	<string name="file_size_bytes">%d tavua</string>
+	<string name="file_size_kb">%.2f KB</string>
+	<string name="file_size_mb">%.2f MB</string>
+	<string name="file_size_gb">%.2f GB</string>
+	<string name="upload_processing">Käsitellään…</string>
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is version like 1.2.3 -->
 	<!-- %s is file size -->
+	<string name="download_update">Lataa (%s)</string>
+	<string name="install_update">Asenna</string>
+	<string name="privacy_policy_title">Yksityisyytesi</string>
+	<string name="privacy_policy_subtitle">Vaikka Mastodon-sovellus ei kerää mitään tietoja, palvelimella, jonka olet rekisteröitynyt, voi olla eri käytäntö.\n\nJos olet eri mieltä käytännöstä %s, voit palata ja valita eri palvelin.</string>
+	<string name="i_agree">Hyväksyn</string>
+	<string name="empty_list">Luettelo on tyhjä</string>
+	<string name="instance_signup_closed">Tämä palvelin ei hyväksy uusia rekisteröintejä.</string>
+	<string name="text_copied">Kopioitu leikepöydälle</string>
+	<string name="add_bookmark">Kirjanmerkki</string>
+	<string name="remove_bookmark">Poista kirjanmerkki</string>
+	<string name="bookmarks">Kirjanmerkit</string>
+	<string name="your_favorites">Omat suosikit</string>
+	<string name="login_title">Tervetuloa takaisin</string>
+	<string name="login_subtitle">Kirjaudu sisään palvelimella, jossa olet luonut tilisi.</string>
+	<string name="server_url">Palvelimen URL-osoite</string>
+	<string name="signup_random_server_explain">Palvelin valitaan kielesi perusteella, jos jatkat ilman valintaa.</string>
+	<string name="server_filter_any_language">Millä tahansa kielellä</string>
+	<string name="server_filter_instant_signup">Välitön rekisteröityminen</string>
+	<string name="server_filter_manual_review">Manuaalinen hyväksyntä</string>
+	<string name="server_filter_any_signup_speed">Mikä tahansa rekisteröintinopeus</string>
+	<string name="server_filter_region_europe">Eurooppa</string>
+	<string name="server_filter_region_north_america">Pohjois-Amerikka</string>
+	<string name="server_filter_region_south_america">Etelä-Amerikka</string>
+	<string name="server_filter_region_africa">Afrikka</string>
+	<string name="server_filter_region_asia">Aasia</string>
+	<string name="server_filter_region_oceania">Oseania</string>
+	<string name="not_accepting_new_members">Ei hyväksy uusia jäseniä</string>
+	<string name="category_special_interests">Erityiset Kiinnostukset</string>
+	<string name="signup_passwords_dont_match">Salasanat eivät täsmää</string>
+	<string name="pick_server_for_me">Valitse minulle</string>
+	<string name="profile_add_row">Lisää rivi</string>
+	<string name="profile_setup">Profiilin asetukset</string>
+	<string name="profile_setup_subtitle">Voit myös täyttää tämän myöhemmin Profiili-välilehdellä.</string>
+	<string name="profile_setup_explanation">Voit lisätä enintään neljä profiilikenttää joissa on mitä haluat. Sijainti, linkit, pronominit — taivas on rajana.</string>
+	<string name="popular_on_mastodon">Suosittua Mastodonissa</string>
+	<string name="follow_all">Seuraa kaikkia</string>
+	<string name="server_rules_disagree">Eri mieltä</string>
+	<string name="privacy_policy_explanation">TL;DR: Emme kerää tai käsittele mitään.</string>
 	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Eri mieltä tästä %s</string>
+	<string name="profile_bio">Kuvaus</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Seurataan käyttäjiä…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s ei salli ilmoittautumisia osoitteesta %2$s. Kokeile toista osoitetta tai &lt;a&gt;valitse toinen palvelin&lt;/a&gt;.</string>
+	<string name="spoiler_show">Näytä joka tapauksessa</string>
+	<string name="spoiler_hide">Piilota uudelleen</string>
+	<string name="poll_multiple_choice">Valitse yksi tai useampi</string>
+	<string name="save_changes">Tallenna muutokset</string>
+	<string name="profile_featured">Suositellut</string>
+	<string name="profile_timeline">Aikajana</string>
+	<string name="view_all">Näytä kaikki</string>
+	<string name="profile_endorsed_accounts">Tilit</string>
+	<string name="verified_link">Vahvistettu linkki</string>
+	<string name="show">Näytä</string>
+	<string name="hide">Piilota</string>
+	<string name="join_default_server">Liity palvelimelle %s</string>
+	<string name="pick_server">Valitse toinen palvelin</string>
+	<string name="signup_or_login">tai</string>
+	<string name="learn_more">Lue lisää</string>
+	<string name="welcome_to_mastodon">Tervetuloa Mastodoniin</string>
+	<string name="welcome_paragraph1">Mastodon on hajautettu sosiaalinen verkosto, joka tarkoittaa sitä, ettei sitä hallitse mikään yksittäinen yritys. Se koostuu monista itsenäisesti ylläpidetyistä palvelimista, jotka on liitetty yhteen.</string>
+	<string name="what_are_servers">Mitä palvelimet ovat?</string>
+	<string name="welcome_paragraph2">Jokainen Mastodon tili isännöi palvelimella - kullakin on omat arvot, säännöt, &amp; ylläpitäjät. Riippumatta siitä, minkä valitset, voit seurata ja olla vuorovaikutuksessa ihmisten kanssa millä tahansa palvelimella.</string>
+	<string name="opening_link">Avataan linkki…</string>
+	<string name="link_not_supported">Tämä linkki ei ole tuettu sovelluksessa</string>
+	<string name="log_out_all_accounts">Kirjaudu ulos kaikista tileistä</string>
+	<string name="confirm_log_out_all_accounts">Kirjaudu ulos kaikista tileistä?</string>
+	<string name="retry">Yritä uudelleen</string>
+	<string name="post_failed">Viestin lähettäminen epäonnistui</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">%s kuva</string>
+	<string name="attachment_description_video">%s video</string>
+	<string name="attachment_description_audio">%s ääni</string>
+	<string name="attachment_description_unknown">%s tiedosto</string>
+	<string name="attachment_type_image">Kuva</string>
+	<string name="attachment_type_video">Video</string>
+	<string name="attachment_type_audio">Ääni</string>
+	<string name="attachment_type_gif">GIF</string>
+	<string name="attachment_type_unknown">Tiedosto</string>
+	<string name="attachment_x_percent_uploaded">%d%% ladattu</string>
+	<string name="add_poll_option">Lisää kyselyyn vaihtoehto</string>
+	<string name="poll_length">Kyselyn kesto</string>
+	<string name="poll_style">Tyyli</string>
+	<string name="compose_poll_single_choice">Valitse yksi</string>
+	<string name="compose_poll_multiple_choice">Monivalinta</string>
+	<string name="delete_poll_option">Poista kyselyn vaihtoehto</string>
+	<string name="poll_style_title">Kyselyn tyyli</string>
+	<string name="alt_text">Selitys</string>
+	<string name="help">Ohje</string>
+	<string name="what_is_alt_text">Mikä on selitys?</string>
+	<string name="alt_text_help">Kuvaselitys auttaa ihmisiä, joilla on näkövamma, hidas yhteys, tai jotka tarvitsevat lisäkontekstia. \n\nVoit parantaa saavutettavuutta ja kaikkien mahdollisuutta ymmärtää kirjoittamalla selkeän, lyhyen ja objektiivisen selityksen. \n\n<ul><li>Mainitse tärkeät elementit</li>\n<li>Anna tiivistelmä kuvissa olevista teksteistä</li>\n<li>Käytä normaalia lauserakennetta</li>\n<li>Vältä turhaa toistoa</li>\n<li>Keskity monimutkaisissa kuvioissa (kuten kartoissa ja taulukoissa) trendeihin ja tärkeimpiin tietoihin</li></ul></string>
+	<string name="edit_post">Muokkaa julkaisua</string>
+	<string name="no_verified_link">Ei todennettua linkkiä</string>
+	<string name="compose_autocomplete_emoji_empty">Selaa emojeita</string>
+	<string name="compose_autocomplete_users_empty">Löydä etsimäsi henkilöt</string>
+	<string name="no_search_results">Näille hakusanoille ei löytynyt mitään</string>
+	<string name="language">Kieli</string>
+	<string name="language_default">Oletus</string>
+	<string name="language_system">Järjestelmä</string>
+	<string name="language_detecting">Tunnista kieli</string>
+	<string name="language_cant_detect">Ei voi tunnistaa kieltä</string>
+	<string name="language_detected">Tunnistettu</string>
+	<string name="media_hidden">Media piilotettu</string>
+	<string name="post_hidden">Julkaisu piilotettu</string>
+	<string name="report_title_post">Raportoi julkaisu</string>
+	<string name="forward_report_explanation">Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?</string>
 	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">Välitä kohteeseen %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Raportoitu</string>
+	<string name="report_unfollow_explanation">Jos et enää halua nähdä tämän käyttäjän julkaisuja kotiaikajanallasi, lopeta seuraaminen.</string>
+	<string name="muted_user">Käyttäjä %s mykistetty</string>
+	<string name="report_sent_already_blocked">Olet jo estänyt tämän käyttäjän, sinun ei tarvitse tehdä muuta sillä aikaa kun tarkastamme raporttisi.</string>
+	<string name="report_personal_already_blocked">Olet jo estänyt tämän käyttäjän, joten sinun ei tarvitse tehdä mitään muuta.\n\nKiitos, että autat pitämään Mastodonin turvallisena paikkana kaikille!</string>
+	<string name="blocked_user">Estetty %s</string>
+	<string name="mark_all_notifications_read">Merkitse kaikki luetuksi</string>
+	<string name="settings_display">Näyttö</string>
+	<string name="settings_filters">Suodattimet</string>
+	<string name="settings_server_explanation">Yleiskatsaus, säännöt, valvojat</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">Tietoa: %s</string>
+	<string name="default_post_language">Julkaisun oletuskieli</string>
+	<string name="settings_alt_text_reminders">Lisää muistutus kuvaselityksestä</string>
+	<string name="settings_confirm_unfollow">Kysy ennen kuin käyttäjän seuraaminen lopetetaan</string>
+	<string name="settings_confirm_boost">Kysy ennen tehostusta</string>
+	<string name="settings_confirm_delete_post">Kysy ennen julkaisujen poistamista</string>
+	<string name="pause_all_notifications">Keskeytä kaikki</string>
+	<string name="pause_notifications_off">Pois Päältä</string>
+	<string name="notifications_policy_anyone">Kuka tahansa</string>
+	<string name="notifications_policy_followed">Seuraajasi</string>
+	<string name="notifications_policy_follower">Seuraamasi henkilöt</string>
+	<string name="notifications_policy_no_one">Ei kukaan</string>
+	<string name="settings_notifications_policy">Ota vastaan ilmoituksia käyttäjältä</string>
+	<string name="notification_type_mentions_and_replies">Maininnat ja vastaukset</string>
+	<string name="pause_all_notifications_title">Keskeytä kaikki ilmoitukset</string>
+	<plurals name="x_weeks">
+		<item quantity="one">%d viikko</item>
+		<item quantity="other">%d viikkoa</item>
+	</plurals>
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
+	<string name="date_at_time">%1$s klo %2$s</string>
+	<string name="today">tänään</string>
+	<string name="yesterday">eilen</string>
+	<string name="tomorrow">huomenna</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_ends">Päättyy %s</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">Ilmoitukset jatkuvat %s.</string>
+	<string name="resume_notifications_now">Jatka nyt</string>
+	<string name="open_system_notification_settings">Siirry ilmoitusasetuksiin</string>
+	<string name="about_server">Tietoja</string>
+	<string name="server_rules">Säännöt</string>
+	<string name="server_administrator">Ylläpitäjä</string>
+	<string name="send_email_to_server_admin">Viestin ylläpitäjä</string>
+	<string name="notifications_disabled_in_system">Ota ilmoitukset käyttöön laitteesi asetuksista nähdäksesi päivityksiä mistä tahansa.</string>
+	<string name="settings_even_more">Vielä enemmän asetuksia</string>
+	<string name="settings_show_cws">Näytä sisältövaroitukset</string>
+	<string name="settings_hide_sensitive_media">Piilota arkaluontoiseksi merkitty media</string>
+	<string name="settings_show_interaction_counts">Näytä reaktiolaskurit</string>
+	<string name="settings_show_emoji_in_names">Mukautetut emojit näyttönimissä</string>
+	<plurals name="in_x_seconds">
+		<item quantity="one">%d sekunnin kuluttua</item>
+		<item quantity="other">%d sekunnin kuluttua</item>
+	</plurals>
+	<plurals name="in_x_minutes">
+		<item quantity="one">%d minuutin kuluttua</item>
+		<item quantity="other">%d minuutin kuluttua</item>
+	</plurals>
+	<plurals name="in_x_hours">
+		<item quantity="one">%d tunnin kuluttua</item>
+		<item quantity="other">%d tunnin kuluttua</item>
+	</plurals>
+	<plurals name="x_hours_ago">
+		<item quantity="one">%d tunti sitten</item>
+		<item quantity="other">%d tuntia sitten</item>
+	</plurals>
+	<string name="alt_text_reminder_title">Mediasta puuttuu selitysteksti</string>
+	<plurals name="alt_text_reminder_x_images">
+		<item quantity="one">%s kuvastasi puuttuu selitysteksti. Julkaistaanko silti?</item>
+		<item quantity="other">%s kuvastasi puuttuu selitysteksti. Julkaistaanko silti?</item>
+	</plurals>
+	<plurals name="alt_text_reminder_x_attachments">
+		<item quantity="one">%s mediatiedostostasi puuttuu selitysteksti. Julkaistaanko silti?</item>
+		<item quantity="other">%s mediatiedostostasi puuttuu selitysteksti. Julkaistaanko silti?</item>
+	</plurals>
+	<string name="count_one">Yksi</string>
+	<string name="count_two">Kaksi</string>
+	<string name="count_three">Kolme</string>
+	<string name="count_four">Neljä</string>
+	<string name="alt_text_reminder_post_anyway">Julkaise</string>
 	<!-- %s is the username -->
+	<string name="unfollow_confirmation">Lopeta käyttäjän %s seuraaminen?</string>
+	<string name="filter_active">Aktiivinen</string>
+	<string name="filter_inactive">Ei käytössä</string>
+	<string name="settings_add_filter">Lisää suodatin</string>
+	<string name="settings_edit_filter">Muokkaa suodatinta</string>
+	<string name="settings_filter_duration">Kesto</string>
+	<string name="settings_filter_muted_words">Mykistetyt sanat</string>
+	<string name="settings_filter_context">Mykistä alkaen</string>
+	<string name="settings_filter_show_cw">Näytä sisältövaroituksella</string>
+	<string name="settings_filter_show_cw_explanation">Näytä vielä viestejä, jotka täsmäävät tähän suodattimeen, mutta sisällönvaroituksen takana</string>
+	<string name="settings_delete_filter">Poista suodatin</string>
+	<string name="filter_duration_forever">Ikuisesti</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="settings_filter_ends">Päättyy %s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="one">%d mykistetty sana tai lause</item>
+		<item quantity="other">%d mykistettyä sanaa tai lauseita</item>
+	</plurals>
+	<string name="selection_2_options">%1$s ja %2$s</string>
+	<string name="selection_3_options">%1$s, %2$s ja %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s, ja %3$d lisää</string>
+	<string name="filter_context_home_lists">Koti &amp; listat</string>
+	<string name="filter_context_notifications">Ilmoitukset</string>
+	<string name="filter_context_public_timelines">Julkiset aikajanat</string>
+	<string name="filter_context_threads_replies">Langat &amp; vastaukset</string>
+	<string name="filter_context_profiles">Profiilit</string>
+	<string name="settings_filter_title">Otsikko</string>
+	<string name="settings_delete_filter_title">Poistetaanko suodatin “%s”?</string>
+	<string name="settings_delete_filter_confirmation">Tämä suodatin poistetaan tililtäsi kaikissa laitteissa.</string>
+	<string name="add_muted_word">Lisää mykistetty sana</string>
+	<string name="edit_muted_word">Muokkaa mykistettyä sanaa</string>
+	<string name="add">Lisää</string>
+	<string name="filter_word_or_phrase">Sana tai lause</string>
+	<string name="filter_add_word_help">Sanat ovat tapauskohtaisia ja vastaavat vain kokonaisia sanoja.\n\nJos suodattaa avainsana “Apple”, se piilottaa viestit sisältävät “omena” tai “aPPLe” mutta ei “ananas\".</string>
+	<string name="settings_delete_filter_word">Poista sana “%s”?</string>
+	<string name="enter_selection_mode">Valitse</string>
+	<string name="select_all">Valitse kaikki</string>
+	<string name="settings_filter_duration_title">Suodattimen kesto</string>
+	<string name="filter_duration_custom">Mukautettu</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="one">Poista %d sana?</item>
+		<item quantity="other">Poista %d sanaa?</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="one">%d valittu</item>
+		<item quantity="other">%d valittu</item>
+	</plurals>
+	<string name="required_form_field_blank">Tätä ei voi jättää tyhjäksi</string>
+	<string name="filter_word_already_in_list">Jo luettelossa</string>
+	<string name="app_update_ready">Sovelluksen päivitys valmis</string>
+	<string name="app_update_version">Versio %s</string>
+	<string name="downloading_update">Ladataan (%d%%)</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">Sopii suodattimeen ”%s”</string>
+	<string name="search_mastodon">Etsi Mastodonista</string>
+	<string name="clear_all">Tyhjennä kaikki</string>
+	<string name="search_open_url">Avaa URL-osoite Mastodonissa</string>
+	<string name="posts_matching_hashtag">Julkaisut joissa on \"%s\"</string>
+	<string name="search_go_to_account">Siirry tiliin %s</string>
+	<string name="posts_matching_string">Julkaisut joissa on \"%s\"</string>
+	<string name="accounts_matching_string">Henkilöt jossa on \"%s\"</string>
 	<!-- Shown in the post header. Please keep it short -->
+	<string name="time_seconds_ago_short">%ds sitten</string>
+	<string name="time_minutes_ago_short">%dm sitten</string>
+	<string name="time_hours_ago_short">%dh sitten</string>
+	<string name="time_days_ago_short">%dd sitten</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">Käännetty kielestä %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">Käännetty kielestä %1$s käyttäen %2$s</string>
+	<string name="translation_show_original">Näytä alkuperäinen</string>
+	<string name="translation_failed">Käännös epäonnistui. Ehkä järjestelmänvalvoja ei ole ottanut käyttöön käännöksiä tällä palvelimella tai tällä palvelimella on käynnissä vanhempi versio Mastodonista, jossa käännöksiä ei vielä tueta.</string>
+	<plurals name="x_participants">
+		<item quantity="one">%d osallistuja</item>
+		<item quantity="other">%d osallistujaa</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d viesti tänään</item>
+		<item quantity="other">%,d viestiä tänään</item>
+	</plurals>
 </resources>

mastodon/src/main/res/values-fil-rPH/strings.xml

@@ -284,4 +284,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-fr-rFR/strings.xml

@@ -35,7 +35,7 @@
 	<string name="media">Médias</string>
 	<string name="profile_about">À propos</string>
 	<string name="button_follow">Suivre</string>
-	<string name="button_following">Abonné·e·s</string>
+	<string name="button_following">Abonné·e</string>
 	<string name="edit_profile">Modifier le profil</string>
 	<string name="share_user">Partager le profil</string>
 	<string name="mute_user">Masquer %s</string>
@@ -225,6 +225,7 @@
 	<string name="more_options">Paramètres supplémentaires</string>
 	<string name="new_post">Nouveau message</string>
 	<string name="button_reply">Répondre</string>
+	<string name="button_reblog">Booster</string>
 	<string name="button_favorite">Ajouter aux favoris</string>
 	<string name="button_share">Partager</string>
 	<string name="media_no_description">Média sans description</string>
@@ -256,7 +257,11 @@
 	<string name="downloading">Téléchargement…</string>
 	<string name="no_app_to_handle_action">Aucune application ne permet de gérer cette action</string>
 	<string name="local_timeline">Local</string>
+	<string name="trending_posts_info_banner">Ce sont les messages qui gagnent en popularité sur Mastodon.</string>
+	<string name="trending_links_info_banner">Voici les actualités dont on parle sur Mastodon.</string>
 	<!-- %s is the server domain -->
+	<string name="local_timeline_info_banner">Voici tous les messages de tous les comptes de votre serveur (%s).</string>
+	<string name="recommended_accounts_info_banner">Vous pourriez aimer ces comptes en fonction des autres que vous suivez.</string>
 	<string name="see_new_posts">Voir les nouveaux messages</string>
 	<string name="load_missing_posts">Charger les messages manquants</string>
 	<string name="follow_back">Suivre en retour</string>
@@ -276,6 +281,10 @@
 		<item quantity="one">%,d favori</item>
 		<item quantity="other">%,d favoris</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d partage</item>
+		<item quantity="other">%,d partages</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">à l’instant</string>
 	<string name="edit_history">Historique des modifications</string>
@@ -359,58 +368,232 @@
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<string name="sending_follows">Utilisateurs suivants…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s n’autorise pas les inscriptions à partir de %2$s. Essayez-en un autre ou &lt;a&gt;choisissez un autre serveur&lt;/a&gt;.</string>
 	<string name="spoiler_show">Afficher quand même</string>
 	<string name="spoiler_hide">Cacher</string>
 	<string name="poll_multiple_choice">Choisir un ou plusieurs</string>
+	<string name="save_changes">Enregistrer les modifications</string>
+	<string name="profile_featured">En vedette</string>
+	<string name="profile_timeline">Fil</string>
+	<string name="view_all">Tout afficher</string>
+	<string name="profile_endorsed_accounts">Comptes</string>
+	<string name="verified_link">Lien vérifié</string>
+	<string name="show">Afficher</string>
+	<string name="hide">Masquer</string>
 	<string name="join_default_server">Rejoindre %s</string>
+	<string name="pick_server">Choisir un autre serveur</string>
 	<string name="signup_or_login">ou</string>
 	<string name="learn_more">En savoir plus</string>
 	<string name="welcome_to_mastodon">Bienvenue sur Mastodon</string>
+	<string name="welcome_paragraph1">Mastodon est un réseau social décentralisé, ce qui signifie qu’aucune entreprise ne le contrôle. Il est composé de plusieurs serveurs indépendants, tous connectés ensemble.</string>
+	<string name="what_are_servers">Que sont les serveurs ?</string>
+	<string name="welcome_paragraph2">Chaque compte Mastodon est hébergé sur un serveur, chacun ayant ses valeurs, ses règles, et ses administratrices ou administrateurs. Quel que soit le serveur que vous choisissez, vous pouvez suivre et interagir avec des personnes sur n\'importe quel autre serveur.</string>
 	<string name="opening_link">Ouverture du lien…</string>
+	<string name="link_not_supported">Ce lien n’est pas pris en charge dans l’application</string>
 	<string name="log_out_all_accounts">Se déconnecter de tous les comptes</string>
 	<string name="confirm_log_out_all_accounts">Se déconnecter de tous les comptes ?</string>
 	<string name="retry">Réessayer</string>
+	<string name="post_failed">Échec de l\'envoi du message</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">image %s</string>
+	<string name="attachment_description_video">vidéo %s</string>
+	<string name="attachment_description_audio">audio %s</string>
+	<string name="attachment_description_unknown">fichier %s</string>
 	<string name="attachment_type_image">Image</string>
 	<string name="attachment_type_video">Vidéo</string>
 	<string name="attachment_type_audio">Audio</string>
 	<string name="attachment_type_gif">GIF</string>
 	<string name="attachment_type_unknown">Fichier</string>
 	<string name="attachment_x_percent_uploaded">%d%% transférés</string>
+	<string name="add_poll_option">Ajouter une option de sondage</string>
 	<string name="poll_length">Durée du sondage</string>
 	<string name="poll_style">Type</string>
 	<string name="compose_poll_single_choice">Choix unique</string>
 	<string name="compose_poll_multiple_choice">Choix multiple</string>
+	<string name="delete_poll_option">Supprimer l\'option du sondage</string>
 	<string name="poll_style_title">Type de sondage</string>
+	<string name="alt_text">Texte alternatif</string>
 	<string name="help">Aide</string>
+	<string name="what_is_alt_text">Qu’est-ce que le texte alternatif ?</string>
+	<string name="alt_text_help">Un texte alternatif fournit une description de l\'image aux personnes avec un handicap visuel ou une connexion limitée ou qui souhaitent avoir un contexte supplémentaire.\n\nVous pouvez améliorer l\'accessibilité et la compression de tout le monde en écrivant un texte alternatif clair, concis et objectif.\n\n<ul><li>Identifiez les éléments importants</li>\n<li>Résumez le texte présent à l\'image</li>\n<li>Utilisez une structure de phrase normale</li>\n<li>Évitez les informations redondantes</li>\n<li>Pour les visuels complexes (tels que les diagrammes ou les cartes), indiquez les tendances ou points-clés</li></ul></string>
+	<string name="edit_post">Modifier la publication</string>
+	<string name="no_verified_link">Aucun lien vérifié</string>
+	<string name="compose_autocomplete_emoji_empty">Parcourir les émojis</string>
+	<string name="compose_autocomplete_users_empty">Trouvez qui vous cherchez</string>
+	<string name="no_search_results">Aucun résultat avec ces mots-clefs</string>
 	<string name="language">Langue</string>
+	<string name="language_default">Par défaut</string>
+	<string name="language_system">Système</string>
+	<string name="language_detecting">Détection de la langue</string>
+	<string name="language_cant_detect">Impossible de détecter la langue</string>
+	<string name="language_detected">Détectée</string>
+	<string name="media_hidden">Média masqué</string>
+	<string name="post_hidden">Publication masquée</string>
+	<string name="report_title_post">Signaler la publication</string>
+	<string name="forward_report_explanation">Le compte provient d’un autre serveur. Envoyer également une copie anonyme du rapport ?</string>
 	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">Transférer à %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Signalé</string>
+	<string name="report_unfollow_explanation">Pour ne plus voir leurs messages dans votre fil d\'accueil, désabonnez-vous de ces comptes.</string>
+	<string name="muted_user">%s masqué·e</string>
+	<string name="report_sent_already_blocked">Vous avez déjà bloqué ce compte, vous n\'avez rien d\'autre à faire en attendant la revue de votre rapport.</string>
+	<string name="report_personal_already_blocked">Vous avez déjà bloqué ce compte, il n\'y a rien d\'autre à faire.\n\nMerci d\'aider à ce que Mastodon soit un espace sûr pour toutes et tous !</string>
+	<string name="blocked_user">%s bloqué·e</string>
+	<string name="mark_all_notifications_read">Marque tout comme lu</string>
 	<string name="settings_display">Affichage</string>
 	<string name="settings_filters">Filtres</string>
+	<string name="settings_server_explanation">Aperçu, règles, modérateur·rice·s</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
 	<string name="about_app">A propos de %s</string>
+	<string name="default_post_language">Langue de publication par défaut</string>
+	<string name="settings_alt_text_reminders">Ajouter des rappels de texte alternatif</string>
+	<string name="settings_confirm_unfollow">Demander confirmation avant de se désabonner d\'un compte</string>
+	<string name="settings_confirm_boost">Demander avant de booster</string>
+	<string name="settings_confirm_delete_post">Demander confirmation avant la suppression des messages</string>
+	<string name="pause_all_notifications">Tout mettre en pause</string>
+	<string name="pause_notifications_off">Désactivée</string>
+	<string name="notifications_policy_anyone">Tout le monde</string>
+	<string name="notifications_policy_followed">Personnes qui vous suivent</string>
+	<string name="notifications_policy_follower">Personnes que vous suivez</string>
+	<string name="notifications_policy_no_one">De personne</string>
+	<string name="settings_notifications_policy">Recevoir des notifications de</string>
+	<string name="notification_type_mentions_and_replies">Mentions et réponses</string>
+	<string name="pause_all_notifications_title">Mettre en pause toutes les notifications</string>
+	<plurals name="x_weeks">
+		<item quantity="one">%d semaine</item>
+		<item quantity="other">%d semaines</item>
+	</plurals>
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
+	<string name="date_at_time">%1$s à %2$s</string>
+	<string name="today">aujourd’hui</string>
+	<string name="yesterday">hier</string>
+	<string name="tomorrow">demain</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_ends">Se termine à %s</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">Reprise des notifications à %s.</string>
+	<string name="resume_notifications_now">Reprendre maintenant</string>
+	<string name="open_system_notification_settings">Aller aux paramètres des notifications</string>
+	<string name="about_server">À propos</string>
+	<string name="server_rules">Règles</string>
+	<string name="server_administrator">Administrateur·rice</string>
+	<string name="send_email_to_server_admin">Contacter l’admin</string>
+	<string name="notifications_disabled_in_system">Activez les notifications dans les paramètres de votre appareil pour être tenu·e au courant où que vous soyez.</string>
 	<string name="settings_even_more">Paramètres supplémentaires</string>
 	<string name="settings_show_cws">Afficher les avertissements de contenu</string>
 	<string name="settings_hide_sensitive_media">Cacher les médias marqués comme sensibles</string>
 	<string name="settings_show_interaction_counts">Compteurs d\'interaction de publication</string>
 	<string name="settings_show_emoji_in_names">Émoticônes personnalisées dans les noms</string>
+	<plurals name="in_x_seconds">
+		<item quantity="one">dans %d secondes</item>
+		<item quantity="other">dans %d secondes</item>
+	</plurals>
+	<plurals name="in_x_minutes">
+		<item quantity="one">dans %d minute</item>
+		<item quantity="other">dans %d minutes</item>
+	</plurals>
+	<plurals name="in_x_hours">
+		<item quantity="one">dans %d heure</item>
+		<item quantity="other">dans %d heures</item>
+	</plurals>
+	<plurals name="x_hours_ago">
+		<item quantity="one">Il y a %d heure</item>
+		<item quantity="other">Il y a %d heures</item>
+	</plurals>
+	<string name="alt_text_reminder_title">Texte alternatif manquant pour les médias</string>
+	<plurals name="alt_text_reminder_x_images">
+		<item quantity="one">%s de vos images n\'a pas de texte alternatif. Envoyer quand même ?</item>
+		<item quantity="other">%s de vos images n\'ont pas de texte alternatif. Envoyer quand même ?</item>
+	</plurals>
+	<plurals name="alt_text_reminder_x_attachments">
+		<item quantity="one">%s de vos média joint n\'a pas de texte alternatif. Envoyer quand même ?</item>
+		<item quantity="other">%s de vos médias joints n\'ont pas de texte alternatif. Envoyer quand même ?</item>
+	</plurals>
+	<string name="count_one">Un</string>
+	<string name="count_two">Deux</string>
+	<string name="count_three">Trois</string>
+	<string name="count_four">Quatre</string>
+	<string name="alt_text_reminder_post_anyway">Publier</string>
 	<!-- %s is the username -->
+	<string name="unfollow_confirmation">Ne plus suivre %s ?</string>
+	<string name="filter_active">Actif</string>
+	<string name="filter_inactive">Désactivé</string>
 	<string name="settings_add_filter">Ajouter un filtre</string>
+	<string name="settings_edit_filter">Modifier le filtre</string>
 	<string name="settings_filter_duration">Durée</string>
+	<string name="settings_filter_muted_words">Mots masqués</string>
+	<string name="settings_filter_context">Masquer à partir de</string>
+	<string name="settings_filter_show_cw">Afficher avec l\'avertissement de contenu</string>
+	<string name="settings_filter_show_cw_explanation">Continuer d\'afficher les messages correspondant à ce filtre en ajoutant un avertissement de convenu</string>
+	<string name="settings_delete_filter">Supprimer le filtre</string>
 	<string name="filter_duration_forever">Toujours</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="settings_filter_ends">Se termine à %s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="one">%d phrase ou mot masqué</item>
+		<item quantity="other">%d phrases ou mots masqués</item>
+	</plurals>
+	<string name="selection_2_options">%1$s et %2$s</string>
+	<string name="selection_3_options">%1$s, %2$s ainsi que %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s ainsi que %3$d autres</string>
+	<string name="filter_context_home_lists">Accueil et listes</string>
+	<string name="filter_context_notifications">Notifications</string>
+	<string name="filter_context_public_timelines">Fils publics</string>
+	<string name="filter_context_threads_replies">Fils et réponses</string>
+	<string name="filter_context_profiles">Profils</string>
 	<string name="settings_filter_title">Titre</string>
+	<string name="settings_delete_filter_title">Supprimer le filtre « %s » ?</string>
+	<string name="settings_delete_filter_confirmation">Ce filtre sera supprimé de votre compte, sur tous vos appareils.</string>
+	<string name="add_muted_word">Ajouter un mot à masquer</string>
+	<string name="edit_muted_word">Ajouter un mot à masquer</string>
+	<string name="add">Ajouter</string>
+	<string name="filter_word_or_phrase">Mot ou expression</string>
+	<string name="filter_add_word_help">Les mots ne sont pas sensibles à la casse et la correspondance porte sur les mots entiers.\n\nPar exemple, si vous filtrez le mot-clé « Chat », cela masquera les messages qui contiennent « chat » ou « ChAt », mais pas « chaton ».</string>
+	<string name="settings_delete_filter_word">Supprimer le mot « %s » ?</string>
+	<string name="enter_selection_mode">Sélectionner</string>
+	<string name="select_all">Tout sélectionner</string>
 	<string name="settings_filter_duration_title">Durée du filtre</string>
 	<string name="filter_duration_custom">Personnalisée</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="one">Supprimer %d mot ?</item>
+		<item quantity="other">Supprimer %d mots ?</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="one">%d sélectionné(e)</item>
+		<item quantity="other">%d sélectionné(e)s</item>
+	</plurals>
+	<string name="required_form_field_blank">Ne peut pas être vide</string>
+	<string name="filter_word_already_in_list">Déjà dans la liste</string>
+	<string name="app_update_ready">Mise à jour de l’application prête</string>
+	<string name="app_update_version">Version %s</string>
+	<string name="downloading_update">Téléchargement (%d%%)</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">Correspond au filtre « %s »</string>
 	<string name="search_mastodon">Rechercher sur Mastodon</string>
+	<string name="clear_all">Effacer tout</string>
 	<string name="search_open_url">Ouvrir l\'URL dans Mastodon</string>
+	<string name="posts_matching_hashtag">Publications ayant « %s »</string>
 	<string name="search_go_to_account">Aller à %s</string>
+	<string name="posts_matching_string">Publications ayant « %s »</string>
+	<string name="accounts_matching_string">Personnes ayant « %s »</string>
 	<!-- Shown in the post header. Please keep it short -->
+	<string name="time_seconds_ago_short">il y a %ds</string>
+	<string name="time_minutes_ago_short">il y a %dm</string>
 	<string name="time_hours_ago_short">Il y a %dh</string>
 	<string name="time_days_ago_short">Il y a %dj</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">Traduire depuis %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">Traduit depuis %1$s via %2$s</string>
+	<string name="translation_show_original">Afficher l’original</string>
+	<string name="translation_failed">La traduction a échoué. Peut-être que l’administrateur n’a pas activé les traductions sur ce serveur ou que ce serveur utilise une ancienne version de Mastodon où les traductions ne sont pas encore prises en charge.</string>
+	<plurals name="x_participants">
+		<item quantity="one">%,d participant</item>
+		<item quantity="other">%,d participants</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d message aujourd’hui</item>
+		<item quantity="other">%,d messages aujourd’hui</item>
+	</plurals>
 </resources>

mastodon/src/main/res/values-ga-rIE/strings.xml

@@ -20,4 +20,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-gd-rGB/strings.xml

@@ -425,7 +425,7 @@
 	<string name="welcome_to_mastodon">Fàilte gu Mastodon</string>
 	<string name="welcome_paragraph1">’S e lìonra sòisealta sgaoilte a th’ ann am Mastodon agus is ciall dha seo nach eil e fo smachd aon chompanaidh a-mhàin. Tha e dèanta de ghrunn fhrithealaichean a tha ’gan ruith gu neo-eisimeileach ach ceangailte ri chèile.</string>
 	<string name="what_are_servers">Dè th’ anns na frithealaichean?</string>
-	<string name="welcome_paragraph2"><![CDATA[Tha gach cunntas Mastodon ’ga òstadh air frithealaiche – tha luachan, riaghailtean ⁊ rianairean sònraichte aig gach fear. Ge b’ e dè am frithealaiche a thaghas tu, ’s urrainn dhut daoine air frithealaiche sam bith a leantainn is bruidhinn riutha.]]></string>
+	<string name="welcome_paragraph2">Tha gach cunntas Mastodon ’ga òstadh air frithealaiche – tha luachan, riaghailtean ⁊ rianairean sònraichte aig gach fear. Ge b’ e dè am frithealaiche a thaghas tu, ’s urrainn dhut daoine air frithealaiche sam bith a leantainn is bruidhinn riutha.</string>
 	<string name="opening_link">A’ fosgladh a’ cheangail…</string>
 	<string name="link_not_supported">Cha chuir an aplacaid taic ris a’ cheangal seo</string>
 	<string name="log_out_all_accounts">Clàraich a-mach às a h-uile cunntas</string>
@@ -640,4 +640,6 @@
 	<string name="time_minutes_ago_short">%dm air ais</string>
 	<string name="time_hours_ago_short">%du air ais</string>
 	<string name="time_days_ago_short">%dl air ais</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

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

@@ -336,7 +336,6 @@
 	<string name="welcome_to_mastodon">Benvida a Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon é unha rede social descentralizada, onde ningunha empresa ten o control. Está formada por moitos servidores independentes comunicándose entre si.</string>
 	<string name="what_are_servers">Que son os servidores?</string>
-	<string name="welcome_paragraph2"><![CDATA[Cada conta Mastodon está hospedada nun servidor — cada unha coas súas regras, valores e admins. Non importa cal elixas, podes seguir e interactuar con persoas de outros servidores.]]></string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<!-- %s is the server domain -->
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
@@ -348,4 +347,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-hi-rIN/strings.xml

@@ -47,4 +47,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-hr-rHR/strings.xml

@@ -227,4 +227,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-hu-rHU/strings.xml

@@ -372,4 +372,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-hy-rAM/strings.xml

@@ -303,7 +303,6 @@
 	<string name="welcome_to_mastodon">Բարի գալուստ Մաստոդոն</string>
 	<string name="welcome_paragraph1">Մաստոդոնը ապակենտրոնացված սոցցանց է, այսինքն՝ այն չի պատկանում մի ընկերության։ Այն բաղկացած է բազմաթիվ անկախ և կապակցված սերվերներից։</string>
 	<string name="what_are_servers">Ի՞նչ է սերվերը։</string>
-	<string name="welcome_paragraph2"><![CDATA[Մաստոդոնի որևէ հաշիվ գտնվում է սերվերի վրա - ամեն մեկը՝ իր արժեքներով, կանոններով և ադմիններով։ Դուք կարող եք հետևել և շփվել որևէ սերվերի մարդկանց հետ՝ անկախ ձեր ընտրությունից։]]></string>
 	<string name="retry">Կրկին</string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<string name="alt_text">Բացատրություն</string>
@@ -383,4 +382,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-ig-rNG/strings.xml

@@ -20,4 +20,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-in-rID/strings.xml

@@ -368,7 +368,7 @@
 	<string name="welcome_to_mastodon">Selamat datang di Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon adalah jejaring sosial terdesentralisasi, tidak ada satu pun perusahaan yang mengontrol. Semua dijalankan oleh server independen, terkoneksi bersama.</string>
 	<string name="what_are_servers">Apa itu server?</string>
-	<string name="welcome_paragraph2"><![CDATA[Semua akun Mastodon berada pada sebuah server — dengan nilai, aturan, dan admin masing-masing. Mana pun yang kamu pilih, kamu bisa mengikuti dan berinteraksi dengan server mana pun.]]></string>
+	<string name="welcome_paragraph2">Semua akun Mastodon berada pada sebuah server — dengan nilai, aturan, &amp; admin masing-masing. Mana pun yang Anda pilih, Anda dapat mengikuti dan berinteraksi dengan server mana pun.</string>
 	<string name="opening_link">Membuka tautan…</string>
 	<string name="link_not_supported">Tautan ini tidak didukung dalam aplikasi</string>
 	<string name="log_out_all_accounts">Keluar dari semua akun</string>
@@ -553,4 +553,6 @@
 	<string name="time_minutes_ago_short">%dm yang lalu</string>
 	<string name="time_hours_ago_short">%dj yang lalu</string>
 	<string name="time_days_ago_short">%dh yang lalu</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-is-rIS/strings.xml

@@ -387,7 +387,7 @@
 	<string name="welcome_to_mastodon">Velkomin í Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon er dreyfhýst samfélagsnet, sem þýðir að ekkert eitt fyrirtæki ræður yfir því. Netið samanstendur af mörgum sjálfstætt reknum netþjónum sem tengjast innbyrðis.</string>
 	<string name="what_are_servers">Hvað eru netþjónar?</string>
-	<string name="welcome_paragraph2"><![CDATA[Hver einasti Mastodon-aðgangur er hýstur á sínum netþjóni — hver slíkur er með sín eigin gildi, reglur og stjórnendur. Það skiftir ekki máli hvern þeirra þú velur, þú getur fylgst fylgst með og átt í samskiptum við fólk á hvaða netþjóni sem er.]]></string>
+	<string name="welcome_paragraph2">Hver einasti Mastodon-aðgangur er hýstur á sínum netþjóni — hver slíkur er með sín eigin gildi, reglur og stjórnendur. Það skiftir ekki máli hvern þeirra þú velur, þú getur fylgst fylgst með og átt í samskiptum við fólk á hvaða netþjóni sem er.</string>
 	<string name="opening_link">Opna tengil…</string>
 	<string name="link_not_supported">Það er ekki stuðningur við tengilinn í forritinu</string>
 	<string name="log_out_all_accounts">Skrá út úr öllum aðgöngum</string>
@@ -582,4 +582,6 @@
 	<string name="time_minutes_ago_short">fyrir %dm síðan</string>
 	<string name="time_hours_ago_short">fyrir %dh síðan</string>
 	<string name="time_days_ago_short">fyrir %dd síðan</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-it-rIT/strings.xml

@@ -387,7 +387,7 @@
 	<string name="welcome_to_mastodon">Benvenuto/a su Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon è un social network decentralizzato, il che significa che nessuna singola azienda lo controlla. È composto da molti server indipendenti e tutti connessi insieme.</string>
 	<string name="what_are_servers">Cosa sono i server?</string>
-	<string name="welcome_paragraph2"><![CDATA[Ogni account Mastodon è ospitato su un server — ognuno con i propri valori, regole, e amministratori. Non importa quale scegliere, è possibile seguire e interagire con le persone su qualsiasi server.]]></string>
+	<string name="welcome_paragraph2">Ogni account Mastodon è ospitato su un server — ognuno con i propri valori, regole, &amp; amministratori. Non importa quale scegliere, è possibile seguire e interagire con persone su altri server.</string>
 	<string name="opening_link">Apertura del collegamento…</string>
 	<string name="link_not_supported">Questo collegamento non è supportato nell\'app</string>
 	<string name="log_out_all_accounts">Esci da tutti gli account</string>
@@ -582,4 +582,18 @@
 	<string name="time_minutes_ago_short">%dmin fa</string>
 	<string name="time_hours_ago_short">%do fa</string>
 	<string name="time_days_ago_short">%dg fa</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">Traduci da %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">Tradotto da %1$s utilizzando %2$s</string>
+	<string name="translation_show_original">Mostra originale</string>
+	<string name="translation_failed">Traduzione fallita. Forse l\'amministratore non ha abilitato le traduzioni su questo server, o su questo server è in esecuzione una versione precedente di Mastodon in cui le traduzioni non sono ancora supportate.</string>
+	<plurals name="x_participants">
+		<item quantity="one">%,d participante</item>
+		<item quantity="other">%,d partecipanti</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d post oggi</item>
+		<item quantity="other">%,d post oggi</item>
+	</plurals>
 </resources>

mastodon/src/main/res/values-iw-rIL/strings.xml

@@ -88,4 +88,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-ja-rJP/strings.xml

@@ -36,13 +36,13 @@
 	<string name="button_following">フォロー中</string>
 	<string name="edit_profile">プロフィールを編集</string>
 	<string name="share_user">プロフィールを共有</string>
-	<string name="mute_user">%s さんをミュート</string>
-	<string name="unmute_user">%s さんのミュートを解除</string>
-	<string name="block_user">%s さんをブロック</string>
-	<string name="unblock_user">%s さんのブロックを解除</string>
-	<string name="report_user">%s さんを報告</string>
-	<string name="block_domain">%s をブロック</string>
-	<string name="unblock_domain">%s のブロックを解除</string>
+	<string name="mute_user">ミュート: %s さん</string>
+	<string name="unmute_user">ミュート解除: %s さん</string>
+	<string name="block_user">ブロック: %s さん</string>
+	<string name="unblock_user">ブロック解除: %s さん</string>
+	<string name="report_user">報告: %s さん</string>
+	<string name="block_domain">ブロック: %s</string>
+	<string name="unblock_domain">ブロック解除: %s</string>
 	<plurals name="x_posts">
 		<item quantity="other">投稿 %,d 件</item>
 	</plurals>
@@ -134,7 +134,7 @@
 	<string name="sending_report">報告を送信しています...</string>
 	<string name="report_sent_title">ご報告ありがとうございます、追って確認します。</string>
 	<string name="report_sent_subtitle">私たちが確認する前でも、あなたが %s さんにできる対応があります。</string>
-	<string name="unfollow_user">%s さんのフォローを解除</string>
+	<string name="unfollow_user">フォロー解除: %s さん</string>
 	<string name="unfollow">フォローを解除</string>
 	<string name="mute_user_explain">ミュートすると、相手の投稿が表示されなくなります。相手は引き続きあなたをフォローしたり、あなたの投稿を表示したりできますが、ミュートしていることは伝わりません。</string>
 	<string name="block_user_explain">ブロックすると、相手の投稿が表示されなくなります。相手はあなたの投稿を見たり、フォローしたりできなくなります。相手にブロックしていることが伝わります。</string>
@@ -222,13 +222,13 @@
 	<string name="home_timeline">ホームタイムライン</string>
 	<string name="my_profile">プロフィール</string>
 	<string name="media_viewer">メディアビューアー</string>
-	<string name="follow_user">%s さんをフォロー</string>
+	<string name="follow_user">フォロー: %s さん</string>
 	<string name="unfollowed_user">%s さんのフォローを解除しました</string>
 	<string name="followed_user">%s さんをフォローしました</string>
 	<string name="following_user_requested">%s さんにフォローリクエストを送信しました</string>
 	<string name="open_in_browser">ブラウザーで開く</string>
-	<string name="hide_boosts_from_user">%s さんのブーストを非表示</string>
-	<string name="show_boosts_from_user">%s さんのブーストを表示</string>
+	<string name="hide_boosts_from_user">ブーストを非表示: %s さん</string>
+	<string name="show_boosts_from_user">ブーストを表示: %s さん</string>
 	<string name="signup_reason">参加したい理由を入力してください</string>
 	<string name="signup_reason_note">申請の確認に役立つメッセージを添えてください。</string>
 	<string name="clear">クリア</string>
@@ -368,7 +368,7 @@
 	<string name="welcome_to_mastodon">Mastodon とは</string>
 	<string name="welcome_paragraph1">Mastodon は、いち企業の統制に依存しない非中央集権型のソーシャルネットワークです。たくさんの独立したサーバーが相互につながり合い、ひとつのネットワークを形成しています。</string>
 	<string name="what_are_servers">サーバーとは</string>
-	<string name="welcome_paragraph2"><![CDATA[Mastodon のアカウントはいずれかのサーバーに所属します。それぞれのサーバーは異なる価値観やルールをもち、それらを管理する管理者がいます。どのサーバーにいても、ほかのあらゆるサーバーのユーザーをフォローして、かかわりをもつことができるでしょう。]]></string>
+	<string name="welcome_paragraph2">Mastodon のアカウントはいずれかのサーバーに所属します。それぞれのサーバーには異なる価値観やルールがあり、それらを管理する管理者がいます。どのサーバーにいても、他のあらゆるサーバーのユーザーをフォローして、関わりを持てるでしょう。</string>
 	<string name="opening_link">リンクを開いています…</string>
 	<string name="link_not_supported">アプリはこのリンクに対応していません</string>
 	<string name="log_out_all_accounts">すべてのアカウントをログアウト</string>
@@ -553,4 +553,6 @@
 	<string name="time_minutes_ago_short">%d 分前</string>
 	<string name="time_hours_ago_short">%d 時間前</string>
 	<string name="time_days_ago_short">%d 日前</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-kab/strings.xml

@@ -242,4 +242,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-ko-rKR/strings.xml

@@ -300,4 +300,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-my-rMM/strings.xml

@@ -180,4 +180,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-nl-rNL/strings.xml

@@ -85,6 +85,10 @@
 		<item quantity="one">%d dag resterend</item>
 		<item quantity="other">%d dagen resterend</item>
 	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%,d stem</item>
+		<item quantity="other">%,d stemmen</item>
+	</plurals>
 	<string name="poll_closed">Gesloten</string>
 	<string name="confirm_mute_title">Account negeren</string>
 	<string name="confirm_mute">Het negeren van %s bevestigen</string>
@@ -383,7 +387,7 @@
 	<string name="welcome_to_mastodon">Welkom bij Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon is een gedecentraliseerd sociaal netwerk, wat betekent dat geen enkel bedrijf het controleert. Het bestaat uit veel onafhankelijk opererende servers, allemaal met elkaar verbonden.</string>
 	<string name="what_are_servers">Wat zijn servers?</string>
-	<string name="welcome_paragraph2"><![CDATA[Elk Mastodonaccount wordt op een server gehost - elk met diens eigen waarden, regels en beheerders. Het maakt niet uit welke server je kiest, je kunt mensen op elke server volgen en ermee communiceren.]]></string>
+	<string name="welcome_paragraph2">Elk Mastodon-account wordt gehost op een server – elk met diens eigen waarden, regels en beheerders. Het maakt niet uit welke server je kiest, je kunt mensen op elke server volgen en ermee communiceren.</string>
 	<string name="opening_link">Koppeling aan het openen…</string>
 	<string name="link_not_supported">Deze koppeling wordt niet ondersteund in de app</string>
 	<string name="log_out_all_accounts">Bij alle accounts afmelden</string>
@@ -402,6 +406,7 @@
 	<string name="attachment_type_unknown">Bestand</string>
 	<string name="attachment_x_percent_uploaded">%d%% geüpload</string>
 	<string name="add_poll_option">Enquete-optie toevoegen</string>
+	<string name="poll_length">Lengte enquête</string>
 	<string name="poll_style">Stijl</string>
 	<string name="compose_poll_single_choice">Kies een</string>
 	<string name="compose_poll_multiple_choice">Meerkeuze</string>
@@ -410,9 +415,38 @@
 	<string name="alt_text">Alternatieve tekst</string>
 	<string name="help">Hulp</string>
 	<string name="what_is_alt_text">Wat is alternatieve tekst?</string>
+	<string name="alt_text_help">Alt tekst biedt afbeeldingsbeschrijvingen voor mensen met een visiuele beperking en verbindingen met een lage bandbreedte of voor mensen die naar extra context zoeken.\n\nJe kunt de toegankelijkheid en het begrip voor iedereen verbeteren door duidelijk, beknopt en objectief te schrijven.\n\n<ul><li>Beschrijf belangrijke elementen</li>\n<li>Vat tekst in afbeeldingen samen</li>\n<li>Gebruik de reguliere zinsopbouw</li>\n<li>Vermijd overbodige informatie</li>\n<li>Focus op trends en belangrijke bevindingen in complexe beelden (zoals diagrammen of kaarten)</li></ul> \n</string>
+	<string name="edit_post">Bericht bewerken</string>
+	<string name="no_verified_link">Geen geverifieerde koppeling</string>
+	<string name="compose_autocomplete_emoji_empty">Emoji doorzoeken</string>
+	<string name="compose_autocomplete_users_empty">Vind wie je zoekt</string>
+	<string name="no_search_results">Deze zoektermen leveren geen resultaat op</string>
+	<string name="language">Taal</string>
+	<string name="language_default">Standaard</string>
+	<string name="language_system">Systeem</string>
+	<string name="language_detecting">Taal detecteren</string>
+	<string name="language_cant_detect">Kan taal niet detecteren</string>
+	<string name="language_detected">Gedetecteerd</string>
+	<string name="media_hidden">Media verborgen</string>
+	<string name="post_hidden">Bericht verborgen</string>
+	<string name="report_title_post">Bericht rapporteren</string>
+	<string name="forward_report_explanation">De account bevindt zich op een andere server. Wil je daar eveneens een geanonimiseerde kopie van dit rapport naar toesturen?</string>
 	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">Doorsturen naar %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Gerapporteerd</string>
+	<string name="report_unfollow_explanation">Als je hun berichten niet meer in je home feed wilt zien, moet je deze persoon niet meer volgen.</string>
+	<string name="muted_user">%s gedempt</string>
+	<string name="report_sent_already_blocked">Je hebt deze gebruiker al geblokkeerd, dus je hoeft niets meer te doen terwijl we je rapport beoordelen.</string>
+	<string name="report_personal_already_blocked">Je hebt deze gebruiker al geblokkeerd, dus er is niets anders dat je hoeft te doen.\n\nBedankt voor het helpen om Mastodon een veilige plek voor iedereen te behouden!</string>
+	<string name="blocked_user">%s geblokkeerd</string>
+	<string name="mark_all_notifications_read">Alles als gelezen markeren</string>
+	<string name="settings_display">Weergave</string>
+	<string name="settings_filters">Filters</string>
+	<string name="settings_server_explanation">Overzicht, regels, moderators</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">Over %s</string>
+	<string name="default_post_language">Standaard taal bericht</string>
 	<string name="settings_alt_text_reminders">Alt-tekst-herinneringen toevoegen</string>
 	<string name="settings_confirm_unfollow">Vraag voor ontvolgen iemand</string>
 	<string name="settings_confirm_boost">Vragen voor boosten</string>
@@ -438,6 +472,44 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<string name="pause_notifications_ends">Eindigt %s</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">Notificaties worden hervat %s.</string>
+	<string name="resume_notifications_now">Nu hervatten</string>
+	<string name="open_system_notification_settings">Ga naar de meldingsinstellingen</string>
+	<string name="about_server">Over</string>
+	<string name="server_rules">Regels</string>
+	<string name="server_administrator">Beheerder</string>
+	<string name="send_email_to_server_admin">Bericht aan beheerder</string>
+	<string name="notifications_disabled_in_system">Schakel meldingen vanuit instellingen van uw apparaat in om van overal updates te zien.</string>
+	<string name="settings_even_more">Nog meer instellingen</string>
+	<string name="settings_show_cws">Inhoudswaarschuwingen tonen</string>
+	<string name="settings_hide_sensitive_media">Als gevoelig gemarkeerde media verbergen</string>
+	<string name="settings_show_interaction_counts">Aantal berichtinteracties</string>
+	<string name="settings_show_emoji_in_names">Aangepaste emoji in weergavenamen</string>
+	<plurals name="in_x_seconds">
+		<item quantity="one">in %d seconde</item>
+		<item quantity="other">in %d seconden</item>
+	</plurals>
+	<plurals name="in_x_minutes">
+		<item quantity="one">in %d minuut</item>
+		<item quantity="other">in %d minuten</item>
+	</plurals>
+	<plurals name="in_x_hours">
+		<item quantity="one">in %d uur</item>
+		<item quantity="other">in %d uur</item>
+	</plurals>
+	<plurals name="x_hours_ago">
+		<item quantity="one">%d uur geleden</item>
+		<item quantity="other">%d uur geleden</item>
+	</plurals>
+	<string name="alt_text_reminder_title">Media zonder alt-tekst</string>
+	<plurals name="alt_text_reminder_x_images">
+		<item quantity="one">%s van je afbeeldingen mist alt-tekst. Toch plaatsen?</item>
+		<item quantity="other">%s van je afbeeldingen missen alt-tekst. Toch plaatsen?</item>
+	</plurals>
+	<plurals name="alt_text_reminder_x_attachments">
+		<item quantity="one">%s van je mediabijlagen mist alt-tekst. Toch plaatsen?</item>
+		<item quantity="other">%s van je mediabijlagen missen alt-tekst. Toch plaatsen?</item>
+	</plurals>
 	<string name="count_one">Een</string>
 	<string name="count_two">Twee</string>
 	<string name="count_three">Drie</string>
@@ -445,7 +517,83 @@
 	<string name="alt_text_reminder_post_anyway">Plaatsen</string>
 	<!-- %s is the username -->
 	<string name="unfollow_confirmation">%s ontvolgen?</string>
+	<string name="filter_active">Actief</string>
+	<string name="filter_inactive">Inactief</string>
+	<string name="settings_add_filter">Filter toevoegen</string>
+	<string name="settings_edit_filter">Filter bewerken</string>
+	<string name="settings_filter_duration">Duur</string>
+	<string name="settings_filter_muted_words">Gedempte woorden</string>
+	<string name="settings_filter_context">Gedempt van</string>
+	<string name="settings_filter_show_cw">Toon met inhoudswaarschuwing</string>
+	<string name="settings_filter_show_cw_explanation">Berichten die met dit filter overeenkomen, maar achter een inhoudswaarschuwing zitten toch tonen</string>
+	<string name="settings_delete_filter">Filter verwijderen</string>
+	<string name="filter_duration_forever">Voor altijd</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="settings_filter_ends">Eindigt %s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="one">%d gedempt woord of zin</item>
+		<item quantity="other">%d gedempte woorden of zinnen</item>
+	</plurals>
+	<string name="selection_2_options">%1$s en %2$s</string>
+	<string name="selection_3_options">%1$s, %2$s en %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s en %3$d meer</string>
+	<string name="filter_context_home_lists">Startpagina &amp; lijsten</string>
+	<string name="filter_context_notifications">Meldingen</string>
+	<string name="filter_context_public_timelines">Openbare tijdlijnen</string>
+	<string name="filter_context_threads_replies">Threads &amp; antwoorden</string>
+	<string name="filter_context_profiles">Profielen</string>
+	<string name="settings_filter_title">Titel</string>
+	<string name="settings_delete_filter_title">Filter ‘%s’ verwijderen?</string>
+	<string name="settings_delete_filter_confirmation">Dit filter zal op al uw apparaten uit uw account worden verwijderd.</string>
+	<string name="add_muted_word">Gedempte woord toevoegen</string>
+	<string name="edit_muted_word">Gedempte woord bewerken</string>
+	<string name="add">Toevoegen</string>
+	<string name="filter_word_or_phrase">Woord of zin</string>
+	<string name="filter_add_word_help">Woorden zijn niet hoofdlettergevoelig en komen alleen overeen met volledige woorden.\n\nAls je op de term ‘Apple’ filtert, verbergt het berichten die ‘apple’ of ‘aPpLe’ bevatten, maar niet ‘ananas’.</string>
+	<string name="settings_delete_filter_word">‘%s’ verwijderen?</string>
+	<string name="enter_selection_mode">Selecteren</string>
+	<string name="select_all">Alles selecteren</string>
+	<string name="settings_filter_duration_title">Filter tijdsduur</string>
+	<string name="filter_duration_custom">Aangepast</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="one">%d woord verwijderen?</item>
+		<item quantity="other">%d woorden verwijderen?</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="one">%d geselecteerd</item>
+		<item quantity="other">%d geselecteerd</item>
+	</plurals>
+	<string name="required_form_field_blank">Mag niet leeg zijn</string>
+	<string name="filter_word_already_in_list">Al in de lijst</string>
+	<string name="app_update_ready">App-update voltooid</string>
+	<string name="app_update_version">Versie %s</string>
+	<string name="downloading_update">Downloaden (%d%%)</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">Komt overeen met filter ‘%s’</string>
+	<string name="search_mastodon">Mastodon doorzoeken</string>
+	<string name="clear_all">Alles wissen</string>
+	<string name="search_open_url">URL in Mastodon openen</string>
+	<string name="posts_matching_hashtag">Berichten met ‘%s’</string>
+	<string name="search_go_to_account">Ga naar %s</string>
+	<string name="posts_matching_string">Berichten met ‘%s’</string>
+	<string name="accounts_matching_string">Personen met ‘%s’</string>
 	<!-- Shown in the post header. Please keep it short -->
+	<string name="time_seconds_ago_short">%ds geleden</string>
+	<string name="time_minutes_ago_short">%dm geleden</string>
+	<string name="time_hours_ago_short">%du geleden</string>
+	<string name="time_days_ago_short">%d dagen geleden</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">Vanuit het %s vertalen</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">Vertaald vanuit het %1$s door %2$s</string>
+	<string name="translation_show_original">Origineel bekijken</string>
+	<string name="translation_failed">Vertaling mislukt. Mogelijk heeft de serverbeheerder vertalingen niet ingeschakeld op deze server, of draait deze server een oude versie van Mastodon waar vertalingen nog niet worden ondersteund.</string>
+	<plurals name="x_participants">
+		<item quantity="one">%d deelnemer</item>
+		<item quantity="other">%d deelnemers</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d bericht vandaag</item>
+		<item quantity="other">%,d berichten vandaag</item>
+	</plurals>
 </resources>

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

@@ -6,7 +6,7 @@
 	<string name="error">Feil</string>
 	<string name="not_a_mastodon_instance">%s ser ikke ut til å være en Mastodon server.</string>
 	<string name="ok">OK</string>
-	<string name="preparing_auth">Forbereder for autentisering…</string>
+	<string name="preparing_auth">Forbereder autentisering…</string>
 	<string name="finishing_auth">Ferdigstiller autentisering…</string>
 	<string name="user_boosted">Fremhevet av %s</string>
 	<string name="in_reply_to">Som svar på %s</string>
@@ -90,7 +90,7 @@
 		<item quantity="other">%,d stemmer</item>
 	</plurals>
 	<string name="poll_closed">Lukket</string>
-	<string name="confirm_mute_title">Demp Konto</string>
+	<string name="confirm_mute_title">Demp konto</string>
 	<string name="confirm_mute">Bekreft demping av %s</string>
 	<string name="do_mute">Demp</string>
 	<string name="confirm_unmute_title">Opphev demping av konto</string>
@@ -179,7 +179,7 @@
 	<string name="confirm_email_title">Sjekk innboksen din</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Trykk på linken vi sendte deg for å verifisere %s. Vi venter her.</string>
-	<string name="confirm_email_didnt_get">Fikk du ikke lenken?</string>
+	<string name="confirm_email_didnt_get">Fikk du ikke linken?</string>
 	<string name="resend">Send på nytt</string>
 	<string name="open_email_app">Åpne e-post appen</string>
 	<string name="resent_email">Bekreftelse e-post er sendt</string>
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Velkommen til Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon er et desentralisert sosialt nettverk, som betyr at ingen selskaper kontrollerer det. Det består av mange uavhengige servere som er koblet sammen.</string>
 	<string name="what_are_servers">Hva er en server?</string>
-	<string name="welcome_paragraph2"><![CDATA[Enhver Mastodon konto er en vert på en server - med sine egne verdier, regler og administratorer. Uansett hvilken du velger, kan du følge og samhandle med folk på hvilken som helst server.]]></string>
 	<string name="opening_link">Åpner link…</string>
 	<string name="link_not_supported">Denne linken støttes ikke av appen</string>
 	<string name="log_out_all_accounts">Logg ut av alle kontoer</string>
@@ -582,4 +581,6 @@
 	<string name="time_minutes_ago_short">%dm siden</string>
 	<string name="time_hours_ago_short">%dt siden</string>
 	<string name="time_days_ago_short">%dd siden</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-oc-rFR/strings.xml

@@ -79,4 +79,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-pl-rPL/strings.xml

@@ -425,7 +425,6 @@
 	<string name="welcome_to_mastodon">Witaj na Mastodonie</string>
 	<string name="welcome_paragraph1">Mastodon to zdecentralizowana sieć społecznościowa, co oznacza że żadna firma nie może nią kontrolować w całości. Składa się z wielu niezależnych od siebie serwerów, które się ze sobą komunikują.</string>
 	<string name="what_are_servers">Czym są serwery?</string>
-	<string name="welcome_paragraph2"><![CDATA[Każde konto na Mastodonie jest hostowane na instancjach, które wyróżniają się wartościami, zasadami i administracją. Nieważne, jaką wybierzesz - i tak będziesz mógł/mogła kontaktować się nawet z tymi spoza Twojej instancji.]]></string>
 	<string name="opening_link">Otwieranie linku…</string>
 	<string name="link_not_supported">Ten link nie jest wspierany w aplikacji</string>
 	<string name="log_out_all_accounts">Wyloguj się wszędzie</string>
@@ -458,4 +457,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-pt-rBR/strings.xml

@@ -8,7 +8,7 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparando para autenticação…</string>
 	<string name="finishing_auth">Finalizando autenticação…</string>
-	<string name="user_boosted">%s impulsionado</string>
+	<string name="user_boosted">%s impulsionou</string>
 	<string name="in_reply_to">Em resposta à %s</string>
 	<string name="notifications">Notificações</string>
 	<string name="user_followed_you">%s seguiu você</string>
@@ -236,7 +236,9 @@
 	<string name="follow_user">Seguir %s</string>
 	<string name="unfollowed_user">Deixou de seguir %s</string>
 	<string name="followed_user">Agora você está seguindo %s</string>
+	<string name="following_user_requested">Solicitou para te seguir %s</string>
 	<string name="open_in_browser">Abrir no navegador</string>
+	<string name="hide_boosts_from_user">Ocultar boosts de %s</string>
 	<string name="signup_reason">Por que você deseja se inscrever?</string>
 	<string name="signup_reason_note">Isso vai nos ajudar a revisar sua inscrição.</string>
 	<string name="clear">Limpar</string>
@@ -365,6 +367,7 @@
 	<string name="poll_multiple_choice">Escolha um ou mais</string>
 	<string name="save_changes">Salvar alterações</string>
 	<string name="profile_featured">Destaques</string>
+	<string name="profile_timeline">Linha do tempo</string>
 	<string name="view_all">Visualizar tudo</string>
 	<string name="profile_endorsed_accounts">Contas</string>
 	<string name="verified_link">Link verificado</string>
@@ -377,7 +380,7 @@
 	<string name="welcome_to_mastodon">Bem-vindo ao Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon é uma rede social descentralizada, o que significa que nenhuma empresa a controla. É composto de muitos servidores executados de forma independente, todos conectados entre si.</string>
 	<string name="what_are_servers">O que são servidores?</string>
-	<string name="welcome_paragraph2"><![CDATA[Cada conta Mastodon é hospedada em um servidor - cada um com seus próprios valores, regras e administradores. Não importa qual você escolha, você pode seguir e interagir com as pessoas que estão em qualquer outro servidor.]]></string>
+	<string name="welcome_paragraph2">Todas as contas no Mastodon são hospedadas em um servidor — cada um com seus próprios valores, regras, &amp; administradores. Não importa qual você escolha, você pode seguir e interagir com pessoas que estão em qualquer outro servidor.</string>
 	<string name="opening_link">Abrindo link…</string>
 	<string name="link_not_supported">Este link não é compatível com o aplicativo</string>
 	<string name="log_out_all_accounts">Sair de todas as contas</string>
@@ -462,10 +465,12 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<string name="pause_notifications_ends">Termina %s</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">Notificações serão retomadas %s.</string>
 	<string name="open_system_notification_settings">Vá para as configurações de notificação</string>
 	<string name="about_server">Sobre</string>
 	<string name="server_rules">Regras</string>
 	<string name="server_administrator">Administrador</string>
+	<string name="send_email_to_server_admin">Contatar administrador</string>
 	<string name="notifications_disabled_in_system">Ative as notificações nas configurações do seu dispositivo para ver as atualizações de qualquer lugar.</string>
 	<string name="settings_even_more">Ainda mais configurações</string>
 	<string name="settings_show_cws">Mostrar avisos de conteúdo</string>
@@ -566,4 +571,6 @@
 	<string name="time_minutes_ago_short">%dm atrás</string>
 	<string name="time_hours_ago_short">%dh atrás</string>
 	<string name="time_days_ago_short">%dd atrás</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-pt-rPT/strings.xml

@@ -4,11 +4,15 @@
 	<string name="next">Seguinte</string>
 	<string name="loading_instance">A carregar informação do servidor…</string>
 	<string name="error">Erro</string>
+	<string name="not_a_mastodon_instance">%s não parece ser um servidor Mastodon.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">A preparar a autenticação…</string>
 	<string name="finishing_auth">A finalizar a autenticação…</string>
+	<string name="user_boosted">%s reforçou</string>
 	<string name="in_reply_to">Responder a %s</string>
 	<string name="notifications">Notificações</string>
+	<string name="user_followed_you">%s começou a seguir-te</string>
+	<string name="user_favorited">%s assinalou a sua publicação como favorita</string>
 	<string name="share_toot_title">Partilhar</string>
 	<string name="settings">Configurações</string>
 	<string name="publish">Publicar</string>
@@ -30,6 +34,7 @@
 	<string name="button_follow">Seguir</string>
 	<string name="button_following">A seguir</string>
 	<string name="edit_profile">Editar Perfil</string>
+	<string name="share_user">Partilhar perfil</string>
 	<string name="mute_user">Silenciar %s</string>
 	<string name="unmute_user">Deixar de silenciar @%s</string>
 	<string name="block_user">Bloquear %s</string>
@@ -77,6 +82,10 @@
 		<item quantity="one">%d dia restante</item>
 		<item quantity="other">%d dias restantes</item>
 	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%,d voto</item>
+		<item quantity="other">%,d votos</item>
+	</plurals>
 	<string name="poll_closed">Fechado</string>
 	<string name="confirm_mute_title">Silenciar Conta</string>
 	<string name="confirm_mute">Confirme para silenciar %s</string>
@@ -225,4 +234,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-ro-rRO/strings.xml

@@ -48,4 +48,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-ru-rRU/strings.xml

@@ -4,12 +4,17 @@
 	<string name="next">Далее</string>
 	<string name="loading_instance">Получение информации о сервере…</string>
 	<string name="error">Ошибка</string>
+	<string name="not_a_mastodon_instance">%s не является сервером Mastodon.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Подготовка к авторизации…</string>
 	<string name="finishing_auth">Завершение авторизации…</string>
 	<string name="user_boosted">%s продвинул(а)</string>
 	<string name="in_reply_to">В ответ %s</string>
 	<string name="notifications">Уведомления</string>
+	<string name="user_followed_you">%s подписался(ась) на вас</string>
+	<string name="user_sent_follow_request">%s отправил(а) вам запрос на подписку</string>
+	<string name="user_favorited">%s добавил(а) в избранное ваш пост</string>
+	<string name="notification_boosted">%s продвинул(а) ваш пост</string>
 	<string name="poll_ended">Посмотреть результаты опроса, в котором вы проголосовали</string>
 	<string name="share_toot_title">Поделиться</string>
 	<string name="settings">Настройки</string>
@@ -35,7 +40,7 @@
 	<string name="profile_about">О себе</string>
 	<string name="button_follow">Подписаться</string>
 	<string name="button_following">В подписках</string>
-	<string name="edit_profile">Редактировать профиль</string>
+	<string name="edit_profile">Изменить профиль</string>
 	<string name="share_user">Поделиться профилем</string>
 	<string name="mute_user">Игнорировать %s</string>
 	<string name="unmute_user">Убрать %s из игнорируемых</string>
@@ -100,14 +105,20 @@
 		<item quantity="many">Осталось %d дней</item>
 		<item quantity="other">Осталось %d дней</item>
 	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%,d голос</item>
+		<item quantity="few">%,d голоса</item>
+		<item quantity="many">%,d голосов</item>
+		<item quantity="other">%,d голосов</item>
+	</plurals>
 	<string name="poll_closed">Завершён</string>
-	<string name="confirm_mute_title">Игнорировать аккаунт</string>
+	<string name="confirm_mute_title">Игнорировать</string>
 	<string name="confirm_mute">Игнорировать %s?</string>
 	<string name="do_mute">Игнорировать</string>
-	<string name="confirm_unmute_title">Убрать из игнорируемых</string>
+	<string name="confirm_unmute_title">Не игнорировать</string>
 	<string name="confirm_unmute">Убрать %s из игнорируемых?</string>
 	<string name="do_unmute">Убрать из игнорируемых</string>
-	<string name="confirm_block_title">Заблокировать аккаунт</string>
+	<string name="confirm_block_title">Заблокировать</string>
 	<string name="confirm_block_domain_title">Заблокировать узел</string>
 	<string name="confirm_block">Заблокировать %s?</string>
 	<string name="do_block">Заблокировать</string>
@@ -130,6 +141,7 @@
 	<string name="hashtags">Хэштеги</string>
 	<string name="news">Новости</string>
 	<string name="for_you">Для вас</string>
+	<string name="all_notifications">Все</string>
 	<string name="mentions">Упоминания</string>
 	<plurals name="x_people_talking">
 		<item quantity="one">%d человек обсуждает</item>
@@ -147,6 +159,7 @@
 	<string name="report_reason_spam_subtitle">Вредоносные ссылки, фальшивое взаимодействие или повторяющиеся ответы</string>
 	<string name="report_reason_violation">Нарушаются правила сервера</string>
 	<string name="report_reason_violation_subtitle">Вы знаете, что подобное нарушает определенные правила</string>
+	<string name="report_reason_other">Это что-то другое</string>
 	<string name="report_reason_other_subtitle">Проблема не попадает ни под одну из категорий</string>
 	<string name="report_choose_rule">Какие правила нарушены?</string>
 	<string name="report_choose_rule_subtitle">Выберите все подходящие варианты</string>
@@ -156,8 +169,13 @@
 	<string name="report_comment_hint">Дополнительные комментарии</string>
 	<string name="sending_report">Отправка жалобы…</string>
 	<string name="report_sent_title">Спасибо за обращение, мы его рассмотрим.</string>
+	<string name="report_sent_subtitle">Пока мы проверяем это, вы можете принять меры против %s:</string>
 	<string name="unfollow_user">Отписаться от %s</string>
 	<string name="unfollow">Отписаться</string>
+	<string name="mute_user_explain">Вы не будете видеть их посты. Они по-прежнему могут подписываться на вас и видеть ваши посты, но не будут знать, что они в списке игнорируемых.</string>
+	<string name="block_user_explain">Вы не будете видеть их посты. Они не смогут видеть ваши посты или подписываться на вас. Они поймут, что они заблокированы.</string>
+	<string name="report_personal_title">Не хотите видеть это?</string>
+	<string name="report_personal_subtitle">Вот несколько опций управления тем, что вы видите в Mastodon:</string>
 	<string name="back">Назад</string>
 	<string name="search_communities">Имя сервера или URL</string>
 	<string name="instance_rules_title">Правила сервера</string>
@@ -184,14 +202,19 @@
 	<string name="category_tech">Технологии</string>
 	<string name="confirm_email_title">Проверьте входящие сообщения</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Нажмите на ссылку, которую мы вам отправили, чтобы подтвердить %s. Мы подождем здесь.</string>
+	<string name="confirm_email_didnt_get">Не получили ссылку?</string>
 	<string name="resend">Отправить заново</string>
 	<string name="open_email_app">Открыть почту</string>
 	<string name="resent_email">Письмо подтверждения отправлено</string>
+	<string name="compose_hint">Напишите то, о чём думаете</string>
 	<string name="content_warning">Предупреждение о содержании</string>
 	<string name="save">Сохранить</string>
 	<string name="add_alt_text">Добавить альтернативный текст</string>
 	<string name="visibility_public">Публичный</string>
 	<string name="visibility_followers_only">Для подписчиков</string>
+	<string name="visibility_private">Для упомянутых</string>
+	<string name="recent_searches">Недавние</string>
 	<string name="skip">Пропустить</string>
 	<string name="notification_type_follow">Новые подписчики</string>
 	<string name="notification_type_favorite">Избранное</string>
@@ -200,8 +223,16 @@
 	<string name="notification_type_poll">Опросы</string>
 	<string name="choose_account">Выберите аккаунт</string>
 	<string name="err_not_logged_in">Сначала войдите в Mastodon</string>
+	<plurals name="cant_add_more_than_x_attachments">
+		<item quantity="one">Можно добавить не более %d вложения</item>
+		<item quantity="few">Можно добавить не более %d вложений</item>
+		<item quantity="many">Можно добавить не более %d вложений</item>
+		<item quantity="other">Можно добавить не более %d вложений</item>
+	</plurals>
 	<string name="media_attachment_unsupported_type">Тип файла %s не поддерживается</string>
 	<string name="media_attachment_too_big">Размер файла %1$s превышает ограничение в %2$s МБ</string>
+	<string name="settings_theme">Внешний вид</string>
+	<string name="theme_auto">Как на устройстве</string>
 	<string name="theme_light">Светлый</string>
 	<string name="theme_dark">Тёмный</string>
 	<string name="settings_behavior">Поведение</string>
@@ -211,17 +242,20 @@
 	<string name="settings_contribute">Внести вклад в Mastodon</string>
 	<string name="settings_tos">Условия использования</string>
 	<string name="settings_privacy_policy">Политика конфиденциальности</string>
-	<string name="settings_clear_cache">Очистить кэш медиа</string>
+	<string name="settings_clear_cache">Очистить кэш данных</string>
 	<string name="settings_app_version">Mastodon для Android v%1$s (%2$d)</string>
-	<string name="media_cache_cleared">Кэш медиа очищен</string>
+	<string name="media_cache_cleared">Кэш очищен</string>
+	<string name="confirm_log_out">Выйти из %s?</string>
+	<string name="sensitive_content_explain">Автор отметил что это материал деликатного характера.</string>
+	<string name="avatar_description">Перейти в профиль %s</string>
 	<string name="more_options">Дополнительные настройки</string>
 	<string name="new_post">Новый пост</string>
 	<string name="button_reply">Ответить</string>
 	<string name="button_reblog">Продвинуть</string>
 	<string name="button_favorite">Добавить в избранное</string>
 	<string name="button_share">Поделиться</string>
-	<string name="media_no_description">Медиа без описания</string>
-	<string name="add_media">Добавить медиа</string>
+	<string name="media_no_description">Файлы без описания</string>
+	<string name="add_media">Добавить файл</string>
 	<string name="add_poll">Добавить опрос</string>
 	<string name="emoji">Эмодзи</string>
 	<string name="home_timeline">Домашняя лента</string>
@@ -229,6 +263,7 @@
 	<string name="media_viewer">Просмотрщик медиа</string>
 	<string name="follow_user">Подписаться на %s</string>
 	<string name="unfollowed_user">Вы отписались от %s</string>
+	<string name="followed_user">Вы подписались на %s</string>
 	<string name="following_user_requested">Отправлен запрос на подписку %s</string>
 	<string name="open_in_browser">Открыть в браузере</string>
 	<string name="hide_boosts_from_user">Скрыть продвигаемые от %s</string>
@@ -236,8 +271,8 @@
 	<string name="signup_reason">Почему вы хотите присоединиться?</string>
 	<string name="signup_reason_note">Это поможет нам рассмотреть вашу заявку.</string>
 	<string name="clear">Очистить</string>
-	<string name="profile_header">Изображение шапки</string>
-	<string name="profile_picture">Аватарка</string>
+	<string name="profile_header">Обложка профиля</string>
+	<string name="profile_picture">Фото профиля</string>
 	<string name="reorder">Изменить порядок</string>
 	<string name="download">Скачать</string>
 	<string name="permission_required">Требуется доступ</string>
@@ -246,7 +281,13 @@
 	<string name="error_saving_file">Ошабка при сохранении файла</string>
 	<string name="file_saved">Файл сохранён</string>
 	<string name="downloading">Скачивание…</string>
+	<string name="no_app_to_handle_action">Нет приложения для обработки этого действия</string>
+	<string name="local_timeline">Локальные</string>
+	<string name="trending_posts_info_banner">Эти посты набирают популярность в Mastodon.</string>
+	<string name="trending_links_info_banner">Это новости, о которых говорят в Mastodon.</string>
 	<!-- %s is the server domain -->
+	<string name="local_timeline_info_banner">Это все посты от всех пользователей на вашем сервере (%s).</string>
+	<string name="recommended_accounts_info_banner">Вам могут понравиться эти учетные записи, основаные на ваших подписках.</string>
 	<string name="see_new_posts">Показать новые</string>
 	<string name="load_missing_posts">Загрузить недостающие посты</string>
 	<string name="follow_back">Подписаться в ответ</string>
@@ -295,21 +336,21 @@
 		<item quantity="many">%d минут назад</item>
 		<item quantity="other">%d минут назад</item>
 	</plurals>
-	<string name="edited_timestamp">редактировано %s</string>
-	<string name="edit_original_post">Начальное сообщение</string>
-	<string name="edit_text_edited">Текст отредактирован</string>
+	<string name="edited_timestamp">изменено %s</string>
+	<string name="edit_original_post">Оригинальный пост</string>
+	<string name="edit_text_edited">Текст изменён</string>
 	<string name="edit_spoiler_added">Предупреждение о содержании добавлено</string>
-	<string name="edit_spoiler_edited">Предупреждение о содержании отредактировано</string>
+	<string name="edit_spoiler_edited">Предупреждение о содержании изменено</string>
 	<string name="edit_spoiler_removed">Предупреждение о содержании удалено</string>
 	<string name="edit_poll_added">Опрос добавлен</string>
 	<string name="edit_poll_edited">Опрос изменён</string>
 	<string name="edit_poll_removed">Опрос удалён</string>
 	<string name="edit_media_added">Файл добавлен</string>
 	<string name="edit_media_removed">Файл удалён</string>
-	<string name="edit_media_reordered">Файл переупорядочен</string>
-	<string name="edit_marked_sensitive">Отметить как «не для всех»</string>
-	<string name="edit_marked_not_sensitive">Снять отметку «не для всех»</string>
-	<string name="edit_multiple_changed">Публикация изменена</string>
+	<string name="edit_media_reordered">Файлы переупорядочены</string>
+	<string name="edit_marked_sensitive">Отметить как «деликатный»</string>
+	<string name="edit_marked_not_sensitive">Снять отметку «деликатный»</string>
+	<string name="edit_multiple_changed">Пост изменён</string>
 	<string name="edit">Редактировать</string>
 	<string name="discard_changes">Отменить изменения?</string>
 	<string name="upload_failed">Сбой загрузки</string>
@@ -336,6 +377,7 @@
 	<string name="login_title">С возвращением</string>
 	<string name="login_subtitle">Войдите на сервер, на котором вы создали свою учётную запись.</string>
 	<string name="server_url">URL-адрес сервера</string>
+	<string name="signup_random_server_explain">Мы выберем сервер на основе вашего языка, если вы продолжите, не сделав выбор.</string>
 	<string name="server_filter_any_language">Любой язык</string>
 	<string name="server_filter_instant_signup">Мгновенная регистрация</string>
 	<string name="server_filter_manual_review">Ручная проверка</string>
@@ -348,6 +390,7 @@
 	<string name="server_filter_region_oceania">Океания</string>
 	<string name="not_accepting_new_members">Не принимает новых участников</string>
 	<string name="category_special_interests">Особые интересы</string>
+	<string name="signup_passwords_dont_match">Пароли не совпадают</string>
 	<string name="pick_server_for_me">Выбрать за меня</string>
 	<string name="profile_add_row">Добавить строку</string>
 	<string name="profile_setup">Настройка профиля</string>
@@ -356,12 +399,14 @@
 	<string name="popular_on_mastodon">Популярно на Mastodon</string>
 	<string name="follow_all">Подписаться на всех</string>
 	<string name="server_rules_disagree">Отклонить</string>
+	<string name="privacy_policy_explanation">TL;DR: Мы ничего не собираем и не обрабатываем.</string>
 	<!-- %s is server domain -->
 	<string name="server_policy_disagree">Отклонить %s</string>
 	<string name="profile_bio">О себе</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<string name="sending_follows">Подписка на пользователей…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s не позволяет зарегистрироваться от %2$s. Попробуйте другой или &lt;a&gt;выберите другой сервер&lt;/a&gt;.</string>
 	<string name="spoiler_show">Все равно показать</string>
 	<string name="spoiler_hide">Спрятать повторно</string>
 	<string name="poll_multiple_choice">Выберите один или более</string>
@@ -369,7 +414,7 @@
 	<string name="profile_featured">Избранное</string>
 	<string name="profile_timeline">Лента</string>
 	<string name="view_all">Посмотреть все</string>
-	<string name="profile_endorsed_accounts">Учётные записи</string>
+	<string name="profile_endorsed_accounts">Аккаунты</string>
 	<string name="verified_link">Подтвержденная ссылка</string>
 	<string name="show">Показать</string>
 	<string name="hide">Скрыть</string>
@@ -380,16 +425,221 @@
 	<string name="welcome_to_mastodon">Добро пожаловать в Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon - это децентрализованная социальная сеть, то есть ни одна компания не контролирует ее. Она состоит из множества независимо управляемых серверов, соединенных вместе.</string>
 	<string name="what_are_servers">Что такое сервер?</string>
-	<string name="welcome_paragraph2"><![CDATA[Каждый аккаунт Mastodon размещается на сервере - каждый со своими ценностями, правилами и администраторами. Независимо от того, какой сервер вы выберете, вы можете следить и взаимодействовать с людьми на любом сервере.]]></string>
+	<string name="welcome_paragraph2">Каждый аккаунт Mastodon размещается на сервере - каждый со своими ценностями, правилами и администраторами. Независимо от того, какой сервер вы выберете, вы можете следить и взаимодействовать с людьми на любом сервере.</string>
+	<string name="opening_link">Открытие ссылки…</string>
+	<string name="link_not_supported">Эта ссылка не поддерживается в приложении</string>
+	<string name="log_out_all_accounts">Выйти из всех аккаунтов</string>
+	<string name="confirm_log_out_all_accounts">Выйти из всех аккаунтов?</string>
+	<string name="retry">Повторить</string>
+	<string name="post_failed">Не удалось отправить</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">%s изображение</string>
+	<string name="attachment_description_video">%s видео</string>
+	<string name="attachment_description_audio">%s аудиозапись</string>
+	<string name="attachment_description_unknown">%s файл</string>
+	<string name="attachment_type_image">Изображение</string>
+	<string name="attachment_type_video">Видео</string>
+	<string name="attachment_type_audio">Аудио</string>
+	<string name="attachment_type_gif">GIF</string>
+	<string name="attachment_type_unknown">Файл</string>
+	<string name="attachment_x_percent_uploaded">%d%% загружен</string>
+	<string name="add_poll_option">Добавить вариант ответа</string>
+	<string name="poll_length">Срок</string>
+	<string name="poll_style">Стиль</string>
+	<string name="compose_poll_single_choice">Только один</string>
+	<string name="compose_poll_multiple_choice">Несколько</string>
+	<string name="delete_poll_option">Удалить опцию опроса</string>
+	<string name="poll_style_title">Стиль опроса</string>
+	<string name="alt_text">Альтернативный текст</string>
+	<string name="help">Помощь</string>
+	<string name="what_is_alt_text">Что такое альтернативный текст?</string>
+	<string name="alt_text_help">Альтернативный текст содержит описания изображений для людей с ограничениями и тех, кому нужен дополнительный контекст.\n\nВы можете улучшить доступность и понимание для всех, написав четкий, краткий и объективный альтернативный текст.\n\n<ul><li>Фиксируйте важные элементы</li>\n<li>Описывайте изображение</li>\n<li>Используйте правильную структуру предложений</li>\n<li>Избегайте избыточной информации</li>\n<li>Сосредоточьтесь на основных и ключевых визуальных элементах (таких как диаграммы или карты)</li></ul></string>
+	<string name="edit_post">Изменить пост</string>
+	<string name="no_verified_link">Не подтвержденная ссылка</string>
+	<string name="compose_autocomplete_emoji_empty">Просмотр эмодзи</string>
+	<string name="compose_autocomplete_users_empty">Найдите тех, кого ищете</string>
+	<string name="no_search_results">Ничего не найдено по этому запросу</string>
+	<string name="language">Язык</string>
+	<string name="language_default">По умолчанию</string>
+	<string name="language_system">Система</string>
+	<string name="language_detecting">Определение языка</string>
+	<string name="language_cant_detect">Не удается определить язык</string>
+	<string name="language_detected">Определён</string>
+	<string name="media_hidden">Файлы скрыты</string>
+	<string name="post_hidden">Пост скрыт</string>
+	<string name="report_title_post">Пожаловаться</string>
+	<string name="forward_report_explanation">Аккаунт принадлежит другому серверу. Отправить туда анонимную копию этого отчета?</string>
 	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">Переслать на %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Сообщено</string>
+	<string name="report_unfollow_explanation">Чтобы больше не видеть их посты в вашей ленте, отмените подписку на них.</string>
+	<string name="muted_user">Игнорировать %s</string>
+	<string name="report_sent_already_blocked">Вы уже заблокировали этого пользователя, так что вам больше ничего не нужно делать, пока мы просматриваем ваше обращение.</string>
+	<string name="report_personal_already_blocked">Вы уже заблокировали этого пользователя, так что вам больше ничего не нужно делать.\n\nСпасибо, что помогаете сделать Mastodon безопасным для всех!</string>
+	<string name="blocked_user">Заблокировать %s</string>
+	<string name="mark_all_notifications_read">Отметить всё как прочитанное</string>
+	<string name="settings_display">Отображение</string>
+	<string name="settings_filters">Фильтры</string>
+	<string name="settings_server_explanation">Обзор, правила, модераторы</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">О %s</string>
+	<string name="default_post_language">Язык по умолчанию</string>
+	<string name="settings_alt_text_reminders">Напоминать об альтернативном тексте</string>
+	<string name="settings_confirm_unfollow">Подтверждать отписку</string>
+	<string name="settings_confirm_boost">Подтверждать продвижение</string>
+	<string name="settings_confirm_delete_post">Подтверждать удаление поста</string>
+	<string name="pause_all_notifications">Приостановить все</string>
+	<string name="pause_notifications_off">Отключено</string>
+	<string name="notifications_policy_anyone">Всех</string>
+	<string name="notifications_policy_followed">Тех, кто на меня подписан(а)</string>
+	<string name="notifications_policy_follower">Тех, на кого я подписан(а)</string>
+	<string name="notifications_policy_no_one">Никого</string>
+	<string name="settings_notifications_policy">Получать уведомления от</string>
+	<string name="notification_type_mentions_and_replies">Упоминания и ответы</string>
+	<string name="pause_all_notifications_title">Просмотреть все уведомления</string>
+	<plurals name="x_weeks">
+		<item quantity="one">%d неделя</item>
+		<item quantity="few">%d недели</item>
+		<item quantity="many">%d недель</item>
+		<item quantity="other">%d недель</item>
+	</plurals>
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
+	<string name="date_at_time">%1$s в %2$s</string>
+	<string name="today">сегодня</string>
+	<string name="yesterday">вчера</string>
+	<string name="tomorrow">завтра</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_ends">Закончится %s</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">Уведомления возобновятся %s.</string>
+	<string name="resume_notifications_now">Возобновить</string>
+	<string name="open_system_notification_settings">Перейти к настройкам уведомлений</string>
+	<string name="about_server">О нас</string>
+	<string name="server_rules">Правила</string>
+	<string name="server_administrator">Администратор</string>
+	<string name="send_email_to_server_admin">Написать администратору</string>
+	<string name="notifications_disabled_in_system">Включите уведомления из настроек вашего устройства, чтобы увидеть обновления откуда угодно.</string>
+	<string name="settings_even_more">Еще больше настроек</string>
+	<string name="settings_show_cws">Показывать предупреждения о содержании</string>
+	<string name="settings_hide_sensitive_media">Скрывать материал деликатного характера</string>
+	<string name="settings_show_interaction_counts">Показывать количество взаимодействий под постами</string>
+	<string name="settings_show_emoji_in_names">Пользовательские эмодзи в именах</string>
+	<plurals name="in_x_seconds">
+		<item quantity="one">через %d секунду</item>
+		<item quantity="few">через %d секунд(ы)</item>
+		<item quantity="many">через %d секунд(ы)</item>
+		<item quantity="other">через %d секунд(ы)</item>
+	</plurals>
+	<plurals name="in_x_minutes">
+		<item quantity="one">через %d минуту</item>
+		<item quantity="few">через %d минут(ы)</item>
+		<item quantity="many">через %d минут(ы)</item>
+		<item quantity="other">через %d минут(ы)</item>
+	</plurals>
+	<plurals name="in_x_hours">
+		<item quantity="one">через %d час</item>
+		<item quantity="few">через %d часа(ов)</item>
+		<item quantity="many">через %d часов</item>
+		<item quantity="other">через %d часов</item>
+	</plurals>
+	<plurals name="x_hours_ago">
+		<item quantity="one">%d час назад</item>
+		<item quantity="few">%d часов(-а) назад</item>
+		<item quantity="many">%d часов(-а) назад</item>
+		<item quantity="other">%d часов(-а) назад</item>
+	</plurals>
+	<string name="alt_text_reminder_title">В материале отсутствует альтернативный текст</string>
+	<plurals name="alt_text_reminder_x_images">
+		<item quantity="one">В %s вашем изображении отсутствует альтернативный текст. Опубликовать в любом случае?</item>
+		<item quantity="few">В %s ваших изображениях отсутствует альтернативный текст. Опубликовать в любом случае?</item>
+		<item quantity="many">В %s ваших изображениях отсутствует альтернативный текст. Опубликовать в любом случае?</item>
+		<item quantity="other">В %s ваших изображениях отсутствует альтернативный текст. Опубликовать в любом случае?</item>
+	</plurals>
+	<plurals name="alt_text_reminder_x_attachments">
+		<item quantity="one">В %s вашем файле отсутствует альтернативный текст. Опубликовать в любом случае?</item>
+		<item quantity="few">В %s ваших файлах отсутствует альтернативный текст. Опубликовать в любом случае?</item>
+		<item quantity="many">В %s ваших файлах отсутствует альтернативный текст. Опубликовать в любом случае?</item>
+		<item quantity="other">В %s ваших файлах отсутствует альтернативный текст. Опубликовать в любом случае?</item>
+	</plurals>
+	<string name="count_one">Один</string>
+	<string name="count_two">Два</string>
+	<string name="count_three">Три</string>
+	<string name="count_four">Четыре</string>
+	<string name="alt_text_reminder_post_anyway">Пост</string>
 	<!-- %s is the username -->
+	<string name="unfollow_confirmation">Отписаться от %s?</string>
+	<string name="filter_active">Активный</string>
+	<string name="filter_inactive">Неактивный</string>
+	<string name="settings_add_filter">Добавить фильтр</string>
+	<string name="settings_edit_filter">Изменить фильтр</string>
+	<string name="settings_filter_duration">Продолжительность</string>
+	<string name="settings_filter_muted_words">Игнорируемые слова</string>
+	<string name="settings_filter_context">Игнорировать</string>
+	<string name="settings_filter_show_cw">Показывать предупреждения о содержании</string>
+	<string name="settings_filter_show_cw_explanation">Показывать посты, которые соответствуют этому фильтру, но с предупреждением о содержании</string>
+	<string name="settings_delete_filter">Удалить фильтр</string>
+	<string name="filter_duration_forever">Всегда</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="settings_filter_ends">Закончится %s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="one">%d игнорируемое слово или фраза</item>
+		<item quantity="few">%d игнорируемых слов(а) или фраз</item>
+		<item quantity="many">%d игнорируемых слов(а) или фраз</item>
+		<item quantity="other">%d игнорируемых слов(а) или фраз</item>
+	</plurals>
+	<string name="selection_2_options">%1$s и %2$s</string>
+	<string name="selection_3_options">%1$s, %2$s и %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s и ещё %3$d</string>
+	<string name="filter_context_home_lists">Главная &amp; списки</string>
+	<string name="filter_context_notifications">Уведомления</string>
+	<string name="filter_context_public_timelines">Публичная лента</string>
+	<string name="filter_context_threads_replies">Темы &amp; ответы</string>
+	<string name="filter_context_profiles">Профили</string>
+	<string name="settings_filter_title">Название</string>
+	<string name="settings_delete_filter_title">Удалить фильтр “%s”?</string>
+	<string name="settings_delete_filter_confirmation">Этот фильтр будет удален из аккаунта на всех ваших устройствах.</string>
+	<string name="add_muted_word">Добавить игнорируемое слово</string>
+	<string name="edit_muted_word">Изменить игнорируемое слово</string>
+	<string name="add">Добавить</string>
+	<string name="filter_word_or_phrase">Слово или фраза</string>
+	<string name="filter_add_word_help">Слова не чувствительны к регистру и соответствуют только целым словам.\n\nЕсли вы отфильтруете ключевое слово “Apple”, оно скроет посты, содержащие “apple” или “aPpLe” но не “pineapple.”</string>
+	<string name="settings_delete_filter_word">Удалить слово “%s”?</string>
+	<string name="enter_selection_mode">Выбрать</string>
+	<string name="select_all">Выбрать все</string>
+	<string name="settings_filter_duration_title">Продолжительность фильтра</string>
+	<string name="filter_duration_custom">Другое</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="one">Удалить %d слово?</item>
+		<item quantity="few">Удалить %d слова?</item>
+		<item quantity="many">Удалить %d слов?</item>
+		<item quantity="other">Удалить %d слов?</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="one">Выбрано %d</item>
+		<item quantity="few">Выбрано %d</item>
+		<item quantity="many">Выбрано %d</item>
+		<item quantity="other">Выбрано %d</item>
+	</plurals>
+	<string name="required_form_field_blank">Не может быть пустым</string>
+	<string name="filter_word_already_in_list">Уже в списке</string>
+	<string name="app_update_ready">Приложение готово к обновлению</string>
+	<string name="app_update_version">Версия %s</string>
+	<string name="downloading_update">Скачивание (%d%%)</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">Соответствует фильтру “%s”</string>
+	<string name="search_mastodon">Поиск в Mastodon</string>
+	<string name="clear_all">Очистить все</string>
+	<string name="search_open_url">Открывать ссылки в Mastodon</string>
+	<string name="posts_matching_hashtag">Посты с “%s”</string>
+	<string name="search_go_to_account">Перейти в %s</string>
+	<string name="posts_matching_string">Посты с “%s”</string>
+	<string name="accounts_matching_string">Аккаунты с “%s”</string>
 	<!-- Shown in the post header. Please keep it short -->
+	<string name="time_seconds_ago_short">%d сек. назад</string>
+	<string name="time_minutes_ago_short">%d мин. назад</string>
+	<string name="time_hours_ago_short">%d ч. назад</string>
+	<string name="time_days_ago_short">%d д. назад</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-si-rLK/strings.xml

@@ -75,4 +75,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-sl-rSI/strings.xml

@@ -15,6 +15,7 @@
 	<string name="user_sent_follow_request">%s vam je poslal_a zahtevo za sledenje</string>
 	<string name="user_favorited">%s je vzljubil/a vašo objavo</string>
 	<string name="notification_boosted">%s je izpostavila/a vašo objavo</string>
+	<string name="poll_ended">Pokaži rezultate ankete, v kateri sem sodeloval_a</string>
 	<string name="share_toot_title">Deli</string>
 	<string name="settings">Nastavitve</string>
 	<string name="publish">Objavi</string>
@@ -40,6 +41,7 @@
 	<string name="button_follow">Sledi</string>
 	<string name="button_following">Sledi</string>
 	<string name="edit_profile">Uredi profil</string>
+	<string name="share_user">Profil v skupno rabo</string>
 	<string name="mute_user">Utišaj %s</string>
 	<string name="unmute_user">Odtišaj %s</string>
 	<string name="block_user">Blokiraj %s</string>
@@ -206,6 +208,7 @@
 	<string name="visibility_public">Javno</string>
 	<string name="visibility_followers_only">Samo sledilci</string>
 	<string name="visibility_private">Samo osebe, ki jih omenjam</string>
+	<string name="recent_searches">Nedavno</string>
 	<string name="skip">Preskoči</string>
 	<string name="notification_type_follow">Novi sledilci</string>
 	<string name="notification_type_favorite">Priljubljeni</string>
@@ -230,6 +233,8 @@
 	<string name="settings_clear_cache">Počisti medijski predpomnilnik</string>
 	<string name="settings_app_version">Mastodon za Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Predpomnilnik medijev počiščen</string>
+	<string name="confirm_log_out">Ali se želite odjaviti iz %s?</string>
+	<string name="sensitive_content_explain">Avtor je to vsebino označil kot občutljivo.</string>
 	<string name="avatar_description">Pojdi na profil %s</string>
 	<string name="more_options">Več možnosti</string>
 	<string name="new_post">Nova objava</string>
@@ -265,7 +270,9 @@
 	<string name="file_saved">Datoteka shranjena</string>
 	<string name="downloading">Prejemanje …</string>
 	<string name="no_app_to_handle_action">Ni programa za ravnanje s tem dejanjem</string>
+	<string name="local_timeline">Krajevno</string>
 	<string name="trending_posts_info_banner">To so objave, ki plenijo pozornost po Mastodonu.</string>
+	<string name="trending_links_info_banner">To so novice, o katerih se govori na Mastodonu.</string>
 	<!-- %s is the server domain -->
 	<string name="see_new_posts">Pokaži nove objave</string>
 	<string name="load_missing_posts">Naloži manjkajoče objave</string>
@@ -379,6 +386,7 @@
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<string name="sending_follows">Sledenje uporabnikom ...</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s ne dovoljuje prijav s/z %2$s. Poskusite drugega ali &lt;a&gt;izberite drug strežnik&lt;/a&gt;.</string>
 	<string name="spoiler_show">Vseeno pokaži</string>
 	<string name="spoiler_hide">Ponovno skrij</string>
 	<string name="poll_multiple_choice">Izberi eno ali več izbir</string>
@@ -397,75 +405,133 @@
 	<string name="welcome_to_mastodon">Dobrodošli na Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon je decentralizirano družbeno omrežje, kar pomeni, da ga ne upravlja nobeno posamezno podjetje. Sestavljajo ga številni neodvisni strežniki, ki so medsebojno povezani.</string>
 	<string name="what_are_servers">Kaj so strežniki?</string>
-	<string name="welcome_paragraph2"><![CDATA[Vsak račun Mastodon gostuje na strežniku — vsak strežnik ima svoje vrednote, pravila in skbrnike. Vseeno je, katerega izberete - sledite in komunicirate lahko z osebbami na poljubnem strežniku.]]></string>
+	<string name="welcome_paragraph2">Vsak račun Mastodon gostuje na strežniku — vsak strežnik ima svoje vrednote, pravila in skbrnike. Vseeno je, katerega izberete - sledite in komunicirate lahko z osebbami na poljubnem strežniku.</string>
 	<string name="opening_link">Odpiranje povezav ...</string>
+	<string name="link_not_supported">Ta povezava v aplikaciji ni podprta</string>
 	<string name="log_out_all_accounts">Odjava iz vseh računov</string>
 	<string name="confirm_log_out_all_accounts">Ali se želite odjaviti iz vseh računov?</string>
 	<string name="retry">Poskusi znova</string>
+	<string name="post_failed">Objave ni možno poslati</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">%s slika</string>
+	<string name="attachment_description_video">%s video posnetek</string>
+	<string name="attachment_description_audio">%s zvočni posnetek</string>
+	<string name="attachment_description_unknown">%s datoteka</string>
 	<string name="attachment_type_image">Slika</string>
 	<string name="attachment_type_video">Video</string>
 	<string name="attachment_type_audio">Zvok</string>
 	<string name="attachment_type_gif">GIF</string>
 	<string name="attachment_type_unknown">Datoteka</string>
+	<string name="add_poll_option">Dodaj možen odgovor v anketi</string>
+	<string name="poll_length">Dolžina ankete</string>
 	<string name="poll_style">Slog</string>
+	<string name="compose_poll_single_choice">Izberite eno možnost</string>
+	<string name="compose_poll_multiple_choice">Več možnosti</string>
+	<string name="delete_poll_option">Izbriši možen odgovor v anketi</string>
 	<string name="poll_style_title">Slog ankete</string>
+	<string name="alt_text">Nadomestno besedilo</string>
 	<string name="help">Pomoč</string>
+	<string name="what_is_alt_text">Kaj je nadomestno besedilo (alt text)?</string>
 	<string name="edit_post">Uredi objavo</string>
 	<string name="no_verified_link">Ni preverjenih povezav</string>
+	<string name="compose_autocomplete_users_empty">Najdite tiste, ki jih iščete</string>
+	<string name="no_search_results">Za ta iskalni niz ni zadetkov</string>
 	<string name="language">Jezik</string>
 	<string name="language_default">Privzeto</string>
 	<string name="language_system">sistemski</string>
 	<string name="language_detecting">Zaznavanje jezika</string>
 	<string name="language_cant_detect">Jezika ni moč zaznati</string>
 	<string name="language_detected">Zaznano</string>
+	<string name="media_hidden">Mediji so skriti</string>
+	<string name="post_hidden">Skrita objava</string>
+	<string name="report_title_post">Prijavi objavo</string>
+	<string name="forward_report_explanation">Račun je z drugega strežnika. Ali želite poslati anonimno kopijo prijave tudi na drugi strežnik?</string>
 	<!-- %s is the server domain -->
+	<string name="forward_report_to_server">Posreduj k %s</string>
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Prijavljeno</string>
 	<string name="mark_all_notifications_read">Označi vse kot prebrano</string>
 	<string name="settings_filters">Filtri</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">O programu %s</string>
 	<string name="default_post_language">Privzeti jezik objave</string>
+	<string name="pause_all_notifications">Premor za vse</string>
+	<string name="pause_notifications_off">Izklopljeno</string>
+	<string name="notifications_policy_follower">Ljudje, ki jim sledite</string>
 	<string name="notifications_policy_no_one">Nihče</string>
+	<string name="notification_type_mentions_and_replies">Omembe in odgovori</string>
+	<string name="pause_all_notifications_title">Zaustavi vsa obvestila</string>
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
+	<string name="date_at_time">%1$s ob %2$s</string>
 	<string name="today">danes</string>
 	<string name="yesterday">včeraj</string>
 	<string name="tomorrow">jutri</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">Obveščanje se bo nadaljevalo: %s.</string>
 	<string name="resume_notifications_now">Nadaljuj zdaj</string>
+	<string name="open_system_notification_settings">Pojdi k nastavitvam obvestil</string>
 	<string name="about_server">O programu</string>
 	<string name="server_rules">Pravila</string>
 	<string name="server_administrator">Skrbnik</string>
+	<string name="settings_even_more">Še več nastavitev</string>
 	<string name="settings_show_cws">Pokaži opozorilo o vsebini</string>
 	<string name="settings_hide_sensitive_media">Skrij medij, ki je označen kot občutljiv</string>
+	<string name="settings_show_interaction_counts">Števci interakcije objave</string>
 	<string name="count_one">Ena</string>
+	<string name="count_two">Dva</string>
+	<string name="count_three">Tri</string>
+	<string name="count_four">Štiri</string>
+	<string name="alt_text_reminder_post_anyway">Objavi</string>
 	<!-- %s is the username -->
+	<string name="unfollow_confirmation">Ne želite slediti %s?</string>
+	<string name="filter_active">Dejaven</string>
+	<string name="filter_inactive">Nedejaven</string>
 	<string name="settings_add_filter">Dodaj filter</string>
 	<string name="settings_edit_filter">Uredi filter</string>
 	<string name="settings_filter_duration">Trajanje</string>
+	<string name="settings_filter_muted_words">Utišane besede</string>
+	<string name="settings_filter_show_cw">Pokaži z oporozilom o vsebini</string>
 	<string name="settings_delete_filter">Izbriši filter</string>
 	<string name="filter_duration_forever">Za vedno</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="selection_2_options">%1$s in %2$s</string>
+	<string name="selection_3_options">%1$s, %2$s in %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s in še dodatnih %3$d</string>
 	<string name="filter_context_notifications">Obvestila</string>
 	<string name="filter_context_public_timelines">Javne časovnice</string>
+	<string name="filter_context_threads_replies">Niti in odgovori</string>
 	<string name="filter_context_profiles">Profili</string>
 	<string name="settings_filter_title">Naslov</string>
+	<string name="settings_delete_filter_title">Ali želite izbrisati filter »%s«?</string>
+	<string name="add_muted_word">Dodaj utišano besedo</string>
+	<string name="edit_muted_word">Uredi utišano besedo</string>
 	<string name="add">Dodaj</string>
 	<string name="filter_word_or_phrase">Beseda ali besedna zveza</string>
+	<string name="settings_delete_filter_word">Ali želite izbrisati besedo »%s«?</string>
+	<string name="enter_selection_mode">Izberite</string>
 	<string name="select_all">Izberi vse</string>
 	<string name="settings_filter_duration_title">Filtriraj po trajanju</string>
 	<string name="filter_duration_custom">Po meri</string>
 	<string name="required_form_field_blank">Ne sme biti prazno</string>
 	<string name="filter_word_already_in_list">Že na seznamu</string>
+	<string name="app_update_ready">Posodobitev aplikacije je pripravljena</string>
 	<string name="app_update_version">Različica %s</string>
 	<string name="downloading_update">Prenos %d%%</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">Se ujema s filtrom »%s«</string>
+	<string name="search_mastodon">Išči v Mastodonu</string>
 	<string name="clear_all">Počisti vse</string>
 	<string name="search_open_url">Odpri URL v Mastodonu</string>
+	<string name="posts_matching_hashtag">Objave s/z »%s«</string>
 	<string name="search_go_to_account">Pojdi na %s</string>
+	<string name="posts_matching_string">Objave s/z »%s«</string>
+	<string name="accounts_matching_string">Osebe s/z »%s«</string>
 	<!-- Shown in the post header. Please keep it short -->
 	<string name="time_seconds_ago_short">pred %d s</string>
 	<string name="time_minutes_ago_short">pred %d meseci</string>
 	<string name="time_hours_ago_short">pred %dh urami</string>
 	<string name="time_days_ago_short">pred %d dnemi</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-sv-rSE/strings.xml

@@ -4,12 +4,15 @@
 	<string name="next">Nästa</string>
 	<string name="loading_instance">Hämtar serverinfo…</string>
 	<string name="error">Fel</string>
+	<string name="not_a_mastodon_instance">%s verkar inte vara en mastodon server.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Förbereder för autentisering…</string>
 	<string name="finishing_auth">Slutför autentisering…</string>
 	<string name="user_boosted">%s boostade</string>
 	<string name="in_reply_to">Som svar på %s</string>
 	<string name="notifications">Notiser</string>
+	<string name="user_followed_you">%s följde dig</string>
+	<string name="user_favorited">%s favoritmarkerade ditt inlägg</string>
 	<string name="share_toot_title">Dela</string>
 	<string name="settings">Inställningar</string>
 	<string name="publish">Publicera</string>
@@ -120,6 +123,7 @@
 	</plurals>
 	<string name="report_title">Rapportera %s</string>
 	<string name="report_choose_reason_subtitle">Välj den bästa träffen</string>
+	<string name="report_reason_personal">Jag gillar det inte</string>
 	<string name="report_reason_personal_subtitle">Det är inget som du vill se</string>
 	<string name="report_reason_spam">Det är skräppost</string>
 	<string name="report_reason_spam_subtitle">Skadliga länkar, bedrägligt beteende eller repetitiva svar</string>
@@ -135,6 +139,7 @@
 	<string name="sending_report">Skickar rapport…</string>
 	<string name="unfollow_user">Avfölj %s</string>
 	<string name="unfollow">Avfölj</string>
+	<string name="report_personal_title">Vill du inte se detta?</string>
 	<string name="back">Tillbaka</string>
 	<string name="search_communities">Servernamn eller URL</string>
 	<string name="instance_rules_title">Serverregler</string>
@@ -161,6 +166,7 @@
 	<string name="category_tech">Teknik</string>
 	<string name="confirm_email_title">Kolla din inkorg</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_didnt_get">Fick du ingen länk?</string>
 	<string name="resend">Skicka igen</string>
 	<string name="open_email_app">Öppna e-postappen</string>
 	<string name="resent_email">Bekräftelse via e-post skickad</string>
@@ -169,6 +175,7 @@
 	<string name="add_alt_text">Lägg till alternativtext</string>
 	<string name="visibility_public">Offentlig</string>
 	<string name="visibility_followers_only">Endast följare</string>
+	<string name="recent_searches">Nyligen</string>
 	<string name="skip">Hoppa över</string>
 	<string name="notification_type_follow">Nya följare</string>
 	<string name="notification_type_favorite">Favoriter</string>
@@ -223,6 +230,7 @@
 	<string name="file_saved">Filen sparad</string>
 	<string name="downloading">Laddar ner…</string>
 	<!-- %s is the server domain -->
+	<string name="recommended_accounts_info_banner">Du kanske gillar dessa konton baserat på andra konton du följer.</string>
 	<string name="see_new_posts">Se nya inlägg</string>
 	<string name="load_missing_posts">Ladda saknade inlägg</string>
 	<string name="follow_back">Följ tillbaka</string>
@@ -333,31 +341,41 @@
 	<string name="show">Visa</string>
 	<string name="hide">Dölj</string>
 	<string name="join_default_server">Gå med %s</string>
+	<string name="pick_server">Välj en annan server</string>
 	<string name="signup_or_login">eller</string>
 	<string name="learn_more">Läs mer</string>
 	<string name="welcome_to_mastodon">Välkommen till Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon är ett decentraliserat socialt nätverk, vilket innebär att inget enskilt företag kontrollerar det. Det består av många oberoende servrar, alla sammankopplade.</string>
 	<string name="what_are_servers">Vad är servrar?</string>
-	<string name="welcome_paragraph2"><![CDATA[Varje Mastodon-konto finns på en server — var och en med sina värderingar, regler och administratörer. Oavsett vilken du väljer kan du följa och interagera med människor på vilken server som helst.]]></string>
 	<string name="log_out_all_accounts">Logga ut från alla konton</string>
 	<string name="confirm_log_out_all_accounts">Logga ut från alla konton?</string>
 	<string name="retry">Försök igen</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">%s bild</string>
+	<string name="attachment_description_video">%s video</string>
+	<string name="attachment_description_audio">%s ljud</string>
+	<string name="attachment_description_unknown">%s fil</string>
+	<string name="attachment_type_image">Bild</string>
+	<string name="attachment_type_video">Video</string>
 	<string name="attachment_type_audio">Ljud</string>
 	<string name="attachment_type_gif">GIF</string>
 	<string name="attachment_type_unknown">Fil</string>
 	<string name="help">Hjälp</string>
 	<string name="edit_post">Redigera inlägg</string>
+	<string name="no_verified_link">Ingen verifierad länk</string>
 	<string name="language">Språk</string>
 	<string name="language_default">Standard</string>
 	<string name="report_title_post">Rapportera inlägg</string>
 	<!-- %s is the server domain -->
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Rapporterad</string>
 	<string name="mark_all_notifications_read">Markera alla som lästa</string>
 	<string name="settings_filters">Filter</string>
 	<string name="settings_server_explanation">Översikt, regler och moderatorer</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
 	<string name="about_app">Om %s</string>
+	<string name="settings_confirm_delete_post">Fråga innan du raderar inlägg</string>
+	<string name="notifications_policy_followed">Personer som följer dig</string>
 	<string name="notifications_policy_no_one">Ingen</string>
 	<plurals name="x_weeks">
 		<item quantity="one">%d vecka</item>
@@ -369,10 +387,18 @@
 	<string name="about_server">Om</string>
 	<string name="server_rules">Regler</string>
 	<string name="server_administrator">Administratör</string>
+	<string name="settings_show_emoji_in_names">Anpassad emoji i visningsnamn</string>
+	<plurals name="in_x_hours">
+		<item quantity="one">om %d timme</item>
+		<item quantity="other">om %d timmar</item>
+	</plurals>
 	<plurals name="x_hours_ago">
 		<item quantity="one">%d timme sedan</item>
 		<item quantity="other">%d timmar sedan</item>
 	</plurals>
+	<string name="count_two">Två</string>
+	<string name="count_three">Tre</string>
+	<string name="count_four">Fyra</string>
 	<!-- %s is the username -->
 	<string name="filter_active">Aktiv</string>
 	<string name="filter_inactive">Inaktiv</string>
@@ -383,18 +409,29 @@
 	<string name="selection_2_options">%1$s och %2$s</string>
 	<string name="selection_3_options">%1$s, %2$s och %3$s</string>
 	<string name="filter_context_profiles">Profiler</string>
+	<string name="settings_delete_filter_confirmation">Detta filter kommer raderas från ditt konto på alla dina enheter.</string>
 	<string name="add">Lägg till</string>
 	<string name="filter_word_or_phrase">Ord eller fras</string>
 	<string name="enter_selection_mode">Välj</string>
 	<string name="select_all">Välj alla</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="one">Radera %d ord?</item>
+		<item quantity="other">Radera %d ord?</item>
+	</plurals>
 	<string name="app_update_version">Version %s</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">Matchar filter \"%s\"</string>
+	<string name="search_mastodon">Sök i Mastodon</string>
 	<string name="clear_all">Rensa alla</string>
 	<string name="search_open_url">Öppna URL i Mastodon</string>
+	<string name="posts_matching_hashtag">Inlägg med \"%s\"</string>
 	<string name="search_go_to_account">Gå till %s</string>
 	<!-- Shown in the post header. Please keep it short -->
 	<string name="time_seconds_ago_short">%ds sedan</string>
 	<string name="time_minutes_ago_short">%dm sedan</string>
 	<string name="time_hours_ago_short">%dt sedan</string>
 	<string name="time_days_ago_short">%dd sedan</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">Översätt från %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-th-rTH/strings.xml

@@ -354,7 +354,7 @@
 	<string name="spoiler_hide">ซ่อนใหม่</string>
 	<string name="poll_multiple_choice">เลือกจำนวนหนึ่งหรือมากกว่า</string>
 	<string name="save_changes">บันทึกการเปลี่ยนแปลง</string>
-	<string name="profile_featured">แนะนำ</string>
+	<string name="profile_featured">น่าสนใจ</string>
 	<string name="profile_timeline">เส้นเวลา</string>
 	<string name="view_all">ดูทั้งหมด</string>
 	<string name="profile_endorsed_accounts">บัญชี</string>
@@ -368,7 +368,7 @@
 	<string name="welcome_to_mastodon">ยินดีต้อนรับสู่ Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ หมายความว่าไม่มีบริษัทใดควบคุมเครือข่ายสังคม เครือข่ายสังคมประกอบด้วยเซิร์ฟเวอร์ที่ทำงานอย่างอิสระจำนวนมาก ทั้งหมดเชื่อมต่อเข้าด้วยกัน</string>
 	<string name="what_are_servers">เซิร์ฟเวอร์คืออะไร?</string>
-	<string name="welcome_paragraph2"><![CDATA[ทุกบัญชี Mastodon ได้รับการโฮสต์ในเซิร์ฟเวอร์ — แต่ละแห่งมีค่า, กฎ และผู้ดูแลของเซิร์ฟเวอร์เอง ไม่ว่าคุณจะเลือกเซิร์ฟเวอร์ใด คุณสามารถติดตามและโต้ตอบกับผู้คนในเซิร์ฟเวอร์ใด ๆ]]></string>
+	<string name="welcome_paragraph2">ทุกบัญชี Mastodon ได้รับการโฮสต์ในเซิร์ฟเวอร์ — แต่ละแห่งมีค่า, กฎ และผู้ดูแลของเซิร์ฟเวอร์เอง ไม่ว่าคุณจะเลือกเซิร์ฟเวอร์ใด คุณสามารถติดตามและโต้ตอบกับผู้คนในเซิร์ฟเวอร์ใด ๆ</string>
 	<string name="opening_link">กำลังเปิดลิงก์…</string>
 	<string name="link_not_supported">ไม่รองรับลิงก์นี้ในแอป</string>
 	<string name="log_out_all_accounts">ออกจากระบบบัญชีทั้งหมด</string>
@@ -509,7 +509,7 @@
 	</plurals>
 	<string name="selection_2_options">%1$s และ %2$s</string>
 	<string name="selection_3_options">%1$s, %2$s และ %3$s</string>
-	<string name="selection_4_or_more">%1$s, %2$s และเพิ่มเติมอีก %3$d</string>
+	<string name="selection_4_or_more">%1$s, %2$s และอีก %3$d เพิ่มเติม</string>
 	<string name="filter_context_home_lists">หน้าแรกและรายการ</string>
 	<string name="filter_context_notifications">การแจ้งเตือน</string>
 	<string name="filter_context_public_timelines">เส้นเวลาสาธารณะ</string>
@@ -553,4 +553,16 @@
 	<string name="time_minutes_ago_short">%d นาทีที่แล้ว</string>
 	<string name="time_hours_ago_short">%d ชั่วโมงที่แล้ว</string>
 	<string name="time_days_ago_short">%d วันที่แล้ว</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">แปลจาก %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">แปลจาก %1$s โดยใช้ %2$s</string>
+	<string name="translation_show_original">แสดงดั้งเดิม</string>
+	<string name="translation_failed">การแปลล้มเหลว บางทีผู้ดูแลอาจไม่ได้เปิดใช้งานการแปลในเซิร์ฟเวอร์นี้หรือเซิร์ฟเวอร์นี้กำลังใช้ Mastodon รุ่นเก่ากว่าที่ยังไม่รองรับการแปล</string>
+	<plurals name="x_participants">
+		<item quantity="other">%,d ผู้มีส่วนร่วม</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="other">%,d โพสต์วันนี้</item>
+	</plurals>
 </resources>

mastodon/src/main/res/values-tr-rTR/strings.xml

@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Mastodon\'a hoş geldiniz</string>
 	<string name="welcome_paragraph1">Mastodon merkezi olmayan bir sosyal ağdır, yani onu tek bir şirket kontrol etmiyor. Hepsi birbirine bağlı, bağımsız olarak çalışan birçok sunucudan oluşur.</string>
 	<string name="what_are_servers">Sunucular nedir?</string>
-	<string name="welcome_paragraph2"><![CDATA[Her Mastodon hesabı bir sunucuda barındırılır - her birinin kendi değerleri, kuralları ve yöneticileri vardır. Hangisini seçerseniz seçin, herhangi bir sunucudaki insanları takip edebilir ve onlarla etkileşime geçebilirsiniz.]]></string>
 	<string name="opening_link">Bağlantı açılıyor…</string>
 	<string name="link_not_supported">Bu bağlantı uygulamada desteklenmiyor</string>
 	<string name="log_out_all_accounts">Tüm hesaplardan çıkış yap</string>
@@ -582,4 +581,6 @@
 	<string name="time_minutes_ago_short">%ddk önce</string>
 	<string name="time_hours_ago_short">%dsa önce</string>
 	<string name="time_days_ago_short">%dg önce</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-uk-rUA/strings.xml

@@ -425,7 +425,7 @@
 	<string name="welcome_to_mastodon">Вітаємо у Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon - це децентралізована соціальна мережа, тобто жодна компанія не контролює її. Вона складається з багатьох незалежних серверів, які з\'єднані між собою.</string>
 	<string name="what_are_servers">Що таке сервери?</string>
-	<string name="welcome_paragraph2"><![CDATA[Кожен акаунт Mastodon розміщений на сервері, й кожен сервер має особисті цінності, правила, й адмінів. Немає різниці, який ви оберете. Ви можете підписуватися та спілкуватися з усіма, навіть якщо ви на різних серверах.]]></string>
+	<string name="welcome_paragraph2">Кожен обліковий запис Mastodon розміщений на сервері - кожен сервер має свої цінності, правила, й &amp; адмінів. Немає різниці, який ви оберете, ви зможете підписуватися та спілкуватися з користувачами з будь-якого.</string>
 	<string name="opening_link">Відкриття посилання…</string>
 	<string name="link_not_supported">Це посилання не підтримується застосунком</string>
 	<string name="log_out_all_accounts">Вийти з усіх акаунтів</string>
@@ -640,4 +640,6 @@
 	<string name="time_minutes_ago_short">%dхв. тому</string>
 	<string name="time_hours_ago_short">%dгод. тому</string>
 	<string name="time_days_ago_short">%dд. тому</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-ur-rIN/strings.xml

@@ -20,4 +20,6 @@
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<!-- Shown in the post header. Please keep it short -->
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-vi-rVN/strings.xml

@@ -78,7 +78,7 @@
 	<plurals name="x_votes">
 		<item quantity="other">%,d người bình chọn</item>
 	</plurals>
-	<string name="poll_closed">Kết thúc</string>
+	<string name="poll_closed">Đóng</string>
 	<string name="confirm_mute_title">Ẩn người này</string>
 	<string name="confirm_mute">Bạn muốn ẩn %s?</string>
 	<string name="do_mute">Ẩn</string>
@@ -203,14 +203,14 @@
 	<string name="settings_contribute">Đóng góp cho Mastodon</string>
 	<string name="settings_tos">Điều khoản dịch vụ</string>
 	<string name="settings_privacy_policy">Chính sách bảo mật</string>
-	<string name="settings_clear_cache">Xoá bộ nhớ đệm</string>
+	<string name="settings_clear_cache">Xóa bộ nhớ đệm</string>
 	<string name="settings_app_version">Mastodon for Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Đã xóa bộ nhớ đệm</string>
 	<string name="confirm_log_out">Đăng xuất %s?</string>
-	<string name="sensitive_content_explain">Người đăng đánh dấu media này nhạy cảm.</string>
+	<string name="sensitive_content_explain">Người đăng đánh dấu media này nhạy cảm</string>
 	<string name="avatar_description">Xem hồ sơ %s</string>
 	<string name="more_options">Nhiều tùy chọn hơn</string>
-	<string name="new_post">Viết tút</string>
+	<string name="new_post">Soạn tút</string>
 	<string name="button_reply">Trả lời</string>
 	<string name="button_reblog">Đăng lại</string>
 	<string name="button_favorite">Thích</string>
@@ -219,7 +219,7 @@
 	<string name="add_media">Thêm media</string>
 	<string name="add_poll">Tạo bình chọn</string>
 	<string name="emoji">Emoji</string>
-	<string name="home_timeline">Bảng tin</string>
+	<string name="home_timeline">Trang chính</string>
 	<string name="my_profile">Hồ sơ của tôi</string>
 	<string name="media_viewer">Xem media</string>
 	<string name="follow_user">Theo dõi %s</string>
@@ -266,7 +266,7 @@
 		<item quantity="other">%,d lượt thích</item>
 	</plurals>
 	<plurals name="x_reblogs">
-		<item quantity="other">%,đăng lại</item>
+		<item quantity="other">%,d đăng lại</item>
 	</plurals>
 	<string name="timestamp_via_app">%1$s qua %2$s</string>
 	<string name="time_now">vừa xong</string>
@@ -368,7 +368,7 @@
 	<string name="welcome_to_mastodon">Chào mừng đến với Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon là một mạng xã hội phi tập trung, không có công ty nào kiểm soát. Nó bao gồm nhiều máy chủ độc lập được kết nối với nhau.</string>
 	<string name="what_are_servers">Máy chủ là gì?</string>
-	<string name="welcome_paragraph2"><![CDATA[Mỗi tài khoản Mastodon được lưu trữ trên một máy chủ — với nội quy và quản trị viên riêng. Bất kể bạn chọn máy chủ nào, bạn có thể theo dõi và tương tác với mọi người trên máy chủ khác.]]></string>
+	<string name="welcome_paragraph2">Mỗi tài khoản Mastodon được lưu trữ trên một máy chủ — với nội quy &amp; quản trị viên riêng. Bất kể bạn chọn máy chủ nào, bạn có thể theo dõi và tương tác với mọi người trên máy chủ khác.</string>
 	<string name="opening_link">Mở liên kết…</string>
 	<string name="link_not_supported">App không hỗ trợ liên kết này</string>
 	<string name="log_out_all_accounts">Đăng xuất khỏi mọi tài khoản</string>
@@ -553,4 +553,16 @@
 	<string name="time_minutes_ago_short">%dp</string>
 	<string name="time_hours_ago_short">%dh</string>
 	<string name="time_days_ago_short">%d ngày</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">Dịch từ %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">Dịch từ %1$s bằng %2$s</string>
+	<string name="translation_show_original">Bản gốc</string>
+	<string name="translation_failed">Dịch không thành công. Có thể quản trị viên chưa bật dịch trên máy chủ này hoặc máy chủ này đang chạy phiên bản cũ hơn của Mastodon chưa hỗ trợ dịch.</string>
+	<plurals name="x_participants">
+		<item quantity="other">%,d người thảo luận</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="other">%,d tút hôm nay</item>
+	</plurals>
 </resources>

mastodon/src/main/res/values-zh-rCN/strings.xml

@@ -313,7 +313,7 @@
 	<string name="empty_list">还没有内容</string>
 	<string name="instance_signup_closed">此实例不接受新注册。</string>
 	<string name="text_copied">复制成功</string>
-	<string name="add_bookmark">添加到书签</string>
+	<string name="add_bookmark">添加书签</string>
 	<string name="remove_bookmark">移除书签</string>
 	<string name="bookmarks">书签</string>
 	<string name="your_favorites">你喜欢的</string>
@@ -368,7 +368,6 @@
 	<string name="welcome_to_mastodon">欢迎来到Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon 是去中心化的社交网络，这意味着它不由任何企业独控。它是由众多独立运行的实例共同联结而成的。</string>
 	<string name="what_are_servers">是什么实例？</string>
-	<string name="welcome_paragraph2"><![CDATA[所有的 Mastodon 帐号皆托管于各自的服务器上，每个服务器有各自的价值取向、规则与管理员。无论你选择哪个服务器，你都能关注并与其他任何服务器上的用户互动。]]></string>
 	<string name="opening_link">打开链接…</string>
 	<string name="link_not_supported">应用不支持该链接</string>
 	<string name="log_out_all_accounts">登出所有账户</string>
@@ -553,4 +552,6 @@
 	<string name="time_minutes_ago_short">%d 分钟前</string>
 	<string name="time_hours_ago_short">%d 小时前</string>
 	<string name="time_days_ago_short">%d 天前</string>
+	<!-- %s is the name of the post language -->
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
 </resources>

mastodon/src/main/res/values-zh-rTW/strings.xml

@@ -368,7 +368,7 @@
 	<string name="welcome_to_mastodon">歡迎來到 Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon 是去中心化的社交網路，意思是沒有單一公司掌控它。它由許多獨立運行而互相連接的伺服器組成。</string>
 	<string name="what_are_servers">伺服器是什麼？</string>
-	<string name="welcome_paragraph2"><![CDATA[所有的 Mastodon 帳號皆託管於一個伺服器上 — 其擁有各自之價值觀、規則、與管理者。無論您選擇何者，您皆能跟隨並與其他任何伺服器上的人們互動。]]></string>
+	<string name="welcome_paragraph2">所有的 Mastodon 帳號皆託管於一個伺服器上 — 其擁有各自之價值觀、規則、與管理者。無論您選擇何者，您皆能跟隨並與其他任何伺服器上的人們互動。</string>
 	<string name="opening_link">開啟連結...</string>
 	<string name="link_not_supported">此連結不被 app 所支援</string>
 	<string name="log_out_all_accounts">登出所有帳號</string>
@@ -553,4 +553,16 @@
 	<string name="time_minutes_ago_short">%d 分鐘前</string>
 	<string name="time_hours_ago_short">%d 小時前</string>
 	<string name="time_days_ago_short">%d 天前</string>
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">翻譯自 %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">透過 %2$s 翻譯 %1$s</string>
+	<string name="translation_show_original">顯示原文</string>
+	<string name="translation_failed">翻譯失敗。也許管理員未於此伺服器啟用翻譯功能，或此伺服器為未支援翻譯功能之舊版本 Mastodon。</string>
+	<plurals name="x_participants">
+		<item quantity="other">%,d 位參與者</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="other">本日共 %,d 則嘟文</item>
+	</plurals>
 </resources>

mastodon/src/main/res/values/strings.xml

@@ -393,7 +393,7 @@
 	<string name="welcome_to_mastodon">Welcome to Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon is a decentralized social network, meaning no single company controls it. It’s made up of many independently-run servers, all connected together.</string>
 	<string name="what_are_servers">What are servers?</string>
-	<string name="welcome_paragraph2"><![CDATA[Every Mastodon account is hosted on a server — each with its own values, rules, & admins. No matter which one you pick, you can follow and interact with people on any server.]]></string>
+	<string name="welcome_paragraph2">Every Mastodon account is hosted on a server — each with its own values, rules, &amp; admins. No matter which one you pick, you can follow and interact with people on any server.</string>
 	<string name="opening_link">Opening link…</string>
 	<string name="link_not_supported">This link is not supported in the app</string>
 	<string name="log_out_all_accounts">Log out of all accounts</string>
@@ -589,4 +589,23 @@
 	<string name="time_minutes_ago_short">%dm ago</string>
 	<string name="time_hours_ago_short">%dh ago</string>
 	<string name="time_days_ago_short">%dd ago</string>
+
+	<!-- %s is the name of the post language -->
+	<string name="translate_post">Translate from %s</string>
+	<!-- %1$s is the language, %2$s is the name of the translation service -->
+	<string name="post_translated">Translated from %1$s using %2$s</string>
+	<string name="translation_show_original">Show original</string>
+	<string name="translation_failed">Translation failed. Maybe the administrator has not enabled translations on this server or this server is running an older version of Mastodon where translations are not yet supported.</string>
+	<string name="settings_privacy">Privacy and reach</string>
+	<string name="settings_discoverable">Feature profile and posts in discovery algorithms</string>
+	<string name="settings_indexable">Include public posts in search results</string>
+
+	<plurals name="x_participants">
+		<item quantity="one">%,d participant</item>
+		<item quantity="other">%,d participants</item>
+	</plurals>
+	<plurals name="x_posts_today">
+		<item quantity="one">%,d post today</item>
+		<item quantity="other">%,d posts today</item>
+	</plurals>
 </resources>