generalize filtering logic

closes sk22#518

mastodon/build.gradle

@@ -16,7 +16,7 @@ android {
 		minSdk 23
 		targetSdk 33
 		versionCode 83
-		versionName "1.2.2+fork.83"
+		versionName "1.2.3+fork.83"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += ['ar-rSA', 'ar-rDZ', '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/AndroidManifest.xml

@@ -38,6 +38,22 @@
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 		</activity>
+		<activity
+			android:name=".PanicResponderActivity"
+			android:exported="true"
+			android:launchMode="singleInstance"
+			android:noHistory="true"
+			android:theme="@android:style/Theme.NoDisplay">
+			<intent-filter>
+				<action android:name="info.guardianproject.panic.action.TRIGGER" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</activity>
+		<activity
+			android:name=".ExitActivity"
+			android:exported="false"
+			android:theme="@android:style/Theme.NoDisplay" />
 		<activity android:name=".OAuthActivity" android:exported="true" android:configChanges="orientation|screenSize" android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>

mastodon/src/main/assets/blocks.tsv

@@ -1,89 +0,0 @@
-#	lists.d Mastodon Blocklist	(c) 2022 Greyhat Academy	LICENSED  UNDER: CC-BY-NC-SA 4.0
-#	https://raw.githubusercontent.com/greyhat-academy/lists.d/main/mastodon.domains.block.list.tsv
-#	This list contains domains of toxic mastodon instances
-#	Last-Modified:	1672044500
-
-#	gab - a neonazi social network
-gab.ai
-gab.com
-gab.protohype.net
-
-#	consequence-free speech
-social.unzensiert.to
-freeatlantis.com
-
-#	reactionary bigotry and hatespeech against marginalized groups
-poa.st
-freespeechextremist.com
-rdrama.cc
-outpoa.st
-anime.website
-gameliberty.club
-social.byoblu.com
-yggdrasil.social
-smuglo.li
-dogeposting.social
-unsafe.space
-freezepeach.xyz
-
-#	+ CSAM
-rojogato.com
-
-#	antivaxxer shitposting & fearmongering
-shadowsocial.org
-
-#	Kiwifarms
-kiwifarms.net
-kiwifarms.cc
-kiwifarms.is
-kiwifarms.pleroma.net
-
-
-# https://mastodon.art/@Curator/109649354849593592
-
-poa.st antisemitic racist homophobic
-nicecrew.digital antisemitic
-beefyboys.win antisemitic racist homophobic harassment
-cawfee.club antisemitic racist homophobic
-comfyboy.club antisemitic racist homophobic
-freespeechextremist.com racist homophobic
-cum.salon racist misogynist
-bae.st racist
-natehiggers.online racist
-rapemeat.solutions misogynist
-rapist.town misogynist
-rapefeminists.network misogynist
-kiwifarms.cc harassment
-noagendasocial.com noagenda
-posting.lolicon.rocks underage
-urchan.org harassment homophobic racist
-ryona.agency harassment
-yggdrasil.social antisemitic homophobic racist
-genderheretics.xyz transphobic
-baraag.net underage
-lolison.top underage
-shota.house underage
-shota.social underage
-aethy.com underage
-taullo.social underage
-childpawn.shop underage
-posting.lolicon.rocks underage
-loli.best underage
-gothloli.club underage
-smuglo.li underage
-youjo.love underage
-pedo.school underage
-lolison.network underage
-freak.university underage
-mirr0r.city underage
-xhais.love underage
-refusal.biz underage
-refusal.llc underage
-mirr0r.city underage
-nnia.space underage
-ignorelist.com malicious
-repl.co malicious
-
-# custom
-
-pawoo.net csam

mastodon/src/main/assets/blocks.txt

@@ -0,0 +1,171 @@
+13bells.com
+4aem.com
+aethy.com
+anime.website
+annihilation.social
+anon-kenkai.com
+asbestos.cafe
+bae.st
+bajax.us
+banepo.st
+baraag.net
+beefyboys.win
+beepboop.ga
+berserker.town
+bikeshed.party
+boks.moe
+brainsoap.net
+breastmilk.club
+brighteon.social
+cawfee.club
+clew.lol
+clubcyberia.co
+collapsitarian.io
+comfyboy.club
+contrapointsfan.club
+cum.camp
+cum.salon
+cybercriminal.eu
+darknight-coffee.org
+dembased.xyz
+desupost.soy
+detroitriotcity.com
+eatthebugs.social
+eientei.org
+elementality.org
+eveningzoo.club
+firedragonstudios.com
+firefaithfellowship.com
+fluf.club
+foxfam.club
+freak.university
+freeatlantis.com
+freecumextremist.com
+freedomstrike.org
+freesoftwareextremist.com
+freespeech.group
+freespeechextremist.com
+freetalklive.com
+froth.zone
+fulltermprivacy.com
+gameliberty.club
+gearlandia.haus
+genderheretics.xyz
+geofront.rocks
+gleasonator.com
+glee.li
+glindr.org
+goyim.app
+goyslop.cafe
+haeder.net
+handholding.io
+hidamari.apartments
+hitchhiker.social
+hunk.city
+iddqd.social
+intkos.link
+justicewarrior.social
+kawa-kun.com
+kitsunemimi.club
+kiwifarms.cc
+kompost.cz
+kurosawa.moe
+leafposter.club
+leftychan.net
+lewdieheaven.com
+liberdon.com
+ligma.pro
+lizards.live
+lolicon.rocks
+lolison.top
+lovingexpressions.net
+lucasvl.nl
+mahodou.moe
+makemysarcophagus.com
+maladaptive.art
+masochi.st
+mastinator.com
+merovingian.club
+midwaytrades.com
+mirr0r.city
+moa.st
+mouse.services
+mugicha.club
+narrativerry.xyz
+natehiggers.online
+neckbeard.xyz
+needs.vodka
+neenster.org
+nicecrew.digital
+nnia.space
+noagendasocial.com
+noagendasocial.nl
+noagendatube.com
+nobodyhasthe.biz
+nukem.biz
+obo.sh
+onionfarms.org
+outpoa.st
+pawlicker.com
+pawoo.net
+pedo.school
+piazza.today
+pibvt.net
+pieville.net
+pisskey.io
+plagu.ee
+pmth.us
+poa.st
+poast.org
+poast.tv
+poster.place
+prospeech.space
+quodverum.com
+rakket.app
+rapemeat.solutions
+rdrama.cc
+rebelbase.site
+retardedniggers.forsale
+rojogato.com
+ryona.agency
+schwartzwelt.xyz
+seal.cafe
+shigusegubu.club
+shitpost.cloud
+shitposter.club
+shota.house
+silliness.observer
+skinheads.eu
+skinheads.io
+skinheads.social
+skinheads.uk
+skippers-bin.com
+skyshanty.xyz
+slash.cl
+sleepy.cafe
+smuglo.li
+sneed.social
+sonichu.com
+spinster.xyz
+springbo.cc
+starnix.network
+stereophonic.space
+strelizia.net
+syspxl.xyz
+tastingtraffic.net
+teci.world
+theapex.social
+thepostearthdestination.com
+tkammer.de
+trumpislovetrumpis.life
+truthsocial.co.in
+urchan.org
+varishangout.net
+whinge.house
+whinge.town
+wideboys.org
+wolfgirl.bar
+xn--p1abe3d.xn--80asehdb
+yggdrasil.social
+youjo.love
+zztails.gay

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

@@ -0,0 +1,24 @@
+package org.joinmastodon.android;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class ExitActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        finishAndRemoveTask();
+    }
+
+    public static void exit(Context context) {
+        Intent intent = new Intent(context, ExitActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivity(intent);
+    }
+
+}

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

@@ -8,6 +8,7 @@ import android.content.SharedPreferences;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
@@ -53,10 +54,13 @@ public class GlobalUserPreferences{
 
 	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
 	private final static Type pinnedTimelinesType = new TypeToken<Map<String, List<TimelineDefinition>>>() {}.getType();
+	private final static Type accountsDefaultContentTypesType = new TypeToken<Map<String, ContentType>>() {}.getType();
 	public static Map<String, List<String>> recentLanguages;
 	public static Map<String, List<TimelineDefinition>> pinnedTimelines;
 	public static Set<String> accountsWithLocalOnlySupport;
 	public static Set<String> accountsInGlitchMode;
+	public static Set<String> accountsWithContentTypesEnabled;
+	public static Map<String, ContentType> accountsDefaultContentTypes;
 
 	/**
 	 * Pleroma
@@ -111,6 +115,8 @@ public class GlobalUserPreferences{
 		accountsWithLocalOnlySupport=prefs.getStringSet("accountsWithLocalOnlySupport", new HashSet<>());
 		accountsInGlitchMode=prefs.getStringSet("accountsInGlitchMode", new HashSet<>());
 		replyVisibility=prefs.getString("replyVisibility", null);
+		accountsWithContentTypesEnabled=prefs.getStringSet("accountsWithContentTypesEnabled", new HashSet<>());
+		accountsDefaultContentTypes=fromJson(prefs.getString("accountsDefaultContentTypes", null), accountsDefaultContentTypesType, new HashMap<>());
 
 		try {
 			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
@@ -158,6 +164,8 @@ public class GlobalUserPreferences{
 				.putStringSet("accountsWithLocalOnlySupport", accountsWithLocalOnlySupport)
 				.putStringSet("accountsInGlitchMode", accountsInGlitchMode)
 				.putString("replyVisibility", replyVisibility)
+				.putStringSet("accountsWithContentTypesEnabled", accountsWithContentTypesEnabled)
+				.putString("accountsDefaultContentTypes", gson.toJson(accountsDefaultContentTypes))
 				.apply();
 	}
 

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

@@ -0,0 +1,49 @@
+package org.joinmastodon.android;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
+
+public class PanicResponderActivity extends Activity {
+    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final Intent intent = getIntent();
+        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
+            AccountSessionManager.getInstance().getLoggedInAccounts().forEach(accountSession -> logOut(accountSession.getID()));
+            ExitActivity.exit(this);
+        }
+        finishAndRemoveTask();
+    }
+
+    private void logOut(String accountID){
+        AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+        new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
+                .setCallback(new Callback<>(){
+                    @Override
+                    public void onSuccess(Object result){
+                        onLoggedOut(accountID);
+                    }
+
+                    @Override
+                    public void onError(ErrorResponse error){
+                        onLoggedOut(accountID);
+                    }
+                })
+                .exec(accountID);
+    }
+
+    private void onLoggedOut(String accountID){
+        AccountSessionManager.getInstance().removeAccount(accountID);
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java

@@ -74,10 +74,8 @@ public class CacheController{
 								int flags=cursor.getInt(1);
 								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
 								newMaxID=status.id;
-								for(Filter filter:filters){
-									if(filter.matches(status))
-										continue outer;
-								}
+								if (!new StatusFilterPredicate(filters, Filter.FilterContext.HOME).test(status))
+									continue outer;
 								result.add(status);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
@@ -92,7 +90,7 @@ public class CacheController{
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
-								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
+								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters, Filter.FilterContext.HOME)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putHomeTimeline(result, maxID==null);
 							}
 
@@ -148,10 +146,8 @@ public class CacheController{
 								ntf.postprocess();
 								newMaxID=ntf.id;
 								if(ntf.status!=null){
-									for(Filter filter:filters){
-										if(filter.matches(ntf.status))
-											continue outer;
-									}
+									if (!new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status))
+										continue outer;
 								}
 								result.add(ntf);
 							}while(cursor.moveToNext());
@@ -170,11 +166,7 @@ public class CacheController{
 							public void onSuccess(List<Notification> result){
 								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(ntf->{
 									if(ntf.status!=null){
-										for(Filter filter:filters){
-											if(filter.matches(ntf.status)){
-												return false;
-											}
-										}
+										return new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status);
 									}
 									return true;
 								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));

mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java

@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -51,7 +52,9 @@ public class MastodonAPIController{
 			.registerTypeAdapter(Status.class, new Status.StatusDeserializer())
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
-	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
+	private static OkHttpClient httpClient=new OkHttpClient.Builder()
+			.readTimeout(5, TimeUnit.MINUTES)
+			.build();
 
 	private AccountSession session;
 	private static List<String> badDomains = new ArrayList<>();
@@ -60,7 +63,7 @@ public class MastodonAPIController{
 		thread.start();
 		try {
 			final BufferedReader reader = new BufferedReader(new InputStreamReader(
-					MastodonApp.context.getAssets().open("blocks.tsv")
+					MastodonApp.context.getAssets().open("blocks.txt")
 			));
 			String line;
 			while ((line = reader.readLine()) != null) {
@@ -91,7 +94,7 @@ public class MastodonAPIController{
 				Request.Builder builder=new Request.Builder()
 						.url(req.getURL().toString())
 						.method(req.getMethod(), req.getRequestBody())
-						.header("User-Agent", "MastodonAndroid/"+BuildConfig.VERSION_NAME);
+						.header("User-Agent", "MegalodonAndroid/"+BuildConfig.VERSION_NAME);
 
 				String token=null;
 				if(session!=null)

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
@@ -46,6 +47,7 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 		public String language;
 
 		public String quoteId;
+		public ContentType contentType;
 
 		public static class Poll{
 			public ArrayList<String> options=new ArrayList<>();

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

@@ -2,17 +2,22 @@ package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.AllFieldsAreRequired;
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.model.BaseModel;
+import org.joinmastodon.android.model.ContentType;
 
 public class GetStatusSourceText extends MastodonAPIRequest<GetStatusSourceText.Response>{
 	public GetStatusSourceText(String id){
 		super(HttpMethod.GET, "/statuses/"+id+"/source", Response.class);
 	}
 
-	@AllFieldsAreRequired
 	public static class Response extends BaseModel{
+		@RequiredField
 		public String id;
+		@RequiredField
 		public String text;
+		@RequiredField
 		public String spoilerText;
+		public ContentType contentType;
 	}
 }

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

@@ -3,10 +3,6 @@ package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
-import android.view.animation.TranslateAnimation;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
@@ -64,7 +60,12 @@ public class AccountTimelineFragment extends StatusListFragment{
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.ACCOUNT)).collect(Collectors.toList());
+						AccountSessionManager asm = AccountSessionManager.getInstance();
+						result=result.stream().filter(status -> {
+							// don't hide own posts in own profile
+							if (asm.isSelf(accountID, user) && asm.isSelf(accountID, status.account)) return true;
+							else return new StatusFilterPredicate(accountID, getFilterContext()).test(status);
+						}).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -122,4 +123,10 @@ public class AccountTimelineFragment extends StatusListFragment{
 	protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){
 		// no-op
 	}
+
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.ACCOUNT;
+	}
 }

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

@@ -68,7 +68,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends RecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop{
+public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends RecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop, HasFab{
 	protected ArrayList<StatusDisplayItem> displayItems=new ArrayList<>();
 	protected DisplayItemsAdapter adapter;
 	protected String accountID;
@@ -268,34 +268,39 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		});
 	}
 
+	@Override
 	public @Nullable View getFab() {
 		if (getParentFragment() instanceof HasFab l) return l.getFab();
 		else return fab;
 	}
 
-	public void animateFab(boolean show) {
+	@Override
+	public void showFab() {
 		View fab = getFab();
-		if (fab == null) return;
-		if (show && fab.getVisibility() != View.VISIBLE) {
-			fab.setVisibility(View.VISIBLE);
-			TranslateAnimation animate = new TranslateAnimation(
-					0,
-					0,
-					fab.getHeight() * 2,
-					0);
-			animate.setDuration(300);
-			fab.startAnimation(animate);
-		} else if (!show && fab.getVisibility() == View.VISIBLE) {
-			TranslateAnimation animate = new TranslateAnimation(
-					0,
-					0,
-					0,
-					fab.getHeight() * 2);
-			animate.setDuration(300);
-			fab.startAnimation(animate);
-			fab.setVisibility(View.INVISIBLE);
-			scrollDiff = 0;
-		}
+		if (fab == null || fab.getVisibility() == View.VISIBLE) return;
+		fab.setVisibility(View.VISIBLE);
+		TranslateAnimation animate = new TranslateAnimation(
+				0,
+				0,
+				fab.getHeight() * 2,
+				0);
+		animate.setDuration(300);
+		fab.startAnimation(animate);
+	}
+
+	@Override
+	public void hideFab() {
+		View fab = getFab();
+		if (fab == null || fab.getVisibility() != View.VISIBLE) return;
+		TranslateAnimation animate = new TranslateAnimation(
+				0,
+				0,
+				0,
+				fab.getHeight() * 2);
+		animate.setDuration(300);
+		fab.startAnimation(animate);
+		fab.setVisibility(View.INVISIBLE);
+		scrollDiff = 0;
 	}
 
 	@Override
@@ -312,10 +317,10 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				View fab = getFab();
 				if (fab!=null && GlobalUserPreferences.autoHideFab) {
 					if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
-						animateFab(false);
+						hideFab();
 					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
 						if (list.getChildAt(0).getTop() == 0 || scrollDiff > 400) {
-							animateFab(true);
+							showFab();
 							scrollDiff = 0;
 						} else {
 							scrollDiff += Math.abs(dy);

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetBookmarkedStatuses;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
 
@@ -35,4 +36,9 @@ public class BookmarkedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.ACCOUNT;
+	}
 }

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

@@ -91,6 +91,7 @@ import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
 import org.joinmastodon.android.model.Instance;
@@ -179,8 +180,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private int charCount, charLimit, trimmedCharCount;
 
 	private Button publishButton, languageButton, scheduleTimeBtn, draftsBtn;
-	private PopupMenu languagePopup, visibilityPopup, draftOptionsPopup;
-	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss;
+	private PopupMenu languagePopup, contentTypePopup, visibilityPopup, draftOptionsPopup;
+	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss, contentTypeBtn;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
 	private TextView replyText;
@@ -234,6 +235,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private Runnable updateUploadEtaRunnable;
 
 	private String language, encoding;
+	private ContentType contentType;
 	private MastodonLanguage.LanguageResolver languageResolver;
 
 	@Override
@@ -242,6 +244,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		setRetainInstance(true);
 
 		accountID=getArguments().getString("account");
+		contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
+		if (contentType == null && GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID)) {
+			// if formatting is enabled, use plain to avoid confusing unspecified default setting
+			contentType = ContentType.PLAIN;
+		}
+
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		self=session.self;
 		instanceDomain=session.domain;
@@ -330,6 +338,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiBtn=view.findViewById(R.id.btn_emoji);
 		spoilerBtn=view.findViewById(R.id.btn_spoiler);
 		visibilityBtn=view.findViewById(R.id.btn_visibility);
+		contentTypeBtn=view.findViewById(R.id.btn_content_type);
 		scheduleDraftView=view.findViewById(R.id.schedule_draft_view);
 		scheduleDraftText=view.findViewById(R.id.schedule_draft_text);
 		scheduleDraftDismiss=view.findViewById(R.id.schedule_draft_dismiss);
@@ -364,6 +373,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		visibilityBtn.setOnClickListener(v->visibilityPopup.show());
 		visibilityBtn.setOnTouchListener(visibilityPopup.getDragToOpenListener());
 
+		buildContentTypePopup(contentTypeBtn);
+		contentTypeBtn.setOnClickListener(v->contentTypePopup.show());
+		contentTypeBtn.setOnTouchListener(contentTypePopup.getDragToOpenListener());
+
 		scheduleDraftDismiss.setOnClickListener(v->updateScheduledAt(null));
 		scheduleTimeBtn.setOnClickListener(v->pickScheduledDateTime());
 
@@ -466,8 +479,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		}
 
-		if(editingStatus!=null && editingStatus.visibility!=null) {
-			statusVisibility=editingStatus.visibility;
+		if (savedInstanceState != null) {
+			statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
+		} else if (editingStatus != null && editingStatus.visibility != null) {
+			statusVisibility = editingStatus.visibility;
 		} else {
 			loadDefaultStatusVisibility(savedInstanceState);
 		}
@@ -482,6 +497,20 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}).setChecked(true);
 		visibilityPopup.getMenu().findItem(R.id.local_only).setChecked(localOnly);
 
+
+		if (savedInstanceState != null && savedInstanceState.containsKey("contentType")) {
+			contentType = (ContentType) savedInstanceState.getSerializable("contentType");
+		} else if (getArguments().containsKey("sourceContentType")) {
+			try {
+				String val = getArguments().getString("sourceContentType");
+				contentType = val == null ? null : ContentType.valueOf(val);
+			} catch (IllegalArgumentException ignored) {}
+		}
+
+		int contentTypeId = ContentType.getContentTypeRes(contentType);
+		contentTypePopup.getMenu().findItem(contentTypeId).setChecked(true);
+		contentTypeBtn.setSelected(contentTypeId != R.id.content_type_null && contentTypeId != R.id.content_type_plain);
+
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
 		autocompleteViewController.setCompletionSelectedListener(this::onAutocompleteOptionSelected);
 		View autocompleteView=autocompleteViewController.getView();
@@ -518,6 +547,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			outState.putParcelableArrayList("attachments", serializedAttachments);
 		}
 		outState.putSerializable("visibility", statusVisibility);
+		outState.putSerializable("contentType", contentType);
 		if (scheduledAt != null) outState.putSerializable("scheduledAt", scheduledAt);
 		if (scheduledStatus != null) outState.putParcelable("scheduledStatus", Parcels.wrap(scheduledStatus));
 	}
@@ -907,6 +937,17 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 	}
 
+	private int getContentTypeName(String id) {
+		return switch (id) {
+			case "text/plain" -> R.string.sk_content_type_plain;
+			case "text/html" -> R.string.sk_content_type_html;
+			case "text/markdown" -> R.string.sk_content_type_markdown;
+			case "text/bbcode" -> R.string.sk_content_type_bbcode;
+			case "text/x.misskeymarkdown" -> R.string.sk_content_type_mfm;
+			default -> throw new IllegalArgumentException("Invalid content type");
+		};
+	}
+
 	private void addBottomLanguage(Menu menu) {
 		if (menu.findItem(allLanguages.size()) == null) {
 			menu.add(0, allLanguages.size(), Menu.NONE, "bottom (\uD83E\uDD7A\uD83D\uDC49\uD83D\uDC48)");
@@ -1053,6 +1094,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		req.visibility=localOnly && instance.pleroma != null ? StatusPrivacy.LOCAL : statusVisibility;
 		req.sensitive=sensitive;
 		req.language=language;
+		req.contentType=contentType;
 		req.scheduledAt = scheduledAt;
 		if(!attachments.isEmpty()){
 			req.mediaIds=attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
@@ -1895,14 +1937,36 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 	}
 
+	@SuppressLint("ClickableViewAccessibility")
+	private void buildContentTypePopup(View btn) {
+		contentTypePopup=new PopupMenu(getActivity(), btn);
+		contentTypePopup.inflate(R.menu.compose_content_type);
+		Menu m = contentTypePopup.getMenu();
+		ContentType.adaptMenuToInstance(m, instance);
+		if (contentType != null) m.findItem(R.id.content_type_null).setVisible(false);
+
+		contentTypePopup.setOnMenuItemClickListener(i->{
+			int id=i.getItemId();
+			if (id == R.id.content_type_null) contentType = null;
+			else if (id == R.id.content_type_plain) contentType = ContentType.PLAIN;
+			else if (id == R.id.content_type_html) contentType = ContentType.HTML;
+			else if (id == R.id.content_type_markdown) contentType = ContentType.MARKDOWN;
+			else if (id == R.id.content_type_bbcode) contentType = ContentType.BBCODE;
+			else if (id == R.id.content_type_misskey_markdown) contentType = ContentType.MISSKEY_MARKDOWN;
+			else return false;
+			btn.setSelected(id != R.id.content_type_null && id != R.id.content_type_plain);
+			i.setChecked(true);
+			return true;
+		});
+
+		if (!GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID)) {
+			btn.setVisibility(View.GONE);
+		}
+	}
+
 	private void loadDefaultStatusVisibility(Bundle savedInstanceState) {
 		if(replyTo != null) statusVisibility = replyTo.visibility;
 
-		// A saved privacy setting from a previous compose session wins over the reply visibility
-		if(savedInstanceState !=null){
-			statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
-		}
-
 		AccountSessionManager asm = AccountSessionManager.getInstance();
 		Preferences prefs = asm.getAccount(accountID).preferences;
 		if (prefs != null) {

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetFavoritedStatuses;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
 
@@ -35,4 +36,9 @@ public class FavoritedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.ACCOUNT;
+	}
 }

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

@@ -4,4 +4,6 @@ import android.view.View;
 
 public interface HasFab {
     View getFab();
+    void showFab();
+    void hideFab();
 }

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

@@ -123,7 +123,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 					@Override
 					public void onSuccess(List<Status> result){
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -154,4 +154,9 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	protected void onSetFabBottomInset(int inset){
 		((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.PUBLIC;
+	}
 }

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

@@ -160,6 +160,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		notificationsFragment=(NotificationsFragment) getChildFragmentManager().getFragment(savedInstanceState, "notificationsFragment");
 		profileFragment=(ProfileFragment) getChildFragmentManager().getFragment(savedInstanceState, "profileFragment");
 		currentTab=savedInstanceState.getInt("selectedTab");
+		tabBar.selectTab(currentTab);
 		Fragment current=fragmentForTab(currentTab);
 		getChildFragmentManager().beginTransaction()
 				.hide(homeTabFragment)
@@ -227,6 +228,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		}
 		getChildFragmentManager().beginTransaction().hide(fragmentForTab(currentTab)).show(newFragment).commit();
 		maybeTriggerLoading(newFragment);
+		if (newFragment instanceof HasFab fabulous) fabulous.showFab();
 		currentTab=tab;
 		((FragmentStackActivity)getActivity()).invalidateSystemBarColors(this);
 	}
@@ -291,7 +293,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
 		if (instance == null) return;
 
-		new GetNotifications(null, 1, EnumSet.allOf(Notification.Type.class), instance.pleroma != null)
+		new GetNotifications(null, 1, EnumSet.allOf(Notification.Type.class), instance != null && instance.pleroma != null)
 				.setCallback(new Callback<>() {
 					@Override
 					public void onSuccess(List<Notification> notifications) {

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

@@ -448,10 +448,20 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		updateSwitcherIcon(i);
 	}
 
+	@Override
+	public void showFab() {
+		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) l.showFab();
+	}
+
+	@Override
+	public void hideFab() {
+		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) l.hideFab();
+	}
+
 	private void updateSwitcherIcon(int i) {
 		timelineIcon.setImageResource(timelines[i].getIcon().iconRes);
 		timelineTitle.setText(timelines[i].getTitle(getContext()));
-		if (fragments[i] instanceof BaseStatusListFragment<?> l) l.animateFab(true);
+		showFab();
 	}
 
 	@Override

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

@@ -8,8 +8,6 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -150,7 +148,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
-						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
+						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, getFilterContext());
 						toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
@@ -229,7 +227,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 							List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
 							targetList.clear();
 							List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
-							StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
+							StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, getFilterContext());
 							for(Status s:result){
 								if(idsBelowGap.contains(s.id))
 									break;
@@ -282,4 +280,9 @@ public class HomeTimelineFragment extends StatusListFragment {
 	protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
 		return true;
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.HOME;
+	}
 }

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

@@ -137,7 +137,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                     @Override
                     public void onSuccess(List<Status> result) {
                         if (getActivity() == null) return;
-                        result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.HOME)).collect(Collectors.toList());
+                        result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
                         onDataLoaded(result, !result.isEmpty());
                     }
                 })
@@ -162,4 +162,10 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
     protected void onSetFabBottomInset(int inset) {
         ((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
     }
+
+
+    @Override
+    protected Filter.FilterContext getFilterContext() {
+        return Filter.FilterContext.HOME;
+    }
 }

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

@@ -154,8 +154,9 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 						if(offset==0 && !result.items.isEmpty() && !result.isFromCache()){
 							E.post(new AllNotificationsSeenEvent());
 							new SaveMarkers(null, result.items.get(0).id).exec(accountID);
-							AccountSessionManager.getInstance().getAccount(accountID).markers
-									.notifications.lastReadId = result.items.get(0).id;
+							if (AccountSessionManager.getInstance().getAccount(accountID).markers != null)
+								AccountSessionManager.getInstance().getAccount(accountID).markers
+										.notifications.lastReadId = result.items.get(0).id;
 							AccountSessionManager.getInstance().writeAccountsFile();
 						}
 					}

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

@@ -758,6 +758,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return fab;
 	}
 
+	@Override
+	public void showFab() {
+		if (getFragmentForPage(pager.getCurrentItem()) instanceof HasFab fabulous) fabulous.showFab();
+	}
+
+	@Override
+	public void hideFab() {
+		if (getFragmentForPage(pager.getCurrentItem()) instanceof HasFab fabulous) fabulous.hideFab();
+	}
+
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
 		int topBarsH=getToolbar().getHeight()+statusBarHeight;
 		if(scrollY>avatarBorder.getTop()-topBarsH){

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

@@ -79,7 +79,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
-		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true);
+		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true, null);
 	}
 
 	@Override
@@ -96,6 +96,8 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 		args.putString("sourceText", status.text);
 		args.putString("sourceSpoiler", status.spoilerText);
 		args.putBoolean("redraftStatus", true);
+		args.putString("sourceContentType", scheduledStatus.params.contentType != null ?
+				scheduledStatus.params.contentType.name() : null);
 		setResult(true, null);
 
 		// closing this scheduled status list if another status list is opened from compose fragment

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

@@ -14,6 +14,7 @@ import android.util.LruCache;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -48,6 +49,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
 import org.joinmastodon.android.model.PushNotification;
@@ -64,6 +66,7 @@ import java.util.function.Consumer;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -80,7 +83,8 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private ArrayList<Item> items=new ArrayList<>();
 	private ThemeItem themeItem;
 	private NotificationPolicyItem notificationPolicyItem;
-	private SwitchItem showNewPostsButtonItem, glitchModeItem, compactReblogReplyLineItem;
+	private SwitchItem showNewPostsItem, glitchModeItem, compactReblogReplyLineItem;
+	private ButtonItem defaultContentTypeButtonItem;
 	private String accountID;
 	private boolean needUpdateNotificationSettings;
 	private boolean needAppRestart;
@@ -89,7 +93,9 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private ImageView themeTransitionWindowView;
 	private TextItem checkForUpdateItem, clearImageCacheItem;
 	private ImageCache imageCache;
+	private Menu contentTypeMenu;
 
+	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -239,15 +245,15 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}));
 		items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_sync_24_regular, GlobalUserPreferences.loadNewPosts, i->{
 			GlobalUserPreferences.loadNewPosts=i.checked;
-			showNewPostsButtonItem.enabled = i.checked;
+			showNewPostsItem.enabled = i.checked;
 			if (!i.checked) {
 				GlobalUserPreferences.showNewPostsButton = false;
-				showNewPostsButtonItem.checked = false;
+				showNewPostsItem.checked = false;
 			}
-			if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsButtonItem)) instanceof SwitchViewHolder svh) svh.rebind();
+			if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsItem)) instanceof SwitchViewHolder svh) svh.rebind();
 			GlobalUserPreferences.save();
 		}));
-		items.add(showNewPostsButtonItem = new SwitchItem(R.string.sk_settings_see_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
+		items.add(showNewPostsItem = new SwitchItem(R.string.sk_settings_see_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
 			GlobalUserPreferences.showNewPostsButton=i.checked;
 			GlobalUserPreferences.save();
 		}));
@@ -330,6 +336,36 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		if (!TextUtils.isEmpty(instance.version)) items.add(new SmallTextItem(getString(R.string.sk_settings_server_version, instance.version)));
 
 		items.add(new HeaderItem(R.string.sk_instance_features));
+		items.add(new SwitchItem(R.string.sk_settings_content_types, 0, GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID), (i)->{
+			if (i.checked) {
+				GlobalUserPreferences.accountsWithContentTypesEnabled.add(accountID);
+				if (GlobalUserPreferences.accountsDefaultContentTypes.get(accountID) == null) {
+					GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, ContentType.PLAIN);
+				}
+			} else {
+				GlobalUserPreferences.accountsWithContentTypesEnabled.remove(accountID);
+				GlobalUserPreferences.accountsDefaultContentTypes.remove(accountID);
+			}
+			if (list.findViewHolderForAdapterPosition(items.indexOf(defaultContentTypeButtonItem))
+					instanceof ButtonViewHolder bvh) bvh.rebind();
+			GlobalUserPreferences.save();
+		}));
+		items.add(new SmallTextItem(getString(R.string.sk_settings_content_types_explanation)));
+		items.add(defaultContentTypeButtonItem = new ButtonItem(R.string.sk_settings_default_content_type, 0, b->{
+			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
+			popupMenu.inflate(R.menu.compose_content_type);
+			popupMenu.setOnMenuItemClickListener(item -> this.onContentTypeChanged(item, b));
+			b.setOnTouchListener(popupMenu.getDragToOpenListener());
+			b.setOnClickListener(v->popupMenu.show());
+			ContentType contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
+			b.setText(getContentTypeString(contentType));
+			contentTypeMenu = popupMenu.getMenu();
+			contentTypeMenu.findItem(ContentType.getContentTypeRes(contentType)).setChecked(true);
+			ContentType.adaptMenuToInstance(contentTypeMenu, instance);
+			contentTypeMenu.findItem(R.id.content_type_null).setVisible(
+					!GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID));
+		}));
+		items.add(new SmallTextItem(getString(R.string.sk_settings_default_content_type_explanation)));
 		items.add(new SwitchItem(R.string.sk_settings_support_local_only, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{
 			glitchModeItem.enabled = i.checked;
 			if (i.checked) {
@@ -500,6 +536,34 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
+	private @StringRes int getContentTypeString(@Nullable ContentType contentType) {
+		if (contentType == null) return R.string.sk_content_type_unspecified;
+		return switch (contentType) {
+			case PLAIN -> R.string.sk_content_type_plain;
+			case HTML -> R.string.sk_content_type_html;
+			case MARKDOWN -> R.string.sk_content_type_markdown;
+			case BBCODE -> R.string.sk_content_type_bbcode;
+			case MISSKEY_MARKDOWN -> R.string.sk_content_type_mfm;
+		};
+	}
+
+	private boolean onContentTypeChanged(MenuItem item, Button btn){
+		int id = item.getItemId();
+		ContentType contentType = switch (id) {
+			case R.id.content_type_plain -> ContentType.PLAIN;
+			case R.id.content_type_html -> ContentType.HTML;
+			case R.id.content_type_markdown -> ContentType.MARKDOWN;
+			case R.id.content_type_bbcode -> ContentType.BBCODE;
+			case R.id.content_type_misskey_markdown -> ContentType.MISSKEY_MARKDOWN;
+			default -> null;
+		};
+		GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, contentType);
+		GlobalUserPreferences.save();
+		btn.setText(getContentTypeString(contentType));
+		item.setChecked(true);
+		return true;
+	}
+
 	private boolean onReplyVisibilityChanged(MenuItem item, Button btn){
 		String pref = null;
 		int id = item.getItemId();
@@ -1007,7 +1071,11 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		@Override
 		public void onBind(ButtonItem item){
 			text.setText(item.text);
-			icon.setImageResource(item.icon);
+			if (item.icon == 0) {
+				icon.setVisibility(View.GONE);
+			} else {
+				icon.setImageResource(item.icon);
+			}
 			item.buttonConsumer.accept(button);
 		}
 	}

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

@@ -6,6 +6,7 @@ import android.view.View;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusEditHistory;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -55,7 +56,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null, null);
 		int idx=data.indexOf(s);
 		if(idx>=0){
 			String date=UiUtils.DATE_TIME_FORMATTER.format(s.createdAt.atZone(ZoneId.systemDefault()));
@@ -156,4 +157,9 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 	public boolean isItemEnabled(String id){
 		return false;
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return null;
+	}
 }

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

@@ -34,9 +34,11 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		boolean addFooter = !GlobalUserPreferences.spectatorMode ||
 				(this instanceof ThreadFragment t && s.id.equals(t.mainStatus.id));
-		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, addFooter, null, Filter.FilterContext.HOME);
+		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, addFooter, null, getFilterContext());
 	}
 
+	protected abstract Filter.FilterContext getFilterContext();
+
 	@Override
 	protected void addAccountToKnown(Status s){
 		if(!knownAccounts.containsKey(s.account.id))

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

@@ -137,7 +137,7 @@ public class ThreadFragment extends StatusListFragment{
 	}
 
 	private List<Status> filterStatuses(List<Status> statuses){
-		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,Filter.FilterContext.THREAD);
+		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,getFilterContext());
 		return statuses.stream()
 				.filter(statusFilterPredicate)
 				.collect(Collectors.toList());
@@ -181,4 +181,10 @@ public class ThreadFragment extends StatusListFragment{
 	public boolean wantsLightNavigationBar(){
 		return !UiUtils.isDarkTheme();
 	}
+
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.THREAD;
+	}
 }

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

@@ -26,7 +26,7 @@ public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop
 					@Override
 					public void onSuccess(List<Status> result){
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				}).exec(accountID);
@@ -42,4 +42,10 @@ public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop
 	public boolean isOnTop() {
 		return isRecyclerViewOnTop(list);
 	}
+
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.PUBLIC;
+	}
 }

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

@@ -35,7 +35,7 @@ public class FederatedTimelineFragment extends StatusListFragment {
 						if(!result.isEmpty())
 							maxID=result.get(result.size()-1).id;
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -47,4 +47,9 @@ public class FederatedTimelineFragment extends StatusListFragment {
 		super.onViewCreated(view, savedInstanceState);
 		bannerHelper.maybeAddBanner(contentWrap);
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.PUBLIC;
+	}
 }

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

@@ -34,7 +34,7 @@ public class LocalTimelineFragment extends StatusListFragment {
 						if(!result.isEmpty())
 							maxID=result.get(result.size()-1).id;
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -46,4 +46,9 @@ public class LocalTimelineFragment extends StatusListFragment {
 		super.onViewCreated(view, savedInstanceState);
 		bannerHelper.maybeAddBanner(contentWrap);
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.PUBLIC;
+	}
 }

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

@@ -15,6 +15,7 @@ import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.SearchResults;
@@ -80,7 +81,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult> impleme
 		return switch(s.type){
 			case ACCOUNT -> Collections.singletonList(new AccountStatusDisplayItem(s.id, this, s.account));
 			case HASHTAG -> Collections.singletonList(new HashtagStatusDisplayItem(s.id, this, s.hashtag));
-			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null);
+			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null, Filter.FilterContext.PUBLIC);
 		};
 	}
 

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

@@ -21,6 +21,7 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AudioStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
@@ -261,4 +262,9 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 	protected boolean wantsOverlaySystemNavigation(){
 		return false;
 	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return null;
+	}
 }

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

@@ -0,0 +1,40 @@
+package org.joinmastodon.android.model;
+
+import android.view.Menu;
+
+import androidx.annotation.Nullable;
+
+import com.google.gson.annotations.SerializedName;
+
+import org.joinmastodon.android.R;
+
+public enum ContentType {
+	@SerializedName("text/plain")
+	PLAIN,
+	@SerializedName("text/html")
+	HTML,
+	@SerializedName("text/markdown")
+	MARKDOWN,
+	@SerializedName("text/bbcode")
+	BBCODE, // akkoma
+	@SerializedName("text/x.misskeymarkdown")
+	MISSKEY_MARKDOWN; // akkoma/*key
+
+	public static int getContentTypeRes(@Nullable ContentType contentType) {
+		return contentType == null ? R.id.content_type_null : switch(contentType) {
+			case PLAIN -> R.id.content_type_plain;
+			case HTML -> R.id.content_type_html;
+			case MARKDOWN -> R.id.content_type_markdown;
+			case BBCODE -> R.id.content_type_bbcode;
+			case MISSKEY_MARKDOWN -> R.id.content_type_misskey_markdown;
+		};
+	}
+
+	public static void adaptMenuToInstance(Menu m, Instance i) {
+		if (i.pleroma == null) {
+			// memo: change this if glitch or another mastodon fork supports bbcode or mfm
+			m.findItem(R.id.content_type_bbcode).setVisible(false);
+			m.findItem(R.id.content_type_misskey_markdown).setVisible(false);
+		}
+	}
+}

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

@@ -2,22 +2,22 @@ package org.joinmastodon.android.model;
 
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
 import com.google.gson.annotations.SerializedName;
 
 import org.joinmastodon.android.api.ObjectValidationException;
-import org.joinmastodon.android.api.RequiredField;
 import org.parceler.Parcel;
 
 import java.time.Instant;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 @Parcel
 public class Filter extends BaseModel{
-	@RequiredField
 	public String id;
-	@RequiredField
 	public String phrase;
 	public String title;
 	public transient EnumSet<FilterContext> context=EnumSet.noneOf(FilterContext.class);

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

@@ -1,8 +1,15 @@
 package org.joinmastodon.android.model;
 
+import org.joinmastodon.android.api.ObjectValidationException;
 import org.parceler.Parcel;
 
 @Parcel
 public class FilterResult extends BaseModel {
     public Filter filter;
+
+    @Override
+    public void postprocess() throws ObjectValidationException {
+        super.postprocess();
+        if (filter != null) filter.postprocess();
+    }
 }

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

@@ -39,6 +39,7 @@ public class ScheduledStatus extends BaseModel implements DisplayItemsParent{
         public String idempotency;
         public String applicationId;
         public List<String> mediaIds;
+        public ContentType contentType;
     }
 
     @Parcel

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

@@ -101,6 +101,9 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 			card.postprocess();
 		if(reblog!=null)
 			reblog.postprocess();
+		if(filtered!=null)
+			for(FilterResult fr : filtered)
+				fr.postprocess();
 
 		spoilerRevealed=GlobalUserPreferences.alwaysExpandContentWarnings || !sensitive;
 		if (visibility.equals(StatusPrivacy.LOCAL)) localOnly = true;

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

@@ -44,6 +44,7 @@ import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.ScheduledStatus;
@@ -217,6 +218,9 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 									public void onSuccess(GetStatusSourceText.Response result){
 										args.putString("sourceText", result.text);
 										args.putString("sourceSpoiler", result.spoilerText);
+										if (result.contentType != null) {
+											args.putString("sourceContentType", result.contentType.name());
+										}
 										if (redraft) {
 											UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{
 												Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);

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

@@ -55,7 +55,7 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 		for(Attachment att:attachments){
 			requests.add(new UrlImageLoaderRequest(switch(att.type){
 				case IMAGE -> att.url;
-				case VIDEO, GIFV -> att.previewUrl;
+				case VIDEO, GIFV -> att.previewUrl != null ? att.previewUrl : att.url;
 				default -> throw new IllegalStateException("Unexpected value: "+att.type);
 			}, 1000, 1000));
 		}

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

@@ -81,18 +81,10 @@ public abstract class StatusDisplayItem{
 		};
 	}
 
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification){
-		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, false, Filter.FilterContext.HOME);
-	}
-
 	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, Filter.FilterContext filterContext){
 		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, false, filterContext);
 	}
 
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate){
-		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, disableTranslate, Filter.FilterContext.HOME);
-	}
-
 	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate, Filter.FilterContext filterContext){
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
@@ -102,12 +94,8 @@ public abstract class StatusDisplayItem{
 		args.putString("account", accountID);
 		ScheduledStatus scheduledStatus = parentObject instanceof ScheduledStatus ? (ScheduledStatus) parentObject : null;
 
-		List<Filter> filters = AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream()
-			.filter(f -> f.context.contains(filterContext)).collect(Collectors.toList());
-		StatusFilterPredicate filterPredicate = new StatusFilterPredicate(filters);
-
-		if(!statusForContent.filterRevealed){
-			statusForContent.filterRevealed = filterPredicate.testWithWarning(status);
+		if (!statusForContent.filterRevealed) {
+			statusForContent.filterRevealed = new StatusFilterPredicate(accountID, filterContext, Filter.FilterAction.WARN).test(status);
 		}
 
 		ReblogOrReplyLineStatusDisplayItem replyLine = null;

mastodon/src/main/java/org/joinmastodon/android/ui/views/HeaderSubtitleLinearLayout.java

@@ -6,6 +6,8 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import me.grishka.appkit.utils.V;
+
 /**
  * A LinearLayout for TextViews. First child TextView will get truncated if it doesn't fit, remaining will always wrap content.
  */
@@ -36,7 +38,8 @@ public class HeaderSubtitleLinearLayout extends LinearLayout{
 			}
 			View first=getChildAt(0);
 			if(first instanceof TextView){
-				((TextView) first).setMaxWidth(remainingWidth);
+				// guaranteeing at least 64dp of width for the display name
+				((TextView) first).setMaxWidth(Math.max(remainingWidth, V.dp(64)));
 			}
 		}else{
 			View first=getChildAt(0);

mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java

@@ -85,7 +85,7 @@ public class MastodonLanguage {
 		private final MastodonLanguage fallbackLanguage;
 
 		public LanguageResolver(Instance instanceInfo) {
-			String fallbackLanguageTag = !instanceInfo.languages.isEmpty() ? instanceInfo.languages.get(0) : ENGLISH.languageTag;
+			String fallbackLanguageTag = (instanceInfo.languages != null && !instanceInfo.languages.isEmpty()) ? instanceInfo.languages.get(0) : ENGLISH.languageTag;
 			fallbackLanguage = allLanguages.stream()
 					.filter(l->l.languageTag.equalsIgnoreCase(fallbackLanguageTag)).findAny()
 					.orElse(ENGLISH);

mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java

@@ -8,52 +8,53 @@ import java.time.Instant;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class StatusFilterPredicate implements Predicate<Status>{
 	private final List<Filter> filters;
+	private final Filter.FilterContext context;
+	private final Filter.FilterAction action;
 
-	public StatusFilterPredicate(List<Filter> filters){
+	public StatusFilterPredicate(List<Filter> filters, Filter.FilterContext context){
 		this.filters=filters;
+		this.context = context;
+		this.action = Filter.FilterAction.HIDE;
 	}
 
+	/**
+	 * @param context null makes the predicate pass automatically
+	 */
 	public StatusFilterPredicate(String accountID, Filter.FilterContext context){
+		this(accountID, context, Filter.FilterAction.HIDE);
+	}
+
+	/**
+	 * @param context null makes the predicate pass automatically
+	 * @param action defines what the predicate should check:
+	 *               should not be hidden or should not display with warning
+	 */
+	public StatusFilterPredicate(String accountID, Filter.FilterContext context, Filter.FilterAction action){
 		filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(context)).collect(Collectors.toList());
+		this.context = context;
+		this.action = action;
 	}
 
 	@Override
 	public boolean test(Status status){
-		if(status.filtered!=null){
-			if (status.filtered.isEmpty()){
-				return true;
-			}
-			boolean matches=status.filtered.stream()
-					.map(filterResult->filterResult.filter)
-					.filter(filter->filter.expiresAt==null||filter.expiresAt.isAfter(Instant.now()))
-					.anyMatch(filter->filter.filterAction==Filter.FilterAction.HIDE);
-			return !matches;
-		}
-		for(Filter filter:filters){
-			if(filter.matches(status))
-				return false;
-		}
-		return true;
-	}
+		if (context == null) return true;
 
-	public boolean testWithWarning(Status status) {
-		if(status.filtered!=null){
-			if (status.filtered.isEmpty()){
-				return true;
-			}
-			boolean matches=status.filtered.stream()
-					.map(filterResult->filterResult.filter)
-					.filter(filter->filter.expiresAt==null||filter.expiresAt.isAfter(Instant.now()))
-					.anyMatch(filter->filter.filterAction==Filter.FilterAction.WARN);
-			return !matches;
-		}
-		for(Filter filter:filters){
-			if(filter.matches(status))
-				return false;
-		}
-		return true;
+		Stream<Filter> stream = status.filtered != null
+				// use server-provided per-status info (status.filtered) if available
+				? status.filtered.stream().map(f -> f.filter)
+				// or fall back to cached filters
+				: filters.stream().filter(filter -> filter.matches(status));
+
+		return stream
+				// discard expired filters
+				.filter(filter -> filter.expiresAt == null || filter.expiresAt.isAfter(Instant.now()))
+				// only apply filters for given context
+				.filter(filter -> filter.context.contains(context))
+				// treating filterAction = null (from filters list) as FilterAction.HIDE
+				.noneMatch(filter -> filter.filterAction == null ? action == Filter.FilterAction.HIDE : filter.filterAction == action);
 	}
 }

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M20.063 8.445c1.256 1.258 1.255 3.295-0.002 4.551l-7.114 7.102c-0.271 0.272-0.608 0.469-0.978 0.573l-4.613 1.303c-0.57 0.162-1.094-0.373-0.92-0.94l1.387-4.543c0.107-0.354 0.3-0.675 0.562-0.936l7.124-7.112c1.258-1.256 3.297-1.255 4.554 0.002zM8.15 2.37L8.2 2.475l3.253 8.249-1.157 1.155L9.556 10H5.443l-0.995 2.52c-0.14 0.354-0.518 0.542-0.876 0.454l-0.098-0.031c-0.353-0.14-0.54-0.518-0.452-0.876l0.03-0.098 3.754-9.495C7.042 1.88 7.85 1.844 8.151 2.37zM7.503 4.792L6.036 8.5h2.928L7.503 4.792z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M20.063 8.445c1.256 1.258 1.255 3.295-0.002 4.551l-7.123 7.112c-0.263 0.262-0.587 0.455-0.943 0.562l-4.293 1.29c-0.529 0.159-1.086-0.141-1.245-0.67-0.058-0.194-0.056-0.402 0.006-0.594l1.361-4.228c0.11-0.34 0.3-0.65 0.552-0.903l7.133-7.121c1.258-1.256 3.297-1.255 4.554 0.002zm-3.494 1.06l-7.133 7.12c-0.084 0.085-0.147 0.188-0.184 0.301l-1.07 3.323 3.382-1.015c0.119-0.036 0.227-0.1 0.314-0.188L19 11.936c0.672-0.671 0.672-1.76 0.002-2.43-0.672-0.672-1.76-0.673-2.433-0.002zM8.15 2.37L8.2 2.475l3.253 8.249-1.157 1.155L9.556 10H5.443l-0.995 2.52c-0.14 0.354-0.518 0.542-0.876 0.454l-0.098-0.031c-0.353-0.14-0.54-0.518-0.452-0.876l0.03-0.098 3.754-9.495C7.042 1.88 7.85 1.844 8.151 2.37zM7.503 4.792L6.036 8.5h2.928L7.503 4.792z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--~ Copyright (c) 2023. ~ Microsoft Corporation. All rights reserved.-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_fluent_text_edit_style_24_filled" android:state_activated="true"/>
+    <item android:drawable="@drawable/ic_fluent_text_edit_style_24_filled" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_fluent_text_edit_style_24_filled" android:state_selected="true"/>
+    <item android:drawable="@drawable/ic_fluent_text_edit_style_24_regular"/>
+</selector>

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

@@ -416,6 +416,19 @@
 				android:tooltipText="@string/post_visibility"
 				android:src="@drawable/ic_fluent_earth_24_regular"/>
 
+			<ImageButton
+				android:id="@+id/btn_content_type"
+				android:layout_width="36dp"
+				android:layout_height="36dp"
+				android:layout_marginEnd="12dp"
+				android:background="?android:attr/actionBarItemBackground"
+				android:padding="0px"
+				android:tint="@color/compose_button"
+				android:tintMode="src_in"
+				android:contentDescription="@string/sk_content_type"
+				android:tooltipText="@string/sk_content_type"
+				android:src="@drawable/ic_fluent_text_edit_style_24_selector"/>
+
 			<Space
 				android:layout_width="0px"
 				android:layout_height="1px"

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

@@ -56,9 +56,9 @@
 	<TextView
 		android:id="@+id/username"
 		android:layout_width="match_parent"
-		android:layout_height="20dp"
-		android:layout_alignLeft="@id/name"
-		android:layout_alignRight="@id/name"
+		android:layout_height="wrap_content"
+		android:layout_alignStart="@id/name"
+		android:layout_alignEnd="@id/name"
 		android:layout_below="@id/name"
 		android:singleLine="true"
 		android:ellipsize="end"
@@ -87,15 +87,18 @@
 			android:layout_width="0dp"
 			android:layout_weight="1"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:paddingBottom="16dp"
-			android:layout_marginStart="16dp">
+			android:layout_marginBottom="16dp"
+			android:layout_marginStart="16dp"
+			android:layout_gravity="bottom"
+			android:paddingTop="4dp"
+			android:gravity="center_vertical"
+			android:minHeight="44dp">
 
 			<LinearLayout
 				android:id="@+id/posts_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="8dp"
+				android:layout_marginTop="2dp"
 				android:layout_marginEnd="8dp"
 				android:gravity="center_vertical"
 				android:orientation="horizontal">
@@ -122,7 +125,7 @@
 				android:id="@+id/following_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="8dp"
+				android:layout_marginTop="2dp"
 				android:layout_marginEnd="8dp"
 				android:orientation="horizontal"
 				android:gravity="center_vertical">
@@ -149,7 +152,7 @@
 				android:id="@+id/followers_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="8dp"
+				android:layout_marginTop="2dp"
 				android:orientation="horizontal"
 				android:gravity="center_vertical">
 				<TextView

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

@@ -13,7 +13,7 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="32dp"
+        android:layout_marginEnd="16dp"
         android:importantForAccessibility="no"
         android:tint="?android:textColorPrimary"
         tools:src="@drawable/ic_fluent_color_24_regular"/>
@@ -24,6 +24,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
         android:paddingVertical="8dp"
         android:gravity="center_vertical"

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:id="@+id/content_type_group" android:checkableBehavior="single">
+        <item android:id="@+id/content_type_null" android:title="@string/sk_content_type_unspecified" />
+        <item android:id="@+id/content_type_plain" android:title="@string/sk_content_type_plain" />
+        <item android:id="@+id/content_type_markdown" android:title="@string/sk_content_type_markdown" />
+        <item android:id="@+id/content_type_html" android:title="@string/sk_content_type_html" />
+        <item android:id="@+id/content_type_bbcode" android:title="@string/sk_content_type_bbcode" />
+        <item android:id="@+id/content_type_misskey_markdown" android:title="@string/sk_content_type_mfm" />
+    </group>
+</menu>

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

@@ -10,11 +10,13 @@
 	<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="user_followed_you">begyndte at følge dig</string>
 	<string name="user_sent_follow_request">sendte dig en følgeanmodning</string>
 	<string name="user_favorited">favoritmarkerede dit indlæg</string>
+	<string name="notification_boosted">fremhævede dit indlæg</string>
 	<string name="poll_ended">afstemning afsluttet</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%d m</string>
@@ -164,6 +166,7 @@
 	<string name="report_sent_subtitle">Mens dette gennemgås, kan du selv bortfiltrere indlæg fra %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 den pågældendes indlæg eller fremhævninger i din tidslinje. Vedkommende vil ikke få besked om dæmpningen.</string>
 	<string name="block_user_explain">Vedkommende vil ikke længere kunne følge dig eller se dine indlæg, men vedkommende kan se blokeringen.</string>
 	<string name="report_personal_title">Ønsker du ikke at se dette?</string>
 	<string name="report_personal_subtitle">Når du ser noget, du ikke kan lide på Mastodon, kan du fjerne personen fra din tidslinje.</string>
@@ -220,6 +223,7 @@
 	<string name="skip">Spring over</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>
@@ -246,6 +250,7 @@
 	<string name="notify_none">ingen</string>
 	<string name="notify_favorites">Favoritmarkerede mit indlæg</string>
 	<string name="notify_follow">Følger mig</string>
+	<string name="notify_reblog">Fremhæver mit indlæg</string>
 	<string name="notify_mention">Nævner mig</string>
 	<string name="settings_boring">Den kedelige zone</string>
 	<string name="settings_account">Kontoindstillinger</string>
@@ -266,6 +271,7 @@
 	<string name="hide_content">Skjul indhold</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_share">Del</string>
 	<string name="media_no_description">Medier uden beskrivelse</string>
@@ -279,7 +285,10 @@
 	<string name="follow_user">Følg %s</string>
 	<string name="unfollowed_user">Følg ikke længere %s</string>
 	<string name="followed_user">Du følger nu %s</string>
+	<string name="following_user_requested">Anmodede om at følge %s</string>
 	<string name="open_in_browser">Åbn i browser</string>
+	<string name="hide_boosts_from_user">Skjul fremhævninger fra %s</string>
+	<string name="show_boosts_from_user">Vis fremhævninger fra %s</string>
 	<string name="signup_reason">Hvorfor ønsker du at tilmelde dig?</string>
 	<string name="signup_reason_note">Dette hjælper os med at vurdere din ansøgning.</string>
 	<string name="clear">Ryd</string>
@@ -321,8 +330,13 @@
 		<item quantity="one">%,d favoritmarkering</item>
 		<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>
+	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nu</string>
+	<string name="post_info_reblogs">Fremhævninger</string>
 	<string name="post_info_favorites">Favoritmarkeringer</string>
 	<string name="edit_history">Rediger historik</string>
 	<string name="last_edit_at_x">Senest ændret: %s</string>
@@ -369,6 +383,7 @@
 	<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="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>
@@ -402,7 +417,31 @@
 	<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="signup_username_taken">Brugernavnet er allerede i brug.</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>
+	<string name="save_changes">Gem ændringer</string>
+	<string name="profile_featured">Fremhævet</string>
+	<string name="profile_timeline">Tidslinje</string>
+	<string name="view_all">Se alle</string>
+	<string name="profile_endorsed_accounts">Konti</string>
+	<string name="verified_link">Bekræftet link</string>
+	<string name="show">Vis</string>
+	<string name="hide">Skjul</string>
+	<string name="join_default_server">Tilmeld dig %s</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>
 </resources>

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

@@ -10,11 +10,13 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Authentifizierung wird vorbereitet …</string>
 	<string name="finishing_auth">Authentifizierung wird abgeschlossen …</string>
+	<string name="user_boosted">%s hat geteilt</string>
 	<string name="in_reply_to">Als Antwort auf %s</string>
 	<string name="notifications">Benachrichtigungen</string>
 	<string name="user_followed_you">folgt dir jetzt</string>
 	<string name="user_sent_follow_request">hat dir eine Follower-Anfrage gesendet</string>
 	<string name="user_favorited">favorisierte</string>
+	<string name="notification_boosted">teilte deinen Beitrag</string>
 	<string name="poll_ended">Abstimmung beendet</string>
 	<string name="time_seconds">vor %d Sekunden</string>
 	<string name="time_minutes">vor %d Minuten</string>
@@ -164,6 +166,7 @@
 	<string name="report_sent_subtitle">Während wir den Vorfall überprüfen, kannst du gegen %s weitere Maßnahmen ergreifen.</string>
 	<string name="unfollow_user">%s entfolgen</string>
 	<string name="unfollow">Entfolgen</string>
+	<string name="mute_user_explain">Du wirst die eigenen und geteilten Beiträge des Kontos nicht mehr sehen können. Dass du das Profil stummgeschaltet hast, erfährt die Person nicht.</string>
 	<string name="block_user_explain">Dir wird es nicht länger möglich sein, die Beiträge dieses Konto zu sehen. Das blockierte Profil wird nicht mehr in der Lage sein, deine Beiträge zu sehen oder dir zu folgen. Die Person hinter dem Konto wird mitbekommen, dass du ihr Konto gesperrt hast.</string>
 	<string name="report_personal_title">Möchtest du das nicht mehr sehen?</string>
 	<string name="report_personal_subtitle">Wenn du etwas auf Mastodon siehst, das dir nicht gefällt, kannst du die Person aus deinem Umfeld entfernen.</string>
@@ -220,6 +223,7 @@
 	<string name="skip">Überspringen</string>
 	<string name="notification_type_follow">Neue Follower</string>
 	<string name="notification_type_favorite">Favoriten</string>
+	<string name="notification_type_reblog">Geteilte Beiträge</string>
 	<string name="notification_type_mention">Erwähnungen</string>
 	<string name="notification_type_poll">Umfragen</string>
 	<string name="choose_account">Konto auswählen</string>
@@ -246,6 +250,7 @@
 	<string name="notify_none">niemand</string>
 	<string name="notify_favorites">meinen Beitrag favorisiert</string>
 	<string name="notify_follow">mir folgt</string>
+	<string name="notify_reblog">Teilte meinen Beitrag</string>
 	<string name="notify_mention">mich erwähnt</string>
 	<string name="settings_boring">Langweiliges</string>
 	<string name="settings_account">Kontoeinstellungen</string>
@@ -266,6 +271,7 @@
 	<string name="hide_content">Inhalt ausblenden</string>
 	<string name="new_post">Neuer Beitrag</string>
 	<string name="button_reply">Antworten</string>
+	<string name="button_reblog">Teilen</string>
 	<string name="button_favorite">Favorisieren</string>
 	<string name="button_share">Teilen</string>
 	<string name="media_no_description">Medien ohne Beschreibung</string>
@@ -281,6 +287,8 @@
 	<string name="followed_user">Du folgst nun %s</string>
 	<string name="following_user_requested">Deine Follower-Anfrage an %s wurde gesendet</string>
 	<string name="open_in_browser">Im Browser öffnen</string>
+	<string name="hide_boosts_from_user">Geteilte Beiträge von %s verstecken</string>
+	<string name="show_boosts_from_user">Geteilte Beiträge von %s anzeigen</string>
 	<string name="signup_reason">Warum möchtest du beitreten?</string>
 	<string name="signup_reason_note">Das erleichtert uns die Prüfung deiner Anmeldung.</string>
 	<string name="clear">Leeren</string>
@@ -322,8 +330,13 @@
 		<item quantity="one">%,d × favorisiert</item>
 		<item quantity="other">%,d × favorisiert</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d geteilter Beitrag</item>
+		<item quantity="other">%,d geteilte Beiträge</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">jetzt</string>
+	<string name="post_info_reblogs">Geteilte Beiträge</string>
 	<string name="post_info_favorites">Favoriten</string>
 	<string name="edit_history">Verlauf bearbeiten</string>
 	<string name="last_edit_at_x">Zuletzt bearbeitet: %s</string>
@@ -413,4 +426,20 @@
 	<!-- %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 lässt keine Anmeldungen von %2$s zu. Versuche einen anderen oder &lt;a&gt;wähle einen anderen Server&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Dieser Benutzername ist bereits vergeben.</string>
+	<string name="spoiler_show">Trotzdem anzeigen</string>
+	<string name="spoiler_hide">Wieder verstecken</string>
+	<string name="poll_multiple_choice">Wähle ein/e oder mehrere aus</string>
+	<string name="save_changes">Änderungen speichern</string>
+	<string name="profile_featured">Empfohlen</string>
+	<string name="profile_timeline">Timeline</string>
+	<string name="view_all">Alle anzeigen</string>
+	<string name="profile_endorsed_accounts">Konten</string>
+	<string name="verified_link">Verifizierter Link</string>
+	<string name="show">Anzeigen</string>
+	<string name="hide">Ausblenden</string>
+	<string name="join_default_server">%s beitreten</string>
+	<string name="signup_or_login">oder</string>
+	<string name="learn_more">Mehr erfahren</string>
+	<string name="welcome_to_mastodon">Willkommen auf Mastodon</string>
+	<string name="what_are_servers">Was sind Server?</string>
 </resources>

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

@@ -6,11 +6,11 @@
 	<string name="next">Επόμενο</string>
 	<string name="loading_instance">Ανάκτηση πληροφοριών διακομιστή…</string>
 	<string name="error">Σφάλμα</string>
-	<string name="not_a_mastodon_instance">%s δεν φαίνεται να είναι διακομιστής Mastodon.</string>
+	<string name="not_a_mastodon_instance">Το %s δε φαίνεται να είναι διακομιστής Mastodon.</string>
 	<string name="ok">ΟΚ</string>
 	<string name="preparing_auth">Προετοιμασία για έλεγχο ταυτότητας…</string>
 	<string name="finishing_auth">Ολοκλήρωση ταυτοποίησης…</string>
-	<string name="user_boosted">%s ενισχύθηκε</string>
+	<string name="user_boosted">Ο χρήστης %s ενίσχυσε</string>
 	<string name="in_reply_to">Σε απάντηση στο %s</string>
 	<string name="notifications">Ειδοποιήσεις</string>
 	<string name="user_followed_you">σε ακολουθεί</string>
@@ -61,7 +61,7 @@
 		<item quantity="other">%,d αναρτήσεις</item>
 	</plurals>
 	<string name="profile_joined">Έγινε μέλος</string>
-	<string name="done">Εγινε</string>
+	<string name="done">Έγινε</string>
 	<string name="loading">Φόρτωση…</string>
 	<string name="field_label">Περιγραφή</string>
 	<string name="field_content">Περιεχόμενο</string>
@@ -122,7 +122,7 @@
 	<string name="tap_to_reveal">Πάτα για εμφάνιση</string>
 	<string name="delete">Διαγραφή</string>
 	<string name="confirm_delete_title">Διαγραφή ανάρτησης</string>
-	<string name="confirm_delete">Είσαι βέβαιοος ότι θες να διαγράψεις την ανάρτηση;</string>
+	<string name="confirm_delete">Είσαι βέβαιος ότι θες να διαγράψεις την ανάρτηση;</string>
 	<string name="deleting">Διαγραφή…</string>
 	<string name="notification_channel_audio_player">Αναπαραγωγή ήχου</string>
 	<string name="play">Αναπαραγωγή</string>
@@ -146,9 +146,9 @@
 	<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_choose_reason_subtitle">Διάλεξε την καλύτερη αντιστοίχιση</string>
 	<string name="report_reason_personal">Δεν μου αρέσει</string>
-	<string name="report_reason_personal_subtitle">Δεν είναι κάτι που θα ηθέλες να δεις</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>
@@ -160,22 +160,22 @@
 	<string name="report_choose_posts">Υπάρχουν αναρτήσεις που τεκμηριώνουν αυτή την αναφορά;</string>
 	<string name="report_choose_posts_subtitle">Επίλεξε όλα όσα ισχύουν</string>
 	<string name="report_comment_title">Υπάρχει κάτι άλλο που πρέπει να γνωρίζουμε;</string>
-	<string name="report_comment_hint">Επιπλέον σχόλια</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="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="report_personal_subtitle">Όταν βλέπεις κάτι που δε σου αρέσει στο Mastodon, μπορείς να αφαιρέσεις το άτομο από την εμπειρία σου.</string>
 	<string name="back">Πίσω</string>
 	<string name="instance_catalog_title">Το Mastodon αποτελείται από χρήστες σε διαφορετικούς διακομιστές.</string>
 	<string name="instance_catalog_subtitle">Διάλεξε ένα διακομιστή με βάση τα ενδιαφέροντά σου, την περιοχή ή έναν γενικού σκοπού. Μπορείς ακόμα να συνδεθείς με όλους, ανεξάρτητα από το διακομιστή.</string>
 	<string name="search_communities">Όνομα διακομιστή ή διεύθυνση URL</string>
 	<string name="instance_rules_title">Κανόνες Διακομιστή</string>
-	<string name="instance_rules_subtitle">Συνεχίζοντας, συμφωνείτε να ακολουθήσετε υπό τους ακόλουθους κανόνες που έχουν οριστεί και επιβάλλονται από τους %s συντονιστές.</string>
+	<string name="instance_rules_subtitle">Συνεχίζοντας, συμφωνείς να τηρείς τους ακόλουθους κανόνες που έχουν οριστεί και επιβάλλονται από τους %s συντονιστές.</string>
 	<string name="signup_title">Δημιουργία Λογαριασμού</string>
 	<string name="edit_photo">επεξεργασία</string>
 	<string name="display_name">Όνομα</string>
@@ -197,14 +197,14 @@
 	<string name="category_music">Μουσική</string>
 	<string name="category_regional">Τοπικό</string>
 	<string name="category_tech">Τεχνολογία</string>
-	<string name="confirm_email_title">Έλεγξε Τα Εισερχόμενα Σου</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="confirm_email_didnt_get">Δεν έλαβες τον σύνδεσμο;</string>
 	<string name="resend">Επαναποστολή</string>
 	<string name="open_email_app">Άνοιγμα εφαρμογής email</string>
 	<string name="resent_email">Το email επιβεβαίωσης εστάλη</string>
-	<string name="compose_hint">Πληκτρολόγησε ή επικολλησε τι υπάρχει στο μυαλό σου</string>
+	<string name="compose_hint">Πληκτρολόγησε ή επικόλλησε τί έχεις στο μυαλό σου</string>
 	<string name="content_warning">Προειδοποίηση περιεχομένου</string>
 	<string name="add_image_description">Προσθήκη περιγραφής εικόνας…</string>
 	<string name="retry_upload">Επανάληψη μεταμόρφωσης</string>
@@ -212,7 +212,7 @@
 	<string name="save">Αποθήκευση</string>
 	<string name="add_alt_text">Προσθήκη εναλλακτικού κειμένου</string>
 	<string name="alt_text_subtitle">Το εναλλακτικό κείμενο περιγράφει τις φωτογραφίες σου για άτομα με χαμηλή ή καθόλου όραση. Προσπάθησε να συμπεριλάβεις μόνο όσες λεπτομέρειες χρειάζεται για να γίνει κατανοητό το περιεχόμενο.</string>
-	<string name="alt_text_hint">π.χ. Ένας σκύλος που κοιτάζει γύρω του ύποπτα με μισόκλειστα μάτια στην κάμερα.</string>
+	<string name="alt_text_hint">πχ. Ένας σκύλος που κοιτάζει γύρω του ύποπτα με μισόκλειστα μάτια στην κάμερα.</string>
 	<string name="visibility_public">Δημόσιο</string>
 	<string name="visibility_followers_only">Μόνο ακόλουθοι</string>
 	<string name="visibility_private">Μόνο άτομα που επισημαίνω</string>
@@ -252,14 +252,14 @@
 	<string name="notify_follow">Με ακολουθεί</string>
 	<string name="notify_reblog">Ενισχύει την ανάρτησή μου</string>
 	<string name="notify_mention">Με επισημαίνει</string>
-	<string name="settings_boring">Η βαρετή ζώνη</string>
+	<string name="settings_boring">Η ζώνη της βαρεμάρας</string>
 	<string name="settings_account">Ρυθμίσεις λογαριασμού</string>
 	<string name="settings_contribute">Συνείσφερε στο Mastodon</string>
 	<string name="settings_tos">Όροι χρήσης</string>
 	<string name="settings_privacy_policy">Πολιτική απορρήτου</string>
 	<string name="settings_spicy">Η πικάντικη ζώνη</string>
 	<string name="settings_clear_cache">Εκκαθάριση προσωρινής μνήμης πολυμέσων</string>
-	<string name="settings_app_version">Mastodon για Android έκδοση %1$s (%2$d)</string>
+	<string name="settings_app_version">Mastodon για Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Η προσωρινή μνήμη πολυμέσων καθαρίστηκε</string>
 	<string name="confirm_log_out">Είσαι βέβαιος ότι θες να αποσυνδεθείς;</string>
 	<string name="sensitive_content">Ευαίσθητο περιεχόμενο</string>
@@ -285,7 +285,7 @@
 	<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="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>
@@ -297,7 +297,7 @@
 	<string name="reorder">Αναδιάταξη</string>
 	<string name="download">Λήψη</string>
 	<string name="permission_required">Απαιτούνται δικαιώματα</string>
-	<string name="storage_permission_to_download">Η εφαρμογή χρειάζεται πρόσβαση στον αποθηκευτικό σου χώρο για να αποθηκεύσεις αυτό το αρχείο.</string>
+	<string name="storage_permission_to_download">Η εφαρμογή χρειάζεται πρόσβαση στον αποθηκευτικό σου χώρο για να αποθηκεύσει αυτό το αρχείο.</string>
 	<string name="open_settings">Άνοιγμα ρυθμίσεων</string>
 	<string name="error_saving_file">Σφάλμα αποθήκευσης αρχείου</string>
 	<string name="file_saved">Το αρχείο αποθηκεύτηκε</string>
@@ -311,7 +311,7 @@
 	<string name="dismiss">Παράβλεψη</string>
 	<string name="see_new_posts">Δες νέες αναρτήσεις</string>
 	<string name="load_missing_posts">Φόρτωση αναρτήσεων που λείπουν</string>
-	<string name="follow_back">Ακολούθησε Και Συ</string>
+	<string name="follow_back">Ακολούθησε και εσύ</string>
 	<string name="button_follow_pending">Εκκρεμεί</string>
 	<string name="follows_you">Σε ακολουθεί</string>
 	<string name="manually_approves_followers">Χειροκίνητη έγκριση ακολούθων</string>
@@ -438,11 +438,11 @@
 	<string name="show">Εμφάνιση</string>
 	<string name="hide">Απόκρυψη</string>
 	<string name="join_default_server">Συμμετοχή %s</string>
-	<string name="pick_server">Επίλεξε το δικό μου διακομιστή</string>
+	<string name="pick_server">Διάλεξε άλλο διακομιστή</string>
 	<string name="signup_or_login">ή</string>
 	<string name="learn_more">Μάθε περισσότερα</string>
 	<string name="welcome_to_mastodon">Καλώς ήρθες στο Mastodon</string>
-	<string name="welcome_paragraph1">Το 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"><![CDATA[Κάθε λογαριασμός Mastodon φιλοξενείται σε ένα διακομιστή - ο καθένας με τις δικές του αξίες, κανόνες και διαχειριστές. Ανεξάρτητα από το ποιον μπορεί να επιλέξεις, μπορείς να ακολουθήσεις και να αλληλεπιδράσεις με άτομα από οποιονδήποτε διακομιστή.]]></string>
 </resources>

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

@@ -10,11 +10,13 @@
 	<string name="ok">Aceptar</string>
 	<string name="preparing_auth">Preparando para autenticación…</string>
 	<string name="finishing_auth">Finalizando autenticación…</string>
+	<string name="user_boosted">%s retooteó</string>
 	<string name="in_reply_to">En respuesta a %s</string>
 	<string name="notifications">Notificaciones</string>
 	<string name="user_followed_you">ha empezado a seguirte</string>
 	<string name="user_sent_follow_request">te envió una solicitud de seguimiento</string>
 	<string name="user_favorited">marcó como favorita</string>
+	<string name="notification_boosted">retooteó tu publicación</string>
 	<string name="poll_ended">encuesta finalizada</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -164,6 +166,7 @@
 	<string name="report_sent_subtitle">Mientras revisamos esto, puedes tomar medidas contra %s.</string>
 	<string name="unfollow_user">Dejar de seguir a %s</string>
 	<string name="unfollow">Dejar de seguir</string>
+	<string name="mute_user_explain">No verás sus publicaciones o reblogueos en tu línea temporal. No sabrán que han sido silenciados.</string>
 	<string name="block_user_explain">Ya no podrán seguir o ver tus mensajes, pero pueden ver si han sido bloqueados.</string>
 	<string name="report_personal_title">¿No quieres ver esto?</string>
 	<string name="report_personal_subtitle">Cuando vea en Mastodon algo que no le agrada, puede sacar a la persona de su experiencia.</string>
@@ -220,6 +223,7 @@
 	<string name="skip">Saltar</string>
 	<string name="notification_type_follow">Nuevos seguidores</string>
 	<string name="notification_type_favorite">Favoritos</string>
+	<string name="notification_type_reblog">Retoots</string>
 	<string name="notification_type_mention">Menciones</string>
 	<string name="notification_type_poll">Encuestas</string>
 	<string name="choose_account">Elegir cuenta</string>
@@ -246,6 +250,7 @@
 	<string name="notify_none">nadie</string>
 	<string name="notify_favorites">Marca mi post como favorito</string>
 	<string name="notify_follow">Me sigue</string>
+	<string name="notify_reblog">Retootearán mi publicación</string>
 	<string name="notify_mention">Me menciona</string>
 	<string name="settings_boring">La zona aburrida</string>
 	<string name="settings_account">Ajustes de la cuenta</string>
@@ -266,6 +271,7 @@
 	<string name="hide_content">Ocultar contenido</string>
 	<string name="new_post">Nuevo post</string>
 	<string name="button_reply">Responder</string>
+	<string name="button_reblog">Retootear</string>
 	<string name="button_favorite">Favorito</string>
 	<string name="button_share">Compartir</string>
 	<string name="media_no_description">Medios sin descripción</string>
@@ -281,6 +287,8 @@
 	<string name="followed_user">Ahora estás siguiendo a %s</string>
 	<string name="following_user_requested">%s solicitó seguirte</string>
 	<string name="open_in_browser">Abrir en el navegador</string>
+	<string name="hide_boosts_from_user">Ocultar retoots de %s</string>
+	<string name="show_boosts_from_user">Mostrar retoots de %s</string>
 	<string name="signup_reason">¿Por qué quieres unirte?</string>
 	<string name="signup_reason_note">Esto nos ayudará a revisar su solicitud.</string>
 	<string name="clear">Borrar</string>
@@ -322,8 +330,13 @@
 		<item quantity="one">%,d favorito</item>
 		<item quantity="other">%,d favoritos</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d retooteo</item>
+		<item quantity="other">%,d retooteos</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s a través de %2$s</string>
 	<string name="time_now">ahora</string>
+	<string name="post_info_reblogs">Retoots</string>
 	<string name="post_info_favorites">Favoritos</string>
 	<string name="edit_history">Editar historial</string>
 	<string name="last_edit_at_x">Última edición: %s</string>
@@ -413,4 +426,23 @@
 	<!-- %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 no permite registros desde %2$s. Prueba uno diferente o &lt;a&gt;elige un servidor diferente&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Este nombre de usuario ya existe.</string>
+	<string name="spoiler_show">Mostrar de todos modos</string>
+	<string name="spoiler_hide">Volver a ocultar</string>
+	<string name="poll_multiple_choice">Escoge una o más</string>
+	<string name="save_changes">Guardar cambios</string>
+	<string name="profile_featured">Destacado</string>
+	<string name="profile_timeline">Línea de tiempo</string>
+	<string name="view_all">Ver todo</string>
+	<string name="profile_endorsed_accounts">Cuentas</string>
+	<string name="verified_link">Enlace verificado</string>
+	<string name="show">Mostrar</string>
+	<string name="hide">Ocultar</string>
+	<string name="join_default_server">Unirse a %s</string>
+	<string name="pick_server">Elegir otro servidor</string>
+	<string name="signup_or_login">o</string>
+	<string name="learn_more">Saber más</string>
+	<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>
 </resources>

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

@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="get_started">Cruthaich cunntas</string>
+	<string name="already_have_account">Tha cunntas agam mu thràth</string>
 	<string name="log_in">Clàraich a-steach</string>
 	<string name="next">Air adhart</string>
+	<string name="loading_instance">A’ faighinn fiosrachadh an fhrithealaiche…</string>
 	<string name="error">Mearachd</string>
+	<string name="not_a_mastodon_instance">Tha coltas nach eil %s ’na fhrithealaiche Mastodon.</string>
 	<string name="ok">Ceart ma-thà</string>
 	<string name="preparing_auth">Ag ullachadh an dearbhaidh…</string>
 	<string name="finishing_auth">A’ crìochnachadh an dearbhaidh…</string>
+	<string name="user_boosted">’Ga bhrosnachadh le %s</string>
 	<string name="in_reply_to">A’ freagairt dha %s</string>
 	<string name="notifications">Brathan</string>
 	<string name="user_followed_you">– ’s iad ’gad leantainn a-nis</string>
 	<string name="user_sent_follow_request">– ’s iad air iarrtas leantainn a chur thugad</string>
 	<string name="user_favorited">– ’s iad air am post agad a chur ris na h-annsachdan aca</string>
+	<string name="notification_boosted">– ’s iad air a’ phost agad a bhrosnachadh</string>
 	<string name="poll_ended">Thàinig cunntas-bheachd gu crìoch</string>
 	<string name="time_seconds">%dd</string>
 	<string name="time_minutes">%dm</string>
@@ -188,13 +194,23 @@
 	<string name="report_sent_subtitle">Fhad ’s a bhios sinn a’ toirt sùil air, seo nas urrainn dhut dèanamh an aghaidh %s.</string>
 	<string name="unfollow_user">Na lean %s tuilleadh</string>
 	<string name="unfollow">Na lean tuilleadh</string>
+	<string name="mute_user_explain">Chan fhaic thu na postaichean aca is na bhrosnaich iad ’nad dachaigh tuilleadh. Cha bhi fios aca gun do mhùch thu iad.</string>
 	<string name="block_user_explain">Chan urrainn dhaibh ’gad leantainn is chan fhaic iad na postaichean agad tuilleadh ach chì iad gun deach am bacadh.</string>
 	<string name="report_personal_title">Nach eil thu airson seo fhaicinn?</string>
 	<string name="report_personal_subtitle">Nuair a chì thu rudeigin nach toigh leat air Mastodon, ’s urrainn dhut an neach a chumail fad air falbh uat.</string>
 	<string name="back">Air ais</string>
 	<string name="instance_catalog_title">Tha cleachdaichean Mhastodon air iomadh frithealaiche eadar-dhealaichte.</string>
 	<string name="instance_catalog_subtitle">Tagh frithealaiche stèidhichte air d’ ùidhean, air far a bheil thu no fear coitcheann. ’S urrainn dhut conaltradh leis a h-uile duine fhathast ge b’ e am frithealaiche.</string>
+	<string name="search_communities">Ainm no URL an fhrithealaiche</string>
+	<string name="instance_rules_title">Riaghailtean an fhrithealaiche</string>
+	<string name="instance_rules_subtitle">Ma leanas tu air adhart, aontaichidh tu ris na riaghailtean a tha ’gan suidheachadh is èigneachadh leis na maoir aig %s.</string>
+	<string name="signup_title">Cruthaich cunntas</string>
 	<string name="edit_photo">deasaich</string>
+	<string name="display_name">Ainm</string>
+	<string name="username">Ainm-cleachdaiche</string>
+	<string name="email">Post-d</string>
+	<string name="password">Facal-faire</string>
+	<string name="confirm_password">Dearbh am facal-faire</string>
 	<string name="password_note">Gabh a-steach litrichean mòra, caractaran sònraichte agus àireamhan airson am facal-faire agad a dhèanamh nas treasa.</string>
 	<string name="category_academia">Sgoilearachd</string>
 	<string name="category_activism">Iomairteachd</string>
@@ -209,7 +225,10 @@
 	<string name="category_music">Ceòl</string>
 	<string name="category_regional">Sgìreil</string>
 	<string name="category_tech">Teicneolas</string>
+	<string name="confirm_email_title">Thoir sùil air a’ bhogsa a-steach agad</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Thoir gnogag air a’ cheangal a chuir sinn thugad a dhearbhadh %s. Fuirichidh sinn ort an-seo.</string>
+	<string name="confirm_email_didnt_get">Nach d’fhuair thu ceangal?</string>
 	<string name="resend">Cuir a-rithist</string>
 	<string name="open_email_app">Fosgail aplacaid a’ phuist-d</string>
 	<string name="resent_email">Chaidh post-d dearbhaidh a chur</string>
@@ -232,6 +251,7 @@
 	<string name="skip">Leum thairis air</string>
 	<string name="notification_type_follow">Luchd-leantainn ùr</string>
 	<string name="notification_type_favorite">Annsachdan</string>
+	<string name="notification_type_reblog">Brosnachaidhean</string>
 	<string name="notification_type_mention">Iomraidhean</string>
 	<string name="notification_type_poll">Cunntasan-bheachd</string>
 	<string name="choose_account">Tagh cunntas</string>
@@ -260,6 +280,7 @@
 	<string name="notify_none">nach bi duine sam bith</string>
 	<string name="notify_favorites">air post uam a chur ris na h-annsachdan</string>
 	<string name="notify_follow">air mo leantainn</string>
+	<string name="notify_reblog">air post agam a bhrosnachadh</string>
 	<string name="notify_mention">air iomradh a thoirt orm</string>
 	<string name="settings_boring">An earrann ràsanach</string>
 	<string name="settings_account">Roghainnean a’ chunntais</string>
@@ -280,6 +301,7 @@
 	<string name="hide_content">Falaich an t-susbaint</string>
 	<string name="new_post">Post ùr</string>
 	<string name="button_reply">Freagair</string>
+	<string name="button_reblog">Brosnaich</string>
 	<string name="button_favorite">Cuir ris na h-annsachdan</string>
 	<string name="button_share">Co-roinn</string>
 	<string name="media_no_description">Meadhan gun tuairisgeul</string>
@@ -293,7 +315,11 @@
 	<string name="follow_user">Lean %s</string>
 	<string name="unfollowed_user">Chan eil thu a’ leantainn %s tuilleadh</string>
 	<string name="followed_user">Tha thu a’ leantainn %s a-nis</string>
+	<string name="following_user_requested">Dh’iarr thu %s a leantainn</string>
 	<string name="open_in_browser">Fosgail sa bhrabhsair</string>
+	<string name="hide_boosts_from_user">Falaich na brosnachaidhean o %s</string>
+	<string name="show_boosts_from_user">Seall na brosnachaidhean o %s</string>
+	<string name="signup_reason">Carson a bu mhiann leat ballrachd fhaighinn?</string>
 	<string name="signup_reason_note">Bidh e nas fhasa dhuinn lèirmheas a dhèanamh air d’ iarrtas.</string>
 	<string name="clear">Falamhaich</string>
 	<string name="profile_header">Dealbh a’ bhanna-chinn</string>
@@ -340,8 +366,15 @@
 		<item quantity="few">%,d annsachdan</item>
 		<item quantity="other">%,d annsachd</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d bhrosnachadh</item>
+		<item quantity="two">%,d bhrosnachadh</item>
+		<item quantity="few">%,d brosnachaidhean</item>
+		<item quantity="other">%,d brosnachadh</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s slighe %2$s</string>
 	<string name="time_now">an-dràsta</string>
+	<string name="post_info_reblogs">Brosnachaidhean</string>
 	<string name="post_info_favorites">Annsachdan</string>
 	<string name="edit_history">Eachdraidh nan deasachaidhean</string>
 	<string name="last_edit_at_x">An deasachadh mu dheireadh %s</string>
@@ -391,9 +424,67 @@
 	<!-- %s is file size -->
 	<string name="download_update">Luchdaich a-nuas (%s)</string>
 	<string name="install_update">Stàlaich</string>
+	<string name="privacy_policy_title">Do phrìobhaideachd</string>
+	<string name="privacy_policy_subtitle">Ged nach cruinnich aplacaid Mastodon fhèin dàta sam bith, dh’fhaoidte gu bheil poileasaidh eadar-dhealaichte aig an fhrithealaiche leis a chlàraicheas tu.\n\nMur aontaich thu ris a’ phoileasaidh aig %s, rach air ais is tagh frithealaiche eile.</string>
 	<string name="i_agree">Gabhaidh mi ris</string>
 	<string name="empty_list">Tha an liosta seo falamh</string>
+	<string name="instance_signup_closed">Chan eil am frithealaiche seo a’ gabhail ri clàraidhean ùra.</string>
+	<string name="text_copied">Chaidh lethbhreac dheth a chur air an stòr-bhòrd</string>
+	<string name="add_bookmark">Cruthaich comharra-lìn</string>
+	<string name="remove_bookmark">Thoir an comharra-lìn air falbh</string>
+	<string name="bookmarks">Comharran-lìn</string>
+	<string name="your_favorites">Na h-annsachdan agad</string>
+	<string name="login_title">Fàilte air ais</string>
+	<string name="login_subtitle">Clàraich a-steach leis an fhrithealaiche far an do chruthaich thu an cunntas agad.</string>
+	<string name="server_url">URL an fhrithealaiche</string>
+	<string name="signup_random_server_explain">Taghaidh sinn frithealaiche dhut stèidhichte air a’ chànan agad ma leanas tu air adhart gun taghadh.</string>
+	<string name="server_filter_any_language">Cànan sam bith</string>
+	<string name="server_filter_instant_signup">Clàradh sa bhad</string>
+	<string name="server_filter_manual_review">Lèirmheas a làimh</string>
+	<string name="server_filter_any_signup_speed">Luaths clàraidh sam bith</string>
+	<string name="server_filter_region_europe">An Roinn-Eòrpa</string>
+	<string name="server_filter_region_north_america">Aimeireaga a Tuath</string>
+	<string name="server_filter_region_south_america">Aimeireaga a Deas</string>
+	<string name="server_filter_region_africa">Afraga</string>
+	<string name="server_filter_region_asia">Àisia</string>
+	<string name="server_filter_region_oceania">Roinn a’ Chuain Sèimh</string>
+	<string name="not_accepting_new_members">Gun ghabhail ri buill ùra</string>
+	<string name="category_special_interests">Ùidhean sònraichte</string>
+	<string name="signup_passwords_dont_match">Chan eil an dà fhacal-faire co-ionnann</string>
+	<string name="pick_server_for_me">Taghaibh fear dhomh</string>
+	<string name="profile_add_row">Cuir ràgh ris</string>
+	<string name="profile_setup">Suidheachadh na pròifile</string>
+	<string name="profile_setup_subtitle">’S urrainn dhut seo a choileanadh air taba na Pròifile uair sam bith.</string>
+	<string name="profile_setup_explanation">’S urrainn dhut suas ri ceithir raointean a chur ris a’ phròifil agad airson rud sam bith a thogras tu. Ionad, ceanglaichean, roimhearan no ge b’ e dè eile.</string>
+	<string name="popular_on_mastodon">Fèillmhor air Mastodon</string>
+	<string name="follow_all">Lean na h-uile</string>
+	<string name="server_rules_disagree">Diùlt</string>
+	<string name="privacy_policy_explanation">Gu goirid: Cha chruinnich is cha dèan sinn pròiseasadh air dad sam bith.</string>
 	<!-- %s is server domain -->
+	<string name="server_policy_disagree">Diùlt %s</string>
+	<string name="profile_bio">Cunntas-beatha</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">A’ leantainn cleachdaichean…</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">Cha cheadaich %1$s clàradh o %2$s. Feuch fear eile no &lt;a&gt;tagh frithealaiche eile&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Tha an t-ainm-cleachdaiche seo aig cuideigin eile.</string>
+	<string name="spoiler_show">Seall e co-dhiù</string>
+	<string name="spoiler_hide">Falaich a-rithist</string>
+	<string name="poll_multiple_choice">Tagh co-dhiù aonan</string>
+	<string name="save_changes">Sàbhail na h-atharraichean</string>
+	<string name="profile_featured">’Ga bhrosnachadh</string>
+	<string name="profile_timeline">Loidhne-ama</string>
+	<string name="view_all">Seall a h-uile</string>
+	<string name="profile_endorsed_accounts">Cunntasan</string>
+	<string name="verified_link">Ceangal dearbhte</string>
+	<string name="show">Seall</string>
+	<string name="hide">Falaich</string>
+	<string name="join_default_server">Faigh ballrachd aig %s</string>
+	<string name="pick_server">Tagh frithealaiche eile</string>
+	<string name="signup_or_login">no</string>
+	<string name="learn_more">Barrachd fiosrachaidh</string>
+	<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>
 </resources>

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

@@ -10,11 +10,13 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparándose para a autenticación…</string>
 	<string name="finishing_auth">Rematando coa autenticación…</string>
+	<string name="user_boosted">%s promoveu</string>
 	<string name="in_reply_to">Como resposta a %s</string>
 	<string name="notifications">Notificacións</string>
 	<string name="user_followed_you">séguete</string>
 	<string name="user_sent_follow_request">enviouche unha solicitude de seguimento</string>
 	<string name="user_favorited">marcou a túa publicación como favorita</string>
+	<string name="notification_boosted">promoveu a túa publicación</string>
 	<string name="poll_ended">rematou a enquisa</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -164,6 +166,7 @@
 	<string name="report_sent_subtitle">Mestras revisamos, podes tomar accións contra %s.</string>
 	<string name="unfollow_user">Deixar de seguir a %s</string>
 	<string name="unfollow">Deixar de seguir</string>
+	<string name="mute_user_explain">Non verás as súas publicacións ou repeticións na túa cronoloxía. Non saberá que foi acalada.</string>
 	<string name="block_user_explain">Non poderá seguirte nin ver o que publicas, pero pode ver se foi bloqueada.</string>
 	<string name="report_personal_title">Non queres ver esto?</string>
 	<string name="report_personal_subtitle">Cando ves en Mastodon algo que non che gusta podes retirar a esa persoa da túa experiencia como usuaria.</string>
@@ -220,6 +223,7 @@
 	<string name="skip">Omitir</string>
 	<string name="notification_type_follow">Novas seguidoras</string>
 	<string name="notification_type_favorite">Favoritas</string>
+	<string name="notification_type_reblog">Promocións</string>
 	<string name="notification_type_mention">Mencións</string>
 	<string name="notification_type_poll">Enquisas</string>
 	<string name="choose_account">Elixir conta</string>
@@ -246,6 +250,7 @@
 	<string name="notify_none">ninguén</string>
 	<string name="notify_favorites">Favorece unha publicación miña</string>
 	<string name="notify_follow">Me segue</string>
+	<string name="notify_reblog">Promove a miña publicación</string>
 	<string name="notify_mention">Me menciona</string>
 	<string name="settings_boring">A zona aburrida</string>
 	<string name="settings_account">Axustes da conta</string>
@@ -266,6 +271,7 @@
 	<string name="hide_content">Agochar contido</string>
 	<string name="new_post">Nova publicación</string>
 	<string name="button_reply">Responder</string>
+	<string name="button_reblog">Promover</string>
 	<string name="button_favorite">Favorecer</string>
 	<string name="button_share">Compartir</string>
 	<string name="media_no_description">Multimedia sen descrición</string>
@@ -281,6 +287,8 @@
 	<string name="followed_user">Estás a seguir a %s</string>
 	<string name="following_user_requested">Solicitaches seguir a %s</string>
 	<string name="open_in_browser">Abrir nun navegador</string>
+	<string name="hide_boosts_from_user">Agochar promocións de @%s</string>
+	<string name="show_boosts_from_user">Mostrar promocións de %s</string>
 	<string name="signup_reason">Por qué queres unirte?</string>
 	<string name="signup_reason_note">Esto axudaranos a revisar a tua solicitude.</string>
 	<string name="clear">Limpar</string>
@@ -322,8 +330,13 @@
 		<item quantity="one">%,d favorita</item>
 		<item quantity="other">%,d favoritas</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d promoción</item>
+		<item quantity="other">%,d promocións</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s vía %2$s</string>
 	<string name="time_now">agora</string>
+	<string name="post_info_reblogs">Promocións</string>
 	<string name="post_info_favorites">Favoritas</string>
 	<string name="edit_history">Editar historial</string>
 	<string name="last_edit_at_x">Última edición %s</string>
@@ -413,4 +426,22 @@
 	<!-- %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 non acepta rexistros desde %2$s. Proba outro ou &lt;a&gt;elixe outro servidor&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Este nome de usuaria xa está en uso.</string>
+	<string name="spoiler_show">Mostrar igualmente</string>
+	<string name="spoiler_hide">Volver agochar</string>
+	<string name="poll_multiple_choice">Elixe unha ou varias</string>
+	<string name="save_changes">Gardar cambios</string>
+	<string name="profile_featured">Destacadas</string>
+	<string name="profile_timeline">Cronoloxía</string>
+	<string name="view_all">Ver todos</string>
+	<string name="profile_endorsed_accounts">Contas</string>
+	<string name="verified_link">Ligazón verificada</string>
+	<string name="show">Mostrar</string>
+	<string name="hide">Agochar</string>
+	<string name="join_default_server">Únete a %s</string>
+	<string name="signup_or_login">ou</string>
+	<string name="learn_more">Saber máis</string>
+	<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>
 </resources>

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

@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="get_started">Ստեղծել հաշիվ</string>
+	<string name="already_have_account">Արդեն հաշիվ ունեմ</string>
 	<string name="log_in">Մուտք գործել</string>
 	<string name="next">Հաջորդը</string>
 	<string name="error">Սխալ</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">սկսեց հետեւել քեզ</string>
 	<string name="user_sent_follow_request">հետեւելու հարցում է ուղարկել</string>
+	<string name="user_favorited">հավանեց ձեր գրառումը</string>
+	<string name="notification_boosted">տարածեց ձեր գրառումը</string>
 	<string name="poll_ended">հարցումն ավարտվել է</string>
 	<string name="time_seconds">%dվրկ</string>
 	<string name="time_minutes">%dր</string>
@@ -47,12 +52,234 @@
 	<string name="block_user">Արգելափակել%s</string>
 	<string name="unblock_user">Հանել արգելափակումից %s</string>
 	<string name="report_user">Բողոքել %s</string>
+	<string name="block_domain">Արգելափակել %s-ին</string>
+	<plurals name="x_posts">
+		<item quantity="one">%,d գրառում</item>
+		<item quantity="other">%,d գրառում</item>
+	</plurals>
+	<string name="profile_joined">Միացել է</string>
+	<string name="done">Ավարտել</string>
+	<string name="loading">Բեռնվում է…</string>
+	<string name="field_label">Պիտակ</string>
+	<string name="field_content">Բովանդակություն</string>
+	<string name="saving">Պահպանվում է․․․</string>
+	<string name="post_from_user">%s-ի գրառումը</string>
+	<plurals name="x_minutes">
+		<item quantity="one">%d րոպե</item>
+		<item quantity="other">%d րոպե</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="one">%d ժամ</item>
+		<item quantity="other">%d ժամ</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="one">%d օր</item>
+		<item quantity="other">%d օր</item>
+	</plurals>
+	<string name="compose_poll_duration">Տեւողությունը՝ %s</string>
+	<plurals name="x_seconds_left">
+		<item quantity="one">Մնաց %d վայրկյան</item>
+		<item quantity="other">Մնաց %d վայրկյան</item>
+	</plurals>
+	<plurals name="x_minutes_left">
+		<item quantity="one">Մնաց %d րոպե</item>
+		<item quantity="other">Մնաց %d րոպե</item>
+	</plurals>
+	<plurals name="x_hours_left">
+		<item quantity="one">Մնաց %d ժամ</item>
+		<item quantity="other">Մնաց %d ժամ</item>
+	</plurals>
+	<plurals name="x_days_left">
+		<item quantity="one">Մնաց %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_block_title">Արգելափակել հաշիվը</string>
+	<string name="confirm_block_domain_title">Արգելափակել տիրույթը</string>
+	<string name="confirm_block">Հաստատեք %s-ի արգելափակումը</string>
+	<string name="do_block">Արգելափակել</string>
+	<string name="action_vote">Քվեարկել</string>
+	<string name="tap_to_reveal">Սեղմեք տեսնելու համար</string>
+	<string name="delete">Ջնջել</string>
+	<string name="confirm_delete_title">Ջնջել գրառումը</string>
+	<string name="confirm_delete">Վստա՞հ եք, որ ուզում եք ջնջել այս գրառումը։</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="all_notifications">Բոլորը</string>
+	<string name="mentions">Նշումներ</string>
+	<string name="report_title">Զեկուցել %s-ի մասին</string>
+	<string name="report_reason_personal">Ինձ դուր չի գալիս</string>
+	<string name="report_reason_spam">Սպամ է</string>
+	<string name="report_reason_violation">Խախտում է սերվերի կանոնները</string>
+	<string name="report_reason_violation_subtitle">Գիտեք, որ այն խախտում է կանոնները</string>
+	<string name="report_reason_other">Այլ բան է</string>
+	<string name="report_choose_rule">Ո՞ր կանոններն են խախտվել։</string>
+	<string name="report_comment_hint">Լրացուցիչ մեկնաբանություններ</string>
+	<string name="sending_report">Զեկույցը ուղարկվում է․․․</string>
+	<string name="mute_user_explain">Դուք չեք տեսնի նրա գրառումները ձեր հիմնական հոսքում։ Նա չի իմանա, որ խլեցվել է։</string>
+	<string name="block_user_explain">Նա չի կարողանա ձեզ հետևել և չի տեսնի ձեր գրառումները, բայց կարող է տեսնել, որ արգելափակված է։</string>
+	<string name="report_personal_title">Չե՞ք ուզում սա տեսնել։</string>
+	<string name="back">Ետ</string>
+	<string name="instance_catalog_subtitle">Ընտրեք ձեր հետաքրքրություններին կամ տարածաշրջանին համապատասխան սպասարկիչ, կամ ընտրեք ընդհանուր սպասարկիչ։ Դուք կկարողանաք շփվել բոլորի հետ՝ անկախ սպասարկչից։</string>
+	<string name="search_communities">Սպասարկչի անուն կամ հասցե</string>
+	<string name="instance_rules_title">Սպասարկչի կանոնները</string>
+	<string name="signup_title">Ստեղծել հաշիվ</string>
+	<string name="edit_photo">խմբագրել</string>
+	<string name="display_name">Անուն</string>
+	<string name="username">Մուտքանուն</string>
+	<string name="email">Էլ. փոստ</string>
+	<string name="password">Գաղտնաբառ</string>
+	<string name="confirm_password">Գաղտնաբառի հաստատում</string>
+	<string name="category_academia">Ակադեմիական</string>
+	<string name="category_activism">Ակտիվիզմ</string>
+	<string name="category_all">Բոլորը</string>
+	<string name="category_art">Արվեստ</string>
+	<string name="category_food">Ուտեստներ</string>
+	<string name="category_games">Խաղեր</string>
+	<string name="category_general">Ընդհանուր</string>
+	<string name="category_journalism">Լրագրություն</string>
+	<string name="category_music">Երաժշտություն</string>
+	<string name="category_regional">Տարածաշրջանային</string>
+	<string name="category_tech">Տեխնոլոգիա</string>
 	<!-- %s is the email address -->
+	<string name="resend">Ուղարկել նորից</string>
+	<string name="open_email_app">Բացել էլ․ փոստի հավելվածը</string>
+	<string name="content_warning">Նախազգուշացում</string>
+	<string name="add_image_description">Ավելացնել պատկերի նկարագրություն</string>
+	<string name="edit_image">Խմբագրել նկարը</string>
+	<string name="save">Պահպանել</string>
+	<string name="search_all">Բոլորը</string>
+	<string name="search_people">Մարդիկ</string>
+	<string name="recent_searches">Վերջին որոնումներ</string>
+	<string name="step_x_of_n">Քայլ %1$d՝ %2$d-ից</string>
+	<string name="skip">Բաց թողնել</string>
+	<string name="notification_type_follow">Նոր հետևորդներ</string>
+	<string name="notification_type_favorite">Հավանումներ</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>
+	<string name="theme_light">Բաց</string>
+	<string name="theme_dark">Մուգ</string>
+	<string name="theme_true_black">Իսկական սև</string>
+	<string name="settings_behavior">Պահվածքը</string>
+	<string name="settings_custom_tabs">Օգտագործել ներքին բրաուզերը</string>
+	<string name="settings_notifications">Ծանուցումներ</string>
+	<string name="notify_anyone">որեւե մեկը</string>
+	<string name="notify_follower">որեւե հետեւորդ</string>
+	<string name="notify_none">ոչ ոք</string>
+	<string name="notify_favorites">Հավանեց ձեր գրառումը</string>
+	<string name="notify_follow">Հետեւում է ձեզ</string>
+	<string name="notify_reblog">Տարածեց ձեր գրառումը</string>
+	<string name="notify_mention">Նշում է ձեզ</string>
+	<string name="settings_boring">Անհետաքրքիր մասը</string>
+	<string name="settings_account">Հաշվի կարգավորումներ</string>
+	<string name="settings_contribute">Աջակցել Մաստոդոնին</string>
+	<string name="settings_tos">Ծառայության պայմանները</string>
+	<string name="settings_privacy_policy">Գաղտնիության քաղաքականություն</string>
+	<string name="settings_app_version">Մաստոդոն Android-ի համար, տարբերակ %1$s (%2$d)</string>
+	<string name="confirm_log_out">Վստա՞հ եք, որ ուզում եք դուրս գալ։</string>
+	<string name="sensitive_content">Զգայուն բովանդակություն</string>
+	<string name="sensitive_content_explain">Հեղինակը սա նշել է՝ որպես զգայուն բովանդակություն։ Սեղմեք տեսնելու համար։</string>
+	<string name="media_hidden">Սեղմեք տեսնելու համար</string>
+	<string name="avatar_description">Գնալ %s-ի հաշիվ</string>
+	<string name="more_options">Ավելին</string>
+	<string name="hide_content">Թաքցնել կոնտենտը</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="add_media">Ավելացնել մեդիա</string>
+	<string name="add_poll">Ավելացնել հարցում</string>
+	<string name="emoji">Զմայլիկ</string>
+	<string name="post_visibility">Տեսանելիություն</string>
+	<string name="home_timeline">Տեղական հոսք</string>
+	<string name="my_profile">Իմ հաշիվ</string>
+	<string name="follow_user">Հետևել %s-ին</string>
+	<string name="followed_user">Դուք այժմ հետևում եք %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>
+	<string name="profile_picture">Պրոֆիլի նկար</string>
+	<string name="reorder">Վերադասավորել</string>
+	<string name="download">Ներբեռնել</string>
+	<string name="permission_required">Անհրաժեշտ է թույլտվություն</string>
+	<string name="open_settings">Բացել կարգավորումները</string>
+	<string name="downloading">Բեռնում․․․</string>
+	<string name="local_timeline">Համայնք</string>
+	<string name="trending_posts_info_banner">Այս գրառումները տարածված են Մաստոդոնի ձեր անկյունում։</string>
+	<string name="trending_hashtags_info_banner">Այս պիտակները տարածված են Մաստոդոնի ձեր անկյունում։</string>
+	<string name="dismiss">Չեղարկել</string>
+	<string name="see_new_posts">Նոր գրառումներ</string>
+	<string name="follows_you">Հետեւում է ձեզ</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
+	<plurals name="x_followers">
+		<item quantity="one">%,d հետեւորդ</item>
+		<item quantity="other">%,d հետեւորդ</item>
+	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d նախընտրելի</item>
+		<item quantity="other">%,d նախընտրելի</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,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="post_info_favorites">Հավանումներ</string>
+	<string name="edit_history">Խմբագրել պատմությունը</string>
+	<string name="time_just_now">հենց նոր</string>
+	<string name="edit_poll_removed">Հարցումը հեռացվել է</string>
+	<string name="edit_media_added">Մեդիան ավելացվել է</string>
+	<string name="edit_media_removed">Մեդիան հեռացվել է</string>
+	<string name="edit_marked_sensitive">Նշվել է որպես դյուրազգաց</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_available">%s տարբերակը պատրաստ է ներբեռնման։</string>
 	<!-- %s is version like 1.2.3 -->
+	<string name="update_ready">%s տարբերակը ներբեռնվել է և պատրաստ է տեղադրման։</string>
 	<!-- %s is file size -->
+	<string name="download_update">Ներբեռնել (%s)</string>
+	<string name="install_update">Տեղադրել</string>
+	<string name="i_agree">Համաձայն եմ</string>
+	<string name="empty_list">Ցանկը դատարկ է</string>
+	<string name="instance_signup_closed">Սպասարկիչը գրանցումներ չի ընդունում։</string>
+	<string name="text_copied">Պատճենվել է</string>
+	<string name="bookmarks">Էջանիշեր</string>
+	<string name="your_favorites">Հավանածներ</string>
+	<string name="login_title">Բարի վերադարձ</string>
+	<string name="server_url">Սերվերի հասցե</string>
+	<string name="signup_random_server_explain">Եթե շարունակեք՝ առանց ընտրելու, մենք կընտրենք սերվեր՝ ըստ ձեր լեզվի։</string>
+	<string name="server_filter_any_language">Որևե լեզու</string>
+	<string name="server_filter_region_europe">Եվրոպա</string>
+	<string name="server_filter_region_north_america">Հյուսիսային Ամերիկա</string>
+	<string name="server_filter_region_south_america">Հարավային Ամերիկա</string>
+	<string name="server_filter_region_africa">Աֆրիկա</string>
+	<string name="server_filter_region_asia">Ասիա</string>
+	<string name="server_filter_region_oceania">Օվկիանիա</string>
+	<string name="not_accepting_new_members">Չի ընդունում նոր անդամներ</string>
+	<string name="signup_passwords_dont_match">Գաղտնաբառը չի համապատասխանում</string>
+	<string name="pick_server_for_me">Ընտրել իմ համար</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<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"><![CDATA[Մաստոդոնի որևէ հաշիվ գտնվում է սերվերի վրա - ամեն մեկը՝ իր արժեքներով, կանոններով և ադմիններով։ Դուք կարող եք հետևել և շփվել որևէ սերվերի մարդկանց հետ՝ անկախ ձեր ընտրությունից։]]></string>
 </resources>

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

@@ -10,6 +10,7 @@
 	<string name="ok">Oke</string>
 	<string name="preparing_auth">Menyiapkan untuk autentikasi…</string>
 	<string name="finishing_auth">Menyelesaikan autentikasi…</string>
+	<string name="user_boosted">%s di-boost-kan</string>
 	<string name="in_reply_to">Membalas ke %s</string>
 	<string name="notifications">Notifikasi</string>
 	<string name="user_followed_you">mengikuti Anda</string>
@@ -151,6 +152,7 @@
 	<string name="report_sent_subtitle">Saat kami sedang meninjau ini, Anda dapat mengambil tindakan terhadap %s.</string>
 	<string name="unfollow_user">Berhenti mengikuti %s</string>
 	<string name="unfollow">Berhenti mengikuti</string>
+	<string name="mute_user_explain">Anda tidak akan melihat kiriman atau boost mereka pada linimasa Anda. Mereka tidak akan tahu bahwa mereka telah dibisukan.</string>
 	<string name="block_user_explain">Mereka tidak akan dapat mengikuti atau melihat kiriman Anda lagi, tetapi mereka dapat melihat jika mereka telah diblokir.</string>
 	<string name="report_personal_title">Tidak ingin melihat ini?</string>
 	<string name="report_personal_subtitle">Ketika Anda melihat sesuatu yang Anda tidak suka di Mastodon, Anda dapat menghapus orang dari pengalaman Anda.</string>
@@ -207,6 +209,7 @@
 	<string name="skip">Lewati</string>
 	<string name="notification_type_follow">Pengikut baru</string>
 	<string name="notification_type_favorite">Favorit</string>
+	<string name="notification_type_reblog">Boost</string>
 	<string name="notification_type_mention">Sebutan</string>
 	<string name="notification_type_poll">Pemungutan suara</string>
 	<string name="choose_account">Pilih akun</string>
@@ -232,6 +235,7 @@
 	<string name="notify_none">tidak ada</string>
 	<string name="notify_favorites">Memfavorit kiriman saya</string>
 	<string name="notify_follow">Mengikuti saya</string>
+	<string name="notify_reblog">Boost kiriman saya</string>
 	<string name="notify_mention">Menyebut saya</string>
 	<string name="settings_boring">Zona membosankan</string>
 	<string name="settings_account">Pengaturan akun</string>
@@ -252,6 +256,7 @@
 	<string name="hide_content">Sembunyikan konten</string>
 	<string name="new_post">Kiriman baru</string>
 	<string name="button_reply">Balas</string>
+	<string name="button_reblog">Boost</string>
 	<string name="button_favorite">Favorit</string>
 	<string name="button_share">Bagikan</string>
 	<string name="media_no_description">Media tanpa deskripsi</string>
@@ -267,6 +272,8 @@
 	<string name="followed_user">Anda sekarang mengikuti %s</string>
 	<string name="following_user_requested">Diminta untuk mengikuti %s</string>
 	<string name="open_in_browser">Buka di peramban</string>
+	<string name="hide_boosts_from_user">Sembunyikan boost dari %s</string>
+	<string name="show_boosts_from_user">Tampilkan boost dari %s</string>
 	<string name="signup_reason">Mengapa Anda ingin bergabung?</string>
 	<string name="signup_reason_note">Ini akan membantu kami meninjau aplikasi Anda.</string>
 	<string name="clear">Hapus</string>
@@ -305,8 +312,12 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d favorit</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="other">%,d boost</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s melalui %2$s</string>
 	<string name="time_now">sekarang</string>
+	<string name="post_info_reblogs">Boost</string>
 	<string name="post_info_favorites">Favorit</string>
 	<string name="edit_history">Riwayat penyuntingan</string>
 	<string name="last_edit_at_x">Terakhir disunting %s</string>
@@ -394,7 +405,11 @@
 	<!-- %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 tidak memperbolehkan pendaftaran dari %2$s. Coba yang lain atau &lt;a&gt;pilih server lain&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Nama pengguna ini sudah diambil.</string>
+	<string name="spoiler_show">Tampilkan saja</string>
+	<string name="spoiler_hide">Sembunyikan ulang</string>
+	<string name="poll_multiple_choice">Pilih satu atau lebih</string>
 	<string name="save_changes">Simpan perubahan</string>
+	<string name="profile_featured">Sorotan</string>
 	<string name="profile_timeline">Linimasa</string>
 	<string name="view_all">Lihat semua</string>
 	<string name="profile_endorsed_accounts">Akun</string>
@@ -402,6 +417,10 @@
 	<string name="show">Tampilkan</string>
 	<string name="hide">Sembunyikan</string>
 	<string name="join_default_server">Gabung %s</string>
+	<string name="signup_or_login">atau</string>
 	<string name="learn_more">Pelajari lebih lanjut</string>
 	<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>
 </resources>

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

@@ -10,11 +10,13 @@
 	<string name="ok">Í lagi</string>
 	<string name="preparing_auth">Undirbý auðkenningu…</string>
 	<string name="finishing_auth">Lýk auðkenningu…</string>
+	<string name="user_boosted">%s endurbirti</string>
 	<string name="in_reply_to">Sem svar til %s</string>
 	<string name="notifications">Tilkynningar</string>
 	<string name="user_followed_you">fylgdi þér</string>
 	<string name="user_sent_follow_request">sendi þér beiðni um að fylgjast með þér</string>
 	<string name="user_favorited">setti færslu frá þér í eftirlæti</string>
+	<string name="notification_boosted">endurbirti færsluna þína</string>
 	<string name="poll_ended">könnun er lokið</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -164,6 +166,8 @@
 	<string name="report_sent_subtitle">Á meðan við yfirförum þetta, geturðu tekið til aðgerða gegn %s.</string>
 	<string name="unfollow_user">Hætta að fylgjast með %s</string>
 	<string name="unfollow">Hætta að fylgjast með</string>
+	<string name="mute_user_explain">Þú munt ekki sjá færslur eða endurbirtingar frá viðkomandi á streyminu þínu. 
+Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.</string>
 	<string name="block_user_explain">Viðkomandi mun ekki lengur geta fylgst með eða séð færslurnar þínar, en munu sjá ef viðkomandi hefur verið útilokaður.</string>
 	<string name="report_personal_title">Langar þig ekki til að sjá þetta?</string>
 	<string name="report_personal_subtitle">Þegar þú sér eitthvað á Mastodon sem þér líkar ekki, þá geturðu fjarlægt viðkomandi eintakling úr umhverfinu þínu.</string>
@@ -220,6 +224,7 @@
 	<string name="skip">Sleppa</string>
 	<string name="notification_type_follow">Nýir fylgjendur</string>
 	<string name="notification_type_favorite">Eftirlæti</string>
+	<string name="notification_type_reblog">Endurbirtingar</string>
 	<string name="notification_type_mention">Minnst á</string>
 	<string name="notification_type_poll">Kannanir</string>
 	<string name="choose_account">Veldu aðgang</string>
@@ -246,6 +251,7 @@
 	<string name="notify_none">enginn</string>
 	<string name="notify_favorites">Setur færsluna mína í eftirlæti</string>
 	<string name="notify_follow">Fylgist með mér</string>
+	<string name="notify_reblog">Endurbirtir færsluna mína</string>
 	<string name="notify_mention">Minnist á mig</string>
 	<string name="settings_boring">Óhressa svæðið</string>
 	<string name="settings_account">Stillingar aðgangs</string>
@@ -266,6 +272,7 @@
 	<string name="hide_content">Fela efni</string>
 	<string name="new_post">Ný færsla</string>
 	<string name="button_reply">Svara</string>
+	<string name="button_reblog">Endurbirting</string>
 	<string name="button_favorite">Eftirlæti</string>
 	<string name="button_share">Deila</string>
 	<string name="media_no_description">Myndefni án lýsingar</string>
@@ -281,6 +288,8 @@
 	<string name="followed_user">Þú fylgist núna með %s</string>
 	<string name="following_user_requested">Bað um að fylgjast með %s</string>
 	<string name="open_in_browser">Opna í vafra</string>
+	<string name="hide_boosts_from_user">Fela endurbirtingar frá %s</string>
+	<string name="show_boosts_from_user">Sýna endurbirtingar frá %s</string>
 	<string name="signup_reason">Hvers vegna vilt þú taka þátt?</string>
 	<string name="signup_reason_note">Þetta mun hjálpa okkur við að yfirfara umsóknina þína.</string>
 	<string name="clear">Hreinsa</string>
@@ -322,8 +331,13 @@
 		<item quantity="one">%,d eftirlæti</item>
 		<item quantity="other">%,d eftirlæti</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d endurbirting</item>
+		<item quantity="other">%,d endurbirtingar</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s með %2$s</string>
 	<string name="time_now">núna</string>
+	<string name="post_info_reblogs">Endurbirtingar</string>
 	<string name="post_info_favorites">Eftirlæti</string>
 	<string name="edit_history">Breytingaferill</string>
 	<string name="last_edit_at_x">Síðasta breyting %s</string>
@@ -413,4 +427,23 @@
 	<!-- %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 leyfir ekki nýskráningar frá %2$s. Veldu eitthvað annað lén eða &lt;a&gt;veldu annan netþjón&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Þetta notandanafn er þegar í notkun.</string>
+	<string name="spoiler_show">Birta samt</string>
+	<string name="spoiler_hide">Fela aftur</string>
+	<string name="poll_multiple_choice">Veldu eitt eiða fleiri</string>
+	<string name="save_changes">Vista breytingar</string>
+	<string name="profile_featured">Með aukið vægi</string>
+	<string name="profile_timeline">Tímalína</string>
+	<string name="view_all">Skoða allt</string>
+	<string name="profile_endorsed_accounts">Notandaaðgangar</string>
+	<string name="verified_link">Sannreyndur tengill</string>
+	<string name="show">Sýna</string>
+	<string name="hide">Fela</string>
+	<string name="join_default_server">Taka þátt í %s</string>
+	<string name="pick_server">Veldu annan netþjón</string>
+	<string name="signup_or_login">eða</string>
+	<string name="learn_more">Kanna nánar</string>
+	<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>
 </resources>

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

@@ -250,6 +250,7 @@
 	<string name="notify_none">nessuno</string>
 	<string name="notify_favorites">Apprezza i miei post</string>
 	<string name="notify_follow">Mi segue</string>
+	<string name="notify_reblog">Condivide il mio post</string>
 	<string name="notify_mention">Mi menziona</string>
 	<string name="settings_boring">La zona noiosa</string>
 	<string name="settings_account">Impostazioni dell\'account</string>
@@ -437,9 +438,11 @@
 	<string name="show">Mostra</string>
 	<string name="hide">Nascondi</string>
 	<string name="join_default_server">Unisciti a %s</string>
-	<string name="pick_server">Scegli il mio server</string>
+	<string name="pick_server">Scegli un altro server</string>
 	<string name="signup_or_login">o</string>
 	<string name="learn_more">Scopri di più</string>
 	<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>
 </resources>

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

@@ -10,11 +10,13 @@
 	<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">がフォロー</string>
 	<string name="user_sent_follow_request">フォローリクエストを送信しました</string>
 	<string name="user_favorited">がお気に入り登録</string>
+	<string name="notification_boosted">にブーストされました</string>
 	<string name="poll_ended">アンケートが終了しました</string>
 	<string name="time_seconds">%d秒前</string>
 	<string name="time_minutes">%d分前</string>
@@ -148,8 +150,9 @@
 	<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>
 	<string name="report_personal_title">見えないようにしたいですか？</string>
 	<string name="report_personal_subtitle">Mastodonで気に入らないものを見ると、その人をあなたの体験から取り除くことができます。</string>
@@ -206,6 +209,7 @@
 	<string name="skip">スキップ</string>
 	<string name="notification_type_follow">新しいフォロワー</string>
 	<string name="notification_type_favorite">お気に入り</string>
+	<string name="notification_type_reblog">ブースト</string>
 	<string name="notification_type_mention">メンション</string>
 	<string name="notification_type_poll">投票</string>
 	<string name="choose_account">アカウントを選択</string>
@@ -229,9 +233,10 @@
 	<string name="notify_follower">フォロワー</string>
 	<string name="notify_followed">フォローしている人</string>
 	<string name="notify_none">なし</string>
-	<string name="notify_favorites">お気に入り登録された</string>
-	<string name="notify_follow">フォローされた</string>
-	<string name="notify_mention">メンションされた</string>
+	<string name="notify_favorites">お気に入り登録</string>
+	<string name="notify_follow">フォロー</string>
+	<string name="notify_reblog">ブースト</string>
+	<string name="notify_mention">メンション</string>
 	<string name="settings_boring">アプリについて</string>
 	<string name="settings_account">アカウント設定</string>
 	<string name="settings_contribute">Mastodonに貢献する</string>
@@ -251,6 +256,7 @@
 	<string name="hide_content">内容を非表示</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>
@@ -261,10 +267,13 @@
 	<string name="home_timeline">ホームタイムライン</string>
 	<string name="my_profile">プロフィール</string>
 	<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="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>
@@ -303,8 +312,12 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d お気に入り</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="other">%,d ブースト</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$sに%2$s経由</string>
 	<string name="time_now">今</string>
+	<string name="post_info_reblogs">ブースト</string>
 	<string name="post_info_favorites">お気に入り</string>
 	<string name="edit_history">編集履歴</string>
 	<string name="last_edit_at_x">最終更新日%s</string>
@@ -392,4 +405,23 @@
 	<!-- %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="signup_username_taken">このユーザー名はすでに使用されています。</string>
+	<string name="spoiler_show">表示する</string>
+	<string name="spoiler_hide">非表示</string>
+	<string name="poll_multiple_choice">1つまたは複数を選択</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">Mastodon とは</string>
+	<string name="welcome_paragraph1">Mastodon は、いち企業の統制に依存しない非中央集権型のソーシャルネットワークです。たくさんの独立したサーバーが相互につながり合い、ひとつのネットワークを形成しています。</string>
+	<string name="what_are_servers">サーバーとは</string>
+	<string name="welcome_paragraph2"><![CDATA[Mastodon のアカウントはいずれかのサーバーに所属します。それぞれのサーバーは異なる価値観やルールをもち、それらを管理する管理者がいます。どのサーバーにいても、ほかのあらゆるサーバーのユーザーをフォローして、かかわりをもつことができるでしょう。]]></string>
 </resources>

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

@@ -10,11 +10,13 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Verificatie aan het voorbereiden…</string>
 	<string name="finishing_auth">Verificatie afronden…</string>
+	<string name="user_boosted">%s boostte</string>
 	<string name="in_reply_to">Als reactie op %s</string>
 	<string name="notifications">Meldingen</string>
 	<string name="user_followed_you">volgt jou</string>
 	<string name="user_sent_follow_request">heeft je een volgverzoek gestuurd</string>
 	<string name="user_favorited">markeerde als favoriet</string>
+	<string name="notification_boosted">boostte jouw bericht</string>
 	<string name="poll_ended">poll is beëindigd</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -164,6 +166,7 @@
 	<string name="report_sent_subtitle">Terwijl wij jouw rapportage beoordelen, kun je deze acties tegen %s ondernemen.</string>
 	<string name="unfollow_user">Ontvolgen</string>
 	<string name="unfollow">Ontvolgen</string>
+	<string name="mute_user_explain">Je ziet hun berichten en boosts niet op je starttijdlijn. Ze zullen niet weten dat ze worden genegeerd.</string>
 	<string name="block_user_explain">Het is niet meer mogelijk om je te volgen of om je berichten te zien, maar het is wel mogelijk om erachter te komen dat je deze account hebt geblokkeerd.</string>
 	<string name="report_personal_title">Wil je dit niet zien?</string>
 	<string name="report_personal_subtitle">Als je iets ziet dat je niet leuk vindt op Mastodon, dan kun je de persoon op meerdere manieren van je tijdlijn verwijderen.</string>
@@ -220,6 +223,7 @@
 	<string name="skip">Overslaan</string>
 	<string name="notification_type_follow">Nieuwe volgers</string>
 	<string name="notification_type_favorite">Favorieten</string>
+	<string name="notification_type_reblog">Boosts</string>
 	<string name="notification_type_mention">Vermeldingen</string>
 	<string name="notification_type_poll">Polls</string>
 	<string name="choose_account">Account kiezen</string>
@@ -246,6 +250,7 @@
 	<string name="notify_none">niemand</string>
 	<string name="notify_favorites">Mijn bericht als favoriet markeert</string>
 	<string name="notify_follow">Mij volgt</string>
+	<string name="notify_reblog">Boost mijn bericht</string>
 	<string name="notify_mention">Mij vermeldt</string>
 	<string name="settings_boring">De saaie zone</string>
 	<string name="settings_account">Accountinstellingen</string>
@@ -266,6 +271,7 @@
 	<string name="hide_content">Inhoud verbergen</string>
 	<string name="new_post">Nieuw bericht</string>
 	<string name="button_reply">Reageren</string>
+	<string name="button_reblog">Boosten</string>
 	<string name="button_favorite">Toevoegen aan favorieten</string>
 	<string name="button_share">Delen</string>
 	<string name="media_no_description">Media zonder beschrijving</string>
@@ -281,6 +287,8 @@
 	<string name="followed_user">Je volgt %s nu</string>
 	<string name="following_user_requested">Je volgverzoek is aan %s verstuurd</string>
 	<string name="open_in_browser">Openen in browser</string>
+	<string name="hide_boosts_from_user">Boosts van %s verbergen</string>
+	<string name="show_boosts_from_user">Boosts van %s tonen</string>
 	<string name="signup_reason">Waarom wil je je hier registreren?</string>
 	<string name="signup_reason_note">Dit helpt ons om jouw aanvraag te beoordelen.</string>
 	<string name="clear">Leegmaken</string>
@@ -322,8 +330,13 @@
 		<item quantity="one">%,d favoriet</item>
 		<item quantity="other">%,d favorieten</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d boost</item>
+		<item quantity="other">%,d boosts</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s via %2$s</string>
 	<string name="time_now">nu</string>
+	<string name="post_info_reblogs">Boosts</string>
 	<string name="post_info_favorites">Favorieten</string>
 	<string name="edit_history">Bewerkingsgeschiedenis</string>
 	<string name="last_edit_at_x">Laatste bewerking op %s</string>
@@ -413,4 +426,22 @@
 	<!-- %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 staat geen registraties toe van %2$s. Probeer het met een andere e-mailprovider of &lt;a&gt;kies een andere server&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Deze gebruikersnaam wordt al gebruikt.</string>
+	<string name="spoiler_show">Alsnog tonen</string>
+	<string name="spoiler_hide">Opnieuw verbergen</string>
+	<string name="poll_multiple_choice">Selecteer een of meer</string>
+	<string name="save_changes">Wijzigingen opslaan</string>
+	<string name="profile_featured">Aanbevolen</string>
+	<string name="profile_timeline">Tijdlijn</string>
+	<string name="view_all">Alles bekijken</string>
+	<string name="profile_endorsed_accounts">Accounts</string>
+	<string name="verified_link">Geverifieerde koppeling</string>
+	<string name="show">Tonen</string>
+	<string name="hide">Verbergen</string>
+	<string name="join_default_server">Deelnemen aan %s</string>
+	<string name="signup_or_login">of</string>
+	<string name="learn_more">Meer informatie</string>
+	<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 verbonden met elkaar.</string>
+	<string name="what_are_servers">Wat zijn servers?</string>
+	<string name="welcome_paragraph2"><![CDATA[Elk Mastodon account wordt gehost op een server - elk met zijn eigen waarden, regels & admins. Het maakt niet uit welke server je kiest, je kunt mensen op elke server volgen en ermee communiceren.]]></string>
 </resources>

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

@@ -412,4 +412,6 @@
 	<!-- %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ão permite inscrições de %2$s. Tente um diferente ou &lt;a&gt;escolha um servidor diferente&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Esse nome de usuário já está em uso.</string>
+	<string name="learn_more">Saiba mais</string>
+	<string name="welcome_to_mastodon">Bem-vindo ao Mastodon</string>
 </resources>

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

@@ -10,11 +10,13 @@
 	<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">подписался(ась) на вас</string>
 	<string name="user_sent_follow_request">прислал(а) запрос на подписку</string>
 	<string name="user_favorited">добавил(а) ваш пост в избранное</string>
+	<string name="notification_boosted">продвинул(а) ваш пост</string>
 	<string name="poll_ended">опрос завершён</string>
 	<string name="time_seconds">%dс</string>
 	<string name="time_minutes">%dм</string>
@@ -192,6 +194,7 @@
 	<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>
@@ -248,6 +251,7 @@
 	<string name="skip">Пропустить</string>
 	<string name="notification_type_follow">Новые подписчики</string>
 	<string name="notification_type_favorite">Избранное</string>
+	<string name="notification_type_reblog">Продвижения</string>
 	<string name="notification_type_mention">Упоминания</string>
 	<string name="notification_type_poll">Опросы</string>
 	<string name="choose_account">Выберите аккаунт</string>
@@ -276,6 +280,7 @@
 	<string name="notify_none">никто</string>
 	<string name="notify_favorites">Добавляет мой пост в избранное</string>
 	<string name="notify_follow">Подписывается на меня</string>
+	<string name="notify_reblog">Продвинуть пост</string>
 	<string name="notify_mention">Упоминает меня</string>
 	<string name="settings_boring">Зона скукотищи</string>
 	<string name="settings_account">Настройки учётной записи</string>
@@ -296,6 +301,7 @@
 	<string name="hide_content">Скрыть содержимое</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>
@@ -309,7 +315,10 @@
 	<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>
@@ -351,8 +360,21 @@
 		<item quantity="many">%,d подписок</item>
 		<item quantity="other">%,d подписок</item>
 	</plurals>
+	<plurals name="x_favorites">
+		<item quantity="one">%,d избранный</item>
+		<item quantity="few">%,d избранных</item>
+		<item quantity="many">%,d избранных</item>
+		<item quantity="other">%,d избранных</item>
+	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d продвинут</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="post_info_reblogs">Продвижения</string>
 	<string name="post_info_favorites">Избранное</string>
 	<string name="edit_history">История изменений</string>
 	<string name="last_edit_at_x">Последнее изменение: %s</string>
@@ -446,4 +468,22 @@
 	<!-- %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="signup_username_taken">Это имя пользователя занято.</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="signup_or_login">или</string>
+	<string name="learn_more">Узнать больше</string>
+	<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>
 </resources>

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

@@ -474,7 +474,7 @@
 	<string name="show">Pokaži</string>
 	<string name="hide">Skrij</string>
 	<string name="join_default_server">Pridruži se %s</string>
-	<string name="pick_server">Izberi moj lasten strežnik</string>
+	<string name="pick_server">Izberi drug strežnik</string>
 	<string name="signup_or_login">ali</string>
 	<string name="learn_more">Več o tem</string>
 	<string name="welcome_to_mastodon">Dobrodošli na Mastodon</string>

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

@@ -189,7 +189,7 @@
 	<string name="confirm_email_didnt_get">ไม่ได้รับลิงก์?</string>
 	<string name="resend">ส่งใหม่</string>
 	<string name="open_email_app">เปิดแอปอีเมล</string>
-	<string name="resent_email">ส่งอีเมลยืนยันแล้ว</string>
+	<string name="resent_email">ส่งอีเมลการยืนยันแล้ว</string>
 	<string name="compose_hint">พิมพ์หรือวางสิ่งที่คุณกำลังคิด</string>
 	<string name="content_warning">คำเตือนเนื้อหา</string>
 	<string name="add_image_description">เพิ่มคำอธิบายภาพ…</string>
@@ -392,7 +392,7 @@
 	<string name="profile_add_row">เพิ่มแถว</string>
 	<string name="profile_setup">การตั้งค่าโปรไฟล์</string>
 	<string name="profile_setup_subtitle">คุณสามารถทำสิ่งนี้ให้เสร็จสมบูรณ์ได้ในภายหลังเสมอในแท็บโปรไฟล์</string>
-	<string name="profile_setup_explanation">คุณสามารถเพิ่มได้สูงสุดถึงสี่ช่องโปรไฟล์สำหรับสิ่งใดก็ตามที่คุณต้องการ ตำแหน่งที่ตั้ง, ลิงก์, สรรพนาม — ไม่มีที่สิ้นสุด</string>
+	<string name="profile_setup_explanation">คุณสามารถเพิ่มได้มากถึงสี่ช่องโปรไฟล์สำหรับสิ่งใดก็ตามที่คุณต้องการ ตำแหน่งที่ตั้ง, ลิงก์, สรรพนาม — ไม่มีที่สิ้นสุด</string>
 	<string name="popular_on_mastodon">เป็นที่นิยมใน Mastodon</string>
 	<string name="follow_all">ติดตามทั้งหมด</string>
 	<string name="server_rules_disagree">ไม่เห็นด้วย</string>
@@ -417,7 +417,7 @@
 	<string name="show">แสดง</string>
 	<string name="hide">ซ่อน</string>
 	<string name="join_default_server">เข้าร่วม %s</string>
-	<string name="pick_server">เลือกเซิร์ฟเวอร์ของฉันเอง</string>
+	<string name="pick_server">เลือกเซิร์ฟเวอร์อื่น</string>
 	<string name="signup_or_login">หรือ</string>
 	<string name="learn_more">เรียนรู้เพิ่มเติม</string>
 	<string name="welcome_to_mastodon">ยินดีต้อนรับสู่ Mastodon</string>

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

@@ -10,33 +10,35 @@
 	<string name="ok">Tamam</string>
 	<string name="preparing_auth">Kimlik doğrulama için hazırlanıyor…</string>
 	<string name="finishing_auth">Kimlik doğrulama tamamlanıyor…</string>
+	<string name="user_boosted">%s yineledi</string>
 	<string name="in_reply_to">%s için yanıt</string>
 	<string name="notifications">Bildirimler</string>
-	<string name="user_followed_you">seni takip etti</string>
+	<string name="user_followed_you">sizi takip etti</string>
 	<string name="user_sent_follow_request">sana bir takip isteği gönderdi</string>
 	<string name="user_favorited">gönderinizi favorilerine ekledi</string>
+	<string name="notification_boosted">gönderinizi yineledi</string>
 	<string name="poll_ended">oylama sona erdi</string>
 	<string name="time_seconds">%ds</string>
-	<string name="time_minutes">%dd</string>
-	<string name="time_hours">%dsaat</string>
-	<string name="time_days">%dgün</string>
+	<string name="time_minutes">%ddk</string>
+	<string name="time_hours">%ds</string>
+	<string name="time_days">%dg</string>
 	<string name="share_toot_title">Paylaş</string>
 	<string name="settings">Ayarlar</string>
 	<string name="publish">Yayınla</string>
 	<string name="discard_draft">Taslak silinsin mi?</string>
 	<string name="discard">Sil</string>
-	<string name="cancel">İptal</string>
+	<string name="cancel">İptal et</string>
 	<plurals name="followers">
-		<item quantity="one">Takipçi</item>
-		<item quantity="other">Takipçi</item>
+		<item quantity="one">takipçi</item>
+		<item quantity="other">takipçi</item>
 	</plurals>
 	<plurals name="following">
-		<item quantity="one">Takip</item>
-		<item quantity="other">Takip</item>
+		<item quantity="one">takip</item>
+		<item quantity="other">takip</item>
 	</plurals>
 	<plurals name="posts">
 		<item quantity="one">gönderi</item>
-		<item quantity="other">gönderiler</item>
+		<item quantity="other">gönderi</item>
 	</plurals>
 	<string name="posts">Gönderiler</string>
 	<string name="posts_and_replies">Gönderiler ve Cevaplar</string>
@@ -52,19 +54,19 @@
 	<string name="block_user">Engelle %s</string>
 	<string name="unblock_user">Engeli kaldır %s</string>
 	<string name="report_user">Raporla %s</string>
-	<string name="block_domain">Engelle %s</string>
-	<string name="unblock_domain">Engeli kaldır %s</string>
+	<string name="block_domain">%s kişisini engelle</string>
+	<string name="unblock_domain">%s kişisinin engelini kaldır</string>
 	<plurals name="x_posts">
 		<item quantity="one">%,d gönderi</item>
-		<item quantity="other">%,d gönderiler</item>
+		<item quantity="other">%,d gönderi</item>
 	</plurals>
 	<string name="profile_joined">Katıldı</string>
 	<string name="done">Tamamla</string>
-	<string name="loading">Yükleniyor...</string>
+	<string name="loading">Yükleniyor…</string>
 	<string name="field_label">Etiket</string>
 	<string name="field_content">İçerik</string>
 	<string name="saving">Kaydediliyor…</string>
-	<string name="post_from_user">Gönderen %s</string>
+	<string name="post_from_user">%s kullanıcına ait gönderi</string>
 	<string name="poll_option_hint">Seçenek %d</string>
 	<plurals name="x_minutes">
 		<item quantity="one">%d dakika</item>
@@ -128,7 +130,7 @@
 	<string name="log_out">Çıkış yap</string>
 	<string name="add_account">Hesap ekle</string>
 	<string name="search_hint">Arama</string>
-	<string name="hashtags">Hashtagler</string>
+	<string name="hashtags">Etiketler</string>
 	<string name="news">Haberler</string>
 	<string name="for_you">Senin için</string>
 	<string name="all_notifications">Hepsi</string>
@@ -164,6 +166,7 @@
 	<string name="report_sent_subtitle">Biz bunu incelerken siz %s karşı önlem alabilirsiniz.</string>
 	<string name="unfollow_user">Takipten çık %s</string>
 	<string name="unfollow">Takipten çık</string>
+	<string name="mute_user_explain">Ana sayfa akışınızda kişinin gönderilerini görmeyeceksiniz. Sessize alındıklarını bilemeyecekler.</string>
 	<string name="block_user_explain">Artık sizi takip edemez ve gönderilerinizi göremezler ama engellendiklerini görebilirler.</string>
 	<string name="report_personal_title">Bunu görmek istemiyor musun?</string>
 	<string name="report_personal_subtitle">Mastodon\'da beğenmediğiniz bir şey gördüğünüzde, o kişiyi deneyiminizden çıkarabilirsiniz.</string>
@@ -220,6 +223,7 @@
 	<string name="skip">Atla</string>
 	<string name="notification_type_follow">Yeni takipçiler</string>
 	<string name="notification_type_favorite">Favoriler</string>
+	<string name="notification_type_reblog">Yeniden paylaşımlar</string>
 	<string name="notification_type_mention">Bahsetmeler</string>
 	<string name="notification_type_poll">Anketler</string>
 	<string name="choose_account">Hesap seç</string>
@@ -240,12 +244,13 @@
 	<string name="settings_custom_tabs">Uygulama içi tarayıcıyı kullan</string>
 	<string name="settings_notifications">Bildirimler</string>
 	<string name="notify_me_when">Beni şu durumda bilgilendir: </string>
-	<string name="notify_anyone">herhangi biri</string>
-	<string name="notify_follower">bir takipçim</string>
-	<string name="notify_followed">takip ettiğim biri</string>
-	<string name="notify_none">bilgilendirme</string>
-	<string name="notify_favorites">Gönderiğimi beğendiğinde</string>
+	<string name="notify_anyone">Herhangi biri</string>
+	<string name="notify_follower">Bir takipçim</string>
+	<string name="notify_followed">Takip ettiğim biri</string>
+	<string name="notify_none">Bilgilendirme</string>
+	<string name="notify_favorites">Gönderimi favorilerine eklediğinde</string>
 	<string name="notify_follow">Beni takip ettiğinde</string>
+	<string name="notify_reblog">Gönderimi yinelediğinde</string>
 	<string name="notify_mention">Benden bahsettiğinde</string>
 	<string name="settings_boring">Sıkıcı bölge</string>
 	<string name="settings_account">Hesap ayarları</string>
@@ -266,6 +271,7 @@
 	<string name="hide_content">İçeriği gizle</string>
 	<string name="new_post">Yeni gönderi</string>
 	<string name="button_reply">Cevapla</string>
+	<string name="button_reblog">Yinele</string>
 	<string name="button_favorite">Favorile</string>
 	<string name="button_share">Paylaş</string>
 	<string name="media_no_description">Açıklamasız medya</string>
@@ -279,7 +285,10 @@
 	<string name="follow_user">%s\'yi takip et</string>
 	<string name="unfollowed_user">%s takip edilmedi</string>
 	<string name="followed_user">%s kişisini takip ediyorsunuz</string>
+	<string name="following_user_requested">%s takip isteği gönderdi</string>
 	<string name="open_in_browser">Tarayıcıda aç</string>
+	<string name="hide_boosts_from_user">%s kişisinin alıntı paylaşımlarını gizle</string>
+	<string name="show_boosts_from_user">%s kişisinin alıntı paylaşımlarını göster</string>
 	<string name="signup_reason">Neden katılmak istiyorsunuz?</string>
 	<string name="signup_reason_note">Bu, başvurunuzu incelememize yardımcı olacaktır.</string>
 	<string name="clear">Temizle</string>
@@ -321,8 +330,13 @@
 		<item quantity="one">%,d favori</item>
 		<item quantity="other">%,d favori</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="one">%,d yineleme</item>
+		<item quantity="other">%,d yineleme</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s tarihinde %2$s uygulamasıyla</string>
 	<string name="time_now">şimdi</string>
+	<string name="post_info_reblogs">Yeniden paylaşımlar</string>
 	<string name="post_info_favorites">Favoriler</string>
 	<string name="edit_history">Düzenleme geçmişi</string>
 	<string name="last_edit_at_x">Son düzenleme: %s</string>
@@ -335,7 +349,7 @@
 		<item quantity="one">%d dakika önce</item>
 		<item quantity="other">%d dakika önce</item>
 	</plurals>
-	<string name="edited_timestamp">%s tarihinde düzenlendi</string>
+	<string name="edited_timestamp">%s önce düzenlendi</string>
 	<string name="edit_original_post">Asıl gönderi</string>
 	<string name="edit_text_edited">Düzenlenmiş gönderi</string>
 	<string name="edit_spoiler_added">İçerik uyarısı eklendi</string>
@@ -396,6 +410,7 @@
 	<string name="category_special_interests">Özel İlgi Alanları</string>
 	<string name="signup_passwords_dont_match">Parolalar eşleşmiyor</string>
 	<string name="pick_server_for_me">Benim için seç</string>
+	<string name="profile_add_row">Satır ekle</string>
 	<string name="profile_setup">Profilini ayarla</string>
 	<string name="profile_setup_subtitle">Bunu istediğin bir zaman Profil sekmesinden tamamlayabilirsin.</string>
 	<string name="profile_setup_explanation">İstediğin herhangi bir şey için en fazla dört profil alanı ekleyebilirsin. Konum, linkler -ne isterseniz.</string>
@@ -411,4 +426,23 @@
 	<!-- %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 sunucusu %2$s mail uzantısı ile hesap oluşturmaya izin vermiyor. Farklı bir mail deneyebilir ya da &lt;a&gt;farklı bir sunucu seçebilirsiniz&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Bu kullanıcı adı kullanılıyor.</string>
+	<string name="spoiler_show">Yine de göster</string>
+	<string name="spoiler_hide">Yeniden gizle</string>
+	<string name="poll_multiple_choice">Bir ya da daha fazla seçim yapın</string>
+	<string name="save_changes">Değişiklikleri kaydet</string>
+	<string name="profile_featured">Öne çıkan</string>
+	<string name="profile_timeline">Zaman çizelgesi</string>
+	<string name="view_all">Tümünü Gör</string>
+	<string name="profile_endorsed_accounts">Hesaplar</string>
+	<string name="verified_link">Onaylanmış bağlantı</string>
+	<string name="show">Göster</string>
+	<string name="hide">Gizle</string>
+	<string name="join_default_server">%s\'e katıl</string>
+	<string name="pick_server">Başka sunucu seç</string>
+	<string name="signup_or_login">veya</string>
+	<string name="learn_more">Daha fazla bilgi edinin</string>
+	<string name="welcome_to_mastodon">Mastodon\'a hoş geldiniz</string>
+	<string name="welcome_paragraph1">Mastodon merkezi olmayan bir sosyal ağdır, yani tek bir şirket tarafından kontrol edilmemektedir. Hepsi birbirine bağlı, bağımsız olarak işletilen birçok sunucudan oluşur.</string>
+	<string name="what_are_servers">Sunucular nelerdir?</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>
 </resources>

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

@@ -10,11 +10,13 @@
 	<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">підписався(-лася) на вас</string>
 	<string name="user_sent_follow_request">відправив запит на підписку</string>
 	<string name="user_favorited">Вподобав(-ла) ваш допис</string>
+	<string name="notification_boosted">поширив ваш пост</string>
 	<string name="poll_ended">опитування завершено</string>
 	<string name="time_seconds">%dсек</string>
 	<string name="time_minutes">%dхв</string>
@@ -192,6 +194,7 @@
 	<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>
@@ -248,6 +251,7 @@
 	<string name="skip">Пропустити</string>
 	<string name="notification_type_follow">Нові підписники</string>
 	<string name="notification_type_favorite">Улюблені</string>
+	<string name="notification_type_reblog">Поширення</string>
 	<string name="notification_type_mention">Згадки</string>
 	<string name="notification_type_poll">Опитування</string>
 	<string name="choose_account">Виберіть обліковий запис</string>
@@ -276,6 +280,7 @@
 	<string name="notify_none">ніхто</string>
 	<string name="notify_favorites">Вподобавує ваш допис</string>
 	<string name="notify_follow">Підписався на мене</string>
+	<string name="notify_reblog">Поширює мій пост</string>
 	<string name="notify_mention">Згадує мене</string>
 	<string name="settings_boring">Нудна зона</string>
 	<string name="settings_account">Налаштування облікового запису</string>
@@ -296,6 +301,7 @@
 	<string name="hide_content">Приховати вміст</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>
@@ -311,6 +317,8 @@
 	<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>
@@ -360,6 +368,7 @@
 	</plurals>
 	<string name="timestamp_via_app">%1$s через %2$s</string>
 	<string name="time_now">щойно</string>
+	<string name="post_info_reblogs">Поширення</string>
 	<string name="post_info_favorites">Улюблені</string>
 	<string name="edit_history">Змінити історію</string>
 	<string name="last_edit_at_x">Останнє редагування %s</string>
@@ -453,4 +462,23 @@
 	<!-- %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="signup_username_taken">Ім\'я користувача вже зайняте.</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">Вітаємо у Mastodon</string>
+	<string name="welcome_paragraph1">Mastodon - це децентралізована соціальна мережа, що визначає, що жодна компанія контролює її. У її склад входить велика кількість незалежних серверів, які всі з\'єднані один з іншим.</string>
+	<string name="what_are_servers">Що таке сервери?</string>
+	<string name="welcome_paragraph2"><![CDATA[Кожен акаунт Mastodon розміщений на сервері, й кожен сервер має особисті цінності, правила, й адмінів. Немає різниці, який ви оберете. Ви можете підписуватися та спілкуватися з усіма, навіть якщо ви на різних серверах.]]></string>
 </resources>

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

@@ -10,11 +10,13 @@
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Chuẩn bị xác thực…</string>
 	<string name="finishing_auth">Hoàn tất xác thực…</string>
+	<string name="user_boosted">%s đăng lại</string>
 	<string name="in_reply_to">%s viết tiếp</string>
 	<string name="notifications">Thông báo</string>
 	<string name="user_followed_you">đã theo dõi bạn</string>
 	<string name="user_sent_follow_request">đã yêu cầu theo dõi bạn</string>
 	<string name="user_favorited">thích tút của bạn</string>
+	<string name="notification_boosted">vừa đăng lại tút của bạn</string>
 	<string name="poll_ended">cuộc bình chọn kết thúc</string>
 	<string name="time_seconds">%ds</string>
 	<string name="time_minutes">%dm</string>
@@ -36,7 +38,7 @@
 		<item quantity="other">tút</item>
 	</plurals>
 	<string name="posts">Tút</string>
-	<string name="posts_and_replies">Tút kèm trả lời</string>
+	<string name="posts_and_replies">Lượt trả lời</string>
 	<string name="media">Media</string>
 	<string name="profile_about">Giới thiệu</string>
 	<string name="button_follow">Theo dõi</string>
@@ -150,6 +152,7 @@
 	<string name="report_sent_subtitle">Trong lúc chờ chúng tôi xem xét, bạn có thể áp dụng hành động với @%s.</string>
 	<string name="unfollow_user">Ngưng theo dõi %s</string>
 	<string name="unfollow">Ngưng theo dõi</string>
+	<string name="mute_user_explain">Bạn sẽ không thấy tút hoặc lượt đăng lại của họ trên bảng tin. Họ không biết rằng bạn ẩn họ.</string>
 	<string name="block_user_explain">Họ sẽ không thể theo dõi hoặc đọc tút của bạn, nhưng họ có thể hiểu bạn đã chặn họ.</string>
 	<string name="report_personal_title">Không muốn xem thứ này?</string>
 	<string name="report_personal_subtitle">Khi bạn thấy có gì đó mà bạn không thích trên Mastodon, bạn có thể tự loại bỏ chúng.</string>
@@ -206,6 +209,7 @@
 	<string name="skip">Bỏ qua</string>
 	<string name="notification_type_follow">Người theo dõi mới</string>
 	<string name="notification_type_favorite">Lượt thích</string>
+	<string name="notification_type_reblog">Đăng lại</string>
 	<string name="notification_type_mention">Lượt nhắc đến</string>
 	<string name="notification_type_poll">Cuộc bình chọn</string>
 	<string name="choose_account">Chọn tài khoản</string>
@@ -231,6 +235,7 @@
 	<string name="notify_none">không một ai</string>
 	<string name="notify_favorites">Thích tút của tôi</string>
 	<string name="notify_follow">Theo dõi tôi</string>
+	<string name="notify_reblog">Đăng lại tút của tôi</string>
 	<string name="notify_mention">Nhắc đến tôi</string>
 	<string name="settings_boring">Nhàm chán</string>
 	<string name="settings_account">Cài đặt tài khoản</string>
@@ -251,6 +256,7 @@
 	<string name="hide_content">Ẩn nội dung</string>
 	<string name="new_post">Viết 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>
 	<string name="button_share">Chia sẻ</string>
 	<string name="media_no_description">Media chưa có mô tả</string>
@@ -266,6 +272,8 @@
 	<string name="followed_user">Bạn đã theo dõi %s</string>
 	<string name="following_user_requested">Yêu cầu theo dõi %s</string>
 	<string name="open_in_browser">Mở trong trình duyệt</string>
+	<string name="hide_boosts_from_user">Ẩn đăng lại từ %s</string>
+	<string name="show_boosts_from_user">Hiện đăng lại từ %s</string>
 	<string name="signup_reason">Vì sao bạn muốn tham gia?</string>
 	<string name="signup_reason_note">Điều này sẽ giúp chúng tôi phê duyệt đăng ký của bạn.</string>
 	<string name="clear">Xóa</string>
@@ -304,8 +312,12 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d lượt thích</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="other">%,đăng lại</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s qua %2$s</string>
 	<string name="time_now">vừa xong</string>
+	<string name="post_info_reblogs">Lượt đăng lại</string>
 	<string name="post_info_favorites">Lượt thích</string>
 	<string name="edit_history">Lịch sử chỉnh sửa</string>
 	<string name="last_edit_at_x">Sửa lần cuối %s</string>
@@ -393,4 +405,23 @@
 	<!-- %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 không cho phép đăng ký với %2$s. Dùng cái khác hoặc &lt;a&gt;chọn máy chủ khác&lt;/a&gt;.</string>
 	<string name="signup_username_taken">Tên này đã được sử dụng.</string>
+	<string name="spoiler_show">Vẫn cứ xem</string>
+	<string name="spoiler_hide">Ẩn lại</string>
+	<string name="poll_multiple_choice">Chọn một hoặc nhiều</string>
+	<string name="save_changes">Lưu thay đổi</string>
+	<string name="profile_featured">Nổi bật</string>
+	<string name="profile_timeline">Bảng tin</string>
+	<string name="view_all">Xem tất cả</string>
+	<string name="profile_endorsed_accounts">Tài khoản</string>
+	<string name="verified_link">Liên kết xác minh</string>
+	<string name="show">Hiện</string>
+	<string name="hide">Ẩn</string>
+	<string name="join_default_server">Tham gia %s</string>
+	<string name="pick_server">Tìm máy chủ khác</string>
+	<string name="signup_or_login">hoặc</string>
+	<string name="learn_more">Tìm hiểu thêm</string>
+	<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>
 </resources>

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

@@ -10,11 +10,13 @@
 	<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">关注了你</string>
 	<string name="user_sent_follow_request">向你发送了关注请求</string>
 	<string name="user_favorited">喜欢了你的嘟文</string>
+	<string name="notification_boosted">转发了你的嘟文</string>
 	<string name="poll_ended">投票已结束</string>
 	<string name="time_seconds">%d 秒前</string>
 	<string name="time_minutes">%d 分钟前</string>
@@ -156,7 +158,15 @@
 	<string name="back">返回</string>
 	<string name="instance_catalog_title">Mastodon由来自不同服务器的用户组成。</string>
 	<string name="instance_catalog_subtitle">根据你的兴趣、地区或其他目的挑选一个服务器。无论你选择哪个服务器，你都可以跟所有人联系。</string>
+	<string name="search_communities">服务器名称或地址</string>
+	<string name="instance_rules_title">实例规则</string>
+	<string name="signup_title">创建帐号</string>
 	<string name="edit_photo">编辑</string>
+	<string name="display_name">名字</string>
+	<string name="username">用户名</string>
+	<string name="email">邮箱</string>
+	<string name="password">密码</string>
+	<string name="confirm_password">确认密码</string>
 	<string name="password_note">包括大写字母、特殊字符和数字以增加你的密码强度。</string>
 	<string name="category_academia">学术</string>
 	<string name="category_activism">行动主义</string>
@@ -171,7 +181,9 @@
 	<string name="category_music">音乐</string>
 	<string name="category_regional">地区</string>
 	<string name="category_tech">科技</string>
+	<string name="confirm_email_title">检查你的收件箱</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_didnt_get">没有收到链接？</string>
 	<string name="resend">重新发送</string>
 	<string name="open_email_app">打开电子邮件应用</string>
 	<string name="resent_email">邮件已发送</string>
@@ -194,6 +206,7 @@
 	<string name="skip">跳过</string>
 	<string name="notification_type_follow">新关注者</string>
 	<string name="notification_type_favorite">喜欢</string>
+	<string name="notification_type_reblog">转嘟</string>
 	<string name="notification_type_mention">提及</string>
 	<string name="notification_type_poll">投票</string>
 	<string name="choose_account">选择账户</string>
@@ -219,6 +232,7 @@
 	<string name="notify_none">关闭通知</string>
 	<string name="notify_favorites">喜欢我的嘟文</string>
 	<string name="notify_follow">关注我</string>
+	<string name="notify_reblog">转发我的嘟文</string>
 	<string name="notify_mention">提及我</string>
 	<string name="settings_boring">更多</string>
 	<string name="settings_account">账户设置</string>
@@ -239,6 +253,7 @@
 	<string name="hide_content">隐藏内容</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>
@@ -252,7 +267,11 @@
 	<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>
 	<string name="profile_header">资料页横幅图片</string>
@@ -290,8 +309,12 @@
 	<plurals name="x_favorites">
 		<item quantity="other">%,d 次喜欢</item>
 	</plurals>
+	<plurals name="x_reblogs">
+		<item quantity="other">%d 条嘟文</item>
+	</plurals>
 	<string name="timestamp_via_app">%1$s 来自 %2$s</string>
 	<string name="time_now">刚刚</string>
+	<string name="post_info_reblogs">转嘟</string>
 	<string name="post_info_favorites">喜欢</string>
 	<string name="edit_history">编辑记录</string>
 	<string name="last_edit_at_x">编辑于 %s</string>
@@ -335,6 +358,8 @@
 	<!-- %s is file size -->
 	<string name="download_update">已下载(%s)</string>
 	<string name="install_update">安装</string>
+	<string name="privacy_policy_title">你的隐私</string>
+	<string name="privacy_policy_subtitle">Mastodon客户端本身不会采集任何数据，但是你注册的服务器可能有不同的隐私政策。  如果你不同意 %s 的隐私政策，可以重新挑选其他服务器。</string>
 	<string name="i_agree">我同意</string>
 	<string name="empty_list">还没有内容</string>
 	<string name="instance_signup_closed">此服务器不接受新注册。</string>
@@ -346,7 +371,38 @@
 	<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>
+	<string name="server_filter_region_europe">欧洲</string>
+	<string name="server_filter_region_north_america">北美洲</string>
+	<string name="server_filter_region_south_america">南美洲</string>
+	<string name="server_filter_region_africa">非洲</string>
+	<string name="server_filter_region_asia">亚洲</string>
+	<string name="server_filter_region_oceania">大洋洲</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>
+	<string name="popular_on_mastodon">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" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="profile_timeline">时间轴</string>
+	<string name="profile_endorsed_accounts">帐号</string>
+	<string name="show">显示</string>
+	<string name="hide">隐藏</string>
+	<string name="join_default_server">加入 %s</string>
+	<string name="signup_or_login">或者</string>
+	<string name="learn_more">了解更多</string>
+	<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>
 </resources>

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

@@ -201,7 +201,7 @@
 	<string name="alt_text_hint">舉例來說，一隻狗對著鏡頭瞇著眼睛懷疑地看著四周。</string>
 	<string name="visibility_public">公開</string>
 	<string name="visibility_followers_only">僅限跟隨者</string>
-	<string name="visibility_private">僅限於我提及的人</string>
+	<string name="visibility_private">僅限提及者</string>
 	<string name="search_all">全部</string>
 	<string name="search_people">使用者</string>
 	<string name="recent_searches">最近的搜尋</string>
@@ -417,7 +417,7 @@
 	<string name="show">顯示</string>
 	<string name="hide">隱藏</string>
 	<string name="join_default_server">加入 %s</string>
-	<string name="pick_server">選擇我的伺服器</string>
+	<string name="pick_server">挑選另一個伺服器</string>
 	<string name="signup_or_login">或</string>
 	<string name="learn_more">了解更多</string>
 	<string name="welcome_to_mastodon">歡迎來到 Mastodon</string>

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

@@ -445,7 +445,7 @@
 	<string name="show">Show</string>
 	<string name="hide">Hide</string>
 	<string name="join_default_server">Join %s</string>
-	<string name="pick_server">Pick my own server</string>
+	<string name="pick_server">Pick another server</string>
 	<string name="signup_or_login">or</string>
 	<string name="learn_more">Learn more</string>
 	<string name="welcome_to_mastodon">Welcome to Mastodon</string>

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

@@ -275,4 +275,15 @@
     <string name="sk_show_thread">Show thread</string>
     <string name="sk_compact_reblog_reply_line">Compact boost/reply line</string>
     <string name="sk_settings_confirm_before_reblog">Confirm before boosting</string>
+    <string name="sk_content_type">Content type</string>
+    <string name="sk_content_type_unspecified">Not specified</string>
+    <string name="sk_content_type_plain">Plain text</string>
+    <string name="sk_content_type_html">HTML</string>
+    <string name="sk_content_type_markdown">Markdown</string>
+    <string name="sk_content_type_bbcode">BBCode</string>
+    <string name="sk_content_type_mfm">MFM</string>
+    <string name="sk_settings_content_types">Enable post formatting</string>
+    <string name="sk_settings_content_types_explanation">Allows setting a content type like Markdown when creating a post. Keep in mind that not all instances support this.</string>
+    <string name="sk_settings_default_content_type">Default content type</string>
+    <string name="sk_settings_default_content_type_explanation">This lets you have a content type be pre-selected when creating new posts, overriding the value set in “Posting preferences”.</string>
 </resources>