Merge remote-tracking branch 'megalodon_main/main' into m3-merger

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-ru-rRU/strings_sk.xml
#	metadata/ru/full_description.txt

mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/AddAnnouncementReaction.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.announcements;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+public class AddAnnouncementReaction extends MastodonAPIRequest<Object> {
+	public AddAnnouncementReaction(String id, String emoji) {
+		super(HttpMethod.PUT, "/announcements/" + id + "/reactions/" + emoji, Object.class);
+		setRequestBody(new Object());
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DeleteAnnouncementReaction.java

@@ -0,0 +1,9 @@
+package org.joinmastodon.android.api.requests.announcements;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+
+public class DeleteAnnouncementReaction extends MastodonAPIRequest<Object> {
+	public DeleteAnnouncementReaction(String id, String emoji) {
+		super(HttpMethod.DELETE, "/announcements/" + id + "/reactions/" + emoji, Object.class);
+	}
+}

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

@@ -26,6 +26,8 @@ import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.DummyStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.EmojiReactionsStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
@@ -69,10 +71,12 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 		Status fakeStatus = a.toStatus();
 		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus, true);
 		textItem.textSelectable = true;
-		return List.of(
+
-				HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead),
+		List<StatusDisplayItem> items=new ArrayList<>();
-				textItem
+		items.add(HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead));
-		);
+		items.add(textItem);
+		if(!isInstanceAkkoma()) items.add(new EmojiReactionsStatusDisplayItem(a.id, this, fakeStatus, accountID, false, true));
+		return items;
 	}
 
 	public void onMarkAsRead(String id) {

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

@@ -1186,6 +1186,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		);
 
 		name.setVisibility(View.GONE);
+		rolesView.setVisibility(View.GONE);
 		username.setVisibility(View.GONE);
 		bio.setVisibility(View.GONE);
 		countersLayout.setVisibility(View.GONE);
@@ -1234,6 +1235,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		nameEditWrap.setVisibility(View.GONE);
 		bioEditWrap.setVisibility(View.GONE);
 		name.setVisibility(View.VISIBLE);
+		rolesView.setVisibility(View.VISIBLE);
 		username.setVisibility(View.VISIBLE);
 		bio.setVisibility(View.VISIBLE);
 		countersLayout.setVisibility(View.VISIBLE);

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

@@ -237,7 +237,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 							footer.rebind();
 						}else if(holder instanceof ExtendedFooterStatusDisplayItem.Holder footer && footer.getItem().status==s.getContentStatus()){
 							footer.rebind();
-						}else if(holder instanceof EmojiReactionsStatusDisplayItem.Holder reactions && ev.viewHolder!=holder){
+						}else if(holder instanceof EmojiReactionsStatusDisplayItem.Holder reactions && reactions.getItem().status==s.getContentStatus() && ev.viewHolder!=holder){
 							reactions.rebind();
 						}
 					}

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

@@ -417,6 +417,10 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 		adapter.notifyDataSetChanged();
 	}
 
+	public Status getMainStatus(){
+		return mainStatus;
+	}
+
 	@Override
 	public boolean isItemEnabled(String id){
 		return !id.equals(mainStatus.id) || !mainStatus.filterRevealed;

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

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

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

@@ -1,9 +1,11 @@
 package org.joinmastodon.android.model;
 
+import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
 import org.parceler.Parcel;
 
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.List;
 
 @Parcel
@@ -20,6 +22,7 @@ public class Announcement extends BaseModel implements DisplayItemsParent {
     public Instant updatedAt;
     public boolean read;
     public List<Emoji> emojis;
+	public List<EmojiReaction> reactions;
     public List<Mention> mentions;
     public List<Hashtag> tags;
 
@@ -41,10 +44,17 @@ public class Announcement extends BaseModel implements DisplayItemsParent {
                 '}';
     }
 
+	@Override
+	public void postprocess() throws ObjectValidationException{
+		super.postprocess();
+		if(reactions==null) reactions=new ArrayList<>();
+	}
+
 	public Status toStatus() {
-        Status s = Status.ofFake(id, content, publishedAt);
+        Status s=Status.ofFake(id, content, publishedAt);
-        s.createdAt = startsAt != null ? startsAt : publishedAt;
+        s.createdAt=startsAt != null ? startsAt : publishedAt;
-        if (updatedAt != null) s.editedAt = updatedAt;
+		s.reactions=reactions;
+        if(updatedAt != null) s.editedAt=updatedAt;
         return s;
     }
 

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

@@ -2,8 +2,14 @@ package org.joinmastodon.android.model;
 
 import org.parceler.Parcel;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.V;
+
 @Parcel
 public class EmojiReaction {
     public List<Account> accounts;
@@ -13,4 +19,38 @@ public class EmojiReaction {
     public String name;
     public String url;
 	public String staticUrl;
+
+	public transient ImageLoaderRequest request;
+
+	public static EmojiReaction of(Emoji info, Account me){
+		EmojiReaction reaction=new EmojiReaction();
+		reaction.me=true;
+		reaction.count=1;
+		reaction.name=info.shortcode;
+		reaction.url=info.url;
+		reaction.staticUrl=info.staticUrl;
+		reaction.accounts=new ArrayList<>(Collections.singleton(me));
+		reaction.accountIds=new ArrayList<>(Collections.singleton(me.id));
+		reaction.request=new UrlImageLoaderRequest(info.url, V.sp(24), V.sp(24));
+		return reaction;
+	}
+
+	public static EmojiReaction of(String emoji, Account me){
+		EmojiReaction reaction=new EmojiReaction();
+		reaction.me=true;
+		reaction.count=1;
+		reaction.name=emoji;
+		reaction.accounts=new ArrayList<>(Collections.singleton(me));
+		reaction.accountIds=new ArrayList<>(Collections.singleton(me.id));
+		return reaction;
+	}
+
+	public void add(Account self){
+		if(accounts==null) accounts=new ArrayList<>();
+		if(accountIds==null) accountIds=new ArrayList<>();
+		count++;
+		me=true;
+		accounts.add(self);
+		accountIds.add(self.id);
+	}
 }

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

@@ -106,7 +106,7 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 			t.postprocess();
 		for(Emoji e:emojis)
 			e.postprocess();
-		if (mediaAttachments == null) mediaAttachments = List.of();
+		if (mediaAttachments == null) mediaAttachments=List.of();
 		for(Attachment a:mediaAttachments)
 			a.postprocess();
 		account.postprocess();
@@ -181,8 +181,7 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 		reblogged=ev.reblogged;
 		bookmarked=ev.bookmarked;
 		pinned=ev.pinned;
-		reactions.clear();
+		reactions=ev.reactions;
-		reactions.addAll(ev.reactions);
 	}
 
 	public Status getContentStatus(){
@@ -208,17 +207,18 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	}
 
 	public static Status ofFake(String id, String text, Instant createdAt) {
-		Status s = new Status();
+		Status s=new Status();
-		s.id = id;
+		s.id=id;
-		s.mediaAttachments = List.of();
+		s.mediaAttachments=List.of();
-		s.createdAt = createdAt;
+		s.createdAt=createdAt;
-		s.content = s.text = text;
+		s.content=s.text=text;
-		s.spoilerText = "";
+		s.spoilerText="";
-		s.visibility = StatusPrivacy.PUBLIC;
+		s.visibility=StatusPrivacy.PUBLIC;
-		s.mentions = List.of();
+		s.reactions=List.of();
-		s.tags = List.of();
+		s.mentions=List.of();
-		s.emojis = List.of();
+		s.tags =List.of();
-		s.filtered = List.of();
+		s.emojis=List.of();
+		s.filtered=List.of();
 		return s;
 	}
 
@@ -230,21 +230,21 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	public static class StatusDeserializer implements JsonDeserializer<Status> {
 		@Override
 		public Status deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-			JsonObject obj = json.getAsJsonObject();
+			JsonObject obj=json.getAsJsonObject();
 
-			Status quote = null;
+			Status quote=null;
 			if (obj.has("quote") && obj.get("quote").isJsonObject())
-				quote = gson.fromJson(obj.get("quote"), Status.class);
+				quote=gson.fromJson(obj.get("quote"), Status.class);
 			obj.remove("quote");
 
-			Status reblog = null;
+			Status reblog=null;
 			if (obj.has("reblog"))
-				reblog = gson.fromJson(obj.get("reblog"), Status.class);
+				reblog=gson.fromJson(obj.get("reblog"), Status.class);
 			obj.remove("reblog");
 
-			Status status = gsonWithoutDeserializer.fromJson(json, Status.class);
+			Status status=gsonWithoutDeserializer.fromJson(json, Status.class);
-			status.quote = quote;
+			status.quote=quote;
-			status.reblog = reblog;
+			status.reblog=reblog;
 
 			return status;
 		}

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

@@ -4,16 +4,16 @@ import android.content.Context;
 import android.view.ViewGroup;
 import android.widget.Space;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 
 import me.grishka.appkit.utils.V;
 
 public class DummyStatusDisplayItem extends StatusDisplayItem {
-	private final boolean addMediaGridMargin;
 
-	public DummyStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, boolean addMediaGridMargin) {
+	public DummyStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment) {
 		super(parentID, parentFragment);
-		this.addMediaGridMargin = addMediaGridMargin;
 	}
 
 	@Override
@@ -22,19 +22,21 @@ public class DummyStatusDisplayItem extends StatusDisplayItem {
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<DummyStatusDisplayItem> {
+		private final RecyclerView.LayoutParams params;
+
 		public Holder(Context context) {
 			super(new Space(context));
-		}
+			params=new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0);
 
-		@Override
-		public void onBind(DummyStatusDisplayItem item) {
 			// BetterItemAnimator appears not to handle InsetStatusItemDecoration's getItemOffsets
 			// correctly, causing removed inset views to jump while animating. i don't quite
 			// understand it, but this workaround appears to work.
 			// see InsetStatusItemDecoration#getItemOffsets
-			ViewGroup.MarginLayoutParams params = new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0);
+			params.setMargins(0, 0, 0, V.dp(16));
-			params.setMargins(0, item.addMediaGridMargin ? V.dp(0) : 0, 0, V.dp(16));
 			itemView.setLayoutParams(params);
 		}
+
+		@Override
+		public void onBind(DummyStatusDisplayItem item) {}
 	}
 }

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

@@ -1,15 +1,19 @@
 package org.joinmastodon.android.ui.displayitems;
 
 import android.app.Activity;
+import android.content.Context;
 import android.graphics.Paint;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.MotionEvent;
+import android.util.DisplayMetrics;
+import android.util.Pair;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -18,21 +22,26 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.requests.announcements.AddAnnouncementReaction;
+import org.joinmastodon.android.api.requests.announcements.DeleteAnnouncementReaction;
 import org.joinmastodon.android.api.requests.statuses.AddStatusReaction;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatusReaction;
 import org.joinmastodon.android.api.requests.statuses.PleromaAddStatusReaction;
 import org.joinmastodon.android.api.requests.statuses.PleromaDeleteStatusReaction;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.account_list.StatusEmojiReactionsListFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Announcement;
+import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiReaction;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.CustomEmojiPopupKeyboard;
 import org.joinmastodon.android.ui.utils.TextDrawable;
 import org.joinmastodon.android.ui.utils.UiUtils;
-
+import org.joinmastodon.android.ui.views.ProgressBarButton;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -50,21 +59,19 @@ import me.grishka.appkit.views.UsableRecyclerView;
 public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 	public final Status status;
 	private final Drawable placeholder;
-	private List<ImageLoaderRequest> requests;
+	private final boolean hideAdd, forAnnouncement;
+	private final String accountID;
+	private boolean hidden;
 
-    public EmojiReactionsStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status) {
+    public EmojiReactionsStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status, String accountID, boolean hideAdd, boolean forAnnouncement) {
 		super(parentID, parentFragment);
 		this.status=status;
+		this.hideAdd=hideAdd;
+		this.forAnnouncement=forAnnouncement;
+		this.accountID=accountID;
 		placeholder=parentFragment.getContext().getDrawable(R.drawable.image_placeholder).mutate();
 		placeholder.setBounds(0, 0, V.sp(24), V.sp(24));
-    }
+		updateHidden();
-
-	private void refresh(Holder holder) {
-		requests=status.reactions.stream()
-				.map(e->e.url!=null ? new UrlImageLoaderRequest(e.url, V.sp(24), V.sp(24)) : null)
-				.collect(Collectors.toList());
-		holder.list.setPadding(holder.list.getPaddingLeft(),
-				status.reactions.isEmpty() ? 0 : V.dp(8), holder.list.getPaddingRight(), 0);
     }
 
 	@Override
@@ -74,7 +81,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 
 	@Override
 	public ImageLoaderRequest getImageRequest(int index){
-		return requests.get(index);
+		return status.reactions.get(index).request;
 	}
 
     @Override
@@ -82,29 +89,181 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
         return Type.EMOJI_REACTIONS;
     }
 
