Merge remote-tracking branch 'megalodon_main/main'

# Conflicts: # mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
2023-08-29 10:41:09 -03:00
parent 7191e5a96a 580ae15af6
commit c4b7262e89
60 changed files with 522 additions and 220 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -340,7 +340,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		req.visibility = preferences.postingDefaultVisibility;
 		req.inReplyToId = notification.status.id;

-		if (!notification.status.spoilerText.isEmpty() &&
+		if (notification.status.hasSpoiler() &&
 				(GlobalUserPreferences.prefixReplies == ALWAYS
 						|| (GlobalUserPreferences.prefixReplies == TO_OTHERS && !ownID.equals(notification.status.account.id)))
 				&& !notification.status.spoilerText.startsWith("re: ")) {
--- a/mastodon/src/main/java/org/joinmastodon/android/UnifiedPushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/UnifiedPushNotificationReceiver.java
@@ -27,9 +27,9 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
 	public void onNewEndpoint(@NotNull Context context, @NotNull String endpoint, @NotNull String instance) {
 		// Called when a new endpoint be used for sending push messages
 		Log.d(TAG, "onNewEndpoint: New Endpoint " + endpoint + " for "+ instance);
-		AccountSession account = AccountSessionManager.getInstance().getLastActiveAccount();
+		AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
 		if (account != null)
-			account.getPushSubscriptionManager().registerAccountForPush(null);
+			account.getPushSubscriptionManager().registerAccountForPush(null, endpoint);
 	}

 	@Override
@@ -37,7 +37,7 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
 		// called when the registration is not possible, eg. no network
 		Log.d(TAG, "onRegistrationFailed: " + instance);
 		//re-register for gcm
-		AccountSession account = AccountSessionManager.getInstance().getLastActiveAccount();
+		AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
 		if (account != null)
 			account.getPushSubscriptionManager().registerAccountForPush(null);
 	}
@@ -47,7 +47,7 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
 		// called when this application is unregistered from receiving push messages
 		Log.d(TAG, "onUnregistered: " + instance);
 		//re-register for gcm
-		AccountSession account = AccountSessionManager.getInstance().getLastActiveAccount();
+		AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
 		if (account != null)
 			account.getPushSubscriptionManager().registerAccountForPush(null);
 	}
@@ -55,7 +55,10 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
 	@Override
 	public void onMessage(@NotNull Context context, @NotNull byte[] message, @NotNull String instance) {
 		// Called when a new message is received. The message contains the full POST body of the push message
-		AccountSession account = AccountSessionManager.getInstance().getAccount(instance);
+		AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
+
+		if (account == null)
+		    return;

 		//this is stupid
 		// Mastodon stores the info to decrypt the message in the HTTP headers, which are not accessible in UnifiedPush,
--- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
@@ -125,11 +125,11 @@ public class PushSubscriptionManager{
 		// this function is used for registering push notifications using FCM
 		// to avoid NonFreeNet in F-Droid, this registration is disabled in it
 		// see https://github.com/LucasGGamerM/moshidon/issues/206 for more context
-		if(BuildConfig.BUILD_TYPE.equals("fdroidRelease"))
+		if(BuildConfig.BUILD_TYPE.equals("fdroidRelease") || TextUtils.isEmpty(deviceToken)){
+			Log.d(TAG, "Skipping registering for FCM push notifications");
 			return;
+		}

-		if(TextUtils.isEmpty(deviceToken))
-			throw new IllegalStateException("No device push token available");
 		String endpoint = "https://app.joinmastodon.org/relay-to/fcm/"+deviceToken+"/"+accountID;
 		registerAccountForPush(subscription, endpoint);
 	}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -465,7 +465,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			hasSpoiler=true;
 			spoilerWrap.setVisibility(View.VISIBLE);
 			spoilerBtn.setSelected(true);
-		}else if(editingStatus!=null && !TextUtils.isEmpty(editingStatus.spoilerText)){
+		}else if(editingStatus!=null && editingStatus.hasSpoiler()){
 			hasSpoiler=true;
 			spoilerWrap.setVisibility(View.VISIBLE);
 			spoilerEdit.setText(getArguments().getString("sourceSpoiler", editingStatus.spoilerText));
@@ -737,7 +737,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			view.findViewById(R.id.time).setVisibility(time==null ? View.GONE : View.VISIBLE);
 			if(time!=null) ((TextView) view.findViewById(R.id.time)).setText(time);

-			if (status.spoilerText != null && !status.spoilerText.isBlank()) {
+			if (status.hasSpoiler()) {
 				TextView replyToSpoiler = view.findViewById(R.id.reply_to_spoiler);
 				replyToSpoiler.setVisibility(View.VISIBLE);
 				replyToSpoiler.setText(status.spoilerText);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
@@ -45,8 +45,8 @@ public class FeaturedHashtagsListFragment extends BaseStatusListFragment<Hashtag
 	}

 	@Override
-	public void onItemClick(String id){
-		UiUtils.openHashtagTimeline(getActivity(), accountID, id, data.stream().filter(h -> Objects.equals(h.name, id)).findAny().map(h -> h.following).orElse(null));
+	public void onItemClick(String hashtag){
+		UiUtils.openHashtagTimeline(getActivity(), accountID, hashtag, data.stream().filter(h -> Objects.equals(h.name, hashtag)).findAny().map(h -> h.following).orElse(null));
 	}

 	@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -1169,7 +1169,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		actionButton.setText(R.string.save_changes);
 		pager.setVisibility(View.GONE);
 		tabbar.setVisibility(View.GONE);
-		Drawable overlay=getResources().getDrawable(R.drawable.edit_avatar_overlay).mutate();
+		Drawable overlay=getResources().getDrawable(R.drawable.edit_avatar_overlay, getActivity().getTheme()).mutate();
 		avatar.setForeground(overlay);
 		updateMetadataHeight();

@@ -1541,16 +1541,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 	}

-	private class AboutViewHolder extends BaseViewHolder implements ImageLoaderViewHolder {
+	private class AboutViewHolder extends BaseViewHolder implements ImageLoaderViewHolder{
 		private final TextView title;
 		private final LinkedTextView value;
-//		private final ImageView verifiedIcon;

 		public AboutViewHolder(){
 			super(R.layout.item_profile_about);
 			title=findViewById(R.id.title);
 			value=findViewById(R.id.value);
-//			verifiedIcon=findViewById(R.id.verified_icon);
 		}

 		@Override
@@ -1558,7 +1556,18 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			super.onBind(item);
 			title.setText(item.parsedName);
 			value.setText(item.parsedValue);
-//			verifiedIcon.setVisibility(item.verifiedAt!=null ? View.VISIBLE : View.GONE);
+			if(item.verifiedAt!=null){
+				int textColor=UiUtils.isDarkTheme() ? 0xFF89bb9c : 0xFF5b8e63;
+				value.setTextColor(textColor);
+				value.setLinkTextColor(textColor);
+				Drawable check=getResources().getDrawable(R.drawable.ic_fluent_checkmark_starburst_20_regular, getActivity().getTheme()).mutate();
+				check.setTint(textColor);
+				value.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, check, null);
+			}else{
+				value.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
+				value.setLinkTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.colorAccent));
+				value.setCompoundDrawables(null, null, null, null);
+			}
 		}

 		@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
@@ -16,6 +16,7 @@ import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.utils.UiUtils;

 import java.util.List;
+import java.util.Objects;

 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.imageloader.ImageCache;
@@ -32,7 +33,7 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void>{
 		setTitle(getString(R.string.about_app, getString(R.string.mo_app_name)));
 		AccountSession s=AccountSessionManager.get(accountID);
 		onDataLoaded(List.of(
-				new ListItem<>(R.string.sk_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.mo_donate_url))),
+				new ListItem<>(R.string.mo_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.mo_donate_url))),
 				new ListItem<>(R.string.mo_settings_contribute, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.mo_repo_url))),
 				new ListItem<>(R.string.settings_tos, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/terms")),
 				new ListItem<>(R.string.settings_privacy_policy, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.privacy_policy_url)), 0, true),
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
@@ -120,8 +120,8 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 			for(FilterResult fr:filtered)
 				fr.postprocess();

-		if(!TextUtils.isEmpty(spoilerText)) sensitive=true;
-		spoilerRevealed=TextUtils.isEmpty(spoilerText);
+		spoilerRevealed=!hasSpoiler();
+		if(!spoilerRevealed) sensitive=true;
 		sensitiveRevealed=!sensitive;
 		if(visibility.equals(StatusPrivacy.LOCAL)) localOnly=true;
 		if(emojiReactions!=null) reactions=emojiReactions;
@@ -194,6 +194,10 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 		return strippedText;
 	}

+	public boolean hasSpoiler(){
+		return !TextUtils.isEmpty(spoilerText);
+	}
+
 	@NonNull
 	@Override
 	public Status clone(){
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/OutlineProviders.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/OutlineProviders.java
@@ -37,6 +37,16 @@ public class OutlineProviders{
 		}
 	};

+	private final static int BUTTON_BG_HEIGHT=V.dp(40);
+	public static final ViewOutlineProvider M3_BUTTON=new ViewOutlineProvider(){
+		@Override
+		public void getOutline(View view, Outline outline){
+			int viewHeight=view.getHeight();
+			int top=Math.floorDiv(viewHeight - BUTTON_BG_HEIGHT, 2);
+			outline.setRoundRect(0, top, view.getWidth(), top + BUTTON_BG_HEIGHT, V.dp(20));
+		}
+	};
+
 	public static ViewOutlineProvider roundedRect(int dp){
 		ViewOutlineProvider provider=roundedRects.get(dp);
 		if(provider!=null)
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
@@ -195,7 +195,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 						}
 					}
 					boolean isPixelfed = item.parentFragment.isInstancePixelfed();
-					boolean textEmpty = TextUtils.isEmpty(item.status.content) && TextUtils.isEmpty(item.status.spoilerText);
+					boolean textEmpty = TextUtils.isEmpty(item.status.content) && !item.status.hasSpoiler();
 					if(!redraft && (isPixelfed || textEmpty)){
 						// pixelfed doesn't support /statuses/:id/source :/
 						if (isPixelfed) {
@@ -327,11 +327,16 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{

 			deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null && !item.inset ? View.VISIBLE : View.GONE);
 			if (item.hasVisibilityToggle){
-				boolean disabled = !item.status.sensitiveRevealed ||
-						(!TextUtils.isEmpty(item.status.spoilerText) &&
-								!item.status.spoilerRevealed);
-				visibility.setEnabled(!disabled);
-				V.setVisibilityAnimated(visibility, disabled ? View.INVISIBLE : View.VISIBLE);
+				boolean hidden = !item.status.sensitiveRevealed || (item.status.hasSpoiler() && !item.status.spoilerRevealed);
+
+				// doing this because V.setVisibilityAnimated ignores changes between INVISIBLE and GONE
+				int newVis=hidden ? View.INVISIBLE : View.VISIBLE;
+				if(newVis==View.INVISIBLE && visibility.getVisibility()==View.GONE)
+					visibility.setVisibility(newVis);
+				else
+					V.setVisibilityAnimated(visibility, newVis);
+
+				visibility.setEnabled(!hidden);
 				visibility.setContentDescription(item.parentFragment.getString(item.status.sensitiveRevealed ? R.string.spoiler_hide : R.string.spoiler_show));
 				if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O){
 					visibility.setTooltipText(visibility.getContentDescription());
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
@@ -80,7 +80,7 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 			progressBg=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted, activity.getTheme()).mutate();
 			progressBgInset=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted_inset, activity.getTheme()).mutate();
 			itemView.setOnClickListener(this::onButtonClick);
-			button.setOutlineProvider(OutlineProviders.roundedRect(24));
+			button.setOutlineProvider(OutlineProviders.M3_BUTTON);
 			button.setClipToOutline(true);
 		}

--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -229,7 +229,7 @@ public abstract class StatusDisplayItem{
 		}

 		ArrayList<StatusDisplayItem> contentItems;
-		if(!TextUtils.isEmpty(statusForContent.spoilerText)){
+		if(statusForContent.hasSpoiler()){
 			if (AccountSessionManager.get(accountID).getLocalPreferences().revealCWs) statusForContent.spoilerRevealed = true;
 			SpoilerStatusDisplayItem spoilerItem=new SpoilerStatusDisplayItem(parentID, fragment, null, statusForContent, Type.SPOILER);
 			items.add(spoilerItem);
@@ -309,7 +309,7 @@ public abstract class StatusDisplayItem{
 		int i=1;
 		boolean inset=(flags & FLAG_INSET)!=0;
 		// add inset dummy so last content item doesn't clip out of inset bounds
-		if(inset || footer==null){
+		if((inset || footer==null) && (flags & FLAG_CHECKABLE)==0){
 			items.add(new DummyStatusDisplayItem(parentID, fragment));
 			// in case we ever need the dummy to display a margin for the media grid again:
 			// (i forgot why we apparently don't need this anymore)
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
@@ -185,11 +185,10 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			readMore.setText(item.status.textExpanded ? R.string.sk_collapse : R.string.sk_expand);

 			StatusDisplayItem next=getNextVisibleDisplayItem().orElse(null);
-			int bottomPadding=next instanceof FooterStatusDisplayItem
-					? V.dp(6)
-					: (!item.inset && next instanceof DummyStatusDisplayItem) ||
-						next instanceof EmojiReactionsStatusDisplayItem e && !e.isHidden()
-					? 0
+			if(next!=null && !next.parentID.equals(item.parentID)) next=null;
+			int bottomPadding=next instanceof FooterStatusDisplayItem ? V.dp(6)
+					: item.inset ? V.dp(12)
+					: (next instanceof EmojiReactionsStatusDisplayItem || next==null) ? 0
 					: V.dp(12);
 			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), bottomPadding);

--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/ListItemViewHolder.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/ListItemViewHolder.java
@@ -40,11 +40,9 @@ public abstract class ListItemViewHolder<T extends ListItem<?>> extends Bindable

 		if(TextUtils.isEmpty(item.subtitle) && item.subtitleRes==0){
 			subtitle.setVisibility(View.GONE);
-			title.setMaxLines(2);
 			view.setMinimumHeight(V.dp(56));
 		}else{
 			subtitle.setVisibility(View.VISIBLE);
-			title.setMaxLines(1);
 			view.setMinimumHeight(V.dp(72));
 			if(TextUtils.isEmpty(item.subtitle))
 				subtitle.setText(item.subtitleRes);
--- a/mastodon/src/main/res/drawable/ic_fluent_checkmark_starburst_20_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_checkmark_starburst_20_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M8.46 1.897l0.99 0.39c0.353 0.138 0.746 0.138 1.099 0l0.99-0.39c1.21-0.477 2.582 0.091 3.102 1.285l0.424 0.975c0.151 0.348 0.429 0.626 0.777 0.777l0.975 0.424c1.194 0.52 1.762 1.891 1.285 3.103l-0.39 0.99c-0.139 0.352-0.139 0.745 0 1.098l0.39 0.99c0.477 1.21-0.091 2.582-1.285 3.102l-0.975 0.424c-0.348 0.151-0.626 0.429-0.777 0.777l-0.424 0.975c-0.52 1.194-1.891 1.762-3.103 1.285l-0.99-0.39c-0.352-0.139-0.745-0.139-1.098 0l-0.99 0.39c-1.21 0.477-2.582-0.091-3.102-1.285l-0.424-0.975c-0.151-0.348-0.429-0.626-0.777-0.777l-0.975-0.424c-1.194-0.52-1.762-1.891-1.285-3.103l0.39-0.99c0.138-0.352 0.138-0.745 0-1.098l-0.39-0.99C1.42 7.25 1.988 5.878 3.182 5.358l0.975-0.424c0.348-0.151 0.626-0.429 0.777-0.777l0.424-0.975C5.878 1.988 7.25 1.42 8.461 1.897zm3.445 0.93l-0.99 0.39c-0.588 0.232-1.243 0.232-1.831 0l-0.99-0.39C7.384 2.549 6.58 2.881 6.275 3.582L5.851 4.556C5.599 5.136 5.136 5.6 4.556 5.851L3.581 6.275c-0.7 0.305-1.033 1.109-0.753 1.82l0.389 0.989c0.232 0.588 0.232 1.243 0 1.831l-0.39 0.99c-0.279 0.71 0.054 1.514 0.754 1.819l0.975 0.424c0.58 0.252 1.043 0.715 1.295 1.295l0.424 0.975c0.305 0.7 1.109 1.033 1.82 0.753l0.989-0.39c0.588-0.23 1.243-0.23 1.831 0l0.99 0.39c0.71 0.28 1.514-0.053 1.819-0.753l0.424-0.975c0.252-0.58 0.715-1.043 1.295-1.295l0.975-0.424c0.7-0.305 1.033-1.11 0.753-1.82l-0.39-0.989c-0.23-0.588-0.23-1.243 0-1.831l0.39-0.99c0.28-0.71-0.053-1.514-0.753-1.819l-0.975-0.424c-0.58-0.252-1.043-0.715-1.295-1.295l-0.424-0.975c-0.305-0.7-1.11-1.033-1.82-0.753zm-2.927 8.944l3.648-4.104c0.183-0.206 0.5-0.225 0.706-0.041 0.183 0.163 0.218 0.43 0.095 0.633l-0.054 0.073-4 4.5c-0.17 0.19-0.451 0.22-0.655 0.081l-0.072-0.06-2-2c-0.195-0.195-0.195-0.512 0-0.707 0.173-0.174 0.443-0.193 0.638-0.058l0.069 0.058 1.625 1.625 3.648-4.104-3.648 4.104z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
--- a/mastodon/src/main/res/layout/display_item_emoji_reactions.xml
+++ b/mastodon/src/main/res/layout/display_item_emoji_reactions.xml
@@ -43,6 +43,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginStart="-4dp"
 			android:paddingStart="8dp"
+			android:paddingEnd="3dp"
 			android:clipToPadding="false"
 			android:requiresFadingEdge="horizontal"
 			android:fadingEdgeLength="24dp" />
--- a/mastodon/src/main/res/layout/display_item_header_checkable.xml
+++ b/mastodon/src/main/res/layout/display_item_header_checkable.xml
@@ -8,83 +8,33 @@
 	android:paddingLeft="16dp"
 	android:clipToPadding="false">

-	<View
-		android:id="@+id/checkbox"
-		android:layout_width="32dp"
-		android:layout_height="32dp"
-		android:layout_marginStart="-4dp"
-		android:layout_marginTop="-8dp"
-		android:layout_marginEnd="12dp"
-		android:duplicateParentState="true"/>
+	<FrameLayout
+		android:id="@+id/checkbox_wrap"
+		android:layout_width="wrap_content"
+		android:layout_height="46sp"
+		android:duplicateParentState="true">

-	<ImageView
-		android:id="@+id/more"
-		android:layout_width="24dp"
-		android:layout_height="24dp"
-		android:layout_alignParentTop="true"
-		android:layout_alignParentEnd="true"
-		android:layout_marginTop="-2dp"
-		android:layout_marginEnd="-2dp"
-		android:background="?android:selectableItemBackgroundBorderless"
-		android:scaleType="center"
-		android:tint="?colorM3OnSurfaceVariant"
-		android:contentDescription="@string/more_options"
-		android:src="@drawable/ic_fluent_more_vertical_20_filled" />
+		<View
+			android:id="@+id/checkbox"
+			android:layout_gravity="center_vertical"
+			android:layout_width="32dp"
+			android:layout_height="32dp"
+			android:layout_marginStart="-4dp"
+			android:layout_marginTop="0dp"
+			android:layout_marginEnd="12dp"
+			android:duplicateParentState="true"/>

-	<ImageView
-		android:id="@+id/avatar"
-		android:layout_width="40dp"
-		android:layout_height="40dp"
-		android:layout_alignParentTop="true"
-		android:layout_toEndOf="@id/checkbox"
-		android:layout_marginTop="2dp"
-		android:layout_marginEnd="8dp" />
+	</FrameLayout>

-	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
-		android:id="@+id/name_wrap"
+	<FrameLayout
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
-		android:layout_toEndOf="@id/avatar"
-		android:layout_toStartOf="@id/more"
-		android:layout_marginEnd="8dp">
+		android:layout_height="wrap_content"
+		android:layout_marginTop="-16dp"
+		android:layout_marginStart="-16dp"
+		android:layout_toEndOf="@id/checkbox_wrap">

-		<TextView
-			android:id="@+id/name"
-			android:layout_width="wrap_content"
-			android:layout_height="24dp"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
-			android:textColor="?colorM3OnSurface"
-			android:gravity="start|center_vertical"
-			tools:text="Eugen" />
+		<include layout="@layout/display_item_header" />

-		<TextView
-			android:id="@+id/extra_text"
-			android:layout_width="wrap_content"
-			android:layout_height="24dp"
-			android:layout_marginStart="8dp"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
-			android:fontFamily="sans-serif"
-			android:textAlignment="viewStart"
-			android:textColor="?colorM3OnSurface"
-			tools:text="boosted your cat picture" />
-
-	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
-
-	<TextView
-		android:id="@+id/time_and_username"
-		android:layout_width="match_parent"
-		android:layout_height="20dp"
-		android:layout_below="@id/name_wrap"
-		android:layout_toEndOf="@id/avatar"
-		android:singleLine="true"
-		android:ellipsize="end"
-		android:textAppearance="@style/m3_title_small"
-		android:gravity="center_vertical"
-		android:textColor="?colorM3OnSurfaceVariant"
-		tools:text="9h ago · \@Gargron@mastodon.social"/>
+	</FrameLayout>

 </org.joinmastodon.android.ui.views.CheckableRelativeLayout>
--- a/mastodon/src/main/res/layout/fragment_report_comment.xml
+++ b/mastodon/src/main/res/layout/fragment_report_comment.xml
@@ -91,50 +91,6 @@

 			</RelativeLayout>

-			<LinearLayout
-				android:id="@+id/forward_report"
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="16dp"
-				android:paddingHorizontal="8dp"
-				android:paddingVertical="8dp"
-				android:gravity="center_vertical"
-				android:layoutDirection="locale"
-				android:background="?android:selectableItemBackground">
-
-				<ImageView
-					android:id="@+id/icon"
-					android:layout_width="24dp"
-					android:layout_height="24dp"
-					android:layout_marginStart="16dp"
-					android:layout_marginEnd="32dp"
-					android:importantForAccessibility="no"
-					android:tint="?android:textColorPrimary"
-					android:src="@drawable/ic_fluent_arrow_forward_24_regular"/>
-
-				<TextView
-					android:id="@+id/forward_report_text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_weight="1"
-					android:paddingVertical="8dp"
-					android:textSize="16sp"
-					android:text="@string/sk_forward_report_to"
-					android:textColor="?android:textColorPrimary" />
-
-				<Switch
-					android:id="@+id/forward_report_switch"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:duplicateParentState="true"
-					android:layout_marginStart="16dp"
-					android:layout_marginEnd="12dp"
-					android:focusable="false"
-					android:clickable="false"/>
-
-			</LinearLayout>
-
 		</LinearLayout>

 	</ScrollView>
--- a/mastodon/src/main/res/layout/onboarding_profile_field.xml
+++ b/mastodon/src/main/res/layout/onboarding_profile_field.xml
@@ -5,7 +5,6 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:paddingTop="8dp"
-	android:paddingEnd="16dp"
 	android:clipToPadding="false"
 	android:background="?colorM3Background"
 	tools:ignore="RtlSymmetry">
@@ -26,6 +25,7 @@
 		android:layout_height="48dp"
 		android:layout_alignParentEnd="true"
 		android:layout_marginStart="8dp"
+		android:layout_marginEnd="8dp"
 		android:scaleType="center"
 		android:tint="?colorM3OnSurface"
 		android:background="?android:actionBarItemBackground"
--- a/mastodon/src/main/res/values-ar-rSA/strings.xml
+++ b/mastodon/src/main/res/values-ar-rSA/strings.xml
@@ -182,7 +182,7 @@
 	<string name="report_reason_spam">إنه غير مرغوب فيه</string>
 	<string name="report_reason_spam_subtitle">روابط خبيثة أو تفاعل كاذب أو ردود متكررة</string>
 	<string name="report_reason_violation">ينتهك قواعد الخادم</string>
-	<string name="report_reason_violation_subtitle">تعلم أنه ينتهك قواعد محددة</string>
+	<string name="report_reason_violation_subtitle">أنت مُدرك لانتهاكه قواعد مُحَدَّدَة</string>
 	<string name="report_reason_other">إنَّهُ شَيءٌ آخَر</string>
 	<string name="report_reason_other_subtitle">لا تندرج هذه المشكلة ضمن فئات أخرى</string>
 	<string name="report_choose_rule">ما هي القواعد المنتهكة؟</string>
@@ -362,7 +362,7 @@
 		<item quantity="zero">منذ %d ثانية</item>
 		<item quantity="one">منذ ثانية</item>
 		<item quantity="two">منذ ثانيتان</item>
-		<item quantity="few">%d ثواني</item>
+		<item quantity="few">%d ثوانٍ</item>
 		<item quantity="many">منذ %d ثانية</item>
 		<item quantity="other">%d ثواني مضت</item>
 	</plurals>
@@ -463,7 +463,7 @@
 	<string name="welcome_to_mastodon">أهلًا بك على ماستدون</string>
 	<string name="welcome_paragraph1">ماستدون شبكة اجتماعية لامركزية، بمعنى أنه ليس هناك شركة واحدة تتحكم فيها. وهي تتألف من العديد من الخوادم التي تدار بشكل مستقل، وجميعها متصلة معا.</string>
 	<string name="what_are_servers">ما هي الخوادم؟</string>
-	<string name="welcome_paragraph2"><![CDATA[تتم استضافة كل حساب ماستدون على خادم - ولكل منها قيمه وقواعده ومسؤوليه الخاصين. بغض النظر عن الشخص الذي تختاره ، يمكنك متابعة الأشخاص والتفاعل معهم على أي خادم.]]></string>
+	<string name="welcome_paragraph2">تتم استضافة كل حساب ماستدون على خادم - ولكل خادم قيمه وقواعده ومسؤوليه الخاصين. مهما اخترت أي خادم، يمكنك متابعة الأشخاص والتفاعل معهم على أي خادم آخر.</string>
 	<string name="opening_link">رابط الافتتاح…</string>
 	<string name="link_not_supported">هذا الرابط غير مدعوم في التطبيق</string>
 	<string name="log_out_all_accounts">تسجيل الخروج من جميع الحسابات</string>
@@ -694,8 +694,8 @@
 	<string name="posts_matching_string">منشورات تحتوي على “%s”</string>
 	<string name="accounts_matching_string">أشخاص لديهم \"%s\"</string>
 	<!-- Shown in the post header. Please keep it short -->
-	<string name="time_seconds_ago_short">مُنذُ %dث</string>
-	<string name="time_minutes_ago_short">مُنذُ %dش</string>
-	<string name="time_hours_ago_short">مُنذُ %dس</string>
-	<string name="time_days_ago_short">مُنذُ %dي</string>
+	<string name="time_seconds_ago_short">مُنذُ %dثا</string>
+	<string name="time_minutes_ago_short">مُنذُ %dد</string>
+	<string name="time_hours_ago_short">مُنذُ %dسا</string>
+	<string name="time_days_ago_short">مُنذُ %d أيام</string>
 </resources>
--- a/mastodon/src/main/res/values-be-rBY/strings.xml
+++ b/mastodon/src/main/res/values-be-rBY/strings.xml
@@ -404,7 +404,6 @@
 	<string name="welcome_to_mastodon">Вітаем у Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon - гэта дэцэнтралізаваная сацыяльная сетка, што азначае, што ні адна кампанія не кантралюе яе. Яна складаецца з мноства незалежна працуючых сервераў, злучаных разам.</string>
 	<string name="what_are_servers">Што такое серверы?</string>
-	<string name="welcome_paragraph2"><![CDATA[Кожны акаўнт Mastodon размяшчаецца на серверы - кожны са сваімі каштоўнасцямі, правіламі і адміністратарамі. Незалежна ад таго, які сервер вы вылучыце, вы можаце сачыць і ўзаемадзейнічаць з людзьмі на любым серверы.]]></string>
 	<string name="retry">Паўтарыць</string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<string name="attachment_type_video">Відэа</string>
--- a/mastodon/src/main/res/values-bn-rBD/strings.xml
+++ b/mastodon/src/main/res/values-bn-rBD/strings.xml
@@ -181,7 +181,6 @@
 	<string name="welcome_to_mastodon">Mastodon - এ আপনাকে স্বাগত জানাই</string>
 	<string name="welcome_paragraph1">Mastodon হল একটি বিকেন্দ্রীভূত সামাজিক নেটওয়ার্ক, যার মানে কোনো একক কোম্পানি এটিকে নিয়ন্ত্রণ করে না। এটি অনেকগুলি স্বাধীনভাবে চালিত সার্ভারের সমন্বয়ে গঠিত, যেখানে সব সার্ভারগুলি একসাথে সংযুক্ত৷</string>
 	<string name="what_are_servers">সার্ভার কি?</string>
-	<string name="welcome_paragraph2"><![CDATA[প্রতিটি Mastodon অ্যাকাউন্টকে একটি সার্ভারে হোস্ট করা হয় — প্রত্যেকটির নিজস্ব মান, নিয়ম এবং প্রশাসক (অ্যাডমিন) রয়েছে। আপনি যে কোনো সার্ভারই বেছে নিন না কেন তা বিবেচ্য নয়, আপনি যেকোনো সার্ভারের লোকেদের সাথে যোগাযোগ করতে এবং তাদের ফলো করতে পারেন।]]></string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<!-- %s is the server domain -->
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
--- a/mastodon/src/main/res/values-ca-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
@@ -34,7 +34,7 @@
    <string name="sk_list_timelines">Llistes</string>
    <string name="sk_follow_requests">Sol·licituds de seguiment</string>
    <string name="sk_reject_follow_request">Rebutja la sol·licitud</string>
-    <string name="sk_lists_with_user">Edita les llistes amb %s</string>
+    <string name="sk_lists_with_user">Llistes amb %s</string>
    <string name="sk_settings_always_reveal_content_warnings">Mostra sempre els avisos de contingut</string>
    <string name="sk_settings_contribute">Contribueix a Megalodon</string>
    <string name="sk_settings_show_federated_timeline">Mostra la línia de temps federada</string>
@@ -246,11 +246,130 @@
    <string name="sk_searching">Cercant…</string>
    <string name="sk_save_draft">Voleu desar l\'esborrany\?</string>
    <string name="sk_settings_show_no_alt_indicator">Indicador dels textos alternatius inexistents</string>
-    <string name="sk_settings_prefix_reply_cw_with_re">Afegeix «re:» a les respostes als avisos de contingut</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Afig «re:» en respondre als avisos de contingut</string>
    <string name="sk_filtered">Filtrat: %s</string>
    <string name="sk_expand">Amplia</string>
    <string name="sk_collapse">Tanca</string>
    <string name="sk_settings_collapse_long_posts">Acurta les publicacions llargues</string>
    <string name="sk_signed_up">registrat</string>
    <string name="sk_spectator_mode">Mode d\'espectador</string>
+    <string name="sk_button_react">Reacciona amb un emoji</string>
+    <string name="sk_enter_emoji_hint">Escriviu per a reaccionar amb un emoji</string>
+    <string name="sk_duration_minutes_5">5 minuts</string>
+    <string name="sk_duration_minutes_30">30 minuts</string>
+    <string name="sk_duration_hours_1">1 hora</string>
+    <string name="sk_duration_hours_6">6 hores</string>
+    <string name="sk_duration_indefinite">Indefinida</string>
+    <string name="sk_mute_label">Durada</string>
+    <string name="sk_enter_emoji_toast">Heu d\'escriure un emoji</string>
+    <string name="sk_again_for_system_keyboard">Toqueu una altra vegada per a obrir el teclat del sistema</string>
+    <string name="sk_duration_days_1">1 dia</string>
+    <string name="sk_duration_days_3">3 dies</string>
+    <string name="sk_duration_days_7">7 dies</string>
+    <string name="sk_notification_mention">%s t\'ha mencionat</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Mostra els mateixos avisos de contingut en respostes</string>
+    <string name="sk_settings_auto_reveal_nobody">Mai</string>
+    <string name="sk_settings_auto_reveal_author">Respostes del mateix autor</string>
+    <string name="sk_open_in_app_failed">No s\'ha pogut obrir</string>
+    <string name="sk_no_remote_info_hint">La informació remota no està disponible</string>
+    <string name="sk_error_loading_profile">No s\'ha pogut carregar el perfil via %s</string>
+    <string name="sk_settings_prefix_replies_to_others">Només en resposta a altres</string>
+    <string name="sk_settings_prefix_replies_always">Responent a qualsevol</string>
+    <string name="sk_settings_prefix_replies_never">Mai</string>
+    <string name="sk_content_type_unspecified">Sense especificar</string>
+    <string name="sk_content_type_plain">Text pla</string>
+    <string name="sk_content_type_html">HTML</string>
+    <string name="sk_content_type">Tipus de contingut</string>
+    <string name="sk_content_type_mfm">MFM</string>
+    <string name="sk_settings_default_content_type">Contingut per defecte</string>
+    <string name="sk_timeline_bubble">Bombolla</string>
+    <string name="sk_in_reply">Resposta</string>
+    <string name="sk_followed_as">Seguit a %s</string>
+    <string name="sk_follow_as">Segueix des d\'un altre compte</string>
+    <string name="sk_icon_feed">Línia del temps</string>
+    <string name="sk_edit_timeline_tag_main">Publicacions amb l\'etiqueta…</string>
+    <string name="sk_edit_timeline_tags_explanation">Tingueu en compte que el servidor gestiona aquestes operacions. És possible que no s\'admeta combinar-les.</string>
+    <string name="sk_new_reports">Denúncies noves</string>
+    <string name="sk_unfinished_attachments_message">Alguns fitxers adjunts no han acabat de pujar-se\'n.</string>
+    <string name="sk_settings_hide_fab">Amaga automàticament el botó de redacció</string>
+    <string name="sk_settings_confirm_before_reblog">Confirma abans d\'impulsar</string>
+    <string name="sk_settings_content_types">Activa la formatació de text</string>
+    <string name="sk_settings_content_types_explanation">Permet establir un format de contingut com Markdown en crear una publicació. Tingueu en compte que no totes les instàncies són compatibles.</string>
+    <string name="sk_settings_default_content_type_explanation">Això permet preseleccionar un tipus de contingut en crear publicacions noves, substituint el valor establert a «Preferències de publicació».</string>
+    <string name="sk_settings_emoji_reactions">Activa les reaccions d\'emojis</string>
+    <string name="sk_settings_emoji_reactions_explanation">Mostra les reaccions d\'emojis a les publicacions i us permet interactuar amb elles. Algunes versions modificades de Mastodon són compatibles, però Mastodon no.</string>
+    <string name="sk_settings_emoji_reactions_in_lists">Mostra les reaccions d\'emojis a les línies de temps</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">Un usuari ha reaccionat amb %2$s</item>
+        <item quantity="other">%1$,d usuaris han reaccionat amb %2$s</item>
+    </plurals>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">Si les reaccions d\'emojis s\'han de mostrar a les línies de temps. Si l\'opció està desactivada, les reaccions d\'emojis només es mostraran quan es visualitze un fil.</string>
+    <string name="sk_settings_unifiedpush">Utilitza UnifiedPush</string>
+    <string name="sk_list_exclusive_switch">Fes la llista exclusiva</string>
+    <string name="sk_settings_unifiedpush_choose">Tria un distribuïdor</string>
+    <string name="sk_list_exclusive_switch_explanation">Els membres d\'una llista exclusiva no apareixeran a la línia de temps de l\'inici (si la vostra instància és compatible).</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Heu d\'instal·lar un distribuïdor perquè funcionen les notificacions UnifiedPush. Per a més informació, visita https://unifiedpush.org/</string>
+    <string name="sk_settings_allow_remote_loading">Carrega la informació de les instàncies remotes</string>
+    <string name="sk_settings_forward_report_default">Activa per defecte «Reenvia la denúncia»</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_quoting_user">Citant %s</string>
+    <string name="sk_settings_reply_visibility">Visibilitat de la resposta</string>
+    <string name="sk_settings_reply_visibility_all">Totes les respostes</string>
+    <string name="sk_settings_reply_visibility_following">Respostes als meus seguits</string>
+    <string name="sk_settings_reply_visibility_self">Respostes a mi</string>
+    <string name="sk_notification_action_replied">S\'ha enviat la resposta a %s</string>
+    <string name="sk_settings_continues_playback">Superposició d\'àudio</string>
+    <string name="sk_settings_continues_playback_summary">Permet que els fitxers multimèdia que ja s\'estan reproduint continuen reproduint-se en la superposició el reproductor nou</string>
+    <string name="sk_settings_unifiedpush_no_distributor">No s\'ha trobat cap distribuïdor</string>
+    <string name="sk_icon_bed">Llit</string>
+    <string name="sk_icon_recycle_bin">Paperera de reciclatge</string>
+    <string name="sk_icon_verified">Verificat</string>
+    <string name="sk_icon_doctor">Metge</string>
+    <string name="sk_icon_diamond">Diamant</string>
+    <string name="sk_icon_umbrella">Paraigua</string>
+    <string name="sk_add_timeline">Afig línia de temps</string>
+    <string name="sk_edit_timeline_tag_any">…o alguna d\'aquestes</string>
+    <string name="sk_edit_timeline_tag_all">…i cada una d\'aquestes</string>
+    <string name="sk_edit_timeline_tag_none">…però cap d\'aquestes</string>
+    <string name="sk_edit_timeline_tag_hint">Introduïu l\'etiqueta…</string>
+    <string name="sk_edit_timeline_tags_hint">Introduïu etiquetes…</string>
+    <string name="sk_icon_beaker">Vas científic</string>
+    <string name="sk_hashtag_timeline_local_only_switch">Mostra només publicacions locals\?</string>
+    <string name="sk_add_timeline_tag_error_empty">L\'etiqueta no pot ser buida</string>
+    <string name="sk_reported">denunciat</string>
+    <string name="sk_unfinished_attachments">Voleu arreglar els adjunts\?</string>
+    <string name="sk_reply_line_above_avatar">Text «En resposta a» damunt de l\'avatar</string>
+    <string name="sk_compact_reblog_reply_line">Text compacte d\'impuls/resposta</string>
+    <string name="sk_content_type_markdown">Markdown</string>
+    <string name="sk_content_type_bbcode">BBCode</string>
+    <string name="sk_instance_info_unavailable">La informació de la instància no està disponible temporalment</string>
+    <string name="sk_open_in_app">Obri en l\'aplicació</string>
+    <string name="sk_external_share_title">Comparteix amb un compte</string>
+    <string name="sk_external_share_or_open_title">Comparteix o obri amb un compte</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">Mostra els noms de les pestanyes a la barra de navegació</string>
+    <string name="sk_tab_profile">Perfil</string>
+    <string name="sk_tab_notifications">Notificacions</string>
+    <string name="sk_tab_search">Cerca</string>
+    <string name="sk_tab_home">Inici</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Mostra els pronoms als llistats d\'usuaris</string>
+    <string name="sk_settings_display_pronouns_in_threads">Mostra els pronoms als fils</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Mostra els pronoms a les línies de temps</string>
+    <string name="sk_settings_instance">Instància</string>
+    <string name="sk_switch_timeline">Canvia de línia de temps</string>
+    <string name="sk_pronouns_label">Pronoms</string>
+    <string name="sk_spoiler_show">Mostra el contingut</string>
+    <string name="sk_exclusive_list">Llista exclusiva</string>
+    <string name="sk_settings_allow_remote_loading_explanation">Prova d\'obtenir llistes més precises de seguidors, m\'agrada i impulsos carregant la informació de la instància d\'origen.</string>
+    <string name="sk_settings_auto_reveal_anyone">Respostes de tothom</string>
+    <string name="sk_advanced_options_show">Mostra les opcions avançades</string>
+    <string name="sk_advanced_options_hide">Amaga les opcions avançades</string>
+    <string name="sk_disable_pill_shaped_active_indicator">Desactiva l\'indicador en forma de pastilla de pestanya activa</string>
+    <string name="sk_settings_true_black">Mode de negre pur</string>
+    <string name="sk_reacted_with">%1$s ha reaccionat amb %2$s</string>
+    <string name="sk_reacted">%s ha reaccionat</string>
+    <string name="sk_settings_hide_interaction">Amaga els botons d\'interacció</string>
+    <string name="sk_show_thread">Mostra el fil</string>
+    <string name="sk_bubble_timeline_info_banner">Aquestes són les publicacions més recents de la xarxa seleccionades per l\'administració de la instància.</string>
+    <string name="sk_icon_gauge">Indicador</string>
+    <string name="sk_search_fediverse">Cerca al fedivers</string>
 </resources>
--- a/mastodon/src/main/res/values-cs-rCZ/strings.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings.xml
@@ -425,7 +425,6 @@
 	<string name="welcome_to_mastodon">Vítejte na Mastodonu</string>
 	<string name="welcome_paragraph1">Mastodon je decentralizovaná sociální síť, což znamená, že ji neovládá žádná jednotlivá společnost. Skládá se z mnoha nezávisle spravovaných serverů, všechny jsou propojeny dohromady.</string>
 	<string name="what_are_servers">Co jsou to servery?</string>
-	<string name="welcome_paragraph2"><![CDATA[Každý účet Mastodon je hostován na serveru - každý s vlastními hodnotami, pravidly a správci. Bez ohledu na to, který si vyberete, můžete sledovat a komunikovat s lidmi na jakémkoliv serveru.]]></string>
 	<string name="opening_link">Odkaz se otevírá…</string>
 	<string name="link_not_supported">Tento odkaz není v aplikaci podporovaný</string>
 	<string name="log_out_all_accounts">Odhlásit se ze všech účtů</string>
--- a/mastodon/src/main/res/values-da-rDK/strings.xml
+++ b/mastodon/src/main/res/values-da-rDK/strings.xml
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Velkommen til Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon er et decentraliseret socialt netværk, hvilket betyder at ingen enkelt virksomhed styrer det. Det består af mange uafhængige servere, alle forbundet sammen.</string>
 	<string name="what_are_servers">Hvad er servere?</string>
-	<string name="welcome_paragraph2"><![CDATA[Alle Mastodon-konti har plads på en server. Hver server har sine egne værdier, regler og administratorer. Ligegyldigt hvilken server du vælger, kan du følge og interagere med folk på alle andre servere.]]></string>
 	<string name="opening_link">Åbner link…</string>
 	<string name="link_not_supported">Linket er ikke understøttet i appen</string>
 	<string name="log_out_all_accounts">Log ud af alle konti</string>
--- a/mastodon/src/main/res/values-de-rDE/strings.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings.xml
@@ -43,8 +43,8 @@
 	<string name="block_user">%s sperren</string>
 	<string name="unblock_user">%s entsperren</string>
 	<string name="report_user">%s melden</string>
-	<string name="block_domain">%s sperren</string>
-	<string name="unblock_domain">%s nicht mehr sperren</string>
+	<string name="block_domain">%s blockieren</string>
+	<string name="unblock_domain">%s nicht mehr blockieren</string>
 	<plurals name="x_posts">
 		<item quantity="one">%,d Beitrag</item>
 		<item quantity="other">%,d Beiträge</item>
@@ -98,12 +98,12 @@
 	<string name="do_unmute">Nicht mehr stummschalten</string>
 	<string name="confirm_block_title">Konto sperren</string>
 	<string name="confirm_block_domain_title">Domain sperren</string>
-	<string name="confirm_block">Bestätigen, um %s zu sperren</string>
+	<string name="confirm_block">Bestätigen, um %s zu blockieren</string>
 	<string name="do_block">Sperren</string>
 	<string name="confirm_unblock_title">Konto nicht mehr sperren</string>
 	<string name="confirm_unblock_domain_title">Domain nicht mehr blockieren</string>
-	<string name="confirm_unblock">Bestätigen, um Sperre von %s aufzuheben</string>
-	<string name="do_unblock">Sperre aufheben</string>
+	<string name="confirm_unblock">Bestätigen, um %s nicht mehr zu blockieren</string>
+	<string name="do_unblock">Nicht mehr blockieren</string>
 	<string name="button_blocked">Blockiert</string>
 	<string name="action_vote">Abstimmen</string>
 	<string name="delete">Löschen</string>
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Willkommen auf Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon ist ein dezentrales, soziales Netzwerk. Das bedeutet, dass es nicht von einem einzigen Unternehmen kontrolliert wird. Das Netzwerk besteht aus unabhängig voneinander betriebenen Servern, die miteinander verbunden sind.</string>
 	<string name="what_are_servers">Was sind Server?</string>
-	<string name="welcome_paragraph2"><![CDATA[Jedes Mastodon-Konto wird auf einem Server gehostet. Jeder Server hat dabei seine eigenen Werte, Regeln und Administrator*innen. Aber egal, für welchen Server Du Dich entscheidest: Du kannst mit Leuten von anderen Servern interagieren und ihnen folgen.]]></string>
 	<string name="opening_link">Link wird geöffnet…</string>
 	<string name="link_not_supported">Dieser Link wird in der App nicht unterstützt</string>
 	<string name="log_out_all_accounts">Von allen Konten abmelden</string>
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Καλώς ήρθες στο Mastodon</string>
 	<string name="welcome_paragraph1">Το Mastodon είναι ένα αποκεντρωμένο κοινωνικό δίκτυο που σημαίνει ότι καμία εταιρεία δεν το ελέγχει. Αποτελείται από πολλούς ανεξάρτητους διακομιστές, όλοι συνδεδεμένοι μαζί.</string>
 	<string name="what_are_servers">Τι είναι οι διακομιστές;</string>
-	<string name="welcome_paragraph2"><![CDATA[Κάθε λογαριασμός Mastodon φιλοξενείται σε ένα διακομιστή - ο καθένας με τις δικές του αξίες, κανόνες και διαχειριστές. Ανεξάρτητα από το ποιον μπορεί να επιλέξεις, μπορείς να ακολουθήσεις και να αλληλεπιδράσεις με άτομα από οποιονδήποτε διακομιστή.]]></string>
 	<string name="opening_link">Άνοιγμα συνδέσμου…</string>
 	<string name="link_not_supported">Αυτός ο σύνδεσμος δεν υποστηρίζεται στην εφαρμογή</string>
 	<string name="log_out_all_accounts">Αποσύνδεση από όλους τους λογαριασμούς</string>
--- a/mastodon/src/main/res/values-es-rES/strings.xml
+++ b/mastodon/src/main/res/values-es-rES/strings.xml
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Bienvenido/da a Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon es una red social descentralizada, lo que significa que no la controla una sola compañía. Está formada por muchos servidores independientes, todos juntos conectados.</string>
 	<string name="what_are_servers">¿Qué son los servidores?</string>
-	<string name="welcome_paragraph2"><![CDATA[Cada cuenta de Mastodon está alojada en un servidor — cada uno con sus propios valores, reglas y administradores. No importa cual elijas, puede seguir e interactuar con personas en cualquier servidor.]]></string>
 	<string name="opening_link">Abriendo enlace…</string>
 	<string name="link_not_supported">Este enlace no es compatible con la aplicación</string>
 	<string name="log_out_all_accounts">Cerrar sesión en todas las cuentas</string>
--- a/mastodon/src/main/res/values-fa-rIR/strings.xml
+++ b/mastodon/src/main/res/values-fa-rIR/strings.xml
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">به ماستودون خوش آمدید</string>
 	<string name="welcome_paragraph1">ماستودون یک شبکه اجتماعی غیر متمرکز است،به این معنی که هیچ شرکتی آن را کنترل نمی کند. این از بسیاری از کارسازهای مستقل تشکیل شده است که همه به هم متصل هستند.</string>
 	<string name="what_are_servers">کارساز شما کجاست؟</string>
-	<string name="welcome_paragraph2"><![CDATA[هر حساب ماستودون بر روی یک سرور میزبانی می شود — هر کدام با مقادیر، قوانین و مدیران خاص خود. مهم نیست کدام یک را انتخاب می کنید، می توانید افراد را در هر کارسازی دنبال کنید و با آنها تعامل داشته باشید.]]></string>
 	<string name="opening_link">باز کردن پیوند…</string>
 	<string name="link_not_supported">این پیوند در کاره پشتیبانی نمی شود</string>
 	<string name="log_out_all_accounts">از همه حساب‌ها خارج شوید</string>
--- a/mastodon/src/main/res/values-fr-rFR/strings.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings.xml
@@ -387,7 +387,7 @@
 	<string name="welcome_to_mastodon">Bienvenue sur Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon est un réseau social décentralisé, ce qui signifie qu’aucune entreprise ne le contrôle. Il est composé de plusieurs serveurs indépendants, tous connectés ensemble.</string>
 	<string name="what_are_servers">Que sont les serveurs ?</string>
-	<string name="welcome_paragraph2"><![CDATA[Chaque compte Mastodon est hébergé sur un serveur, chacun ayant ses valeurs, ses règles, et ses administratrices ou administrateurs. Quel que soit le serveur que vous choisissez, vous pouvez suivre et interagir avec des personnes sur n\'importe quel serveur.]]></string>
+	<string name="welcome_paragraph2">Chaque compte Mastodon est hébergé sur un serveur, chacun ayant ses valeurs, ses règles, et ses administratrices ou administrateurs. Quel que soit le serveur que vous choisissez, vous pouvez suivre et interagir avec des personnes sur n\'importe quel autre serveur.</string>
 	<string name="opening_link">Ouverture du lien…</string>
 	<string name="link_not_supported">Ce lien n’est pas pris en charge dans l’application</string>
 	<string name="log_out_all_accounts">Se déconnecter de tous les comptes</string>
--- a/mastodon/src/main/res/values-gd-rGB/strings.xml
+++ b/mastodon/src/main/res/values-gd-rGB/strings.xml
@@ -425,7 +425,7 @@
 	<string name="welcome_to_mastodon">Fàilte gu Mastodon</string>
 	<string name="welcome_paragraph1">’S e lìonra sòisealta sgaoilte a th’ ann am Mastodon agus is ciall dha seo nach eil e fo smachd aon chompanaidh a-mhàin. Tha e dèanta de ghrunn fhrithealaichean a tha ’gan ruith gu neo-eisimeileach ach ceangailte ri chèile.</string>
 	<string name="what_are_servers">Dè th’ anns na frithealaichean?</string>
-	<string name="welcome_paragraph2"><![CDATA[Tha gach cunntas Mastodon ’ga òstadh air frithealaiche – tha luachan, riaghailtean ⁊ rianairean sònraichte aig gach fear. Ge b’ e dè am frithealaiche a thaghas tu, ’s urrainn dhut daoine air frithealaiche sam bith a leantainn is bruidhinn riutha.]]></string>
+	<string name="welcome_paragraph2">Tha gach cunntas Mastodon ’ga òstadh air frithealaiche – tha luachan, riaghailtean ⁊ rianairean sònraichte aig gach fear. Ge b’ e dè am frithealaiche a thaghas tu, ’s urrainn dhut daoine air frithealaiche sam bith a leantainn is bruidhinn riutha.</string>
 	<string name="opening_link">A’ fosgladh a’ cheangail…</string>
 	<string name="link_not_supported">Cha chuir an aplacaid taic ris a’ cheangal seo</string>
 	<string name="log_out_all_accounts">Clàraich a-mach às a h-uile cunntas</string>
--- a/mastodon/src/main/res/values-gl-rES/strings.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings.xml
@@ -336,7 +336,6 @@
 	<string name="welcome_to_mastodon">Benvida a Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon é unha rede social descentralizada, onde ningunha empresa ten o control. Está formada por moitos servidores independentes comunicándose entre si.</string>
 	<string name="what_are_servers">Que son os servidores?</string>
-	<string name="welcome_paragraph2"><![CDATA[Cada conta Mastodon está hospedada nun servidor — cada unha coas súas regras, valores e admins. Non importa cal elixas, podes seguir e interactuar con persoas de outros servidores.]]></string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<!-- %s is the server domain -->
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
--- a/mastodon/src/main/res/values-hy-rAM/strings.xml
+++ b/mastodon/src/main/res/values-hy-rAM/strings.xml
@@ -303,7 +303,6 @@
 	<string name="welcome_to_mastodon">Բարի գալուստ Մաստոդոն</string>
 	<string name="welcome_paragraph1">Մաստոդոնը ապակենտրոնացված սոցցանց է, այսինքն՝ այն չի պատկանում մի ընկերության։ Այն բաղկացած է բազմաթիվ անկախ և կապակցված սերվերներից։</string>
 	<string name="what_are_servers">Ի՞նչ է սերվերը։</string>
-	<string name="welcome_paragraph2"><![CDATA[Մաստոդոնի որևէ հաշիվ գտնվում է սերվերի վրա - ամեն մեկը՝ իր արժեքներով, կանոններով և ադմիններով։ Դուք կարող եք հետևել և շփվել որևէ սերվերի մարդկանց հետ՝ անկախ ձեր ընտրությունից։]]></string>
 	<string name="retry">Կրկին</string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<string name="alt_text">Բացատրություն</string>
--- a/mastodon/src/main/res/values-in-rID/strings.xml
+++ b/mastodon/src/main/res/values-in-rID/strings.xml
@@ -368,7 +368,6 @@
 	<string name="welcome_to_mastodon">Selamat datang di Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon adalah jejaring sosial terdesentralisasi, tidak ada satu pun perusahaan yang mengontrol. Semua dijalankan oleh server independen, terkoneksi bersama.</string>
 	<string name="what_are_servers">Apa itu server?</string>
-	<string name="welcome_paragraph2"><![CDATA[Semua akun Mastodon berada pada sebuah server — dengan nilai, aturan, dan admin masing-masing. Mana pun yang kamu pilih, kamu bisa mengikuti dan berinteraksi dengan server mana pun.]]></string>
 	<string name="opening_link">Membuka tautan…</string>
 	<string name="link_not_supported">Tautan ini tidak didukung dalam aplikasi</string>
 	<string name="log_out_all_accounts">Keluar dari semua akun</string>
--- a/mastodon/src/main/res/values-is-rIS/strings.xml
+++ b/mastodon/src/main/res/values-is-rIS/strings.xml
@@ -387,7 +387,7 @@
 	<string name="welcome_to_mastodon">Velkomin í Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon er dreyfhýst samfélagsnet, sem þýðir að ekkert eitt fyrirtæki ræður yfir því. Netið samanstendur af mörgum sjálfstætt reknum netþjónum sem tengjast innbyrðis.</string>
 	<string name="what_are_servers">Hvað eru netþjónar?</string>
-	<string name="welcome_paragraph2"><![CDATA[Hver einasti Mastodon-aðgangur er hýstur á sínum netþjóni — hver slíkur er með sín eigin gildi, reglur og stjórnendur. Það skiftir ekki máli hvern þeirra þú velur, þú getur fylgst fylgst með og átt í samskiptum við fólk á hvaða netþjóni sem er.]]></string>
+	<string name="welcome_paragraph2">Hver einasti Mastodon-aðgangur er hýstur á sínum netþjóni — hver slíkur er með sín eigin gildi, reglur og stjórnendur. Það skiftir ekki máli hvern þeirra þú velur, þú getur fylgst fylgst með og átt í samskiptum við fólk á hvaða netþjóni sem er.</string>
 	<string name="opening_link">Opna tengil…</string>
 	<string name="link_not_supported">Það er ekki stuðningur við tengilinn í forritinu</string>
 	<string name="log_out_all_accounts">Skrá út úr öllum aðgöngum</string>
--- a/mastodon/src/main/res/values-it-rIT/strings.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings.xml
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Benvenuto/a su Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon è un social network decentralizzato, il che significa che nessuna singola azienda lo controlla. È composto da molti server indipendenti e tutti connessi insieme.</string>
 	<string name="what_are_servers">Cosa sono i server?</string>
-	<string name="welcome_paragraph2"><![CDATA[Ogni account Mastodon è ospitato su un server — ognuno con i propri valori, regole, e amministratori. Non importa quale scegliere, è possibile seguire e interagire con le persone su qualsiasi server.]]></string>
 	<string name="opening_link">Apertura del collegamento…</string>
 	<string name="link_not_supported">Questo collegamento non è supportato nell\'app</string>
 	<string name="log_out_all_accounts">Esci da tutti gli account</string>
--- a/mastodon/src/main/res/values-ja-rJP/strings.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings.xml
@@ -36,13 +36,13 @@
 	<string name="button_following">フォロー中</string>
 	<string name="edit_profile">プロフィールを編集</string>
 	<string name="share_user">プロフィールを共有</string>
-	<string name="mute_user">%s さんをミュート</string>
-	<string name="unmute_user">%s さんのミュートを解除</string>
-	<string name="block_user">%s さんをブロック</string>
-	<string name="unblock_user">%s さんのブロックを解除</string>
-	<string name="report_user">%s さんを報告</string>
-	<string name="block_domain">%s をブロック</string>
-	<string name="unblock_domain">%s のブロックを解除</string>
+	<string name="mute_user">ミュート: %s さん</string>
+	<string name="unmute_user">ミュート解除: %s さん</string>
+	<string name="block_user">ブロック: %s さん</string>
+	<string name="unblock_user">ブロック解除: %s さん</string>
+	<string name="report_user">報告: %s さん</string>
+	<string name="block_domain">ブロック: %s</string>
+	<string name="unblock_domain">ブロック解除: %s</string>
 	<plurals name="x_posts">
 		<item quantity="other">投稿 %,d 件</item>
 	</plurals>
@@ -134,7 +134,7 @@
 	<string name="sending_report">報告を送信しています...</string>
 	<string name="report_sent_title">ご報告ありがとうございます、追って確認します。</string>
 	<string name="report_sent_subtitle">私たちが確認する前でも、あなたが %s さんにできる対応があります。</string>
-	<string name="unfollow_user">%s さんのフォローを解除</string>
+	<string name="unfollow_user">フォロー解除: %s さん</string>
 	<string name="unfollow">フォローを解除</string>
 	<string name="mute_user_explain">ミュートすると、相手の投稿が表示されなくなります。相手は引き続きあなたをフォローしたり、あなたの投稿を表示したりできますが、ミュートしていることは伝わりません。</string>
 	<string name="block_user_explain">ブロックすると、相手の投稿が表示されなくなります。相手はあなたの投稿を見たり、フォローしたりできなくなります。相手にブロックしていることが伝わります。</string>
@@ -222,13 +222,13 @@
 	<string name="home_timeline">ホームタイムライン</string>
 	<string name="my_profile">プロフィール</string>
 	<string name="media_viewer">メディアビューアー</string>
-	<string name="follow_user">%s さんをフォロー</string>
+	<string name="follow_user">フォロー: %s さん</string>
 	<string name="unfollowed_user">%s さんのフォローを解除しました</string>
 	<string name="followed_user">%s さんをフォローしました</string>
 	<string name="following_user_requested">%s さんにフォローリクエストを送信しました</string>
 	<string name="open_in_browser">ブラウザーで開く</string>
-	<string name="hide_boosts_from_user">%s さんのブーストを非表示</string>
-	<string name="show_boosts_from_user">%s さんのブーストを表示</string>
+	<string name="hide_boosts_from_user">ブーストを非表示: %s さん</string>
+	<string name="show_boosts_from_user">ブーストを表示: %s さん</string>
 	<string name="signup_reason">参加したい理由を入力してください</string>
 	<string name="signup_reason_note">申請の確認に役立つメッセージを添えてください。</string>
 	<string name="clear">クリア</string>
@@ -368,7 +368,7 @@
 	<string name="welcome_to_mastodon">Mastodon とは</string>
 	<string name="welcome_paragraph1">Mastodon は、いち企業の統制に依存しない非中央集権型のソーシャルネットワークです。たくさんの独立したサーバーが相互につながり合い、ひとつのネットワークを形成しています。</string>
 	<string name="what_are_servers">サーバーとは</string>
-	<string name="welcome_paragraph2"><![CDATA[Mastodon のアカウントはいずれかのサーバーに所属します。それぞれのサーバーは異なる価値観やルールをもち、それらを管理する管理者がいます。どのサーバーにいても、ほかのあらゆるサーバーのユーザーをフォローして、かかわりをもつことができるでしょう。]]></string>
+	<string name="welcome_paragraph2">Mastodon のアカウントはいずれかのサーバーに所属します。それぞれのサーバーには異なる価値観やルールがあり、それらを管理する管理者がいます。どのサーバーにいても、他のあらゆるサーバーのユーザーをフォローして、関わりを持てるでしょう。</string>
 	<string name="opening_link">リンクを開いています…</string>
 	<string name="link_not_supported">アプリはこのリンクに対応していません</string>
 	<string name="log_out_all_accounts">すべてのアカウントをログアウト</string>
--- a/mastodon/src/main/res/values-nl-rNL/strings.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings.xml
@@ -383,7 +383,6 @@
 	<string name="welcome_to_mastodon">Welkom bij Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon is een gedecentraliseerd sociaal netwerk, wat betekent dat geen enkel bedrijf het controleert. Het bestaat uit veel onafhankelijk opererende servers, allemaal met elkaar verbonden.</string>
 	<string name="what_are_servers">Wat zijn servers?</string>
-	<string name="welcome_paragraph2"><![CDATA[Elk Mastodonaccount wordt op een server gehost - elk met diens eigen waarden, regels en beheerders. Het maakt niet uit welke server je kiest, je kunt mensen op elke server volgen en ermee communiceren.]]></string>
 	<string name="opening_link">Koppeling aan het openen…</string>
 	<string name="link_not_supported">Deze koppeling wordt niet ondersteund in de app</string>
 	<string name="log_out_all_accounts">Bij alle accounts afmelden</string>
--- a/mastodon/src/main/res/values-no-rNO/strings.xml
+++ b/mastodon/src/main/res/values-no-rNO/strings.xml
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Velkommen til Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon er et desentralisert sosialt nettverk, som betyr at ingen selskaper kontrollerer det. Det består av mange uavhengige servere som er koblet sammen.</string>
 	<string name="what_are_servers">Hva er en server?</string>
-	<string name="welcome_paragraph2"><![CDATA[Enhver Mastodon konto er en vert på en server - med sine egne verdier, regler og administratorer. Uansett hvilken du velger, kan du følge og samhandle med folk på hvilken som helst server.]]></string>
 	<string name="opening_link">Åpner link…</string>
 	<string name="link_not_supported">Denne linken støttes ikke av appen</string>
 	<string name="log_out_all_accounts">Logg ut av alle kontoer</string>
--- a/mastodon/src/main/res/values-pl-rPL/strings.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings.xml
@@ -425,7 +425,6 @@
 	<string name="welcome_to_mastodon">Witaj na Mastodonie</string>
 	<string name="welcome_paragraph1">Mastodon to zdecentralizowana sieć społecznościowa, co oznacza że żadna firma nie może nią kontrolować w całości. Składa się z wielu niezależnych od siebie serwerów, które się ze sobą komunikują.</string>
 	<string name="what_are_servers">Czym są serwery?</string>
-	<string name="welcome_paragraph2"><![CDATA[Każde konto na Mastodonie jest hostowane na instancjach, które wyróżniają się wartościami, zasadami i administracją. Nieważne, jaką wybierzesz - i tak będziesz mógł/mogła kontaktować się nawet z tymi spoza Twojej instancji.]]></string>
 	<string name="opening_link">Otwieranie linku…</string>
 	<string name="link_not_supported">Ten link nie jest wspierany w aplikacji</string>
 	<string name="log_out_all_accounts">Wyloguj się wszędzie</string>
--- a/mastodon/src/main/res/values-pt-rBR/strings.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings.xml
@@ -377,7 +377,6 @@
 	<string name="welcome_to_mastodon">Bem-vindo ao Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon é uma rede social descentralizada, o que significa que nenhuma empresa a controla. É composto de muitos servidores executados de forma independente, todos conectados entre si.</string>
 	<string name="what_are_servers">O que são servidores?</string>
-	<string name="welcome_paragraph2"><![CDATA[Cada conta Mastodon é hospedada em um servidor - cada um com seus próprios valores, regras e administradores. Não importa qual você escolha, você pode seguir e interagir com as pessoas que estão em qualquer outro servidor.]]></string>
 	<string name="opening_link">Abrindo link…</string>
 	<string name="link_not_supported">Este link não é compatível com o aplicativo</string>
 	<string name="log_out_all_accounts">Sair de todas as contas</string>
@@ -466,6 +465,7 @@
 	<string name="about_server">Sobre</string>
 	<string name="server_rules">Regras</string>
 	<string name="server_administrator">Administrador</string>
+	<string name="send_email_to_server_admin">Contatar administrador</string>
 	<string name="notifications_disabled_in_system">Ative as notificações nas configurações do seu dispositivo para ver as atualizações de qualquer lugar.</string>
 	<string name="settings_even_more">Ainda mais configurações</string>
 	<string name="settings_show_cws">Mostrar avisos de conteúdo</string>
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -251,7 +251,7 @@
    <string name="sk_unfinished_attachments">Corrigir anexos\?</string>
    <string name="sk_settings_glitch_mode_explanation">Habilite isso se sua instância inicial for executada no Glitch. Não é necessário para Hometown ou Akkoma.</string>
    <string name="sk_collapse">Mostrar menos</string>
-    <string name="sk_settings_prefix_reply_cw_with_re">Adicionar \"re:\" nos Avisos de Conteúdo em resposta a</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Prefixe com “Aviso de conteúdo” ao responder</string>
    <string name="sk_spectator_mode">Modo espectador</string>
    <string name="sk_timeline_bubble">Bolha</string>
    <string name="sk_bubble_timeline_info_banner">Esses são as publicações mais recentes da rede com curadoria dos administradores da sua instância.</string>
@@ -333,4 +333,40 @@
    <string name="sk_switch_timeline">Alternar linha do tempo</string>
    <string name="sk_settings_true_black">Modo preto</string>
    <string name="sk_search_fediverse">Pesquisar no Fediverso</string>
+    <string name="sk_settings_emoji_reactions_in_lists">Mostrar reações de emojis em linhas do tempo</string>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">Se as reações dos emojis devem ser exibidas nas linhas do tempo. Se esta opção estiver desativada, as reações de emoji só serão exibidas ao visualizar um tópico.</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">Um usuário reagiu com %2$s</item>
+        <item quantity="many">%1$,d usuários reagiram com %2$s</item>
+        <item quantity="other">%1$,d usuários reagiram com %2$s</item>
+    </plurals>
+    <string name="sk_mute_label">Duração</string>
+    <string name="sk_button_react">Reaja com emoji</string>
+    <string name="sk_enter_emoji_toast">Você precisa digitar um emoji</string>
+    <string name="sk_enter_emoji_hint">Digite para reagir com um emoji</string>
+    <string name="sk_again_for_system_keyboard">Toque novamente para Teclado do Sistema</string>
+    <string name="sk_duration_minutes_5">5 minutos</string>
+    <string name="sk_duration_minutes_30">30 minutos</string>
+    <string name="sk_duration_hours_1">1 hora</string>
+    <string name="sk_duration_hours_6">6 horas</string>
+    <string name="sk_duration_days_1">1 dia</string>
+    <string name="sk_duration_days_3">3 dias</string>
+    <string name="sk_duration_days_7">7 dias</string>
+    <string name="sk_duration_indefinite">Indeterminado</string>
+    <string name="sk_settings_emoji_reactions">Ativar reações emoji</string>
+    <string name="sk_settings_emoji_reactions_explanation">Exibe reações emoji nas publicações e permite interagir com elas. Algumas versões modificadas do Mastodon suportam isso, mas o Mastodon não.</string>
+    <string name="sk_settings_unifiedpush_choose">Escolha um distribuidor</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Você precisa instalar um distribuidor para que as notificações UnifiedPush funcionem. Para obter mais informações, visite https://unifiedpush.org/</string>
+    <string name="sk_settings_continues_playback">Sobreposição de áudio</string>
+    <string name="sk_settings_continues_playback_summary">Permitir que a mídia já reproduzida continue sendo reproduzida, sobrepondo a nova reprodução</string>
+    <string name="sk_settings_unifiedpush_no_distributor">Nenhum distribuidor encontrado</string>
+    <string name="sk_settings_unifiedpush">Usar UnifiedPush</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Exibir pronomes em linhas do tempo</string>
+    <string name="sk_settings_display_pronouns_in_threads">Exibir pronomes em tópicos</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Exibir pronomes nas listas de usuários</string>
+    <string name="sk_tab_notifications">Notificações</string>
+    <string name="sk_tab_profile">Perfil</string>
+    <string name="sk_notification_mention">Você foi mencionado por %s</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Revelar automaticamente Avisos de Conteúdo nas respostas</string>
+    <string name="sk_icon_recycle_bin">Lixeira de reciclagem</string>
 </resources>
--- a/mastodon/src/main/res/values-ru-rRU/strings.xml
+++ b/mastodon/src/main/res/values-ru-rRU/strings.xml
@@ -425,7 +425,7 @@
 	<string name="welcome_to_mastodon">Добро пожаловать в Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon - это децентрализованная социальная сеть, то есть ни одна компания не контролирует ее. Она состоит из множества независимо управляемых серверов, соединенных вместе.</string>
 	<string name="what_are_servers">Что такое сервер?</string>
-	<string name="welcome_paragraph2"><![CDATA[Каждый аккаунт Mastodon размещается на сервере - каждый со своими ценностями, правилами и администраторами. Независимо от того, какой сервер вы выберете, вы можете следить и взаимодействовать с людьми на любом сервере.]]></string>
+	<string name="welcome_paragraph2">Каждый аккаунт Mastodon размещается на сервере - каждый со своими ценностями, правилами и администраторами. Независимо от того, какой сервер вы выберете, вы можете следить и взаимодействовать с людьми на любом сервере.</string>
 	<string name="opening_link">Открытие ссылки…</string>
 	<string name="link_not_supported">Эта ссылка не поддерживается в приложении</string>
 	<string name="log_out_all_accounts">Выйти из всех аккаунтов</string>
--- a/mastodon/src/main/res/values-ru-rRU/strings_sk.xml
+++ b/mastodon/src/main/res/values-ru-rRU/strings_sk.xml
@@ -323,4 +323,12 @@
    <string name="sk_content_type_unspecified">Не указано</string>
    <string name="sk_bubble_timeline_info_banner">Это недавние посты из сети, управляемой администраторами этого сервера.</string>
    <string name="sk_search_fediverse">Искать в Федивёрсе</string>
+    <string name="sk_settings_unifiedpush">Использовать UnifiedPush</string>
+    <string name="sk_settings_unifiedpush_choose">Выберите распределитель</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Для работы уведомлений Вам необходимо установить распределитель UnifiedPush. Подробности: https://unifiedpush.org/</string>
+    <string name="sk_content_type_mfm">MFM</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Автоотображение идентичных предупреждений о содержимом в ответах</string>
+    <string name="sk_settings_prefix_replies_to_others">Только в ответ другим</string>
+    <string name="sk_settings_unifiedpush_no_distributor">Распределители не найдены</string>
+    <string name="sk_settings_content_types_explanation">Позволяет устанавливать тип содержимого вроде Markdown при создании поста. Имейте в виду, что это поддерживается не на всех серверах.</string>
 </resources>
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -403,7 +403,6 @@
 	<string name="welcome_to_mastodon">Dobrodošli na Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon je decentralizirano družbeno omrežje, kar pomeni, da ga ne upravlja nobeno posamezno podjetje. Sestavljajo ga številni neodvisni strežniki, ki so medsebojno povezani.</string>
 	<string name="what_are_servers">Kaj so strežniki?</string>
-	<string name="welcome_paragraph2"><![CDATA[Vsak račun Mastodon gostuje na strežniku — vsak strežnik ima svoje vrednote, pravila in skbrnike. Vseeno je, katerega izberete - sledite in komunicirate lahko z osebbami na poljubnem strežniku.]]></string>
 	<string name="opening_link">Odpiranje povezav ...</string>
 	<string name="log_out_all_accounts">Odjava iz vseh računov</string>
 	<string name="confirm_log_out_all_accounts">Ali se želite odjaviti iz vseh računov?</string>
--- a/mastodon/src/main/res/values-sv-rSE/strings.xml
+++ b/mastodon/src/main/res/values-sv-rSE/strings.xml
@@ -138,6 +138,7 @@
 	<string name="sending_report">Skickar rapport…</string>
 	<string name="unfollow_user">Avfölj %s</string>
 	<string name="unfollow">Avfölj</string>
+	<string name="report_personal_title">Vill du inte se detta?</string>
 	<string name="back">Tillbaka</string>
 	<string name="search_communities">Servernamn eller URL</string>
 	<string name="instance_rules_title">Serverregler</string>
@@ -343,7 +344,6 @@
 	<string name="welcome_to_mastodon">Välkommen till Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon är ett decentraliserat socialt nätverk, vilket innebär att inget enskilt företag kontrollerar det. Det består av många oberoende servrar, alla sammankopplade.</string>
 	<string name="what_are_servers">Vad är servrar?</string>
-	<string name="welcome_paragraph2"><![CDATA[Varje Mastodon-konto finns på en server — var och en med sina värderingar, regler och administratörer. Oavsett vilken du väljer kan du följa och interagera med människor på vilken server som helst.]]></string>
 	<string name="log_out_all_accounts">Logga ut från alla konton</string>
 	<string name="confirm_log_out_all_accounts">Logga ut från alla konton?</string>
 	<string name="retry">Försök igen</string>
@@ -357,11 +357,13 @@
 	<string name="attachment_type_unknown">Fil</string>
 	<string name="help">Hjälp</string>
 	<string name="edit_post">Redigera inlägg</string>
+	<string name="no_verified_link">Ingen verifierad länk</string>
 	<string name="language">Språk</string>
 	<string name="language_default">Standard</string>
 	<string name="report_title_post">Rapportera inlägg</string>
 	<!-- %s is the server domain -->
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<string name="reported">Rapporterad</string>
 	<string name="mark_all_notifications_read">Markera alla som lästa</string>
 	<string name="settings_filters">Filter</string>
 	<string name="settings_server_explanation">Översikt, regler och moderatorer</string>
@@ -379,6 +381,10 @@
 	<string name="about_server">Om</string>
 	<string name="server_rules">Regler</string>
 	<string name="server_administrator">Administratör</string>
+	<plurals name="in_x_hours">
+		<item quantity="one">om %d timme</item>
+		<item quantity="other">om %d timmar</item>
+	</plurals>
 	<plurals name="x_hours_ago">
 		<item quantity="one">%d timme sedan</item>
 		<item quantity="other">%d timmar sedan</item>
@@ -401,6 +407,7 @@
 	<!-- Shown like a content warning, %s is the name of the filter -->
 	<string name="clear_all">Rensa alla</string>
 	<string name="search_open_url">Öppna URL i Mastodon</string>
+	<string name="posts_matching_hashtag">Inlägg med \"%s\"</string>
 	<string name="search_go_to_account">Gå till %s</string>
 	<!-- Shown in the post header. Please keep it short -->
 	<string name="time_seconds_ago_short">%ds sedan</string>
--- a/mastodon/src/main/res/values-sv-rSE/strings_sk.xml
+++ b/mastodon/src/main/res/values-sv-rSE/strings_sk.xml
@@ -40,4 +40,116 @@
    <string name="sk_update_ready">Megalodon %s är nerladdad och redo att installeras.</string>
    <string name="sk_settings_translation_availability_note_unavailable">%s verkar inte stödja översättning.</string>
    <string name="sk_clear_recent_languages">Rensa nyligen använda språk</string>
+    <string name="sk_duration_minutes_30">30 minuter</string>
+    <string name="sk_duration_hours_1">1 timme</string>
+    <string name="sk_duration_hours_6">6 timmar</string>
+    <string name="sk_duration_days_1">1 dag</string>
+    <string name="sk_duration_days_3">3 dagar</string>
+    <string name="sk_duration_days_7">7 dagar</string>
+    <string name="sk_timeline_local">Lokal</string>
+    <string name="sk_timeline_federated">Federation</string>
+    <string name="sk_poll_allow_multiple">Tillåt flera val</string>
+    <string name="sk_translate_post">Översätt</string>
+    <string name="sk_available_languages">Tillgängliga språk</string>
+    <string name="sk_confirm_clear_recent_languages">Är du säker på att du vill rensa dina nyligen använda språk\?</string>
+    <string name="sk_bookmark_as">Bokmärk med annat konto</string>
+    <string name="sk_favorite_as">Favorit med annat konto</string>
+    <string name="sk_bookmarked_as">Bokmärkt som %s</string>
+    <string name="sk_already_bookmarked">Redan bokmärkt</string>
+    <string name="sk_favorited_as">Favorit som %s</string>
+    <string name="sk_settings_rules">Regler</string>
+    <string name="sk_settings_auth">Säkerhetsinställningar</string>
+    <string name="sk_settings_color_palette">Färgpalett</string>
+    <string name="sk_color_palette_purple">Lila</string>
+    <string name="sk_color_palette_green">Grön</string>
+    <string name="sk_color_palette_blue">Blå</string>
+    <string name="sk_color_palette_brown">Brun</string>
+    <string name="sk_color_palette_pink">Rosa</string>
+    <string name="sk_hashtags_you_follow">Hashtaggar du föjer</string>
+    <string name="sk_timelines">Tidslinjer</string>
+    <string name="sk_timeline">Tidslinje</string>
+    <string name="sk_post_language">Språk: %s</string>
+    <string name="sk_duration_minutes_5">5 minuter</string>
+    <string name="sk_reply_line_above_avatar">\"Som svar till\"-linje ovanför avatar</string>
+    <string name="sk_open_with_account">Öppna med annat konot</string>
+    <string name="sk_compose_draft">Inlägget kommer sparas som utkast.</string>
+    <string name="sk_scheduled_too_soon">Inlägg måste schemaläggas minst 10 minuter i framtiden.</string>
+    <string name="sk_timeline_home">Hem</string>
+    <string name="sk_remove">Ta bort</string>
+    <string name="sk_forward_report_to">Vidarebefordra till %s</string>
+    <string name="sk_confirm_save_draft">Spara utkast\?</string>
+    <string name="sk_confirm_save_changes">Spara ändringar\?</string>
+    <string name="sk_mark_as_draft">Markera som utkast</string>
+    <string name="sk_schedule_post">Schemalägg inlägg</string>
+    <string name="sk_compose_no_schedule">Schemalägg inte</string>
+    <string name="sk_icon_umbrella">Paraply</string>
+    <string name="sk_settings_reduce_motion">Reducera rörelser i animationer</string>
+    <string name="sk_announcements">Meddelanden</string>
+    <string name="sk_mark_as_read">Markera som läst</string>
+    <string name="sk_settings_about_instance">Om instansen</string>
+    <string name="sk_create">Skapa</string>
+    <string name="sk_in_reply">Som svar</string>
+    <string name="sk_recent_searches_placeholder">Skriv för att börja söka</string>
+    <string name="sk_remove_follower">Ta bort följare</string>
+    <string name="sk_remove_follower_confirm">Ta bort %s som följare genom att blockera och omedelbart avblockera dem\?</string>
+    <string name="sk_do_remove_follower">Ta bort</string>
+    <string name="sk_remove_follower_success">Följaren har tagits bort</string>
+    <string name="sk_alt_text_missing_title">Alternativtext saknas</string>
+    <string name="sk_alt_text_missing">Minst en bilaga saknar beskrivning.</string>
+    <string name="sk_publish_anyway">Publicera ändå</string>
+    <string name="sk_settings_disable_alt_text_reminder">Inaktivera påminnelse om att lägga till alternativtext</string>
+    <string name="sk_searching">Söker…</string>
+    <string name="sk_no_results">Inga resultat</string>
+    <string name="sk_icon_book">Bok</string>
+    <string name="sk_edit_timeline">Redigera tidslinje</string>
+    <string name="sk_edit_timelines">Redigera tidslinjer</string>
+    <string name="sk_alt_button">ALT</string>
+    <string name="sk_save_draft">Spara utkast\?</string>
+    <string name="sk_save_draft_message">Vill du spara dina ändringar till det här utkastet eller publicera det nu\?</string>
+    <string name="sk_no_alt_text">Ingen alternativtext tillgänglig</string>
+    <string name="sk_separator">·</string>
+    <string name="sk_settings_reply_visibility_all">Alla svar</string>
+    <string name="sk_settings_reply_visibility_self">Svar till mig</string>
+    <string name="sk_color_palette_red">Röd</string>
+    <string name="sk_color_palette_yellow">Gul</string>
+    <string name="sk_already_favorited">Redan favorit</string>
+    <string name="sk_compose_scheduled">Schemalagt för</string>
+    <string name="sk_post_scheduled">Inlägg schemalagt</string>
+    <string name="sk_scheduled_too_soon_title">Schemalagd tid är för tidigt</string>
+    <string name="sk_create_list_title">Skapa lista</string>
+    <string name="sk_list_name_hint">Listans namn</string>
+    <string name="sk_list_replies_policy">Visa svar till</string>
+    <string name="sk_list_replies_policy_list">medlemmar i listan</string>
+    <string name="sk_list_replies_policy_followed">följda användare</string>
+    <string name="sk_list_replies_policy_none">ingen</string>
+    <string name="sk_hashtag">Hashtagg</string>
+    <string name="sk_icon_heart">Hjärta</string>
+    <string name="sk_icon_star">Stjärna</string>
+    <string name="sk_icon_city">Stad</string>
+    <string name="sk_icon_cat">Katt</string>
+    <string name="sk_icon_dog">Hund</string>
+    <string name="sk_icon_rabbit">Kanin</string>
+    <string name="sk_icon_turtle">Sköldpadda</string>
+    <string name="sk_icon_balloon">Ballong</string>
+    <string name="sk_edit_list_title">Redigera lista</string>
+    <string name="sk_your_lists">Dina listor</string>
+    <string name="sk_timeline_posts">Inlägg</string>
+    <string name="sk_timelines_add">Lägg till</string>
+    <string name="sk_list">Lista</string>
+    <string name="sk_timeline_icon">Ikon</string>
+    <string name="sk_icon_microphone">Mikrofon</string>
+    <string name="sk_icon_microscope">Mikroskop</string>
+    <string name="sk_icon_coffee">Kaffe</string>
+    <string name="sk_icon_stethoscope">Stetoskop</string>
+    <string name="sk_icon_bicycle">Cykel</string>
+    <string name="sk_icon_map">Karta</string>
+    <string name="sk_icon_backpack">Ryggsäck</string>
+    <string name="sk_icon_pizza">Pizza</string>
+    <string name="sk_post_edited">redigerad</string>
+    <string name="sk_notification_type_update">Redigerade inlägg</string>
+    <string name="sk_welcome_title">Välkommen!</string>
+    <string name="sk_draft">Utkast</string>
+    <string name="sk_reply_as">Svara med annat konto</string>
+    <string name="sk_unsent_posts">Opublicerade inlägg</string>
+    <string name="sk_draft_saved">Utkast sparat</string>
 </resources>
--- a/mastodon/src/main/res/values-th-rTH/strings.xml
+++ b/mastodon/src/main/res/values-th-rTH/strings.xml
@@ -368,7 +368,7 @@
 	<string name="welcome_to_mastodon">ยินดีต้อนรับสู่ Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ หมายความว่าไม่มีบริษัทใดควบคุมเครือข่ายสังคม เครือข่ายสังคมประกอบด้วยเซิร์ฟเวอร์ที่ทำงานอย่างอิสระจำนวนมาก ทั้งหมดเชื่อมต่อเข้าด้วยกัน</string>
 	<string name="what_are_servers">เซิร์ฟเวอร์คืออะไร?</string>
-	<string name="welcome_paragraph2"><![CDATA[ทุกบัญชี Mastodon ได้รับการโฮสต์ในเซิร์ฟเวอร์ — แต่ละแห่งมีค่า, กฎ และผู้ดูแลของเซิร์ฟเวอร์เอง ไม่ว่าคุณจะเลือกเซิร์ฟเวอร์ใด คุณสามารถติดตามและโต้ตอบกับผู้คนในเซิร์ฟเวอร์ใด ๆ]]></string>
+	<string name="welcome_paragraph2">ทุกบัญชี Mastodon ได้รับการโฮสต์ในเซิร์ฟเวอร์ — แต่ละแห่งมีค่า, กฎ และผู้ดูแลของเซิร์ฟเวอร์เอง ไม่ว่าคุณจะเลือกเซิร์ฟเวอร์ใด คุณสามารถติดตามและโต้ตอบกับผู้คนในเซิร์ฟเวอร์ใด ๆ</string>
 	<string name="opening_link">กำลังเปิดลิงก์…</string>
 	<string name="link_not_supported">ไม่รองรับลิงก์นี้ในแอป</string>
 	<string name="log_out_all_accounts">ออกจากระบบบัญชีทั้งหมด</string>
--- a/mastodon/src/main/res/values-tr-rTR/strings.xml
+++ b/mastodon/src/main/res/values-tr-rTR/strings.xml
@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Mastodon\'a hoş geldiniz</string>
 	<string name="welcome_paragraph1">Mastodon merkezi olmayan bir sosyal ağdır, yani onu tek bir şirket kontrol etmiyor. Hepsi birbirine bağlı, bağımsız olarak çalışan birçok sunucudan oluşur.</string>
 	<string name="what_are_servers">Sunucular nedir?</string>
-	<string name="welcome_paragraph2"><![CDATA[Her Mastodon hesabı bir sunucuda barındırılır - her birinin kendi değerleri, kuralları ve yöneticileri vardır. Hangisini seçerseniz seçin, herhangi bir sunucudaki insanları takip edebilir ve onlarla etkileşime geçebilirsiniz.]]></string>
 	<string name="opening_link">Bağlantı açılıyor…</string>
 	<string name="link_not_supported">Bu bağlantı uygulamada desteklenmiyor</string>
 	<string name="log_out_all_accounts">Tüm hesaplardan çıkış yap</string>
--- a/mastodon/src/main/res/values-uk-rUA/strings.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings.xml
@@ -425,7 +425,6 @@
 	<string name="welcome_to_mastodon">Вітаємо у Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon - це децентралізована соціальна мережа, тобто жодна компанія не контролює її. Вона складається з багатьох незалежних серверів, які з\'єднані між собою.</string>
 	<string name="what_are_servers">Що таке сервери?</string>
-	<string name="welcome_paragraph2"><![CDATA[Кожен акаунт Mastodon розміщений на сервері, й кожен сервер має особисті цінності, правила, й адмінів. Немає різниці, який ви оберете. Ви можете підписуватися та спілкуватися з усіма, навіть якщо ви на різних серверах.]]></string>
 	<string name="opening_link">Відкриття посилання…</string>
 	<string name="link_not_supported">Це посилання не підтримується застосунком</string>
 	<string name="log_out_all_accounts">Вийти з усіх акаунтів</string>
--- a/mastodon/src/main/res/values-vi-rVN/strings.xml
+++ b/mastodon/src/main/res/values-vi-rVN/strings.xml
@@ -203,14 +203,14 @@
 	<string name="settings_contribute">Đóng góp cho Mastodon</string>
 	<string name="settings_tos">Điều khoản dịch vụ</string>
 	<string name="settings_privacy_policy">Chính sách bảo mật</string>
-	<string name="settings_clear_cache">Xoá bộ nhớ đệm</string>
+	<string name="settings_clear_cache">Xóa bộ nhớ đệm</string>
 	<string name="settings_app_version">Mastodon for Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Đã xóa bộ nhớ đệm</string>
 	<string name="confirm_log_out">Đăng xuất %s?</string>
-	<string name="sensitive_content_explain">Người đăng đánh dấu media này nhạy cảm.</string>
+	<string name="sensitive_content_explain">Người đăng đánh dấu media này nhạy cảm</string>
 	<string name="avatar_description">Xem hồ sơ %s</string>
 	<string name="more_options">Nhiều tùy chọn hơn</string>
-	<string name="new_post">Viết tút</string>
+	<string name="new_post">Soạn tút</string>
 	<string name="button_reply">Trả lời</string>
 	<string name="button_reblog">Đăng lại</string>
 	<string name="button_favorite">Thích</string>
@@ -368,7 +368,7 @@
 	<string name="welcome_to_mastodon">Chào mừng đến với Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon là một mạng xã hội phi tập trung, không có công ty nào kiểm soát. Nó bao gồm nhiều máy chủ độc lập được kết nối với nhau.</string>
 	<string name="what_are_servers">Máy chủ là gì?</string>
-	<string name="welcome_paragraph2"><![CDATA[Mỗi tài khoản Mastodon được lưu trữ trên một máy chủ — với nội quy và quản trị viên riêng. Bất kể bạn chọn máy chủ nào, bạn có thể theo dõi và tương tác với mọi người trên máy chủ khác.]]></string>
+	<string name="welcome_paragraph2">Mỗi tài khoản Mastodon được lưu trữ trên một máy chủ — với nội quy &amp; quản trị viên riêng. Bất kể bạn chọn máy chủ nào, bạn có thể theo dõi và tương tác với mọi người trên máy chủ khác.</string>
 	<string name="opening_link">Mở liên kết…</string>
 	<string name="link_not_supported">App không hỗ trợ liên kết này</string>
 	<string name="log_out_all_accounts">Đăng xuất khỏi mọi tài khoản</string>
--- a/mastodon/src/main/res/values-zh-rCN/strings.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings.xml
@@ -368,7 +368,6 @@
 	<string name="welcome_to_mastodon">欢迎来到Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon 是去中心化的社交网络，这意味着它不由任何企业独控。它是由众多独立运行的实例共同联结而成的。</string>
 	<string name="what_are_servers">是什么实例？</string>
-	<string name="welcome_paragraph2"><![CDATA[所有的 Mastodon 账户皆托管于各自的服务器上，每个服务器有各自的价值取向、规则与管理员。无论你选择哪个服务器，你都能关注并与其他任何服务器上的用户互动。]]></string>
 	<string name="opening_link">打开链接…</string>
 	<string name="link_not_supported">应用不支持该链接</string>
 	<string name="log_out_all_accounts">登出所有账户</string>
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -89,8 +89,8 @@
    <string name="sk_hashtags_you_follow">你关注的标签</string>
    <string name="sk_loading_resource_on_instance_title">在 %s 上查找</string>
    <string name="sk_resource_not_found">找不到资源</string>
-    <string name="sk_open_with_account">用其它帐户打开</string>
-    <string name="sk_bookmark_as">用其它帐户加入书签</string>
+    <string name="sk_open_with_account">用其它账号打开</string>
+    <string name="sk_bookmark_as">用其它账号加入书签</string>
    <string name="sk_bookmarked_as">已加入书签为 %s</string>
    <string name="sk_already_bookmarked">已加入书签过</string>
    <string name="sk_favorite_as">用其他账号收藏</string>
@@ -99,7 +99,7 @@
    <string name="sk_reblog_as">用其他账号转嘟</string>
    <string name="sk_reblogged_as">已转嘟为 %s</string>
    <string name="sk_already_reblogged">已转嘟过</string>
-    <string name="sk_reply_as">用其他帐号回复</string>
+    <string name="sk_reply_as">用其他账号回复</string>
    <string name="sk_settings_uniform_icon_for_notifications">所有通知的统一图标</string>
    <string name="sk_unsent_posts">未发送的嘟文</string>
    <string name="sk_confirm_delete_draft_title">删除草稿</string>
@@ -257,7 +257,7 @@
    <string name="sk_unfinished_attachments_message">部分附件尚未上传完毕。</string>
    <string name="sk_filtered">已过滤：%s</string>
    <string name="sk_settings_collapse_long_posts">折叠很长的嘟文</string>
-    <string name="sk_settings_prefix_reply_cw_with_re">在回复带有内容警告的嘟文前加上 \"re:\"</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">回复时在 CW 前加上 “re:”</string>
    <string name="sk_spectator_mode">旁观模式</string>
    <string name="sk_settings_hide_interaction">隐藏互动按钮</string>
    <string name="sk_settings_reply_visibility_self">对我的回复</string>
@@ -274,8 +274,8 @@
    <string name="sk_compact_reblog_reply_line">紧凑转嘟/回复行</string>
    <string name="sk_show_thread">显示对话</string>
    <string name="sk_settings_auto_reveal_nobody">没有人</string>
-    <string name="sk_settings_auto_reveal_author">作者</string>
-    <string name="sk_settings_auto_reveal_anyone">任何人</string>
+    <string name="sk_settings_auto_reveal_author">同一人的回复</string>
+    <string name="sk_settings_auto_reveal_anyone">任何人的回复</string>
    <string name="sk_open_in_app_failed">无法在应用程序中打开</string>
    <string name="sk_no_remote_info_hint">远程信息不可用</string>
    <string name="sk_error_loading_profile">通过%s加载配置文件失败</string>
@@ -296,5 +296,80 @@
    <string name="sk_instance_info_unavailable">实例信息暂时不可用</string>
    <string name="sk_open_in_app">在应用程序中打开</string>
    <string name="sk_settings_confirm_before_reblog">转嘟前确认</string>
-    <string name="sk_reacted">反应</string>
+    <string name="sk_reacted">%s 回应了</string>
+    <string name="sk_settings_emoji_reactions">启用表情回应</string>
+    <string name="sk_external_share_title">用账号分享</string>
+    <string name="sk_external_share_or_open_title">用账号分享或打开</string>
+    <string name="sk_icon_beaker">烧杯</string>
+    <string name="sk_icon_bed">床</string>
+    <string name="sk_settings_continues_playback">音频叠加</string>
+    <string name="sk_add_timeline">添加时间线</string>
+    <string name="sk_edit_timeline_tag_all">…并包含其中全部</string>
+    <string name="sk_edit_timeline_tags_explanation">请注意，服务器会处理这些操作。可能不支持合并这些操作。</string>
+    <string name="sk_settings_allow_remote_loading_explanation">尝试从原实例加载信息，以获取更准确的关注者、点赞和转发列表。</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">在回复中自动显示相同的 CWs</string>
+    <string name="sk_settings_forward_report_default">\"转发报告 \"开关默认值</string>
+    <string name="sk_list_exclusive_switch_explanation">排除列表的成员不会显示在你的主页时间线上--如果你的实例支持的话。</string>
+    <string name="sk_advanced_options_show">显示高级选项</string>
+    <string name="sk_advanced_options_hide">隐藏高级选项</string>
+    <string name="sk_spoiler_show">显示内容</string>
+    <string name="sk_pronouns_label">性别代词</string>
+    <string name="sk_switch_timeline">切换时间线</string>
+    <string name="sk_settings_instance">实例</string>
+    <string name="sk_disable_pill_shaped_active_indicator">禁用药丸状的活跃选项卡指示器</string>
+    <string name="sk_settings_true_black">全黑模式</string>
+    <string name="sk_settings_display_pronouns_in_timelines">在时间线上显示性别代词</string>
+    <string name="sk_settings_emoji_reactions_explanation">显示对嘟文的表情回应，并让你与之互动。某些修改版的 Mastodon 支持此功能，但 Mastodon 不支持。</string>
+    <string name="sk_settings_emoji_reactions_in_lists">在时间线中显示表情回应</string>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">是否在时间线中显示表情回应。如果此选项为关闭，则只有在查看对话时才会显示表情回应。</string>
+    <string name="sk_button_react">用表情回应</string>
+    <string name="sk_again_for_system_keyboard">再次点击以打开系统键盘</string>
+    <string name="sk_enter_emoji_toast">你需要输入一个表情</string>
+    <string name="sk_enter_emoji_hint">输入一个表情以回应</string>
+    <string name="sk_mute_label">持续时间</string>
+    <string name="sk_duration_indefinite">无限期</string>
+    <string name="sk_duration_minutes_5">5分钟</string>
+    <string name="sk_duration_minutes_30">30分钟</string>
+    <string name="sk_duration_hours_1">1小时</string>
+    <string name="sk_duration_hours_6">6小时</string>
+    <string name="sk_duration_days_1">1天</string>
+    <string name="sk_duration_days_3">3天</string>
+    <string name="sk_duration_days_7">7天</string>
+    <string name="sk_notification_mention">你被 %s 提及了</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="other">%1$,d 用户回应了 %2$s</item>
+    </plurals>
+    <string name="sk_settings_continues_playback_summary">允许已播放的媒体继续播放，并覆盖新的播放内容</string>
+    <string name="sk_settings_unifiedpush">使用 UnifiedPush</string>
+    <string name="sk_settings_unifiedpush_choose">选择一个分发器</string>
+    <string name="sk_settings_unifiedpush_no_distributor">未找到分发器</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">你需要安装分发器才能使用 UnifiedPush 通知。如需更多信息，请访问 https://unifiedpush.org/</string>
+    <string name="sk_icon_recycle_bin">回收站</string>
+    <string name="sk_icon_verified">已认证</string>
+    <string name="sk_icon_doctor">医生</string>
+    <string name="sk_icon_diamond">钻石</string>
+    <string name="sk_icon_umbrella">雨伞</string>
+    <string name="sk_edit_timeline_tag_main">包含标签的嘟文…</string>
+    <string name="sk_edit_timeline_tag_none">…但都不包含</string>
+    <string name="sk_edit_timeline_tag_any">…或包含其中任何一个</string>
+    <string name="sk_edit_timeline_tag_hint">输入标签…</string>
+    <string name="sk_edit_timeline_tags_hint">输入标签…</string>
+    <string name="sk_hashtag_timeline_local_only_switch">仅显示本地嘟文？</string>
+    <string name="sk_add_timeline_tag_error_empty">标签不可为空</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_settings_prefix_replies_always">回复至任何人</string>
+    <string name="sk_settings_prefix_replies_never">永不</string>
+    <string name="sk_settings_prefix_replies_to_others">仅在回复至他人时</string>
+    <string name="sk_exclusive_list">排除列表</string>
+    <string name="sk_list_exclusive_switch">使列表转为排除列表</string>
+    <string name="sk_settings_display_pronouns_in_threads">在对话中显示性别代词</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">在用户列表中显示性别代词</string>
+    <string name="sk_tab_home">主页</string>
+    <string name="sk_tab_search">搜索</string>
+    <string name="sk_tab_notifications">通知</string>
+    <string name="sk_tab_profile">个人资料</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">在导航栏中显示选项卡标签</string>
+    <string name="sk_reacted_with">%1$s 回应了 %2$s</string>
+    <string name="sk_bubble_timeline_info_banner">这些都是实例管理员从网络中最新精选出来的嘟文。</string>
+    <string name="sk_search_fediverse">搜索联邦宇宙</string>
 </resources>
--- a/mastodon/src/main/res/values-zh-rTW/strings.xml
+++ b/mastodon/src/main/res/values-zh-rTW/strings.xml
@@ -368,7 +368,7 @@
 	<string name="welcome_to_mastodon">歡迎來到 Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon 是去中心化的社交網路，意思是沒有單一公司掌控它。它由許多獨立運行而互相連接的伺服器組成。</string>
 	<string name="what_are_servers">伺服器是什麼？</string>
-	<string name="welcome_paragraph2"><![CDATA[所有的 Mastodon 帳號皆託管於一個伺服器上 — 其擁有各自之價值觀、規則、與管理者。無論您選擇何者，您皆能跟隨並與其他任何伺服器上的人們互動。]]></string>
+	<string name="welcome_paragraph2">所有的 Mastodon 帳號皆託管於一個伺服器上 — 其擁有各自之價值觀、規則、與管理者。無論您選擇何者，您皆能跟隨並與其他任何伺服器上的人們互動。</string>
 	<string name="opening_link">開啟連結...</string>
 	<string name="link_not_supported">此連結不被 app 所支援</string>
 	<string name="log_out_all_accounts">登出所有帳號</string>
--- a/mastodon/src/main/res/values/urls.xml
+++ b/mastodon/src/main/res/values/urls.xml
@@ -2,5 +2,5 @@
 <resources>
 	<string name="repo_url" translatable="false">https://github.com/sk22/megalodon</string>
 	<string name="privacy_policy_url" translatable="false">https://joinmastodon.org/privacy-policy</string>
-	<string name="donate_url" translatable="false">https://ko-fi.com/xsk22</string>
+	<string name="donate_hashtag" translatable="false">MutualAid</string>
 </resources>
--- a/metadata/fa-IR/changelogs/50.txt
+++ b/metadata/fa-IR/changelogs/50.txt
@@ -0,0 +1,4 @@
+- آماده سازی پرونده‌ها برای انتشار در اف دروید
+- رفع بروزرسانی خودکار
+- افزودن دوباره نقشک‌های تک رنگ به نقشک‌های لانچر
+- جایگزینی نماد به اشتباه فهرست نشده را در پاورقی گسترش‌یافته
--- a/metadata/fa-IR/changelogs/77.txt
+++ b/metadata/fa-IR/changelogs/77.txt
@@ -0,0 +1,4 @@
+- دکمه پیگیری را برای پیگیری نمایه‌ها از حساب دیگر فشار دهید
+- گزینه ای برای باز کردن نمایه‌ها در حساب های دیگر
+- پنهان کردن خودکار دکمه نوشتن هنگام پیمایش کردن خطوط زمانی
+- رفع خرابی هنگام باز کردن نمایه‌های مدیر کارساز
--- a/metadata/ru/changelogs/77.txt
+++ b/metadata/ru/changelogs/77.txt
@@ -0,0 +1,4 @@
+- Долгое зажатие кнопки подписки для подписки с другого аккаунта
+- Возможность открывать профили с другого аккаунта
+- Автоскрытие кнопки публикации при прокрутке ленты вниз
+- Исправлен вылет при открытии профиля администратора сервера
--- a/metadata/ru/changelogs/83.txt
+++ b/metadata/ru/changelogs/83.txt
@@ -0,0 +1,5 @@
+- Возможность оценки/добавления в закладки/ответа напрямую из уведомления
+- Улучшен вид заголовков реблогов и ответов в ленте
+- Добавлена неполноценная поддержка точек уведомлений
+- Для пользователей Akkoma: видимость сортировка ответов в ветке, цитирование, ...
+- Исправлены вылеты или прочие недочёты
--- a/metadata/ru/changelogs/94.txt
+++ b/metadata/ru/changelogs/94.txt
@@ -0,0 +1,8 @@
+- Улучшенный, более понятный просмотр веток
+- Открытие профилей и постов при отправке веб-сайта в Megalodon
+- Загрузка подписчиков/избранного/прочего с изначального сервера
+- Улучшена поддержка других (не-Mastodon) серверов
+- Возможность установки типа содержимого записи
+- Поддержка копирования ссылки из Недавних приложений на устройствах Pixel
+- Автоотображение идентичных предупреждений о содержимом (CW) в ветках
+- Исправления и улучшения интерфейса