-    public static class Holder extends StatusDisplayItem.Holder<EmojiReactionsStatusDisplayItem> implements ImageLoaderViewHolder {
+	public boolean isHidden(){
-        private final UsableRecyclerView list;
+		return hidden;
+	}
 
-		public Holder(Activity activity, ViewGroup parent) {
+	private void updateHidden(){
-			super(new UsableRecyclerView(activity) {
+		hidden=status.reactions.isEmpty() && hideAdd;
+	}
+
+	// borrowed from ProfileFragment
+	private void setActionProgressVisible(Holder.EmojiReactionViewHolder vh, boolean visible){
+		if(vh==null) return;
+		vh.progress.setVisibility(visible ? View.VISIBLE : View.GONE);
+		if(visible)
+			vh.progress.setIndeterminateTintList(vh.btn.getTextColors());
+		vh.btn.setClickable(!visible);
+	}
+
+	private MastodonAPIRequest<?> createRequest(String name, int count, boolean delete, Holder.EmojiReactionViewHolder vh, Runnable cb, Runnable err){
+		setActionProgressVisible(vh, true);
+		boolean ak=parentFragment.isInstanceAkkoma();
+		boolean keepSpinning=delete && count == 1;
+		if(forAnnouncement){
+			MastodonAPIRequest<Object> req=delete
+					? new DeleteAnnouncementReaction(status.id, name)
+					: new AddAnnouncementReaction(status.id, name);
+			return req.setCallback(new Callback<>(){
 				@Override
-				public boolean onTouchEvent(MotionEvent e){
+				public void onSuccess(Object result){
-					super.onTouchEvent(e);
+					if(!keepSpinning) setActionProgressVisible(vh, false);
-					// to pass through touch events (i.e. clicking the status) to the parent view
+					cb.run();
-					return false;
+				}
+				@Override
+				public void onError(ErrorResponse error){
+					setActionProgressVisible(vh, false);
+					error.showToast(parentFragment.getContext());
+					if(err!=null) err.run();
 				}
 			});
-			list=(UsableRecyclerView) itemView;
+		}else{
-			list.setPadding(V.dp(12), 0, V.dp(12), 0);
+			MastodonAPIRequest<Status> req=delete
-			list.setClipToPadding(false);
+					? (ak ? new PleromaDeleteStatusReaction(status.id, name) : new DeleteStatusReaction(status.id, name))
+					: (ak ? new PleromaAddStatusReaction(status.id, name) : new AddStatusReaction(status.id, name));
+			return req.setCallback(new Callback<>(){
+				@Override
+				public void onSuccess(Status result){
+					if(!keepSpinning) setActionProgressVisible(vh, false);
+					cb.run();
+				}
+				@Override
+				public void onError(ErrorResponse error){
+					setActionProgressVisible(vh, false);
+					error.showToast(parentFragment.getContext());
+					if(err!=null) err.run();
+				}
+			});
+		}
+	}
+
+	public static class Holder extends StatusDisplayItem.Holder<EmojiReactionsStatusDisplayItem> implements ImageLoaderViewHolder, CustomEmojiPopupKeyboard.Listener {
+		private final UsableRecyclerView list;
+		private final LinearLayout root, line;
+		private CustomEmojiPopupKeyboard emojiKeyboard;
+		private final View space;
+		private final ImageButton addButton;
+		private final ProgressBar progress;
+		private final EmojiReactionsAdapter adapter;
+		private final ListImageLoaderWrapper imgLoader;
+
+		public Holder(Activity activity, ViewGroup parent) {
+			super(activity, R.layout.display_item_emoji_reactions, parent);
+			root=(LinearLayout) itemView;
+			line=findViewById(R.id.line);
+			list=findViewById(R.id.list);
+			imgLoader=new ListImageLoaderWrapper(activity, list, new RecyclerViewDelegate(list), null);
+			list.setAdapter(adapter=new EmojiReactionsAdapter(this, imgLoader));
+			addButton=findViewById(R.id.add_btn);
+			progress=findViewById(R.id.progress);
+			addButton.setOnClickListener(this::onReactClick);
+			space=findViewById(R.id.space);
+			list.setLayoutManager(new LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false));
         }
 
         @Override
         public void onBind(EmojiReactionsStatusDisplayItem item) {
-			ListImageLoaderWrapper imgLoader=new ListImageLoaderWrapper(item.parentFragment.getContext(), list, new RecyclerViewDelegate(list), null);
+			if(emojiKeyboard != null) root.removeView(emojiKeyboard.getView());
-			list.setAdapter(new EmojiReactionsAdapter(this, imgLoader));
+			AccountSession session=item.parentFragment.getSession();
-			list.setLayoutManager(new LinearLayoutManager(item.parentFragment.getContext(), LinearLayoutManager.HORIZONTAL, false));
+			item.status.reactions.forEach(r->
-			item.refresh(this);
+					r.request=r.url != null ? new UrlImageLoaderRequest(r.url, V.sp(24), V.sp(24)) : null);
+			emojiKeyboard=new CustomEmojiPopupKeyboard(
+					(Activity) item.parentFragment.getContext(),
+					AccountSessionManager.getInstance().getCustomEmojis(session.domain),
+					session.domain, true);
+			emojiKeyboard.setListener(this);
+			space.setVisibility(View.GONE);
+			root.addView(emojiKeyboard.getView());
+			item.updateHidden();
+			root.setVisibility(item.hidden ? View.GONE : View.VISIBLE);
+			line.setVisibility(item.hidden ? View.GONE : View.VISIBLE);
+			line.setPadding(
+					list.getPaddingLeft(),
+					item.hidden ? 0 : V.dp(8),
+					list.getPaddingRight(),
+					item.forAnnouncement ? V.dp(8) : 0
+			);
+			imgLoader.updateImages();
+			adapter.notifyDataSetChanged();
+        }
+
+		private void hideEmojiKeyboard(){
+			space.setVisibility(View.GONE);
+			addButton.setSelected(false);
+			if(emojiKeyboard.isVisible()) emojiKeyboard.toggleKeyboardPopup(null);
+		}
+
+		@Override
+		public void onEmojiSelected(Emoji emoji) {
+			addEmojiReaction(emoji.shortcode, emoji);
+			hideEmojiKeyboard();
+		}
+
+		@Override
+		public void onEmojiSelected(String emoji){
+			addEmojiReaction(emoji, null);
+			hideEmojiKeyboard();
+		}
+
+		private void addEmojiReaction(String emoji, Emoji info) {
+			if(item.status.reactions.stream().filter(r->r.name.equals(emoji) && r.me).findAny().isPresent()) return;
+			progress.setVisibility(View.VISIBLE);
+			addButton.setClickable(false);
+			addButton.setAlpha(0.55f);
+
+			Runnable resetBtn=()->{
+				progress.setVisibility(View.GONE);
+				addButton.setClickable(true);
+				addButton.setAlpha(1f);
+			};
+			Account me=AccountSessionManager.get(item.accountID).self;
+			EmojiReaction existing=null;
+			for(int i=0; i<item.status.reactions.size(); i++){
+				EmojiReaction r=item.status.reactions.get(i);
+				if(r.name.equals(emoji)){
+					existing=r;
+					break;
+				}
+			}
+			EmojiReaction finalExisting=existing;
+			item.createRequest(emoji, existing==null ? 1 : existing.count, false, null, ()->{
+				resetBtn.run();
+				if(finalExisting==null){
+					item.status.reactions.add(0, info!=null ? EmojiReaction.of(info, me) : EmojiReaction.of(emoji, me));
+					adapter.notifyItemRangeInserted(0, 1);
+				}else{
+					finalExisting.add(me);
+					adapter.notifyItemChanged(item.status.reactions.indexOf(finalExisting));
+				}
+				E.post(new StatusCountersUpdatedEvent(item.status, adapter.parentHolder));
+			}, resetBtn).exec(item.accountID);
+		}
+
+		@Override
+		public void onBackspace() {}
+
+		private void onReactClick(View v){
+			emojiKeyboard.toggleKeyboardPopup(null);
+			v.setSelected(emojiKeyboard.isVisible());
+			space.setVisibility(emojiKeyboard.isVisible() ? View.VISIBLE : View.GONE);
+			DisplayMetrics displayMetrics = new DisplayMetrics();
+			int[] locationOnScreen = new int[2];
+			((Activity) v.getContext()).getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+			v.getLocationOnScreen(locationOnScreen);
+			double fromScreenTop = (double) locationOnScreen[1] / displayMetrics.heightPixels;
+			if (fromScreenTop > 0.75) {
+				item.parentFragment.scrollBy(0, (int) (displayMetrics.heightPixels * 0.3));
+			}
 		}
 
 		@Override
@@ -116,11 +275,11 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 
 		@Override
 		public void clearImage(int index){
+			if(item.status.reactions.get(index).url==null) return;
 			setImage(index, item.placeholder);
 		}
 
 		private class EmojiReactionsAdapter extends UsableRecyclerView.Adapter<EmojiReactionViewHolder> implements ImageLoaderRecyclerAdapter{
-			RecyclerView list;
 			ListImageLoaderWrapper imgLoader;
 			Holder parentHolder;
 
@@ -130,28 +289,15 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 				this.imgLoader=imgLoader;
 			}
 
-			@Override
-			public void onAttachedToRecyclerView(@NonNull RecyclerView list){
-				super.onAttachedToRecyclerView(list);
-				this.list=list;
-			}
-
 			@NonNull
 			@Override
 			public EmojiReactionViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-				Button btn=new Button(parent.getContext(), null, 0, R.style.Widget_Mastodon_M3_Button_Outlined_Icon);
+				return new EmojiReactionViewHolder(parent.getContext(), list);
-				ViewGroup.MarginLayoutParams params=new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-				params.setMarginEnd(V.dp(8));
-				btn.setLayoutParams(params);
-				btn.setCompoundDrawableTintList(null);
-				btn.setBackgroundResource(R.drawable.bg_button_m3_tonal);
-				btn.setCompoundDrawables(item.placeholder, null, null, null);
-				return new EmojiReactionViewHolder(btn, item);
 			}
 
 			@Override
 			public void onBindViewHolder(EmojiReactionViewHolder holder, int position){
-				holder.bind(item.status.reactions.get(position));
+				holder.bind(Pair.create(item, item.status.reactions.get(position)));
 				super.onBindViewHolder(holder, position);
 			}
 
@@ -167,18 +313,19 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 
 			@Override
 			public ImageLoaderRequest getImageRequest(int position, int image){
-				return item.requests.get(position);
+				return item.status.reactions.get(position).request;
 			}
 		}
 
-		private static class EmojiReactionViewHolder extends BindableViewHolder<EmojiReaction> implements ImageLoaderViewHolder{
+		private static class EmojiReactionViewHolder extends BindableViewHolder<Pair<EmojiReactionsStatusDisplayItem, EmojiReaction>> implements ImageLoaderViewHolder{
-			private final Button btn;
+			private final ProgressBarButton btn;
-			private final EmojiReactionsStatusDisplayItem parent;
+			private final ProgressBar progress;
 
-			public EmojiReactionViewHolder(@NonNull View itemView, EmojiReactionsStatusDisplayItem parent){
+			public EmojiReactionViewHolder(Context context, RecyclerView list){
-				super(itemView);
+				super(context, R.layout.item_emoji_reaction, list);
-				btn=(Button) itemView;
+				btn=findViewById(R.id.btn);
-				this.parent=parent;
+				progress=findViewById(R.id.progress);
+				itemView.setClickable(true);
 			}
 
 			@Override
@@ -190,66 +337,54 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 
 			@Override
 			public void clearImage(int index){
-				setImage(index, parent.placeholder);
+				setImage(index, item.first.placeholder);
 			}
 
 			@Override
-			public void onBind(EmojiReaction item){
+			public void onBind(Pair<EmojiReactionsStatusDisplayItem, EmojiReaction> item){
-				btn.setText(UiUtils.abbreviateNumber(item.count));
+				item.first.setActionProgressVisible(this, false);
-				btn.setContentDescription(item.name);
+				EmojiReactionsStatusDisplayItem parent=item.first;
-				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)btn.setTooltipText(item.name);
+				EmojiReaction reaction=item.second;
-				if(item.url==null){
+				btn.setText(UiUtils.abbreviateNumber(reaction.count));
+				btn.setContentDescription(reaction.name);
+				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) btn.setTooltipText(reaction.name);
+				if(reaction.url==null){
 					Paint p=new Paint();
 					p.setTextSize(V.sp(18));
-					TextDrawable drawable=new TextDrawable(p, item.name);
+					TextDrawable drawable=new TextDrawable(p, reaction.name);
 					btn.setCompoundDrawablesRelative(drawable, null, null, null);
 				}else{
-					btn.setCompoundDrawablesRelative(parent.placeholder, null, null, null);
+					btn.setCompoundDrawablesRelative(item.first.placeholder, null, null, null);
 				}
-				btn.setSelected(item.me);
+				btn.setSelected(reaction.me);
-				btn.setOnClickListener(e -> {
+				btn.setOnClickListener(e->{
-					boolean deleting=item.me;
+					boolean deleting=reaction.me;
-					boolean ak=parent.parentFragment.isInstanceAkkoma();
+					parent.createRequest(reaction.name, reaction.count, deleting, this, ()->{
-					MastodonAPIRequest<Status> req = deleting
-							? (ak ? new PleromaDeleteStatusReaction(parent.status.id, item.name) : new DeleteStatusReaction(parent.status.id, item.name))
-							: (ak ? new PleromaAddStatusReaction(parent.status.id, item.name) : new AddStatusReaction(parent.status.id, item.name));
-					req.setCallback(new Callback<>() {
-								@Override
-								public void onSuccess(Status result) {
-									List<EmojiReaction> oldList=new ArrayList<>(parent.status.reactions);
-									parent.status.reactions.clear();
-									parent.status.reactions.addAll(result.reactions);
 						EmojiReactionsAdapter adapter = (EmojiReactionsAdapter) getBindingAdapter();
-
+						for(int i=0; i<parent.status.reactions.size(); i++){
-									// this handles addition/removal of new reactions
+							EmojiReaction r=parent.status.reactions.get(i);
-									UiUtils.updateList(oldList, result.reactions, adapter.list, adapter,
+							if(!r.name.equals(reaction.name)) continue;
-											(e1, e2) -> e1.name.equals(e2.name));
+							if(deleting && r.count==1) {
-
+								parent.status.reactions.remove(i);
-									// update the existing reactions' counts
+								adapter.notifyItemRemoved(i);
-									for(int i=0; i<result.reactions.size(); i++){
+								break;
-										int index=i;
-										EmojiReaction newReaction=result.reactions.get(index);
-										oldList.stream().filter(r->r.name.equals(newReaction.name)).findAny().ifPresent(r->{
-											if(newReaction.count!=r.count) adapter.notifyItemChanged(index);
-										});
 							}
-									parent.refresh(adapter.parentHolder);
+							r.me=!deleting;
-									adapter.imgLoader.updateImages();
+							if(deleting) r.count--;
-									E.post(new StatusCountersUpdatedEvent(result, adapter.parentHolder));
+							else r.count++;
+							adapter.notifyItemChanged(i);
+							break;
 						}
 
-								@Override
+						E.post(new StatusCountersUpdatedEvent(parent.status, adapter.parentHolder));
-								public void onError(ErrorResponse error) {
+						adapter.parentHolder.imgLoader.updateImages();
-									error.showToast(itemView.getContext());
+					}, null).exec(parent.parentFragment.getAccountID());
-								}
-							})
-							.exec(parent.parentFragment.getAccountID());
 				});
 
 				if (parent.parentFragment.isInstanceAkkoma()) {
 					// glitch-soc doesn't have this, afaik
 					btn.setOnLongClickListener(e->{
-						EmojiReaction emojiReaction=parent.status.reactions.stream().filter(r->r.name.equals(item.name)).findAny().orElseThrow();
+						EmojiReaction emojiReaction=parent.status.reactions.get(getAbsoluteAdapterPosition());
 						Bundle args=new Bundle();
 						args.putString("account", parent.parentFragment.getAccountID());
 						args.putString("statusID", parent.status.id);

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

@@ -5,14 +5,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.DisplayMetrics;
-import android.os.VibrationEffect;
-import android.os.Vibrator;
-import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -21,41 +14,26 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
-import android.view.inputmethod.InputMethodManager;
-import android.view.animation.AnimationSet;
-import android.view.animation.BounceInterpolator;
-import android.view.animation.RotateAnimation;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.FrameLayout;
-import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.api.requests.statuses.AddStatusReaction;
-import org.joinmastodon.android.api.requests.statuses.PleromaAddStatusReaction;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
-import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
-import org.joinmastodon.android.ui.CustomEmojiPopupKeyboard;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
 import java.util.function.Consumer;
-import java.util.regex.Pattern;
 
 import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
@@ -76,14 +54,8 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<FooterStatusDisplayItem>{
-		private final FrameLayout reactLayout;
 		private final TextView replies, boosts, favorites;
-		private final View reply, boost, favorite, share, bookmark, react;
+		private final View reply, boost, favorite, share, bookmark;
-		private final InputMethodManager imm;
-		private CustomEmojiPopupKeyboard emojiKeyboard;
-		private LinearLayout emojiKeyboardContainer;
-		private boolean reactKeyboardVisible;
-		private final Activity activity;
 		private static final Animation opacityOut, opacityIn;
 		private static AnimationSet animSet;
 
@@ -130,10 +102,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_footer, parent);
-			this.activity = activity;
-
-			reactLayout=findViewById(R.id.react_layout);
-			emojiKeyboardContainer=findViewById(R.id.footer_emoji_keyboard_container);
 
 			replies=findViewById(R.id.reply);
 			boosts=findViewById(R.id.boost);
@@ -144,7 +112,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			favorite=findViewById(R.id.favorite_btn);
 			share=findViewById(R.id.share_btn);
 			bookmark=findViewById(R.id.bookmark_btn);
-			react=findViewById(R.id.react_btn);
 
 			reply.setOnTouchListener(this::onButtonTouch);
 			reply.setOnClickListener(this::onReplyClick);
@@ -158,9 +125,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			favorite.setOnClickListener(this::onFavoriteClick);
 			favorite.setOnLongClickListener(this::onFavoriteLongClick);
 			favorite.setAccessibilityDelegate(buttonAccessibilityDelegate);
-			react.setOnTouchListener(this::onButtonTouch);
-			react.setOnClickListener(this::onReactClick);
-			react.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			bookmark.setOnTouchListener(this::onButtonTouch);
 			bookmark.setOnClickListener(this::onBookmarkClick);
 			bookmark.setOnLongClickListener(this::onBookmarkLongClick);
@@ -169,8 +133,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			share.setOnClickListener(this::onShareClick);
 			share.setOnLongClickListener(this::onShareLongClick);
 			share.setAccessibilityDelegate(buttonAccessibilityDelegate);
-
-			imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
 		}
 
 		@Override
@@ -187,11 +149,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			bookmark.setSelected(item.status.bookmarked);
 			boost.setEnabled(item.status.isReblogPermitted(item.accountID));
 
-			AccountSession accountSession=AccountSessionManager.get(item.accountID);
-			reactLayout.setVisibility(accountSession.getLocalPreferences().emojiReactionsEnabled
-						? View.VISIBLE
-						: View.GONE);
-
 			int nextPos = getAbsoluteAdapterPosition() + 1;
 			boolean nextIsWarning = item.parentFragment.getDisplayItems().size() > nextPos &&
 					item.parentFragment.getDisplayItems().get(nextPos) instanceof WarningFilteredStatusDisplayItem;
@@ -203,28 +160,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 					condenseBottom ? V.dp(-5) : 0);
 
 			itemView.requestLayout();
-
-			reactKeyboardVisible=false;
-			emojiKeyboard=new CustomEmojiPopupKeyboard(activity, AccountSessionManager.getInstance().getCustomEmojis(accountSession.domain), accountSession.domain, true, item.accountID);
-			emojiKeyboard.setListener(new CustomEmojiPopupKeyboard.Listener(){
-				@Override
-				public void onEmojiSelected(Emoji emoji) {
-					addEmojiReaction(emoji.shortcode);
-					emojiKeyboard.toggleKeyboardPopup(null);
-				}
-
-				@Override
-				public void onEmojiSelected(String emoji){
-					addEmojiReaction(emoji);
-					emojiKeyboard.toggleKeyboardPopup(null);
-				}
-
-				@Override
-				public void onBackspace() {}
-			});
-
-			emojiKeyboardContainer.removeAllViews();
-			emojiKeyboardContainer.addView(emojiKeyboard.getView());
 		}
 
 		private void bindText(TextView btn, long count){
@@ -468,29 +403,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			return true;
 		}
 
-		private boolean resetReact(View v){
-			if(!reactKeyboardVisible) return false;
-			if(emojiKeyboard.isVisible()) emojiKeyboard.toggleKeyboardPopup(null);
-			reactKeyboardVisible=false;
-			v.setAlpha(1);
-			v.startAnimation(opacityIn);
-			return true;
-		}
-
-		private void onReactClick(View v){
-			if (resetReact(v)) return;
-			reactKeyboardVisible=true;
-			emojiKeyboard.toggleKeyboardPopup(null);
-			DisplayMetrics displayMetrics = new DisplayMetrics();
-			int[] locationOnScreen = new int[2];
-			activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-			v.getLocationOnScreen(locationOnScreen);
-			double fromScreenTop = (double) locationOnScreen[1] / displayMetrics.heightPixels;
-			if (fromScreenTop > 0.75) {
-				item.parentFragment.scrollBy(0, (int) (displayMetrics.heightPixels * 0.3));
-			}
-		}
-
 		private void onBookmarkClick(View v){
 			if(item.status.isRemote){
 				UiUtils.lookupStatus(v.getContext(),
@@ -552,51 +464,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 				return R.string.add_bookmark;
 			if(id==R.id.share_btn)
 				return R.string.button_share;
-			if(id==R.id.react_btn)
-				return R.string.sk_button_react;
 			return 0;
 		}
-
-		private void addEmojiReaction(String emoji) {
-			MastodonAPIRequest<Status> req = item.parentFragment.isInstanceAkkoma()
-					? new PleromaAddStatusReaction(item.status.id, emoji)
-					: new AddStatusReaction(item.status.id, emoji);
-			req.setCallback(new Callback<>() {
-				@Override
-				public void onSuccess(Status result) {
-					item.parentFragment.updateEmojiReactions(result, getItemID());
-				}
-
-				@Override
-				public void onError(ErrorResponse error) {
-					error.showToast(item.parentFragment.getContext());
-				}
-			})
-			.exec(item.accountID);
-			reactKeyboardVisible=false;
-			react.startAnimation(opacityIn);
-		}
-
-		private static void vibrateForAction(View view, boolean isPositive) {
-			if (!GlobalUserPreferences.hapticFeedback) return;
-
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-				view.performHapticFeedback(isPositive ? HapticFeedbackConstants.CONFIRM : HapticFeedbackConstants.REJECT);
-			} else {
-				Vibrator vibrator = view.getContext().getSystemService(Vibrator.class);
-
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-					vibrator.vibrate(VibrationEffect.createPredefined(isPositive ? VibrationEffect.EFFECT_CLICK : VibrationEffect.EFFECT_DOUBLE_CLICK));
-				} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					VibrationEffect effect = isPositive
-						? VibrationEffect.createOneShot(75L, 128)
-						: VibrationEffect.createWaveform(new long[]{0L, 75L, 75L, 75L}, new int[]{0, 128, 0, 128}, -1);
-					vibrator.vibrate(effect);
-				} else {
-					if (isPositive) vibrator.vibrate(75L);
-					else vibrator.vibrate(new long[]{0L, 75L, 75L, 75L}, -1);
-				}
-			}
-		}
 	}
 }

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

@@ -92,7 +92,7 @@ public class SpoilerStatusDisplayItem extends StatusDisplayItem{
 					itemView.getPaddingLeft(),
 					itemView.getPaddingTop(),
 					itemView.getPaddingRight(),
-					item.inset || GlobalUserPreferences.spectatorMode ? itemView.getPaddingTop() : 0
+					item.inset ? itemView.getPaddingTop() : 0
 			);
 		}
 

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

@@ -18,6 +18,7 @@ import org.joinmastodon.android.fragments.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.HomeTabFragment;
 import org.joinmastodon.android.fragments.ListTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
+import org.joinmastodon.android.fragments.ScheduledStatusListFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
@@ -49,7 +50,7 @@ import me.grishka.appkit.views.UsableRecyclerView;
 
 public abstract class StatusDisplayItem{
 	public final String parentID;
-	public final BaseStatusListFragment parentFragment;
+	public final BaseStatusListFragment<?> parentFragment;
 	public boolean inset;
 	public int index;
 	public boolean
@@ -78,7 +79,7 @@ public abstract class StatusDisplayItem{
 		this.isDirectDescendant = isDirectDescendant;
 	}
 
-	public StatusDisplayItem(String parentID, BaseStatusListFragment parentFragment){
+	public StatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment){
 		this.parentID=parentID;
 		this.parentFragment=parentFragment;
 	}
@@ -257,7 +258,7 @@ public abstract class StatusDisplayItem{
 		}else if(!hasSpoiler && header!=null){
 			header.needBottomPadding=true;
 		}else if(hasSpoiler){
-			contentItems.add(new DummyStatusDisplayItem(parentID, fragment, true));
+			contentItems.add(new DummyStatusDisplayItem(parentID, fragment));
 		}
 
 		List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList());
@@ -293,11 +294,14 @@ public abstract class StatusDisplayItem{
 		if(contentItems!=items && statusForContent.spoilerRevealed){
 			items.addAll(contentItems);
 		}
-		if((flags & FLAG_NO_EMOJI_REACTIONS)==0 && AccountSessionManager.get(accountID).getLocalPreferences().emojiReactionsEnabled){
+		if((flags & FLAG_NO_EMOJI_REACTIONS)==0
-			items.add(new EmojiReactionsStatusDisplayItem(parentID, fragment, statusForContent));
+				&& AccountSessionManager.get(accountID).getLocalPreferences().emojiReactionsEnabled){
+			boolean isMainStatus=fragment instanceof ThreadFragment t && t.getMainStatus().id.equals(statusForContent.id);
+			items.add(new EmojiReactionsStatusDisplayItem(parentID, fragment, statusForContent, accountID, !isMainStatus, false));
 		}
+		FooterStatusDisplayItem footer=null;
 		if((flags & FLAG_NO_FOOTER)==0){
-			FooterStatusDisplayItem footer=new FooterStatusDisplayItem(parentID, fragment, statusForContent, accountID);
+			footer=new FooterStatusDisplayItem(parentID, fragment, statusForContent, accountID);
 			footer.hideCounts=hideCounts;
 			items.add(footer);
 			if(status.hasGapAfter && !(fragment instanceof ThreadFragment))
@@ -306,10 +310,12 @@ 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) {
+		if(inset || footer==null){
-			items.add(new DummyStatusDisplayItem(parentID, fragment,
+			items.add(new DummyStatusDisplayItem(parentID, fragment));
-					!contentItems.isEmpty() && contentItems
+			// in case we ever need the dummy to display a margin for the media grid again:
-							.get(contentItems.size() - 1) instanceof MediaGridStatusDisplayItem));
+			// (i forgot why we apparently don't need this anymore)
+			// !contentItems.isEmpty() && contentItems
+			// 	.get(contentItems.size() - 1) instanceof MediaGridStatusDisplayItem));
 		}
 		for(StatusDisplayItem item:items){
 			item.inset=inset;

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

@@ -21,6 +21,7 @@ import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
@@ -31,6 +32,8 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 import org.joinmastodon.android.utils.StatusTextEncoder;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
@@ -183,13 +186,19 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			readMore.setText(item.status.textExpanded ? R.string.sk_collapse : R.string.sk_expand);
 
 			// remove additional padding when (transparently padded) translate button is visible
-			int nextPos = getAbsoluteAdapterPosition() + 1;
+			int nextPos=getAbsoluteAdapterPosition() + 1;
 			int bottomPadding=V.dp(12);
-			if(item.parentFragment.getDisplayItems().size() > nextPos){
+			List<StatusDisplayItem> displayItems=item.parentFragment.getDisplayItems();
-				if(item.parentFragment.getDisplayItems().get(nextPos) instanceof FooterStatusDisplayItem) bottomPadding=V.dp(6);
+			if(displayItems.size() > nextPos){
-				if(item.parentFragment.getDisplayItems().get(nextPos) instanceof EmojiReactionsStatusDisplayItem){
+				StatusDisplayItem next=displayItems.get(nextPos);
-					bottomPadding=item.status.reactions.isEmpty() ? V.dp(6) : 0;
+				if(next instanceof EmojiReactionsStatusDisplayItem e && e.isHidden()){
+					next=displayItems.size() > ++nextPos ? displayItems.get(nextPos) : null;
 				}
+
+				if(next instanceof FooterStatusDisplayItem) bottomPadding=V.dp(6);
+				else if((!item.inset && next instanceof DummyStatusDisplayItem)
+						|| next instanceof EmojiReactionsStatusDisplayItem e && !e.isHidden()
+				) bottomPadding=0;
 			}
 			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), bottomPadding);
 
@@ -226,7 +235,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 			// compensate for spoiler's bottom margin
 			ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) itemView.getLayoutParams();
-			params.setMargins(params.leftMargin, (item.inset || GlobalUserPreferences.spectatorMode) && hasSpoiler ? V.dp(-16) : 0,
+			params.setMargins(params.leftMargin, item.inset && hasSpoiler ? V.dp(-16) : 0,
 					params.rightMargin, params.bottomMargin);
 		}
 

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

@@ -0,0 +1,44 @@
+package org.joinmastodon.android.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class EmojiReactionsRecyclerView extends UsableRecyclerView{
+	public EmojiReactionsRecyclerView(Context context){
+		super(context);
+	}
+
+	public EmojiReactionsRecyclerView(Context context, AttributeSet attrs){
+		super(context, attrs);
+	}
+
+	public EmojiReactionsRecyclerView(Context context, AttributeSet attrs, int defStyle){
+		super(context, attrs, defStyle);
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent e){
+		super.onTouchEvent(e);
+		// to pass through touch events (i.e. clicking the status) to the parent view
+		return false;
+	}
+
+	// https://stackoverflow.com/questions/55372837/is-there-a-way-to-make-recyclerview-requiresfadingedge-unaffected-by-paddingtop
+	@Override
+	protected boolean isPaddingOffsetRequired() {
+		return true;
+	}
+
+	@Override
+	protected int getLeftPaddingOffset(){
+		return -getPaddingLeft();
+	}
+
+	@Override
+	protected int getRightPaddingOffset() {
+		return getPaddingRight();
+	}
+}

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,15V13H20V15ZM4,11V9H20V11Z"/>
-</vector>

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

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+	<LinearLayout
+		android:id="@+id/line"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<FrameLayout
+			android:id="@+id/add_btn_wrap"
+			android:layout_height="wrap_content"
+			android:layout_width="wrap_content"
+			android:layout_marginStart="2dp">
+			<ProgressBar
+				android:id="@+id/progress"
+				style="?android:progressBarStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:elevation="10dp"
+				android:indeterminate="true"
+				android:outlineProvider="none"
+				android:visibility="gone"/>
+			<ImageButton
+				android:id="@+id/add_btn"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:minHeight="48dp"
+				android:minWidth="48dp"
+				android:background="@drawable/bg_button_m3_tonal_circle"
+				android:tooltipText="@string/sk_button_react"
+				android:contentDescription="@string/sk_button_react"
+				android:src="@drawable/ic_fluent_add_24_filled" />
+		</FrameLayout>
+
+		<org.joinmastodon.android.ui.views.EmojiReactionsRecyclerView
+			android:id="@+id/list"
+			android:layout_width="0dp"
+			android:layout_weight="1"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="-4dp"
+			android:paddingStart="8dp"
+			android:clipToPadding="false"
+			android:requiresFadingEdge="horizontal"
+			android:fadingEdgeLength="24dp" />
+
+	</LinearLayout>
+
+	<Space
+		android:id="@+id/space"
+		android:visibility="gone"
+		android:layout_width="match_parent"
+		android:layout_height="8dp" />
+
+</LinearLayout>

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

@@ -126,40 +126,6 @@
 				</LinearLayout>
 			</FrameLayout>
 
-			<FrameLayout
-				android:id="@+id/react_layout"
-				android:layout_weight="1"
-				android:layout_width="0dp"
-				android:layout_height="match_parent">
-				<FrameLayout
-					android:id="@+id/react_btn"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:paddingVertical="12dp">
-					<ImageView
-						android:id="@+id/react"
-						android:layout_width="24sp"
-						android:layout_height="24sp"
-						android:layout_gravity="center_vertical"
-						android:layout_marginHorizontal="16dp"
-						android:src="@drawable/ic_fluent_emoji_laugh_24_regular"
-						android:tint="@color/bookmark_icon"
-						android:gravity="center_vertical"
-						android:textAppearance="@style/m3_label_large" />
-				</FrameLayout>
-				<LinearLayout
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:visibility="gone">
-					<EditText
-						android:layout_width="100dp"
-						android:layout_height="20dp"
-						android:focusable="true"
-						android:focusableInTouchMode="true"
-						android:id="@+id/react_input"/>
-				</LinearLayout>
-			</FrameLayout>
-
 			<FrameLayout
 				android:layout_weight="1"
 				android:layout_width="0dp"

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

@@ -56,8 +56,8 @@
 
 					<FrameLayout
 						android:id="@+id/avatar_border"
-						android:layout_width="104dp"
+						android:layout_width="108dp"
-						android:layout_height="104dp"
+						android:layout_height="108dp"
 						android:layout_below="@id/cover"
 						android:layout_alignParentStart="true"
 						android:layout_marginStart="12dp"
@@ -67,8 +67,8 @@
 
 						<ImageView
 							android:id="@+id/avatar"
-							android:layout_width="96dp"
+							android:layout_width="100dp"
-							android:layout_height="96dp"
+							android:layout_height="100dp"
 							android:layout_gravity="center"
 							android:contentDescription="@string/profile_picture"
 							android:scaleType="centerCrop"

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_height="wrap_content"
+	android:layout_width="wrap_content"
+	tools:ignore="RtlSymmetry">
+	<ProgressBar
+		android:id="@+id/progress"
+		style="?android:progressBarStyleSmall"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="8dp"
+		android:layout_gravity="center"
+		android:elevation="10dp"
+		android:indeterminate="true"
+		android:outlineProvider="none"
+		android:visibility="gone"/>
+	<org.joinmastodon.android.ui.views.ProgressBarButton
+		android:id="@+id/btn"
+		style="@style/Widget.Mastodon.M3.Button.Outlined.Icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="8dp"
+		android:drawableTint="@null"
+		android:drawableStart="@drawable/image_placeholder"
+		android:background="@drawable/bg_button_m3_tonal"/>
+</FrameLayout>

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

@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="horizontal"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingStart="8dp"
+	android:paddingTop="8dp"
 	android:paddingEnd="16dp"
 	android:clipToPadding="false"
-	android:background="?colorM3Background">
+	android:background="?colorM3Background"
+	tools:ignore="RtlSymmetry">
 
 	<ImageView
 		android:id="@+id/dragger_thingy"
-		android:layout_width="40dp"
+		android:layout_width="48dp"
-		android:layout_height="40dp"
+		android:layout_height="48dp"
 		android:layout_alignParentStart="true"
-		android:layout_marginEnd="8dp"
 		android:scaleType="center"
 		android:tint="?colorM3OnSurface"
 		android:contentDescription="@string/reorder"
-		android:src="@drawable/ic_drag_handle_24px"/>
+		android:src="@drawable/ic_fluent_re_order_dots_vertical_24_regular"/>
 
 	<ImageButton
 		android:id="@+id/delete"
-		android:layout_width="40dp"
+		android:layout_width="48dp"
-		android:layout_height="40dp"
+		android:layout_height="48dp"
 		android:layout_alignParentEnd="true"
 		android:layout_marginStart="8dp"
 		android:scaleType="center"
@@ -31,32 +32,37 @@
 		android:contentDescription="@string/delete"
 		android:src="@drawable/ic_fluent_delete_24_regular"/>
 
-	<EditText
-		android:id="@+id/content"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
-		android:layout_toEndOf="@id/dragger_thingy"
-		android:layout_toStartOf="@id/delete"
-		style="@style/Widget.Mastodon.M3.EditText"
-		android:inputType="textCapSentences"
-		android:hint="@string/field_content"
-		android:saveEnabled="false"
-		android:singleLine="true"/>
-
 	<EditText
 		android:id="@+id/title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
+		android:layout_marginBottom="6dp"
-		android:layout_marginBottom="8dp"
 		android:layout_toEndOf="@id/dragger_thingy"
 		android:layout_toStartOf="@id/delete"
-		android:layout_below="@id/content"
 		style="@style/Widget.Mastodon.M3.EditText"
 		android:inputType="textCapSentences"
 		android:hint="@string/field_label"
 		android:saveEnabled="false"
 		android:singleLine="true"/>
 
+	<EditText
+		android:id="@+id/content"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_toEndOf="@id/dragger_thingy"
+		android:layout_toStartOf="@id/delete"
+		android:layout_below="@id/title"
+		style="@style/Widget.Mastodon.M3.EditText"
+		android:inputType="textCapSentences"
+		android:hint="@string/field_content"
+		android:saveEnabled="false"
+		android:singleLine="true"/>
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_below="@id/content"
+		android:layout_marginTop="8dp"
+		android:background="?colorM3SurfaceVariant"/>
+
 </RelativeLayout>

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

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

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

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

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

@@ -335,4 +335,17 @@
     <string name="sk_disable_pill_shaped_active_indicator">Pillen-förmigen Indikator für aktiven Tab deaktivieren</string>
     <string name="sk_settings_true_black">Stockfinster-Modus</string>
     <string name="sk_gif_badge">GIF</string>
+    <string name="sk_settings_unifiedpush">UnifiedPush verwenden</string>
+    <string name="sk_settings_unifiedpush_no_distributor">Kein Verteiler gefunden</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Damit UnifiedPush-Benachrichtigungen funktionieren, muss ein Verteiler installiert sein. Mehr Informationen auf https://unifiedpush.org</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Pronomen in der Timeline anzeigen</string>
+    <string name="sk_settings_continues_playback">Tonwiedergabe überlagern</string>
+    <string name="sk_settings_continues_playback_summary">Musik im Hintergrund nicht pausieren, wenn in der App Medien abgespielt werden</string>
+    <string name="sk_settings_unifiedpush_choose">Verteiler auswählen</string>
+    <string name="sk_settings_display_pronouns_in_threads">Pronomen in Threads anzeigen</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Pronomen in User-Auflistungen anzeigen</string>
+    <string name="sk_tab_home">Start</string>
+    <string name="sk_tab_search">Suche</string>
+    <string name="sk_tab_notifications">Benachrichtigungen</string>
+    <string name="sk_tab_profile">Profil</string>
 </resources>

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

@@ -256,7 +256,7 @@
     <string name="sk_settings_collapse_long_posts">Minimizar publicaciones largas</string>
     <string name="sk_unfinished_attachments">¿Corregir adjuntos\?</string>
     <string name="sk_unfinished_attachments_message">Algunos adjuntos no han terminado de subirse.</string>
-    <string name="sk_settings_prefix_reply_cw_with_re">Añadir \"re:\" a Advertencias de Contenido para</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Prefijo CW con \"re:\" al responder</string>
     <string name="sk_spectator_mode">Modo espectador</string>
     <string name="sk_settings_hide_interaction">Ocultar los botones de interacción</string>
     <string name="sk_follow_as">Seguir desde otra cuenta</string>
@@ -273,8 +273,8 @@
     <string name="sk_show_thread">Mostrar hilo</string>
     <string name="sk_compact_reblog_reply_line">Línea compacta compartida/respondida</string>
     <string name="sk_settings_confirm_before_reblog">Confirmación antes de impulsar</string>
-    <string name="sk_reacted_with">reaccionó con %s</string>
+    <string name="sk_reacted_with">%1$s reaccionó con %2$s</string>
-    <string name="sk_reacted">reaccionó</string>
+    <string name="sk_reacted">%s reaccionó</string>
     <string name="sk_content_type">Tipo del contenido</string>
     <string name="sk_content_type_unspecified">Sin especificar</string>
     <string name="sk_content_type_plain">Texto sin formato</string>
@@ -292,18 +292,18 @@
     <string name="sk_external_share_or_open_title">Compartir o abrir con una cuenta</string>
     <string name="sk_open_in_app">Abrir en la app</string>
     <string name="sk_external_share_title">Compartir con una cuenta</string>
-    <string name="sk_settings_auto_reveal_equal_spoilers">Mostrar Avisos de Contenido para respuestas de</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Revelar automáticamente los CW iguales en las respuestas</string>
-    <string name="sk_settings_auto_reveal_nobody">nadie</string>
+    <string name="sk_settings_auto_reveal_nobody">Nunca</string>
-    <string name="sk_settings_auto_reveal_author">autor</string>
+    <string name="sk_settings_auto_reveal_author">Respuestas del mismo autor</string>
-    <string name="sk_settings_auto_reveal_anyone">todos</string>
+    <string name="sk_settings_auto_reveal_anyone">Respuestas de todos</string>
     <string name="sk_open_in_app_failed">No se pudo abrir en la aplicación</string>
     <string name="sk_no_remote_info_hint">no hay información remota disponible</string>
     <string name="sk_error_loading_profile">No se pudo cargar el perfil a través de %s</string>
     <string name="sk_settings_allow_remote_loading">Cargar la información desde las instancias remotas</string>
     <string name="sk_settings_allow_remote_loading_explanation">Intenta obtener listas más precisas de seguidores, Me gusta y promociones cargando la información desde la instancia de origen.</string>
-    <string name="sk_settings_prefix_replies_always">Todas</string>
+    <string name="sk_settings_prefix_replies_always">Responder a cualquiera</string>
-    <string name="sk_settings_prefix_replies_never">Ninguna</string>
+    <string name="sk_settings_prefix_replies_never">Nunca</string>
-    <string name="sk_settings_prefix_replies_to_others">A otros</string>
+    <string name="sk_settings_prefix_replies_to_others">Solo en respuesta a otros</string>
     <string name="sk_settings_forward_report_default">\"Reenviar denuncia\" activado por defecto</string>
     <string name="sk_list_exclusive_switch">Hacer una lista exclusiva</string>
     <string name="sk_icon_feed">Cronología</string>
@@ -328,4 +328,49 @@
     <string name="sk_edit_timeline_tags_explanation">Por favor, ten en cuenta que es el servidor el gestiona estas operaciones. Puede que no sea factible combinarlas.</string>
     <string name="sk_icon_beaker">Ciencia</string>
     <string name="sk_icon_bed">Cama</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_spoiler_show">Mostrar el contenido</string>
+    <string name="sk_pronouns_label">Pronombres</string>
+    <string name="sk_switch_timeline">Cambiar la línea de tiempo</string>
+    <string name="sk_settings_instance">Instancia</string>
+    <string name="sk_disable_pill_shaped_active_indicator">Desactivar el indicador de pestaña activa en forma de pastilla</string>
+    <string name="sk_settings_true_black">Modo negro intenso</string>
+    <string name="sk_search_fediverse">Buscar en el Fediverso</string>
+    <string name="sk_settings_unifiedpush_choose">Selecciona un distribuidor</string>
+    <string name="sk_settings_unifiedpush_no_distributor">No se ha encontrado ningún distribuidor</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Mostrar pronombres en los listados de usuarios</string>
+    <string name="sk_tab_home">Inicio</string>
+    <string name="sk_tab_search">Buscar</string>
+    <string name="sk_tab_notifications">Notificaciones</string>
+    <string name="sk_tab_profile">Perfil</string>
+    <string name="sk_mute_label">Duración</string>
+    <string name="sk_duration_indefinite">Indefinido</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 día</string>
+    <string name="sk_duration_days_3">3 días</string>
+    <string name="sk_duration_days_7">7 días</string>
+    <string name="sk_notification_mention">Has sido mencionado por %s</string>
+    <string name="sk_settings_continues_playback">Superposición del audio</string>
+    <string name="sk_settings_continues_playback_summary">Permitir que los medios que ya se están reproduciendo sigan reproduciéndose, superponiéndose a la nueva reproducción</string>
+    <string name="sk_settings_unifiedpush">Usar UnifiedPush</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Es necesario instalar un distribuidor para que funcionen las notificaciones de UnifiedPush. Para obtener más información, visita https://unifiedpush.org/</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Mostrar pronombres en líneas de tiempo</string>
+    <string name="sk_settings_display_pronouns_in_threads">Mostrar pronombres en los hilos</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">Mostrar las etiquetas de las pestañas en la barra de navegación</string>
+    <string name="sk_settings_emoji_reactions_in_lists">Mostrar las reacciones con los emoticonos en las líneas de tiempo</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">Un usuario reaccionó con %2$s</item>
+        <item quantity="many">%1$,d usuarios reaccionaron con %2$s</item>
+        <item quantity="other">%1$,d usuarios reaccionaron con %2$s</item>
+    </plurals>
+    <string name="sk_enter_emoji_toast">Necesitas escribir un emoticono</string>
+    <string name="sk_enter_emoji_hint">Escribe para reaccionar con un emoticono</string>
+    <string name="sk_settings_emoji_reactions">Activar las reacciones con los emoticonos</string>
+    <string name="sk_settings_emoji_reactions_explanation">Muestra las reacciones con los emoticonos a los mensajes y te permite interactuar con ellos. Algunas versiones modificadas de Mastodon lo soportan, pero Mastodon no.</string>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">Las reacciones con los emoticonos deben mostrarse en las líneas de tiempo. Si esta opción está desactivada, las reacciones con los emoticonos solo se mostrarán al ver un hilo.</string>
+    <string name="sk_button_react">Reacciona con un emoticono</string>
+    <string name="sk_again_for_system_keyboard">Pulsa de nuevo para el Teclado del sistema</string>
 </resources>

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

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

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

@@ -85,7 +85,7 @@
     <string name="sk_delete_notification_confirm_action">حذف آگاهی</string>
     <string name="sk_settings_translation_availability_note_available">%s از ترجمه پشتیبانی می‌کند!</string>
     <string name="sk_copy_link_to_post">رونوشت پیوند فرسته</string>
-    <string name="sk_already_favorited">قبلا برگزیده بوده است</string>
+    <string name="sk_already_favorited">قبلا پسندیده بوده است</string>
     <string name="sk_favorite_as">برگزیدن با حساب دیگر</string>
     <string name="sk_unsent_posts">فرسته‌های ارسال نشده</string>
     <string name="sk_reblog_as">تقویت با حساب دیگر</string>
@@ -160,7 +160,7 @@
     <string name="sk_in_reply">در پاسخ</string>
     <string name="sk_open_in_app">بازکردن در کاره</string>
     <string name="sk_settings_prefix_replies_never">هیچوقت</string>
-    <string name="sk_settings_prefix_replies_to_others">دیگران</string>
+    <string name="sk_settings_prefix_replies_to_others">فقط درپاسخ به دیگران</string>
     <string name="sk_schedule_or_draft">برنامه‌ریزی یا پیش‌نویس</string>
     <string name="sk_edit_list_title">ویرایش سیاهه</string>
     <string name="sk_icon_star">ستاره</string>
@@ -183,7 +183,7 @@
     <string name="sk_user_post_notifications_off">آگاهی‌های فرسته برای %s خاموش شد</string>
     <string name="sk_bubble_timeline_info_banner">اینها جدیدترین فرسته‌های شبکه هستند که توسط سرپرستان نمونه شما انتخاب شده‌اند.</string>
     <string name="sk_clear_recent_languages">زبان‌های اخیراً استفاده شده را پاک‌سازی کنید</string>
-    <string name="sk_settings_color_palette">تخته‌رنگ رنگی</string>
+    <string name="sk_settings_color_palette">تخته‌رنگ</string>
     <string name="sk_confirm_clear_recent_languages">آیا مطمئنید که می خواهید زبان های اخیراً استفاده شده خود را پاک کنید؟</string>
     <string name="sk_resource_not_found">منبع پیدا نشد</string>
     <string name="sk_favorited_as">به‌عنوان %s پسندیده شد</string>
@@ -207,7 +207,7 @@
     <string name="sk_pinned_timeline">به خانه سنجاق شد</string>
     <string name="sk_publish_anyway">انتشار به هرصورت</string>
     <string name="sk_settings_disable_alt_text_reminder">غیرفعال‌کردن یادآوری برای افزودن متن جایگزین</string>
-    <string name="sk_icon_color_palette">تخته‌رنگ رنگی</string>
+    <string name="sk_icon_color_palette">تخته‌رنگ</string>
     <string name="sk_icon_tag">برچسب</string>
     <string name="sk_icon_leaves">برگ‌ها</string>
     <string name="sk_icon_important">مهم</string>
@@ -239,8 +239,8 @@
     <string name="sk_unfinished_attachments_message">بارگذاری برخی از پیوست‌ها به پایان نرسیده است.</string>
     <string name="sk_settings_hide_interaction">نهفتن دکمه های تعامل</string>
     <string name="sk_settings_auto_reveal_nobody">هیچوقت</string>
-    <string name="sk_settings_auto_reveal_author">نویسنده</string>
+    <string name="sk_settings_auto_reveal_author">پاسخ های همان نویسنده</string>
-    <string name="sk_settings_auto_reveal_anyone">هرکس</string>
+    <string name="sk_settings_auto_reveal_anyone">پاسخ های همه</string>
     <string name="sk_settings_prefix_replies_always">درپاسخ به هرکسی</string>
     <string name="sk_external_share_or_open_title">هم‌رسانی یا با حساب باز کنید</string>
     <string name="sk_content_type_mfm">MFM</string>
@@ -309,7 +309,7 @@
     <string name="sk_reacted_with">%1$s با %2$s واکنش نشان داد</string>
     <string name="sk_reacted">%s واکنش نشان داد</string>
     <string name="sk_external_share_title">هم‌رسانی با حساب</string>
-    <string name="sk_settings_prefix_reply_cw_with_re">پیشوند CW با “re:” در پاسخ به</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">وارد کردن پیشوند CW با “re:” هنگام پاسخ دادن</string>
     <string name="sk_unfinished_attachments">رفع مشکل پیوست‌ها؟</string>
     <string name="sk_settings_allow_remote_loading">بارگیری اطلاعات از نمونه های راه دور</string>
     <string name="sk_error_loading_profile">بارگیری نمایه از طریق %s شکست خورد</string>
@@ -333,4 +333,43 @@
     <string name="sk_disable_pill_shaped_active_indicator">نشانگر برگه فعال قرصی را ازکار بندازید</string>
     <string name="sk_list_exclusive_switch_explanation">اعضای یک سیاهه انحصاری در خط زمانی خانه شما نشان داده نمی شوند - اگر نمونه شما از آن پشتیبانی کند.</string>
     <string name="sk_settings_default_content_type_explanation">این به شما امکان می‌دهد هنگام نوشتن فرسته‌های جدید، نوع محتوا را از قبل انتخاب کنید و مقدار تنظیم‌شده در \"ترجیحات‌های ارسال\" را لغو کنید.</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">CW های برابر را در پاسخ‌ها به صورت خودکار آشکار کنید</string>
+    <string name="sk_settings_forward_report_default">پیش‌فرض سوئیچ “گزارش هدایت ”</string>
+    <string name="sk_search_fediverse">جستجوی فدیورس</string>
+    <string name="sk_settings_unifiedpush_choose">انتخاب یک توزیع کننده</string>
+    <string name="sk_settings_unifiedpush_no_distributor">هیچ توزیع‌کننده ای پیدا نشد</string>
+    <string name="sk_settings_display_pronouns_in_timelines">نمایش ضمایر در خطوط زمانی</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_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">۱ ساعت</string>
+    <string name="sk_duration_hours_6">6 ساعت</string>
+    <string name="sk_duration_days_1">۱ روز</string>
+    <string name="sk_duration_days_3">3 روز</string>
+    <string name="sk_notification_mention">شما توسط %s نام‌برده شده اید</string>
+    <string name="sk_settings_unifiedpush">استفاده از UnifiedPush</string>
+    <string name="sk_duration_days_7">7 روز</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">برای کارکردن آگاهی‌های UnifiedPush باید یک توزیع‌کننده نصب کنید. برای اطلاعات بیشتر به https://unifiedpush.org/ مراجعه کنید.</string>
+    <string name="sk_settings_continues_playback">پوشش صوتی</string>
+    <string name="sk_settings_continues_playback_summary">به رسانه‌ای که از قبل پخش می‌شود اجازه دهید به پخش ادامه دهد و پخش جدید را پوشش دهد</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>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">یک کاربر با %2$s واکنش نشان داد</item>
+        <item quantity="other">%1$,d کاربر با %2$s واکنش نشان دادند</item>
+    </plurals>
+    <string name="sk_settings_emoji_reactions">به‌کار انداختن واکنش های ایموجی</string>
+    <string name="sk_settings_emoji_reactions_in_lists">نمایش واکنش های ایموجی در خطوط زمانی</string>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">اینکه آیا واکنش های ایموجی باید در خطوط زمانی نمایش داده شود یا خیر. اگر این گزینه خاموش باشد، واکنش های ایموجی فقط هنگام مشاهده یک موضوع نمایش داده می شود.</string>
+    <string name="sk_settings_emoji_reactions_explanation">واکنش‌های ایموجی را به فرسته‌ها نشان می‌دهد و به شما امکان می‌دهد با آنها تعامل داشته باشید. برخی از نسخه های اصلاح شده ماستودون از این پشتیبانی می کنند، اما ماستودون اینطور نیست.</string>
 </resources>

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

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

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

@@ -336,4 +336,42 @@
     <string name="sk_settings_true_black">Mode noir absolu</string>
     <string name="sk_gif_badge">GIF</string>
     <string name="sk_disable_pill_shaped_active_indicator">Désactiver l\'indicateur d\'onglet actif en forme de punaise</string>
+    <string name="sk_search_fediverse">Chercher sur le Fediverse</string>
+    <string name="sk_settings_unifiedpush_choose">Choisissez un distributeur</string>
+    <string name="sk_settings_unifiedpush_no_distributor">Aucun distributeur trouvé</string>
+    <string name="sk_settings_display_pronouns_in_threads">Afficher les pronoms dans les fils de discussion</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Afficher les pronoms dans les listes d\'utilisateurs</string>
+    <string name="sk_tab_home">Accueil</string>
+    <string name="sk_tab_search">Recherche</string>
+    <string name="sk_tab_notifications">Notifications</string>
+    <string name="sk_tab_profile">Profil</string>
+    <string name="sk_mute_label">Durée</string>
+    <string name="sk_duration_indefinite">Indéfini</string>
+    <string name="sk_duration_minutes_5">5 minutes</string>
+    <string name="sk_duration_minutes_30">30 minutes</string>
+    <string name="sk_duration_hours_1">1 heure</string>
+    <string name="sk_duration_hours_6">6 heures</string>
+    <string name="sk_duration_days_1">1 jour</string>
+    <string name="sk_duration_days_3">3 jours</string>
+    <string name="sk_duration_days_7">7 jours</string>
+    <string name="sk_notification_mention">Vous avez été mentionné par %s</string>
+    <string name="sk_settings_continues_playback">Superposition audio</string>
+    <string name="sk_settings_continues_playback_summary">Autoriser les médias déjà en cours de lecture à continuer à jouer, en superposant la nouvelle lecture</string>
+    <string name="sk_settings_unifiedpush">Utiliser UnifiedPush</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Vous devez installer un distributeur pour que les notifications UnifiedPush fonctionnent. Pour plus d\'informations, visitez https://unifiedpush.org/</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Afficher les pronoms dans les timelines</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">Afficher les étiquettes des onglets dans la barre de navigation</string>
+    <string name="sk_settings_emoji_reactions">Activer les réactions emoji</string>
+    <string name="sk_settings_emoji_reactions_explanation">Affiche les réactions emoji aux messages et vous permet d\'interagir avec elles. Certaines versions modifiées de Mastodon le supportent, mais pas Mastodon.</string>
+    <string name="sk_settings_emoji_reactions_in_lists">Afficher les réactions emoji dans les timelines</string>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">Si les réactions emoji doivent être affichées sur les timelines. Si cette option est désactivée, les réactions emoji ne seront affichées que lors de l\'affichage d\'un fil de discussion.</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">Un utilisateur a réagi avec %2$s</item>
+        <item quantity="many">%1$,d utilisateurs ont réagi avec %2$s</item>
+        <item quantity="other">%1$,d utilisateurs ont réagi avec %2$s</item>
+    </plurals>
+    <string name="sk_button_react">Réagissez avec des emojis</string>
+    <string name="sk_again_for_system_keyboard">Appuyez à nouveau pour le clavier système</string>
+    <string name="sk_enter_emoji_hint">Tapez pour réagir avec un emoji</string>
+    <string name="sk_enter_emoji_toast">Vous devez saisir un emoji</string>
 </resources>

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

@@ -60,10 +60,10 @@
     <string name="sk_example_domain">contoh.social</string>
     <string name="sk_color_palette_red">Merah</string>
     <string name="sk_translated_using">Diterjemahkan menggunakan %s</string>
-    <string name="sk_welcome_text">Hiu menyapamu! Untuk memulai, silakan memasukkan nama domain instansi Anda di bawah.</string>
+    <string name="sk_welcome_text">Hiu menyapamu! Untuk memulai, silakan memasukkan nama domain server Anda di bawah.</string>
     <string name="sk_settings_tabs_disable_swipe">Nonaktifkan mengusap antara tab</string>
     <string name="sk_settings_profile">Atur profil</string>
-    <string name="sk_settings_filters">Atur profil</string>
+    <string name="sk_settings_filters">Atur penyaring</string>
     <string name="sk_settings_enable_delete_notifications">Aktifkan menghapus notifikasi</string>
     <string name="sk_settings_publish_button_text">Teks tombol Terbitkan</string>
     <string name="sk_settings_publish_button_text_title">Ubah teks tombol Terbitkan</string>
@@ -258,7 +258,7 @@
     <string name="sk_settings_hide_interaction">Sembunyikan tombol interaksi</string>
     <string name="sk_follow_as">Ikuti dari akun lain</string>
     <string name="sk_followed_as">Diikuti dari %s</string>
-    <string name="sk_settings_prefix_reply_cw_with_re">Awali balasan peringatan konten dengan “re:”</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Awali peringatan konten dengan “re:” saat membalas</string>
     <string name="sk_settings_collapse_long_posts">Tutup kiriman yang sangat panjang</string>
     <string name="sk_unfinished_attachments">Perbaiki lampiran\?</string>
     <string name="sk_unfinished_attachments_message">Beberapa lampiran belum selesai diunggah.</string>
@@ -271,11 +271,11 @@
     <string name="sk_settings_reply_visibility_self">Balasan kepada saya</string>
     <string name="sk_notification_action_replied">Mengirim balasan ke %s</string>
     <string name="sk_reply_line_above_avatar">Baris “Membalas ke” di atas avatar</string>
-    <string name="sk_show_thread">Tampilkan utasan</string>
+    <string name="sk_show_thread">Tampilkan utas</string>
     <string name="sk_compact_reblog_reply_line">Baris berbagi/balasan</string>
     <string name="sk_settings_confirm_before_reblog">Konfirmasi sebelum membagikan ulang</string>
-    <string name="sk_reacted_with">bereaksi dengan %s</string>
+    <string name="sk_reacted_with">%1$s bereaksi dengan %2$s</string>
-    <string name="sk_reacted">bereaksi</string>
+    <string name="sk_reacted">%s bereaksi</string>
     <string name="sk_content_type_plain">Teks biasa</string>
     <string name="sk_content_type_html">HTML</string>
     <string name="sk_content_type_markdown">Markdown</string>
@@ -295,16 +295,16 @@
     <string name="sk_external_share_or_open_title">Bagikan atau buka dengan akun</string>
     <string name="sk_no_remote_info_hint">info jarak jauh tidak tersedia</string>
     <string name="sk_settings_allow_remote_loading">Muat info dari server jarak jauh</string>
-    <string name="sk_settings_allow_remote_loading_explanation">Coba mendapatkan pendaftaran akurat untuk pengikut cr</string>
+    <string name="sk_settings_allow_remote_loading_explanation">Coba mendapatkan pendaftaran akurat untuk pengikut, favorit, dan pembagian dengan memuat informasi dari asal server.</string>
     <string name="sk_error_loading_profile">Gagal memuat profil melalui %s</string>
     <string name="sk_open_in_app_failed">Tidak dapat buka dalam aplikasi</string>
-    <string name="sk_settings_auto_reveal_equal_spoilers">Tampilkan peringatan konten yang sama dari</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Buka peringatan konten yang sama secara otomatis dalam balasan</string>
-    <string name="sk_settings_auto_reveal_nobody">bukan siapa pun</string>
+    <string name="sk_settings_auto_reveal_nobody">Tidak pernah</string>
-    <string name="sk_settings_auto_reveal_author">pembuat</string>
+    <string name="sk_settings_auto_reveal_author">Balasan dari pembuat yang sama</string>
-    <string name="sk_settings_auto_reveal_anyone">semuanya</string>
+    <string name="sk_settings_auto_reveal_anyone">Balasan dari semuanya</string>
-    <string name="sk_settings_prefix_replies_always">semuanya</string>
+    <string name="sk_settings_prefix_replies_always">Membalas ke siapa pun</string>
-    <string name="sk_settings_prefix_replies_never">bukan siapa pun</string>
+    <string name="sk_settings_prefix_replies_never">Tidak pernah</string>
-    <string name="sk_settings_prefix_replies_to_others">lainnya</string>
+    <string name="sk_settings_prefix_replies_to_others">Hanya dalam balasan ke lainnya</string>
     <string name="sk_settings_forward_report_default">“Laporan diteruskan” ubah bawaan</string>
     <string name="sk_icon_feed">Umpan</string>
     <string name="sk_list_exclusive_switch">Buat daftar ekslusif</string>
@@ -329,4 +329,47 @@
     <string name="sk_advanced_options_show">Tampilkan opsi tingkat lanjut</string>
     <string name="sk_advanced_options_hide">Sembunyikan opsi tingkat lanjut</string>
     <string name="sk_icon_beaker">Gelas kimia</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_pronouns_label">Kata ganti</string>
+    <string name="sk_switch_timeline">Ubah lini masa</string>
+    <string name="sk_settings_instance">Server</string>
+    <string name="sk_settings_true_black">Mode gelap gulita</string>
+    <string name="sk_spoiler_show">Tampilkan konten</string>
+    <string name="sk_disable_pill_shaped_active_indicator">Nonaktifkan indikator tab berbentuk pil yang aktif</string>
+    <string name="sk_search_fediverse">Cari di Fediverse</string>
+    <string name="sk_settings_unifiedpush_no_distributor">Tidak ada distributor yang ditemukan</string>
+    <string name="sk_settings_display_pronouns_in_threads">Tampilkan kata ganti dalam utas</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Tampilkan kata gamti dalam daftar pengguna</string>
+    <string name="sk_tab_home">Beranda</string>
+    <string name="sk_tab_search">Cari</string>
+    <string name="sk_tab_notifications">Notifikasi</string>
+    <string name="sk_tab_profile">Profil</string>
+    <string name="sk_mute_label">Durasi</string>
+    <string name="sk_duration_indefinite">Selamanya</string>
+    <string name="sk_duration_minutes_5">5 menit</string>
+    <string name="sk_duration_minutes_30">30 menit</string>
+    <string name="sk_duration_hours_1">1 jam</string>
+    <string name="sk_duration_hours_6">6 jam</string>
+    <string name="sk_duration_days_1">1 hari</string>
+    <string name="sk_duration_days_3">3 hari</string>
+    <string name="sk_duration_days_7">7 hari</string>
+    <string name="sk_notification_mention">Anda disebut oleh %s</string>
+    <string name="sk_settings_continues_playback">Hamparan audio</string>
+    <string name="sk_settings_continues_playback_summary">Perbolehkan memainkan media yang sudah diputar untuk terus memutar, menghamparkan pemutaran baru</string>
+    <string name="sk_settings_unifiedpush">Gunakan UnifiedPush</string>
+    <string name="sk_settings_unifiedpush_choose">Pilih distributor</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Anda perlu memasang sebuah distributor supaya notifikasi UnifiedPush bekerja. Untuk informasi lanjut, kunjungi https://unifiedpush.org/</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Tampilkan kata ganti dalam lini masa</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">Tampilkan label tab dalam bilah navigasi</string>
+    <string name="sk_settings_emoji_reactions_in_lists">Tampilkan reaksi emoji di lini masa</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="other">%1$,d pengguna bereaksi dengan %2$s</item>
+    </plurals>
+    <string name="sk_enter_emoji_toast">Anda perlu mengetik sebuah emoji</string>
+    <string name="sk_enter_emoji_hint">Ketik untuk bereaksi dengan sebuah emoji</string>
+    <string name="sk_settings_emoji_reactions">Aktifkan reaksi emoji</string>
+    <string name="sk_settings_emoji_reactions_explanation">Menampilkan reaksi emoji di kiriman dan memungkinkan Anda untuk berinteraksi. Beberapa versi Mastodon yang dimodifikasi mendukung ini, tetapi Mastodon sendiri tidak mendukungnya.</string>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">"Menentukan apakah reaksi emoji ditampilkan  di lini masa. Jika opsi ini mati, reaksi emoji hanya akan ditampilkan ketika melihat sebuah utas."</string>
+    <string name="sk_button_react">Bereaksi dengan emoji</string>
+    <string name="sk_again_for_system_keyboard">Ketuk lagi untuk Papan Ketik Sistem</string>
 </resources>

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

@@ -150,7 +150,7 @@
     <string name="sk_changelog">Registro delle modifiche</string>
     <string name="sk_alt_text_missing_title">Testo alternativo mancante</string>
     <string name="sk_publish_anyway">Pubblica comunque</string>
-    <string name="sk_timelines">Timeline</string>
+    <string name="sk_timelines">Linee temporali</string>
     <string name="sk_timeline_posts">Post</string>
     <string name="sk_timelines_add">Aggiungi</string>
     <string name="sk_timeline">Timeline</string>
@@ -218,8 +218,8 @@
     <string name="sk_icon_headphones">Cuffie</string>
     <string name="sk_icon_human">Umano</string>
     <string name="sk_icon_globe">Mappamondo</string>
-    <string name="sk_edit_timeline">Modifica timeline</string>
+    <string name="sk_edit_timeline">Modifica le timeline</string>
-    <string name="sk_edit_timelines">Modifica timeline</string>
+    <string name="sk_edit_timelines">Modifica le timeline</string>
     <string name="sk_notify_update">Modifica un post boostato</string>
     <string name="sk_notification_type_update">Post modificati</string>
     <string name="sk_attach_file">Allega file</string>
@@ -314,8 +314,8 @@
     <string name="sk_edit_timeline_tag_any">…o qualsiasi di questi</string>
     <string name="sk_edit_timeline_tag_all">…e ognuno di questi</string>
     <string name="sk_edit_timeline_tag_none">…ma nessuno di questi</string>
-    <string name="sk_edit_timeline_tag_hint">Inserisci hashtag…</string>
+    <string name="sk_edit_timeline_tag_hint">Inserisci l\'hashtag…</string>
-    <string name="sk_edit_timeline_tags_hint">Inserisci hashtag…</string>
+    <string name="sk_edit_timeline_tags_hint">Inserisci l\'hashtag…</string>
     <string name="sk_edit_timeline_tags_explanation">Nota che il server gestisce queste operazioni. Combinarle poterebbe non essere supportato.</string>
     <string name="sk_hashtag_timeline_local_only_switch">Mostra post solo locali\?</string>
     <string name="sk_add_timeline_tag_error_empty">L\'hashtag non deve essere vuoto</string>
@@ -334,4 +334,5 @@
     <string name="sk_icon_feed">Feed</string>
     <string name="sk_list_exclusive_switch">Crea lista esclusiva</string>
     <string name="sk_list_exclusive_switch_explanation">I membri di una lista esclusiva non appariranno nella tua timeline home - se la tua istanza lo supporta.</string>
+    <string name="sk_search_fediverse">Cerca nel Fediverso</string>
 </resources>

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

@@ -255,12 +255,12 @@
     <string name="sk_quoting_user">Quoting %s</string>
     <string name="sk_settings_reply_visibility">Zichtbaarheid reactie</string>
     <string name="sk_settings_reply_visibility_all">Alle reacties</string>
-    <string name="sk_settings_auto_reveal_anyone">iedereen</string>
+    <string name="sk_settings_auto_reveal_anyone">Reacties van iedereen</string>
-    <string name="sk_settings_auto_reveal_author">auteur</string>
+    <string name="sk_settings_auto_reveal_author">Reacties van dezelfde auteur</string>
-    <string name="sk_settings_auto_reveal_nobody">niemand</string>
+    <string name="sk_settings_auto_reveal_nobody">Nooit</string>
-    <string name="sk_settings_prefix_replies_never">niemand</string>
+    <string name="sk_settings_prefix_replies_never">Nooit</string>
-    <string name="sk_settings_prefix_replies_always">iedereen</string>
+    <string name="sk_settings_prefix_replies_always">Als reactie op iemand</string>
-    <string name="sk_settings_auto_reveal_equal_spoilers">Toon dezelfde CW\'s in reacties van</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Dezelfde CW\'s automatisch tonen in reacties</string>
     <string name="sk_settings_allow_remote_loading">Laad informatie van remote instances (servers)</string>
     <string name="sk_no_remote_info_hint">remote info niet beschikbaar</string>
     <string name="sk_settings_allow_remote_loading_explanation">Probeer meer accurate informatie te krijgen van volgers, favorieten en boosts, door informatie te laden van de originele instance (server).</string>
@@ -277,4 +277,37 @@
     <string name="sk_advanced_options_show">Toon geavanceerde opties</string>
     <string name="sk_open_in_app">Open in app</string>
     <string name="sk_advanced_options_hide">Verberg geavanceerde opties</string>
+    <string name="sk_settings_emoji_reactions">Gebruik emoji reacties</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">Eén persoon reageerde met %2$s</item>
+        <item quantity="other">%1$,d personen reageerden met %2$s</item>
+    </plurals>
+    <string name="sk_duration_minutes_30">30 minuten</string>
+    <string name="sk_duration_minutes_5">5 minuten</string>
+    <string name="sk_duration_indefinite">Onbepaald</string>
+    <string name="sk_mute_label">Duur</string>
+    <string name="sk_enter_emoji_hint">Type om te reageren met een emoji</string>
+    <string name="sk_duration_days_7">7 dagen</string>
+    <string name="sk_duration_days_3">3 dagen</string>
+    <string name="sk_duration_days_1">1 dag</string>
+    <string name="sk_duration_hours_6">6 uur</string>
+    <string name="sk_duration_hours_1">1 uur</string>
+    <string name="sk_button_react">Reageer met emoji</string>
+    <string name="sk_again_for_system_keyboard">Tik nogmaals voor systeem toetsenbord</string>
+    <string name="sk_settings_emoji_reactions_in_lists">Toon emoji reacties in tijdlijnen</string>
+    <string name="sk_external_share_title">Deel met account</string>
+    <string name="sk_content_type_html">HTML</string>
+    <string name="sk_content_type_plain">Alleen tekst</string>
+    <string name="sk_content_type_unspecified">Niet gespecificeerd</string>
+    <string name="sk_settings_default_content_type">Standaard formaat</string>
+    <string name="sk_content_type_markdown">Markdown</string>
+    <string name="sk_content_type_bbcode">BBCode</string>
+    <string name="sk_content_type_mfm">MFM</string>
+    <string name="sk_tab_notifications">Meldingen</string>
+    <string name="sk_tab_search">Zoek</string>
+    <string name="sk_tab_home">Home</string>
+    <string name="sk_external_share_or_open_title">Deel of open met account</string>
+    <string name="sk_instance_info_unavailable">Instance informatie tijdelijk niet beschikbaar</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">Toon tab labels op navigatiebalk</string>
+    <string name="sk_tab_profile">Profiel</string>
 </resources>

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

@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sk_delete_and_redraft">Slett og skriv på nytt</string>
+    <string name="sk_confirm_delete_and_redraft_title">Slett og skriv innlegg på nytt</string>
+    <string name="sk_pin_post">Fest til profil</string>
+    <string name="sk_confirm_pin_post_title">Fest innlegg til profil</string>
+    <string name="sk_confirm_pin_post">Vil du feste dette innlegget til profilen din\?</string>
+    <string name="sk_pinning">Festar innlegg…</string>
+    <string name="sk_unpin_post">Løys frå profil</string>
+    <string name="sk_available_languages">Tilgjengelege språk</string>
+    <string name="sk_language_name">%1$s (%2$s)</string>
+    <string name="sk_clear_recent_languages">Fjern nyleg brukte språk</string>
+    <string name="sk_confirm_clear_recent_languages">Er du sikker på at du vil fjerne nyleg brukte språk\?</string>
+    <string name="sk_welcome_title">Velkomen!</string>
+    <string name="sk_welcome_text">Haien seier hei! For å starte, skriv inn domenenamnet til din heime-instans nedanfor.</string>
+    <string name="sk_example_domain">eksempel.social</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_pinned_posts">Festa</string>
+    <string name="sk_translate_post">Omset</string>
+    <string name="sk_post_language">Språk: %s</string>
+    <string name="sk_translated_using">Omsett ved hjelp av %s</string>
+    <string name="sk_confirm_unpin_post">Er du sikker på at du vil løyse dette innlegget frå profilen\?</string>
+    <string name="sk_unpinning">Løyser innleg frå profil…</string>
+    <string name="sk_visibility_unlisted">Ikkje lista</string>
+    <string name="sk_settings_show_replies">Vis svar</string>
+    <string name="sk_settings_continues_playback">Lydoverlag</string>
+    <string name="sk_quoting_user">Siterer %s</string>
+    <string name="sk_settings_reply_visibility">Vising av svar</string>
+    <string name="sk_settings_reply_visibility_all">Alle svar</string>
+    <string name="sk_settings_reply_visibility_following">Svar til dei eg følgjer</string>
+    <string name="sk_settings_reply_visibility_self">Svar til meg</string>
+    <string name="sk_settings_show_boosts">Vis framhevingar</string>
+    <string name="sk_settings_load_new_posts">Last nye innlegg automatisk</string>
+    <string name="sk_settings_show_interaction_counts">Vis interaksjonsteljar</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">Merk media som ømtolig</string>
+    <string name="sk_user_post_notifications_on">Aktiviert varsling av innlegg frå %s</string>
+    <string name="sk_user_post_notifications_off">Deaktivert varsling av innlegg frå %s</string>
+    <string name="sk_federated_timeline">Fødererasjon</string>
+    <string name="sk_bubble_timeline_info_banner">Dette er dei seinaste innlegga frå nettverket kuratert av dine lokale administratorar.</string>
+    <string name="sk_update_available">Megalodon %s er klar for nedlasting.</string>
+    <string name="sk_check_for_update">Sjekk for oppdatering</string>
+    <string name="sk_no_update_available">Ingen tilgjengelege oppdateringar</string>
+    <string name="sk_list_timelines">Lister</string>
+    <string name="sk_follow_requests">Følgjeførespurnader</string>
+    <string name="sk_accept_follow_request">Aksepter følgjeførespurnad</string>
+    <string name="sk_reject_follow_request">Avslå følgjeførespurnad</string>
+    <string name="sk_lists_with_user">Lister med %s</string>
+    <string name="sk_settings_always_reveal_content_warnings">Ignorer åtvaringar om ømtoleg innhald</string>
+    <string name="sk_settings_enable_marquee">Aktiver rullande tekst i tittelrader</string>
+    <string name="sk_settings_contribute">Bidra til Megalodon</string>
+    <string name="sk_notification_type_status">Innlegg</string>
+    <string name="sk_notification_type_posts">Innleggsvarsel</string>
+    <string name="sk_settings_color_palette">Fargepalett</string>
+    <string name="sk_color_palette_material3">System</string>
+    <string name="sk_color_palette_pink">Rosa</string>
+    <string name="sk_color_palette_purple">Lilla</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_red">Raud</string>
+    <string name="sk_color_palette_yellow">Gul</string>
+    <string name="sk_poll_allow_multiple">Tillat fleire val</string>
+    <string name="sk_confirm_delete_and_redraft">Er du sikker på at du vil slette og skrive dette innlegget på nytt\?</string>
+    <string name="sk_confirm_unpin_post_title">Løys innlegg frå profil</string>
+    <string name="sk_image_description">Bildeforklaring</string>
+    <string name="sk_settings_continues_playback_summary">Lat allereie spelande media halde fram med å spele under den nye avspelinga</string>
+    <string name="sk_federated_timeline_info_banner">Dette er dei seinaste innlegga av folk i føderasjonen din.</string>
+    <string name="sk_update_ready">Megalodon %s er lasta ned og kan no installerast.</string>
+    <string name="sk_settings_show_federated_timeline">Vis føderert tidsline</string>
+    <string name="sk_translate_show_original">Vis original</string>
+    <string name="sk_settings_tabs_disable_swipe">Slå av sveiping mellom faner</string>
+    <string name="sk_settings_profile">Tilpass profil</string>
+    <string name="sk_settings_posting">Publiseringsinnstillingar</string>
+    <string name="sk_settings_filters">Konfigurer filter</string>
+    <string name="sk_settings_auth">Tryggleiksinnstillingar</string>
+    <string name="sk_settings_rules">Reglar</string>
+    <string name="sk_settings_about">Om appen</string>
+    <string name="sk_delete_notification_confirm_action">Slett varsling</string>
+    <string name="sk_settings_donate">Doner</string>
+    <string name="sk_delete_notification">Slett varsling</string>
+    <string name="sk_settings_emoji_reactions_in_lists">Vis emoji-reaksjonar i tidslinjer</string>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">Styrer om emoji-reaksjonar skal visast i tidslinjer. Dersom denne innstillinga er av, vil emoji-reaksjonar kun bli viste når ein ser på ein tråd.</string>
+    <string name="sk_button_react">Reager med emoji</string>
+    <string name="sk_again_for_system_keyboard">Trykk igjen for systemtastatur</string>
+    <string name="sk_enter_emoji_toast">Du må skrive inn ein emoji</string>
+    <string name="sk_enter_emoji_hint">Skriv for å reagere med ein emoji</string>
+    <string name="sk_mute_label">Varigheit</string>
+    <string name="sk_duration_indefinite">Ubestemt</string>
+    <string name="sk_duration_minutes_5">5 minuttar</string>
+    <string name="sk_duration_minutes_30">30 minuttar</string>
+    <string name="sk_duration_hours_6">6 timar</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_notification_mention">Du vart nemnd av %s</string>
+    <string name="sk_resource_not_found">Ressurs ikkje funnen</string>
+    <string name="sk_delete_notification_confirm">Er du sikker på at du vil slette denne varslinga\?</string>
+    <string name="sk_reblog_as">Framhev med annan konto</string>
+    <string name="sk_settings_translation_availability_note_available">%s støttar omsetjing!</string>
+    <string name="sk_schedule">Planlegg</string>
+    <string name="sk_confirm_delete_scheduled_post">Er du sikker på at du vil slette dette planlagde innlegget\?</string>
+    <string name="sk_scheduled_too_soon">Innlegg må planleggjast om minimum 10 minuttar frå no.</string>
+    <string name="sk_mark_as_draft">Marker som utkast</string>
+    <string name="sk_schedule_post">Planlegg innlegg</string>
+    <string name="sk_settings_single_notification">Vis kun ei varsling</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Du må installere ein distributør for at UnifiedPush-varslingar skal fungere. For meir informasjon, gå til https://unifiedpush.org/</string>
+    <string name="sk_alt_text_missing">Minst eitt av vedlegga manglar forklaring.</string>
+    <string name="sk_icon_math_formula">Formel</string>
+    <string name="sk_icon_people">Personar</string>
+    <string name="sk_add_timeline">Legg til tidslinje</string>
+    <string name="sk_settings_show_no_alt_indicator">Indikator for manglande alternativ bildetekst</string>
+    <string name="sk_edit_timeline_tag_hint">Legg til emneknagg…</string>
+    <string name="sk_edit_timeline_tags_explanation">Merk at tenaren handterer desse operasjonane. Å kombinere dei er kanskje ikkje støtta.</string>
+    <string name="sk_settings_local_only_explanation">Heimeinstansen din må støtte lokale innlegg for at dette skal fungere. Dei fleste modifiserte versjonar av Mastodon støttar dette, men Mastodon gjer det ikkje.</string>
+    <string name="sk_settings_glitch_mode_explanation">Aktiver dette dersom heimeinstansen din køyrer Glitch. Trengst ikkje for Hometown eller Akkoma.</string>
+    <string name="sk_notify_poll_results">Resultat av rundspørjing</string>
+    <string name="sk_unfinished_attachments_message">Opplasting ikkje fullført for vedlegg.</string>
+    <string name="sk_compact_reblog_reply_line">Kompakt framhev-/svar-linje</string>
+    <string name="sk_settings_content_types_explanation">Gjer det mogleg å spesifisere innhaldstype, slik som Markdown, ved oppretting av innlegg. Merk at ikkje alle instansar har støtte for dette.</string>
+    <string name="sk_no_remote_info_hint">fjerninformasjon ikkje tilgjengeleg</string>
+    <string name="sk_settings_allow_remote_loading_explanation">Prøv å hente meir nøyaktig informasjon om følgere, likarklikk og framhevingar ved å laste informasjonen frå opphavsinstansen.</string>
+    <string name="sk_settings_emoji_reactions">Aktiver emoji-reaksjonar</string>
+    <string name="sk_settings_emoji_reactions_explanation">Viser emoji-reaksjonar til innlegg og let deg interagere med desse. Enkelte tilpassa versjonar av Mastodon har støtte for dette, men Mastodon har ikkje.</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">Ein brukar reagerte med %2$s</item>
+        <item quantity="other">%1$,d brukarar reagerte med %2$s</item>
+    </plurals>
+    <string name="sk_duration_hours_1">1 time</string>
+    <string name="sk_schedule_or_draft">Plan eller utkast</string>
+    <string name="sk_compose_no_schedule">Ikkje planlegg</string>
+    <string name="sk_compose_no_draft">Ikkje lag utkast</string>
+    <string name="sk_settings_reduce_motion">Reduser rørsler i animasjonar</string>
+    <string name="sk_announcements">Kunngjeringar</string>
+    <string name="sk_mark_as_read">Marker som lest</string>
+    <string name="sk_settings_about_instance">Om instans</string>
+    <string name="sk_settings_unifiedpush">Bruk UnifiedPush</string>
+    <string name="sk_settings_unifiedpush_choose">Vel ein distributør</string>
+    <string name="sk_settings_unifiedpush_no_distributor">Ingen distributør funnen</string>
+    <string name="sk_create">Lage</string>
+    <string name="sk_create_list_title">Lag liste</string>
+    <string name="sk_list_name_hint">Listenamn</string>
+    <string name="sk_list_replies_policy">Vis svar til</string>
+    <string name="sk_list_replies_policy_list">listemedlemer</string>
+    <string name="sk_list_replies_policy_followed">følgde brukarar</string>
+    <string name="sk_list_replies_policy_none">ingen</string>
+    <string name="sk_delete_list">Slett liste</string>
+    <string name="sk_delete_list_confirm">Er du sikker på at du vil slette lista \"%s\"\?</string>
+    <string name="sk_edit_list_title">Tilpass liste</string>
+    <string name="sk_your_lists">Dine lister</string>
+    <string name="sk_timeline_home">Heime</string>
+    <string name="sk_timeline_local">Lokal</string>
+    <string name="sk_timeline_federated">Føderasjon</string>
+    <string name="sk_timeline_bubble">Boble</string>
+    <string name="sk_recent_searches_placeholder">Skriv for å starte søk</string>
+    <string name="sk_remove_follower">Fjern følgjar</string>
+    <string name="sk_remove_follower_confirm">Fjern %s som følgjar ved å blokkere og straks avblokkere\?</string>
+    <string name="sk_do_remove_follower">Fjern</string>
+    <string name="sk_remove_follower_success">Vellukka fjerning av følgjar</string>
+    <string name="sk_changelog">Endringslogg</string>
+    <string name="sk_alt_text_missing_title">Manglande altenativ bildetekst</string>
+    <string name="sk_publish_anyway">Publiser likevel</string>
+    <string name="sk_settings_disable_alt_text_reminder">Skru av påminning om alternativ bildetekst</string>
+    <string name="sk_notify_posts_info_banner">Om du aktiverer varsling av innlegg frå enkelte personar, vil dei nye innlegga deira hamne her.</string>
+    <string name="sk_timelines">Tidslinjer</string>
+    <string name="sk_timeline_posts">Innlegg</string>
+    <string name="sk_timelines_add">Legg til</string>
+    <string name="sk_timeline">Tidslinje</string>
+    <string name="sk_list">Liste</string>
+    <string name="sk_hashtag">Emneknagg</string>
+    <string name="sk_pin_timeline">Fest tidslinje</string>
+    <string name="sk_unpin_timeline">Løys tidslinje</string>
+    <string name="sk_pinned_timeline">Festa til Heime</string>
+    <string name="sk_unpinned_timeline">Løyst frå Heime</string>
+    <string name="sk_remove">Fjern</string>
+    <string name="sk_timeline_icon">Ikon</string>
+    <string name="sk_icon_heart">Hjarte</string>
+    <string name="sk_icon_star">Stjerne</string>
+    <string name="sk_icon_city">By</string>
+    <string name="sk_icon_cat">Katt</string>
+    <string name="sk_icon_dog">Hund</string>
+    <string name="sk_icon_rabbit">Hare</string>
+    <string name="sk_icon_turtle">Skjelpadde</string>
+    <string name="sk_icon_balloon">Ballong</string>
+    <string name="sk_icon_image">Bilde</string>
+    <string name="sk_icon_bot">Robot</string>
+    <string name="sk_icon_language">Språk</string>
+    <string name="sk_icon_location">Stad</string>
+    <string name="sk_icon_megaphone">Megafon</string>
+    <string name="sk_icon_microphone">Mikrofon</string>
+    <string name="sk_icon_microscope">Mikroskop</string>
+    <string name="sk_icon_keyboard">Keyboard</string>
+    <string name="sk_icon_coffee">Kaffi</string>
+    <string name="sk_icon_laugh">Latter</string>
+    <string name="sk_icon_news">Nyhende</string>
+    <string name="sk_icon_pi">Pi</string>
+    <string name="sk_icon_color_palette">Fargepalett</string>
+    <string name="sk_icon_academic_cap">Akademikarhatt</string>
+    <string name="sk_icon_tag">Etikett</string>
+    <string name="sk_icon_stethoscope">Stetoskop</string>
+    <string name="sk_icon_weather">Vêr</string>
+    <string name="sk_icon_games">Spel</string>
+    <string name="sk_icon_code">Kode</string>
+    <string name="sk_icon_light_bulb">Lyspære</string>
+    <string name="sk_icon_train">Tog</string>
+    <string name="sk_icon_clapper_board">Filmklappar</string>
+    <string name="sk_icon_leaves">Lauv</string>
+    <string name="sk_icon_sport">Idrett</string>
+    <string name="sk_icon_aperture">Blendar</string>
+    <string name="sk_icon_music">Musikk</string>
+    <string name="sk_icon_health">Helse</string>
+    <string name="sk_icon_important">Viktig</string>
+    <string name="sk_icon_chat">Prat</string>
+    <string name="sk_icon_shield">Skjold</string>
+    <string name="sk_icon_book">Bok</string>
+    <string name="sk_icon_bicycle">Sykkel</string>
+    <string name="sk_icon_map">Kart</string>
+    <string name="sk_icon_backpack">Ryggsekk</string>
+    <string name="sk_icon_briefcase">Stresskoffert</string>
+    <string name="sk_icon_fire">Brann</string>
+    <string name="sk_icon_bug">Insekt</string>
+    <string name="sk_icon_pizza">Pizza</string>
+    <string name="sk_icon_gavel">Klubbe</string>
+    <string name="sk_icon_gauge">Målar</string>
+    <string name="sk_icon_headphones">Høyretelefon</string>
+    <string name="sk_icon_human">Menneske</string>
+    <string name="sk_icon_globe">Globus</string>
+    <string name="sk_icon_pin">Teiknestift</string>
+    <string name="sk_icon_feed">Flaum</string>
+    <string name="sk_icon_beaker">Beger</string>
+    <string name="sk_icon_bed">Seng</string>
+    <string name="sk_icon_recycle_bin">Søppelkorg</string>
+    <string name="sk_icon_verified">Verifisert</string>
+    <string name="sk_icon_doctor">Dokter</string>
+    <string name="sk_icon_diamond">Diamant</string>
+    <string name="sk_icon_umbrella">Paraply</string>
+    <string name="sk_edit_timeline">Tilpass tidslinje</string>
+    <string name="sk_edit_timelines">Tilpass tidslinjer</string>
+    <string name="sk_edit_timeline_tag_main">Innlegg med emneknaggar…</string>
+    <string name="sk_edit_timeline_tag_any">…eller nokre av desse</string>
+    <string name="sk_edit_timeline_tag_all">…og alle desse</string>
+    <string name="sk_edit_timeline_tag_none">…men ingen av desse</string>
+    <string name="sk_edit_timeline_tags_hint">Legg til emneknaggar…</string>
+    <string name="sk_hashtag_timeline_local_only_switch">Vis kun lokale innlegg\?</string>
+    <string name="sk_add_timeline_tag_error_empty">Emneknagg kan ikkje vera tom</string>
+    <string name="sk_alt_button">ALT</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_post_edited">Endra</string>
+    <string name="sk_notification_type_update">Endra innlegg</string>
+    <string name="sk_notify_update">Endrar eit framheva innlegg</string>
+    <string name="sk_attach_file">Legg ved fil</string>
+    <string name="sk_searching">Søker…</string>
+    <string name="sk_no_results">Ingen resultat</string>
+    <string name="sk_save_draft">Lagre utkast\?</string>
+    <string name="sk_save_draft_message">Vil du lagre endringane dine til dette utkastet eller publisere det no\?</string>
+    <string name="sk_no_alt_text">Ingen alternativ bildetekst tilgjengeleg</string>
+    <string name="sk_settings_show_alt_indicator">Indikator for alternativ bildetekst</string>
+    <string name="sk_updater_enable_pre_releases">Tillat tidlegversjonar</string>
+    <string name="sk_settings_see_new_posts_button">\"Sjå nye innlegg\"-knapp</string>
+    <string name="sk_inline_local_only">kun lokal</string>
+    <string name="sk_inline_direct">nemnde</string>
+    <string name="sk_separator">·</string>
+    <string name="sk_local_only">Kun lokal instans</string>
+    <string name="sk_instance_features">Instans-eigenskapar</string>
+    <string name="sk_settings_support_local_only">Tenar støttar lokale innlegg</string>
+    <string name="sk_settings_glitch_instance">Lokalmodus for Glitch</string>
+    <string name="sk_settings_auto_reveal_nobody">Aldri</string>
+    <string name="sk_settings_auto_reveal_author">Svar frå same forfattar</string>
+    <string name="sk_settings_auto_reveal_anyone">Svar frå alle</string>
+    <string name="sk_settings_prefix_replies_always">Som svar til alle</string>
+    <string name="sk_settings_prefix_replies_never">Aldri</string>
+    <string name="sk_settings_prefix_replies_to_others">Kun i svar til andre</string>
+    <string name="sk_settings_forward_report_default">Standarinnstilling for \"Vidaresend rapport\"-brytar</string>
+    <string name="sk_exclusive_list">Eksklusiv liste</string>
+    <string name="sk_list_exclusive_switch">Gjer lista eksklusiv</string>
+    <string name="sk_list_exclusive_switch_explanation">Medlemer i ei eksklusiv liste vil ikkje bli vist i heime-tidslinja di – dersom instansen din har støtte for dette.</string>
+    <string name="sk_advanced_options_show">Vis avanserte alternativ</string>
+    <string name="sk_advanced_options_hide">Skjul avanserte alternativ</string>
+    <string name="sk_spoiler_show">Vis innhald</string>
+    <string name="sk_pronouns_label">Pronomen</string>
+    <string name="sk_switch_timeline">Bytt tidslinje</string>
+    <string name="sk_settings_instance">Instans</string>
+    <string name="sk_disable_pill_shaped_active_indicator">Deaktiver pilleforma aktiv faneindikator</string>
+    <string name="sk_settings_true_black">Bekmørk modus</string>
+    <string name="sk_search_fediverse">Søk i Fødiverset</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Vis pronomen i tidslinjer</string>
+    <string name="sk_settings_display_pronouns_in_threads">Vis pronomen i trådar</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Vis pronomen i lister over brukarar</string>
+    <string name="sk_tab_home">Heime</string>
+    <string name="sk_tab_search">Søk</string>
+    <string name="sk_tab_notifications">Varslingar</string>
+    <string name="sk_tab_profile">Profil</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">Vis fanetitlar i navigeringsrada</string>
+    <string name="sk_clear_all_notifications">Slett alle varslingar</string>
+    <string name="sk_clear_all_notifications_confirm_action">Slett alt</string>
+    <string name="sk_clear_all_notifications_confirm">Er du sikker på at du vil slette alle varslingar\?</string>
+    <string name="sk_settings_enable_delete_notifications">Aktiver sletting av varslingar</string>
+    <string name="sk_settings_publish_button_text_title">Tilpass publiseringsknapp</string>
+    <string name="sk_settings_publish_button_text">Tekst på publiseringsknapp</string>
+    <string name="sk_settings_translate_only_opened">Omsett kun opna innlegg</string>
+    <string name="sk_settings_translation_availability_note_unavailable">%s støttar tilsynelatande ikkje omsetjing.</string>
+    <string name="sk_loading_fediverse_resource_title">Leitar i Fødiverset</string>
+    <string name="sk_loading_resource_on_instance_title">Leitar på %s</string>
+    <string name="sk_undo_reblog">Angre framheving</string>
+    <string name="sk_reblog_with_visibility">Framhev og gjer synleg</string>
+    <string name="sk_quote_post">Kommenter dette</string>
+    <string name="sk_hashtags_you_follow">Emneknaggar du følgjer</string>
+    <string name="sk_copy_link_to_post">Kopier link til innlegg</string>
+    <string name="sk_open_with_account">Opne med annan konto</string>
+    <string name="sk_bookmark_as">Lag bokmerke med annan konto</string>
+    <string name="sk_bookmarked_as">Bokmerke laga som %s</string>
+    <string name="sk_already_bookmarked">Bokmerke finst frå før</string>
+    <string name="sk_favorite_as">Marker som favoritt med annan konto</string>
+    <string name="sk_favorited_as">Markert som favoritt som %s</string>
+    <string name="sk_already_favorited">Markert som favoritt frå før</string>
+    <string name="sk_reblogged_as">Framheva som %s</string>
+    <string name="sk_already_reblogged">Framheva frå før</string>
+    <string name="sk_reply_as">Svar med annan konto</string>
+    <string name="sk_settings_uniform_icon_for_notifications">Einskaplege ikon for alle varslingar</string>
+    <string name="sk_forward_report_to">Vidaresend til %s</string>
+    <string name="sk_unsent_posts">Ikkje sendte innlegg</string>
+    <string name="sk_draft">Utkast</string>
+    <string name="sk_confirm_delete_draft_title">Slett utkast</string>
+    <string name="sk_confirm_delete_draft">Er du sikker på at du vil slette dette utkastet\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">Slett planlagt innlegg</string>
+    <string name="sk_draft_or_schedule">Lag utkast eller planlegg sending</string>
+    <string name="sk_compose_draft">Innlegg vil bli lagra som utkast.</string>
+    <string name="sk_compose_scheduled">Planlagt til</string>
+    <string name="sk_draft_saved">Utkast lagra</string>
+    <string name="sk_post_scheduled">Innlegg planlagt</string>
+    <string name="sk_scheduled_too_soon_title">Planlagt tid er for tidleg</string>
+    <string name="sk_confirm_save_draft">Lagre utkast\?</string>
+    <string name="sk_confirm_save_changes">Lagre endringar\?</string>
+    <string name="sk_signed_up">registrert</string>
+    <string name="sk_reported">rapportert</string>
+    <string name="sk_reacted_with">%1$s har reagert med %2$s</string>
+    <string name="sk_reacted">%s har reagert</string>
+    <string name="sk_sign_ups">Registreringar</string>
+    <string name="sk_new_reports">Nye rapportar</string>
+    <string name="sk_settings_server_version">Tenarversjon: %s</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Set \"re:\" som prefix til CW ved svar</string>
+    <string name="sk_filtered">Filtrert: %s</string>
+    <string name="sk_expand">Utvid</string>
+    <string name="sk_collapse">Minimer</string>
+    <string name="sk_unfinished_attachments">Fikse vedlegg\?</string>
+    <string name="sk_settings_hide_interaction">Skjul interaksjonsknappar</string>
+    <string name="sk_follow_as">Følg frå annan konto</string>
+    <string name="sk_followed_as">Følgd frå %s</string>
+    <string name="sk_settings_hide_fab">Auto-skjul knappen for å legge til nytt innlegg</string>
+    <string name="sk_notification_action_replied">Sendt svar til %s</string>
+    <string name="sk_in_reply">Som svar</string>
+    <string name="sk_reply_line_above_avatar">\"Som svar til\"-linje over profilbilde</string>
+    <string name="sk_show_thread">Vis tråd</string>
+    <string name="sk_settings_confirm_before_reblog">Stadfest før framheving</string>
+    <string name="sk_content_type">Innhaldstype</string>
+    <string name="sk_content_type_unspecified">Uspesifisert</string>
+    <string name="sk_content_type_plain">Enkel tekst</string>
+    <string name="sk_content_type_html">HTML</string>
+    <string name="sk_content_type_markdown">Markdown</string>
+    <string name="sk_content_type_bbcode">BBCode</string>
+    <string name="sk_content_type_mfm">MFM</string>
+    <string name="sk_settings_content_types">Aktiver innleggsformatering</string>
+    <string name="sk_settings_default_content_type">Standard innhaldstype</string>
+    <string name="sk_settings_default_content_type_explanation">Gjer det mogleg å la ein innhaldstype vera førehandsvald ved skriving av nye innlegg, slik at denne overstyrer innstillingane i \"Innleggspreferansar\".</string>
+    <string name="sk_instance_info_unavailable">Instansinformasjon mellombels utilgjengeleg</string>
+    <string name="sk_open_in_app">Opne i app</string>
+    <string name="sk_open_in_app_failed">Kunne ikkje opne i app</string>
+    <string name="sk_external_share_title">Del med konto</string>
+    <string name="sk_external_share_or_open_title">Del eller opne med konto</string>
+    <string name="sk_error_loading_profile">Kunne ikkje laste profilen via %s</string>
+    <string name="sk_settings_allow_remote_loading">Last informasjon frå fjerninstansar</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Automatisk avsløring av like CW-ar i svar</string>
+    <string name="sk_settings_collapse_long_posts">Minimer svært lange innlegg</string>
+</resources>

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

@@ -6,7 +6,7 @@
 	<string name="error">Feil</string>
 	<string name="not_a_mastodon_instance">%s ser ikke ut til å være en Mastodon server.</string>
 	<string name="ok">OK</string>
-	<string name="preparing_auth">Forbereder for autentisering…</string>
+	<string name="preparing_auth">Forbereder autentisering…</string>
 	<string name="finishing_auth">Ferdigstiller autentisering…</string>
 	<string name="user_boosted">Fremhevet av %s</string>
 	<string name="in_reply_to">Som svar på %s</string>
@@ -90,7 +90,7 @@
 		<item quantity="other">%,d stemmer</item>
 	</plurals>
 	<string name="poll_closed">Lukket</string>
-	<string name="confirm_mute_title">Demp Konto</string>
+	<string name="confirm_mute_title">Demp konto</string>
 	<string name="confirm_mute">Bekreft demping av %s</string>
 	<string name="do_mute">Demp</string>
 	<string name="confirm_unmute_title">Opphev demping av konto</string>
@@ -179,7 +179,7 @@
 	<string name="confirm_email_title">Sjekk innboksen din</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Trykk på linken vi sendte deg for å verifisere %s. Vi venter her.</string>
-	<string name="confirm_email_didnt_get">Fikk du ikke lenken?</string>
+	<string name="confirm_email_didnt_get">Fikk du ikke linken?</string>
 	<string name="resend">Send på nytt</string>
 	<string name="open_email_app">Åpne e-post appen</string>
 	<string name="resent_email">Bekreftelse e-post er sendt</string>

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

@@ -285,5 +285,28 @@
     <string name="sk_settings_content_types">Włącz formatowanie wpisu</string>
     <string name="sk_open_in_app">Otwórz w aplikacji</string>
     <string name="sk_external_share_title">Udostępnij z kontem</string>
-    <string name="sk_bubble_timeline_info_banner">To są najnowsze posty z sieci wybrane przez administratorów Twojej instancji.</string>
+    <string name="sk_settings_auto_reveal_nobody">Nigdy</string>
+    <string name="sk_no_remote_info_hint">zdalne informacje są niedostępne</string>
+    <string name="sk_settings_prefix_replies_never">Nigdy</string>
+    <string name="sk_icon_bed">Łóżko</string>
+    <string name="sk_icon_verified">Zweryfikowano</string>
+    <string name="sk_icon_doctor">Doktor</string>
+    <string name="sk_icon_diamond">Diament</string>
+    <string name="sk_icon_umbrella">Parasol</string>
+    <string name="sk_icon_recycle_bin">Kosz na śmieci</string>
+    <string name="sk_add_timeline">Dodaj oś czasu</string>
+    <string name="sk_edit_timeline_tag_hint">Wprowadź hasztag…</string>
+    <string name="sk_edit_timeline_tags_hint">Wprowadź hasztagi…</string>
+    <string name="sk_edit_timeline_tag_main">Wpisy zawierające hasztag…</string>
+    <string name="sk_icon_feed">Kanał</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_content_type_markdown">Markdown</string>
+    <string name="sk_exclusive_list">Lista wykluczonych</string>
+    <string name="sk_advanced_options_show">Pokaż zaawansowane opcje</string>
+    <string name="sk_pronouns_label">Zaimki</string>
+    <string name="sk_settings_instance">Instancja</string>
+    <string name="sk_spoiler_show">Pokaż zawartość</string>
+    <string name="sk_switch_timeline">Przełącz oś czasu</string>
+    <string name="sk_search_fediverse">Wyszukaj w Fediwersum</string>
+    <string name="sk_advanced_options_hide">Ukryj zaawansowane opcje</string>
 </resources>

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

@@ -261,15 +261,14 @@
     <string name="sk_settings_reply_visibility_all">Todas as respostas</string>
     <string name="sk_settings_reply_visibility_following">Respostas para meus seguidores</string>
     <string name="sk_settings_reply_visibility_self">Respostas para mim</string>
-    <string name="sk_reacted_with">reagiu com %s</string>
+    <string name="sk_reacted_with">%1$s reagiu com %2$s</string>
-    <string name="sk_reacted">reagiu</string>
+    <string name="sk_reacted">%s reagiu</string>
     <string name="sk_sign_ups">Usuários se inscrevendo</string>
     <string name="sk_new_reports">Novas relatórios</string>
     <string name="sk_reported">reportado</string>
-    <string name="sk_settings_auto_reveal_equal_spoilers">Revelar Avisos de Conteúdo em respostas de</string>
+    <string name="sk_settings_auto_reveal_nobody">Nunca</string>
-    <string name="sk_settings_auto_reveal_nobody">ninguém</string>
+    <string name="sk_settings_auto_reveal_author">Respostas do mesmo autor</string>
-    <string name="sk_settings_auto_reveal_author">autor</string>
+    <string name="sk_settings_auto_reveal_anyone">Respostas de todos</string>
-    <string name="sk_settings_auto_reveal_anyone">todo mundo</string>
     <string name="sk_open_in_app_failed">Não foi possível abrir no app</string>
     <string name="sk_external_share_title">Compartilhar com conta</string>
     <string name="sk_external_share_or_open_title">Compartilhar ou abrir com conta</string>
@@ -277,9 +276,9 @@
     <string name="sk_error_loading_profile">Falha em carregar o perfil via %s</string>
     <string name="sk_settings_allow_remote_loading">Carregar informações de instâncias remotas</string>
     <string name="sk_settings_allow_remote_loading_explanation">Tentar buscar listagens mais precisas de seguidores, curtidas e impulsos carregando a informação pela instância de origem.</string>
-    <string name="sk_settings_prefix_replies_always">todo mundo</string>
+    <string name="sk_settings_prefix_replies_always">Em resposta a qualquer um</string>
-    <string name="sk_settings_prefix_replies_never">ninguém</string>
+    <string name="sk_settings_prefix_replies_never">Nunca</string>
-    <string name="sk_settings_prefix_replies_to_others">outros</string>
+    <string name="sk_settings_prefix_replies_to_others">Apenas em resposta a outros</string>
     <string name="sk_content_type">Tipo de conteúdo</string>
     <string name="sk_content_type_unspecified">Não especificado</string>
     <string name="sk_content_type_plain">Texto simples</string>
@@ -309,4 +308,29 @@
     <string name="sk_exclusive_list">Lista exclusiva</string>
     <string name="sk_list_exclusive_switch">Tornar lista exclusiva</string>
     <string name="sk_list_exclusive_switch_explanation">Membros de uma lista exclusiva não irão aparecer na sua linha do tempo inicial - somente se sua instância suportar.</string>
+    <string name="sk_icon_bed">Cama</string>
+    <string name="sk_icon_verified">Verificado</string>
+    <string name="sk_icon_diamond">Diamante</string>
+    <string name="sk_icon_umbrella">Guarda-chuva</string>
+    <string name="sk_add_timeline">Adicionar linha do tempo</string>
+    <string name="sk_edit_timeline_tag_any">…ou qualquer um destes</string>
+    <string name="sk_edit_timeline_tag_all">…e cada um destes</string>
+    <string name="sk_edit_timeline_tag_none">…mas nenhum desses</string>
+    <string name="sk_edit_timeline_tag_hint">Insira a hashtag…</string>
+    <string name="sk_edit_timeline_tags_hint">Insira as hashtags…</string>
+    <string name="sk_hashtag_timeline_local_only_switch">Mostrar apenas postagens locais\?</string>
+    <string name="sk_add_timeline_tag_error_empty">A hashtag não deve estar vazia</string>
+    <string name="sk_icon_beaker">Béquer</string>
+    <string name="sk_icon_doctor">Doutor</string>
+    <string name="sk_edit_timeline_tag_main">Postagens contendo hashtag…</string>
+    <string name="sk_edit_timeline_tags_explanation">Observe que o servidor lida com essas operações. A combinação deles pode não ser suportada.</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_advanced_options_show">Mostrar opções avançadas</string>
+    <string name="sk_advanced_options_hide">Ocultar opções avançadas</string>
+    <string name="sk_spoiler_show">Mostrar conteúdo</string>
+    <string name="sk_pronouns_label">Pronomes</string>
+    <string name="sk_settings_instance">Instância</string>
+    <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>
 </resources>

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

@@ -4,11 +4,15 @@
 	<string name="next">Seguinte</string>
 	<string name="loading_instance">A carregar informação do servidor…</string>
 	<string name="error">Erro</string>
+	<string name="not_a_mastodon_instance">%s não parece ser um servidor Mastodon.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">A preparar a autenticação…</string>
 	<string name="finishing_auth">A finalizar a autenticação…</string>
+	<string name="user_boosted">%s reforçou</string>
 	<string name="in_reply_to">Responder a %s</string>
 	<string name="notifications">Notificações</string>
+	<string name="user_followed_you">%s começou a seguir-te</string>
+	<string name="user_favorited">%s assinalou a sua publicação como favorita</string>
 	<string name="share_toot_title">Partilhar</string>
 	<string name="settings">Configurações</string>
 	<string name="publish">Publicar</string>
@@ -30,6 +34,7 @@
 	<string name="button_follow">Seguir</string>
 	<string name="button_following">A seguir</string>
 	<string name="edit_profile">Editar Perfil</string>
+	<string name="share_user">Partilhar perfil</string>
 	<string name="mute_user">Silenciar %s</string>
 	<string name="unmute_user">Deixar de silenciar @%s</string>
 	<string name="block_user">Bloquear %s</string>
@@ -77,6 +82,10 @@
 		<item quantity="one">%d dia restante</item>
 		<item quantity="other">%d dias restantes</item>
 	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%,d voto</item>
+		<item quantity="other">%,d votos</item>
+	</plurals>
 	<string name="poll_closed">Fechado</string>
 	<string name="confirm_mute_title">Silenciar Conta</string>
 	<string name="confirm_mute">Confirme para silenciar %s</string>

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

@@ -338,4 +338,29 @@
     <string name="sk_settings_true_black">Mod negru complet</string>
     <string name="sk_settings_tabs_disable_swipe">Dezactivați glisarea între file</string>
     <string name="sk_disable_pill_shaped_active_indicator">Dezactivați indicatorul de filă activă în formă de pastilă</string>
+    <string name="sk_search_fediverse">Căutați în Fedivers</string>
+    <string name="sk_settings_unifiedpush">Folosiți UnifiedPush</string>
+    <string name="sk_settings_unifiedpush_choose">Alegeți un distribuitor</string>
+    <string name="sk_settings_unifiedpush_no_distributor">Niciun distribuitor găsit</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Trebuie să instalați un distribuitor pentru ca notificările UnifiedPush să funcționeze. Pentru mai multe informații, vizitați https://unifiedpush.org/</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Afișați pronume în cronologii</string>
+    <string name="sk_settings_display_pronouns_in_threads">Afișați pronume în fire de conversații</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Afișați pronume în listările utilizatorilor</string>
+    <string name="sk_tab_home">Acasă</string>
+    <string name="sk_tab_search">Căutați</string>
+    <string name="sk_tab_notifications">Notificări</string>
+    <string name="sk_tab_profile">Profil</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">Afișați etichetele filelor în bara de navigare</string>
+    <string name="sk_mute_label">Durație</string>
+    <string name="sk_duration_indefinite">Indefinită</string>
+    <string name="sk_duration_minutes_5">5 minute</string>
+    <string name="sk_duration_minutes_30">30 minute</string>
+    <string name="sk_duration_hours_1">1 oră</string>
+    <string name="sk_duration_hours_6">6 ore</string>
+    <string name="sk_duration_days_1">1 zi</string>
+    <string name="sk_duration_days_3">3 zile</string>
+    <string name="sk_duration_days_7">7 zile</string>
+    <string name="sk_settings_continues_playback">Suprapunere audio</string>
+    <string name="sk_settings_continues_playback_summary">Permiteți continuarea redării media curente, suprapunând noua redare</string>
+    <string name="sk_notification_mention">Ați fost menționați de către %s</string>
 </resources>

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

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

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

@@ -270,66 +270,57 @@
     <string name="sk_settings_reply_visibility_self">Ответы мне</string>
     <string name="sk_settings_confirm_before_reblog">Подтверждение перед продвижением</string>
     <string name="sk_compact_reblog_reply_line">Компактная строка продвижения/ответа</string>
-    <string name="sk_reacted_with">отреагировал с %s</string>
+    <string name="sk_reacted_with">%1$s отреагировал: %2$s</string>
-    <string name="sk_reacted">отреагировал</string>
+    <string name="sk_reacted">%s отреагировал</string>
     <string name="sk_notification_action_replied">Отправлен ответ на %s</string>
     <string name="sk_show_thread">Показать тему</string>
-    <string name="sk_content_type">Тип контента</string>
+    <string name="sk_icon_feed">Новости</string>
-    <string name="sk_content_type_unspecified">Не указан</string>
+    <string name="sk_settings_auto_reveal_nobody">Никогда</string>
-    <string name="sk_content_type_plain">Обычный текст</string>
+    <string name="sk_settings_auto_reveal_author">Ответы от этого автора</string>
+    <string name="sk_settings_auto_reveal_anyone">Ответы ото всех</string>
+    <string name="sk_external_share_title">Поделиться с учётной записью</string>
+    <string name="sk_settings_prefix_replies_always">В ответ кому угодно</string>
+    <string name="sk_settings_prefix_replies_never">Никогда</string>
+    <string name="sk_icon_umbrella">Зонт</string>
+    <string name="sk_icon_beaker">Хим. стакан</string>
+    <string name="sk_icon_bed">Кровать</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_add_timeline">Добавить ленту</string>
+    <string name="sk_edit_timeline_tag_main">Посты с хештегом…</string>
+    <string name="sk_edit_timeline_tag_any">...или любые из этих</string>
+    <string name="sk_edit_timeline_tag_all">...и все из этих</string>
+    <string name="sk_edit_timeline_tag_none">...но без этих</string>
+    <string name="sk_edit_timeline_tag_hint">Введите хештег…</string>
+    <string name="sk_edit_timeline_tags_hint">Введите хештеги…</string>
+    <string name="sk_edit_timeline_tags_explanation">Пожалуйста, имейте в виду, что эти операции обрабатываются сервером. Совмещение может не поддерживаться.</string>
+    <string name="sk_hashtag_timeline_local_only_switch">Отображать только местные посты\?</string>
+    <string name="sk_add_timeline_tag_error_empty">Хештег не может быть пустым</string>
     <string name="sk_content_type_html">HTML</string>
     <string name="sk_content_type_markdown">Markdown</string>
-    <string name="sk_content_type_bbcode">BBCode</string>
+    <string name="sk_content_type_bbcode">BB-код</string>
-    <string name="sk_content_type_mfm">MFM</string>
+    <string name="sk_advanced_options_hide">Скрыть дополнительные опции</string>
-    <string name="sk_settings_content_types">Включить форматирование публикаций</string>
+    <string name="sk_timeline_bubble">Круг</string>
-    <string name="sk_settings_content_types_explanation">Позволяет устанавливать тип разметки, такой как Markdown, при создании публикации. Имейте в виду, что не все инстансы поддерживают это.</string>
+    <string name="sk_gif_badge">GIF</string>
-    <string name="sk_settings_default_content_type">Тип контента по умолчанию</string>
+    <string name="sk_content_type_plain">Обычный текст</string>
-    <string name="sk_settings_default_content_type_explanation">Это позволяет вам предварительно выбирать тип контента при создании новых публикаций, переопределяя значение, установленное в “Настройках публикации”.</string>
+    <string name="sk_settings_content_types">Включить форматирование постов</string>
-    <string name="sk_settings_show_new_posts_button">Кнопка \"Показать новые посты\"</string>
+    <string name="sk_settings_default_content_type">Тип содержимого по умолчанию</string>
+    <string name="sk_instance_info_unavailable">Информация о сервере временно недоступна</string>
     <string name="sk_open_in_app">Открыть в приложении</string>
-    <string name="sk_open_in_app_failed">Не удалось открыть в приложении</string>
+    <string name="sk_error_loading_profile">Не удалось загрузить профиль с %s</string>
-    <string name="sk_external_share_or_open_title">Поделиться или открыть с помощью учетной записи</string>
+    <string name="sk_settings_allow_remote_loading">Загрузить информацию с удалённых серверов</string>
-    <string name="sk_no_remote_info_hint">дистанционная информация недоступна</string>
+    <string name="sk_advanced_options_show">Показать дополнительные опции</string>
-    <string name="sk_settings_allow_remote_loading">Загрузка информации из других инстансов</string>
+    <string name="sk_spoiler_show">Показать содержимое</string>
-    <string name="sk_settings_auto_reveal_equal_spoilers">Выявить одинаковые предупреждения в чатах</string>
+    <string name="sk_pronouns_label">Произношение</string>
-    <string name="sk_settings_auto_reveal_never">Никогда</string>
+    <string name="sk_settings_instance">Сервер</string>
-    <string name="sk_settings_auto_reveal_threads">Тот же автор</string>
+    <string name="sk_open_in_app_failed">Невозможно открыть в приложении</string>
-    <string name="sk_settings_auto_reveal_discussions">Обсуждения</string>
+    <string name="sk_external_share_or_open_title">Поделиться или открыть с учётной записью</string>
-    <string name="sk_settings_auto_reveal_always">Всегда</string>
+    <string name="sk_no_remote_info_hint">удалённая информация недоступна</string>
-    <string name="sk_bubble_timeline_info_banner">Это самые последние сообщения из сети, созданные администраторами вашего экземпляра.</string>
+    <string name="sk_switch_timeline">Переключить ленту</string>
-    <string name="sk_timeline_bubble">Пузырь</string>
+    <string name="sk_content_type">Тип содержимого</string>
-    <string name="sk_instance_info_unavailable">Информация об инстансе временно недоступна</string>
+    <string name="sk_content_type_unspecified">Не указано</string>
-    <string name="sk_external_share_title">Поделиться с аккаунтом</string>
+    <string name="sk_bubble_timeline_info_banner">Это недавние посты из сети, управляемой администраторами этого сервера.</string>
-    <string name="sk_error_loading_profile">Не удалось загрузить профиль через %s</string>
+    <string name="sk_search_fediverse">Искать в Федивёрсе</string>
-    <string name="sk_settings_allow_remote_loading_explanation">Попробуйте получить более точные данные о подписчиках, лайках и увеличениях, загрузив информацию из инстанса автора.</string>
-    <string name="sk_icon_feed">Лента</string>
-    <string name="sk_settings_prefix_replies_to_others">Другим</string>
-    <string name="sk_settings_forward_report_default">Переключатель «Переслать отчет» по умолчанию</string>
-    <string name="sk_list_exclusive_switch_explanation">Участники эксклюзивного списка не будут отображаться на вашей домашней ленте– если ваш инстанс поддерживает это.</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_prefix_replies_always">Все</string>
-    <string name="sk_settings_prefix_replies_never">Никто</string>
-    <string name="sk_exclusive_list">Эксклюзивный список</string>
-    <string name="sk_list_exclusive_switch">Сделайте список эксклюзивным</string>
-    <string name="sk_icon_bed">Кровать</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_add_timeline">Добавить ленту</string>
-    <string name="sk_edit_timeline_tag_main">Посты, содержащие хэштег…</string>
-    <string name="sk_edit_timeline_tag_any">...или любой из этих</string>
-    <string name="sk_edit_timeline_tag_none">...но ни одно из этих</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_advanced_options_show">Показать дополнительные параметры</string>
-    <string name="sk_icon_beaker">Мерный стакан</string>
-    <string name="sk_edit_timeline_tag_all">...и каждый из этих</string>
-    <string name="sk_edit_timeline_tags_explanation">Пожалуйста, обратите внимание, что сервер обрабатывает эти операции. Возможно, их объединение не поддерживается.</string>
-    <string name="sk_advanced_options_hide">Скрыть дополнительные параметры</string>
 </resources>

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

@@ -15,6 +15,7 @@
 	<string name="user_sent_follow_request">%s vam je poslal_a zahtevo za sledenje</string>
 	<string name="user_favorited">%s je vzljubil/a vašo objavo</string>
 	<string name="notification_boosted">%s je izpostavila/a vašo objavo</string>
+	<string name="poll_ended">Pokaži rezultate ankete, v kateri sem sodeloval_a</string>
 	<string name="share_toot_title">Deli</string>
 	<string name="settings">Nastavitve</string>
 	<string name="publish">Objavi</string>
@@ -40,6 +41,7 @@
 	<string name="button_follow">Sledi</string>
 	<string name="button_following">Sledi</string>
 	<string name="edit_profile">Uredi profil</string>
+	<string name="share_user">Profil v skupno rabo</string>
 	<string name="mute_user">Utišaj %s</string>
 	<string name="unmute_user">Odtišaj %s</string>
 	<string name="block_user">Blokiraj %s</string>
@@ -206,6 +208,7 @@
 	<string name="visibility_public">Javno</string>
 	<string name="visibility_followers_only">Samo sledilci</string>
 	<string name="visibility_private">Samo osebe, ki jih omenjam</string>
+	<string name="recent_searches">Nedavno</string>
 	<string name="skip">Preskoči</string>
 	<string name="notification_type_follow">Novi sledilci</string>
 	<string name="notification_type_favorite">Priljubljeni</string>
@@ -230,6 +233,8 @@
 	<string name="settings_clear_cache">Počisti medijski predpomnilnik</string>
 	<string name="settings_app_version">Mastodon za Android v%1$s (%2$d)</string>
 	<string name="media_cache_cleared">Predpomnilnik medijev počiščen</string>
+	<string name="confirm_log_out">Ali se želite odjaviti iz %s?</string>
+	<string name="sensitive_content_explain">Avtor je to vsebino označil kot občutljivo.</string>
 	<string name="avatar_description">Pojdi na profil %s</string>
 	<string name="more_options">Več možnosti</string>
 	<string name="new_post">Nova objava</string>
@@ -265,6 +270,7 @@
 	<string name="file_saved">Datoteka shranjena</string>
 	<string name="downloading">Prejemanje …</string>
 	<string name="no_app_to_handle_action">Ni programa za ravnanje s tem dejanjem</string>
+	<string name="local_timeline">Krajevno</string>
 	<string name="trending_posts_info_banner">To so objave, ki plenijo pozornost po Mastodonu.</string>
 	<!-- %s is the server domain -->
 	<string name="see_new_posts">Pokaži nove objave</string>
@@ -424,8 +430,13 @@
 	<string name="mark_all_notifications_read">Označi vse kot prebrano</string>
 	<string name="settings_filters">Filtri</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">O programu %s</string>
 	<string name="default_post_language">Privzeti jezik objave</string>
+	<string name="pause_all_notifications">Premor za vse</string>
+	<string name="pause_notifications_off">Izklopljeno</string>
 	<string name="notifications_policy_no_one">Nihče</string>
+	<string name="notification_type_mentions_and_replies">Omembe in odgovori</string>
+	<string name="pause_all_notifications_title">Zaustavi vsa obvestila</string>
 	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
 	<string name="today">danes</string>
 	<string name="yesterday">včeraj</string>
@@ -436,20 +447,28 @@
 	<string name="about_server">O programu</string>
 	<string name="server_rules">Pravila</string>
 	<string name="server_administrator">Skrbnik</string>
+	<string name="settings_even_more">Še več nastavitev</string>
 	<string name="settings_show_cws">Pokaži opozorilo o vsebini</string>
 	<string name="settings_hide_sensitive_media">Skrij medij, ki je označen kot občutljiv</string>
 	<string name="count_one">Ena</string>
+	<string name="alt_text_reminder_post_anyway">Objavi</string>
 	<!-- %s is the username -->
+	<string name="filter_active">Dejaven</string>
+	<string name="filter_inactive">Nedejaven</string>
 	<string name="settings_add_filter">Dodaj filter</string>
 	<string name="settings_edit_filter">Uredi filter</string>
 	<string name="settings_filter_duration">Trajanje</string>
+	<string name="settings_filter_muted_words">Utišane besede</string>
+	<string name="settings_filter_show_cw">Pokaži z oporozilom o vsebini</string>
 	<string name="settings_delete_filter">Izbriši filter</string>
 	<string name="filter_duration_forever">Za vedno</string>
 	<!-- %s is the timestamp ("tomorrow at 12:34") -->
 	<string name="filter_context_notifications">Obvestila</string>
 	<string name="filter_context_public_timelines">Javne časovnice</string>
+	<string name="filter_context_threads_replies">Niti in odgovori</string>
 	<string name="filter_context_profiles">Profili</string>
 	<string name="settings_filter_title">Naslov</string>
+	<string name="settings_delete_filter_title">Ali želite izbrisati filter »%s«?</string>
 	<string name="add">Dodaj</string>
 	<string name="filter_word_or_phrase">Beseda ali besedna zveza</string>
 	<string name="select_all">Izberi vse</string>
@@ -457,12 +476,18 @@
 	<string name="filter_duration_custom">Po meri</string>
 	<string name="required_form_field_blank">Ne sme biti prazno</string>
 	<string name="filter_word_already_in_list">Že na seznamu</string>
+	<string name="app_update_ready">Posodobitev aplikacije je pripravljena</string>
 	<string name="app_update_version">Različica %s</string>
 	<string name="downloading_update">Prenos %d%%</string>
 	<!-- Shown like a content warning, %s is the name of the filter -->
+	<string name="post_matches_filter_x">Se ujema s filtrom »%s«</string>
+	<string name="search_mastodon">Išči v Mastodonu</string>
 	<string name="clear_all">Počisti vse</string>
 	<string name="search_open_url">Odpri URL v Mastodonu</string>
+	<string name="posts_matching_hashtag">Objave s/z »%s«</string>
 	<string name="search_go_to_account">Pojdi na %s</string>
+	<string name="posts_matching_string">Objave s/z »%s«</string>
+	<string name="accounts_matching_string">Osebe s/z »%s«</string>
 	<!-- Shown in the post header. Please keep it short -->
 	<string name="time_seconds_ago_short">pred %d s</string>
 	<string name="time_minutes_ago_short">pred %d meseci</string>

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

@@ -252,7 +252,7 @@
     <string name="sk_icon_gauge">Merilnik</string>
     <string name="sk_expand">Razširi</string>
     <string name="sk_unfinished_attachments_message">Nekatere priloge se niso naložile do konca.</string>
-    <string name="sk_settings_prefix_reply_cw_with_re">CW predpona odgovora z »re:«</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">CW predpona odgovora z “re:”</string>
     <string name="sk_collapse">Strni</string>
     <string name="sk_settings_collapse_long_posts">Strni zelo dolge objave</string>
     <string name="sk_filtered">Filtrirano: %s</string>
@@ -312,4 +312,28 @@
     <string name="sk_reacted_with">%1$s se je odzval z %2$s</string>
     <string name="sk_reacted">%s se je odzval</string>
     <string name="sk_bubble_timeline_info_banner">To so najnovejše objave iz omrežja, ki so jih kurirali skrbniki vaše instance.</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Samodejno razkrij enake CW-je v odgovorih</string>
+    <string name="sk_settings_auto_reveal_nobody">Nikoli</string>
+    <string name="sk_settings_auto_reveal_author">Odgovori istega avtorja</string>
+    <string name="sk_settings_auto_reveal_anyone">Odgovori vseh</string>
+    <string name="sk_settings_prefix_replies_always">V odgovor komurkoli</string>
+    <string name="sk_settings_prefix_replies_never">Nikoli</string>
+    <string name="sk_settings_prefix_replies_to_others">Samo v odgovoru drugim</string>
+    <string name="sk_list_exclusive_switch_explanation">Člani ekskluzivnega seznama ne bodo prikazani na vaši domači časovnici – če to podpira vaša instanca.</string>
+    <string name="sk_advanced_options_show">Prikaži napredne možnosti</string>
+    <string name="sk_advanced_options_hide">Skrij napredne možnosti</string>
+    <string name="sk_exclusive_list">Ekskluzivni seznam</string>
+    <string name="sk_list_exclusive_switch">Naj bo seznam ekskluziven</string>
+    <string name="sk_settings_forward_report_default">Privzeto stikalo “Posreduj poročilo”</string>
+    <string name="sk_followed_as">Spremljan od %s</string>
+    <string name="sk_settings_default_content_type_explanation">To vam omogoča, da pri ustvarjanju novih objav predhodno izberete vrsto vsebine, s čimer prepišete vrednost, nastavljeno v »Nastavitvah objav«.</string>
+    <string name="sk_settings_allow_remote_loading_explanation">Poskusite pridobiti natančnejše sezname za sledilce, všečke in spodbude, tako da naložite informacije iz originalne instance.</string>
+    <string name="sk_spoiler_show">Prikaži vsebino</string>
+    <string name="sk_pronouns_label">Zaimki</string>
+    <string name="sk_switch_timeline">Preklopi časovnico</string>
+    <string name="sk_settings_instance">Instanca</string>
+    <string name="sk_disable_pill_shaped_active_indicator">Onemogoči indikator aktivnega zavihka v obliki tabletke</string>
+    <string name="sk_settings_true_black">Čisto črni način</string>
+    <string name="sk_settings_reply_visibility_self">Odgovori meni</string>
+    <string name="sk_search_fediverse">Iskanje v Fediverse</string>
 </resources>

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

@@ -4,12 +4,14 @@
 	<string name="next">Nästa</string>
 	<string name="loading_instance">Hämtar serverinfo…</string>
 	<string name="error">Fel</string>
+	<string name="not_a_mastodon_instance">%s verkar inte vara en mastodon server.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Förbereder för autentisering…</string>
 	<string name="finishing_auth">Slutför autentisering…</string>
 	<string name="user_boosted">%s boostade</string>
 	<string name="in_reply_to">Som svar på %s</string>
 	<string name="notifications">Notiser</string>
+	<string name="user_followed_you">%s följde dig</string>
 	<string name="share_toot_title">Dela</string>
 	<string name="settings">Inställningar</string>
 	<string name="publish">Publicera</string>
@@ -120,6 +122,7 @@
 	</plurals>
 	<string name="report_title">Rapportera %s</string>
 	<string name="report_choose_reason_subtitle">Välj den bästa träffen</string>
+	<string name="report_reason_personal">Jag gillar det inte</string>
 	<string name="report_reason_personal_subtitle">Det är inget som du vill se</string>
 	<string name="report_reason_spam">Det är skräppost</string>
 	<string name="report_reason_spam_subtitle">Skadliga länkar, bedrägligt beteende eller repetitiva svar</string>
@@ -169,6 +172,7 @@
 	<string name="add_alt_text">Lägg till alternativtext</string>
 	<string name="visibility_public">Offentlig</string>
 	<string name="visibility_followers_only">Endast följare</string>
+	<string name="recent_searches">Nyligen</string>
 	<string name="skip">Hoppa över</string>
 	<string name="notification_type_follow">Nya följare</string>
 	<string name="notification_type_favorite">Favoriter</string>
@@ -333,6 +337,7 @@
 	<string name="show">Visa</string>
 	<string name="hide">Dölj</string>
 	<string name="join_default_server">Gå med %s</string>
+	<string name="pick_server">Välj en annan server</string>
 	<string name="signup_or_login">eller</string>
 	<string name="learn_more">Läs mer</string>
 	<string name="welcome_to_mastodon">Välkommen till Mastodon</string>
@@ -343,6 +348,10 @@
 	<string name="confirm_log_out_all_accounts">Logga ut från alla konton?</string>
 	<string name="retry">Försök igen</string>
 	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_description_image">%s bild</string>
+	<string name="attachment_description_video">%s video</string>
+	<string name="attachment_description_audio">%s ljud</string>
+	<string name="attachment_description_unknown">%s fil</string>
 	<string name="attachment_type_audio">Ljud</string>
 	<string name="attachment_type_gif">GIF</string>
 	<string name="attachment_type_unknown">Fil</string>
@@ -358,6 +367,7 @@
 	<string name="settings_server_explanation">Översikt, regler och moderatorer</string>
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
 	<string name="about_app">Om %s</string>
+	<string name="settings_confirm_delete_post">Fråga innan du raderar inlägg</string>
 	<string name="notifications_policy_no_one">Ingen</string>
 	<plurals name="x_weeks">
 		<item quantity="one">%d vecka</item>

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

@@ -354,7 +354,7 @@
 	<string name="spoiler_hide">ซ่อนใหม่</string>
 	<string name="poll_multiple_choice">เลือกจำนวนหนึ่งหรือมากกว่า</string>
 	<string name="save_changes">บันทึกการเปลี่ยนแปลง</string>
-	<string name="profile_featured">แนะนำ</string>
+	<string name="profile_featured">น่าสนใจ</string>
 	<string name="profile_timeline">เส้นเวลา</string>
 	<string name="view_all">ดูทั้งหมด</string>
 	<string name="profile_endorsed_accounts">บัญชี</string>
@@ -509,7 +509,7 @@
 	</plurals>
 	<string name="selection_2_options">%1$s และ %2$s</string>
 	<string name="selection_3_options">%1$s, %2$s และ %3$s</string>
-	<string name="selection_4_or_more">%1$s, %2$s และเพิ่มเติมอีก %3$d</string>
+	<string name="selection_4_or_more">%1$s, %2$s และอีก %3$d เพิ่มเติม</string>
 	<string name="filter_context_home_lists">หน้าแรกและรายการ</string>
 	<string name="filter_context_notifications">การแจ้งเตือน</string>
 	<string name="filter_context_public_timelines">เส้นเวลาสาธารณะ</string>

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

@@ -335,4 +335,43 @@
     <string name="sk_gif_badge">GIF</string>
     <string name="sk_spoiler_show">Показати матеріали</string>
     <string name="sk_disable_pill_shaped_active_indicator">Вимкнути індикатор активної вкладки у формі таблетки</string>
+    <string name="sk_search_fediverse">Пошук у Федівсесвіті</string>
+    <string name="sk_settings_unifiedpush_no_distributor">Постачальника не знайдено</string>
+    <string name="sk_tab_home">Головна</string>
+    <string name="sk_tab_search">Пошук</string>
+    <string name="sk_tab_profile">Профіль</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>
+    <string name="sk_settings_display_pronouns_in_timelines">Показувати займенники у стрічках</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Показувати займенники у списках користувачів</string>
+    <string name="sk_settings_continues_playback">Накладення звуку</string>
+    <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_body">Щоб сповіщення UnifiedPush працювали, потрібно встановити постачальника. Для отримання додаткової інформації відвідайте https://unifiedpush.org/</string>
+    <string name="sk_tab_notifications">Сповіщення</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">Показувати ярлики вкладок на панелі навігації</string>
+    <string name="sk_settings_display_pronouns_in_threads">Показувати займенники у гілках</string>
+    <string name="sk_settings_emoji_reactions_in_lists">Показувати реакції емоджі у стрічках</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">Один користувач зреагував %2$s</item>
+        <item quantity="few">%1$,d користувачі зреагували %2$s</item>
+        <item quantity="many">%1$,d користувачів зреагували %2$s</item>
+        <item quantity="other">%1$,d користувачів зреагували %2$s</item>
+    </plurals>
+    <string name="sk_button_react">Реагуйте за допомогою емоджі</string>
+    <string name="sk_again_for_system_keyboard">Торкніться ще раз, щоб відкрити системну клавіатуру</string>
+    <string name="sk_settings_emoji_reactions">Увімкнути реакції з емоджі</string>
+    <string name="sk_settings_emoji_reactions_explanation">Показує реакції емоджі на дописи та дає змогу взаємодіяти з ними. Деякі модифіковані версії Mastodon підтримують цю функцію, але Mastodon не підтримує.</string>
+    <string name="sk_enter_emoji_toast">Вам потрібно ввести емоджі</string>
+    <string name="sk_enter_emoji_hint">Введіть, щоб відреагувати з емоджі</string>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">Чи відображати реакції емоджі у стрічках. Якщо цю опцію вимкнено, реакції емоджі показуватимуться лише під час перегляду гілки.</string>
 </resources>

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

@@ -78,7 +78,7 @@
 	<plurals name="x_votes">
 		<item quantity="other">%,d người bình chọn</item>
 	</plurals>
-	<string name="poll_closed">Kết thúc</string>
+	<string name="poll_closed">Đóng</string>
 	<string name="confirm_mute_title">Ẩn người này</string>
 	<string name="confirm_mute">Bạn muốn ẩn %s?</string>
 	<string name="do_mute">Ẩn</string>
@@ -219,7 +219,7 @@
 	<string name="add_media">Thêm media</string>
 	<string name="add_poll">Tạo bình chọn</string>
 	<string name="emoji">Emoji</string>
-	<string name="home_timeline">Bảng tin</string>
+	<string name="home_timeline">Trang chính</string>
 	<string name="my_profile">Hồ sơ của tôi</string>
 	<string name="media_viewer">Xem media</string>
 	<string name="follow_user">Theo dõi %s</string>

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

@@ -313,7 +313,7 @@
 	<string name="empty_list">还没有内容</string>
 	<string name="instance_signup_closed">此实例不接受新注册。</string>
 	<string name="text_copied">复制成功</string>
-	<string name="add_bookmark">添加到书签</string>
+	<string name="add_bookmark">添加书签</string>
 	<string name="remove_bookmark">移除书签</string>
 	<string name="bookmarks">书签</string>
 	<string name="your_favorites">你喜欢的</string>
@@ -368,7 +368,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"><![CDATA[所有的 Mastodon 账户皆托管于各自的服务器上，每个服务器有各自的价值取向、规则与管理员。无论你选择哪个服务器，你都能关注并与其他任何服务器上的用户互动。]]></string>
 	<string name="opening_link">打开链接…</string>
 	<string name="link_not_supported">应用不支持该链接</string>
 	<string name="log_out_all_accounts">登出所有账户</string>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_notification_type_status">嘟文</string>
+    <string name="sk_notification_type_status">鋪文</string>
     <string name="sk_notification_type_posts">嘟文通知</string>
     <string name="sk_poll_allow_multiple">允許複選</string>
     <string name="sk_translate_post">翻譯</string>

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

@@ -393,7 +393,7 @@
 	<string name="welcome_to_mastodon">Welcome to Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon is a decentralized social network, meaning no single company controls it. It’s made up of many independently-run servers, all connected together.</string>
 	<string name="what_are_servers">What are servers?</string>
-	<string name="welcome_paragraph2"><![CDATA[Every Mastodon account is hosted on a server — each with its own values, rules, & admins. No matter which one you pick, you can follow and interact with people on any server.]]></string>
+	<string name="welcome_paragraph2">Every Mastodon account is hosted on a server — each with its own values, rules, &amp; admins. No matter which one you pick, you can follow and interact with people on any server.</string>
 	<string name="opening_link">Opening link…</string>
 	<string name="link_not_supported">This link is not supported in the app</string>
 	<string name="log_out_all_accounts">Log out of all accounts</string>

metadata/fa-IR/changelogs/51.txt

@@ -0,0 +1,6 @@
+- امکان باز کردن فرسته اصلی را در حین پاسخ دادن (با کلیک برروی خط "در پاسخ به ...")
+- ادغام تغییرات بالادست و رفع اشکال
+- کد استفاده نشده ”App Center“ را حذف کنید
+- اضافه کردن نسخه بدون خط زمانی فدریتد برای فروشگاه Play
+- افزودن URI تغییر مسیر سفارشی برای ورود آسان تر
+- تغییر پیوند مشارکت

metadata/fa-IR/changelogs/55.txt

@@ -0,0 +1,4 @@
+- رندر شکسته تگ های HTML را برطرف کنید و قالب بندی Markdown رندر را فعال کنید
+- <a href="https://translate.codeberg.org/projects/megalodon">پروژه ترجمه Weblate</a> راه‌اندازی
+- اضافه کردن ضامن برای جدول زمانی فدریتد
+- نسخه های 52-54 تنظیمات کوچکی برای انتشار در Google Play بودند

metadata/fa-IR/changelogs/56.txt

@@ -0,0 +1,6 @@
+- تم‌های رنگی سفارشی توسط @LucasGGamerM
+- لوگوی متنی جدید "مگالودون" ارسال شده توسط @LucasGGamerM
+- جستجوی بهتر ایموجی هنگام نوشتن
+- رای گیری بهینه شده (نمایش رای خود، دکمه رای همیشه نمایش داده شود، قطع نکردن پاسخ های طولانی)
+- افزودن تنظیمات آگاهی فشار برای آگاهی‌های فرسته
+- رفع اشکال

metadata/fa-IR/changelogs/59.txt

@@ -0,0 +1,6 @@
+- افزودن انتخابگر زبان
+- افزودن تابع ترجمه
+- بهبود معنایی برای رأی گیری در نظرسنجی‌ها (دکمه های رادیویی و چک باکس)
+- افزودن گزینه‌ای تا امکان رای دادن به چندین گزینه در نظرسنجی ها فراهم شود
+- صفحه ورود جدید
+- رفع اشکال

metadata/fa-IR/changelogs/61.txt

@@ -0,0 +1,5 @@
+- تم های رنگی جدید: متریال یو و قرمز
+- رنگ های خاکستری تیره جدید برای همه تم ها
+- نماد تقویت متمایزتر
+- انیمیشن برای دکمه های تعامل
+- رفع اشکال (کرش در برخی از فرسته‌ها، "سیاهه‌ها با"، زبان فرسته پیش فرض)

metadata/fa-IR/short_description.txt

@@ -0,0 +1 @@
+ماستودون برای اندروید اما صورتی است و ویژگی‌های بیشتری دارد

metadata/fa-IR/title.txt

@@ -0,0 +1 @@
+مگالودون

metadata/pt-BR/changelogs/76.txt

@@ -0,0 +1,6 @@
+- Filtros aprimorados, incluindo compatibilidade com "Ocultar com aviso"
+- Página de perfil redesenhada com metadados diretamente abaixo da biografia
+- Função Recolher/expandir para postagens muito longas
+- Opção para prefixar automaticamente as respostas CWs com “re:”
+- Opção para ocultar botões de interação na linha do tempo
+- Várias correções de bugs, ajustes e melhorias

metadata/pt-BR/changelogs/77.txt

@@ -0,0 +1,4 @@
+- Pressione e segure o botão seguir para seguir perfis de outra conta
+- Opção para abrir perfis em outra conta
+- Ocultar automaticamente o botão de composição ao rolar a linha do tempo
+- Correção de falha ao abrir os perfis do administrador do servidor

metadata/pt-BR/changelogs/83.txt

@@ -0,0 +1,5 @@
+- Curtir/marcar/responder diretamente na aba de notificação
+- Cabeçalhos mais bonitos e consistentes para reblogs e respostas na linha do tempo
+- Ponto de notificação (que ainda não carrega as notificações)
+- Para usuários do Akkoma: Visibilidade de resposta, respostas de tópicos classificados, citações, …
+- Correções de falhas e pequenos ajustes

metadata/pt-BR/changelogs/94.txt

@@ -0,0 +1,8 @@
+- Visualização de thread melhorada e mais clara
+- Abra contas/postagens compartilhando um site para o Megalodon
+- Carregar seguidores/favoritos/… listagens da instância de origem
+- Melhorias de compatibilidade para servidores não-Mastodon
+- Opção para definir o tipo de conteúdo da publicação
+- Suporte para copiar URL de aplicativos recentes em dispositivos Pixel
+- Revelação automática de CWs iguais em threads
+- Correções de bugs e melhorias na interface do usuário

metadata/ru/changelogs/65.txt

@@ -0,0 +1,10 @@
+- Черновики и отложенные посты
+- Отображение изначального поста при ответе
+- Фильтры, совместимые с Mastodon 4.0 (пока без функционала "скрыть с предупреждением")
+- Долгое нажатие для взаимодействия с постами (ответить, продвинуть, оценить, добавить в закладки) с другого авторизованного аккаунта
+- Иконки во всех меню
+- Переключение пересылаемых репортов
+- Добавление упоминаний при использовании функции ""
+- Опция
+- Опция
+- Исправления ошибок

metadata/ru/changelogs/67.txt

@@ -0,0 +1,10 @@
+- Новая домашняя вкладка с публичными лентами
+- Отображение анонсов сервера
+- Масштабирование текста в соответствие с настройками системы
+- Улучшена фильтрация (...)
+- Список
+- Удаление подписчиков по мягкой блокировке
+- Запрет на связи с фашистами
+- Исправлен
+- Исправления и улучшения интерфейса
+- Список изменений добавлен к проверщику обновлений

metadata/sl/changelogs/94.txt

@@ -0,0 +1,8 @@
+- Izboljšan, jasnejši pogled tem
+- Odprite račune/objave z deljenjem spletne strani z Megalodonom
+- Naloži sezname sledilcev/priljubljenih/… iz originalne instance
+- Izboljšave združljivosti za strežnike, ki niso Mastodon-ovi
+- Možnost nastavitve vrste vsebine objave
+- Podpora za kopiranje URL-jev iz "nedavnih aplikacij" v napravah Pixel
+- Samodejno razkrij enake CW-je v temah
+- Popravki napak in izboljšave uporabniškega vmesnika